Sonar defect issues

IssueId: SO-118

Change-Id: I19221e6b4c41db7f00201dbc6805e76068bf099e
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
index f722be7..3ca8527 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -397,7 +398,7 @@ public class ASDCController {
                outFile.write(payloadBytes, 0, payloadBytes.length);\r
                outFile.close();\r
                } catch (Exception e) { \r
-               e.printStackTrace();\r
+                       LOGGER.debug("Exception :",e);\r
                 LOGGER.error(MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,\r
                                        artifact.getArtifactName (),\r
                                        artifact.getArtifactURL (),\r

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
index 176f655..70fa7c1 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
@@ -3,6 +3,7 @@
  * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +48,14 @@ import org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources;
 import org.openecomp.mso.db.catalog.beans.ServiceToNetworks;
 import org.openecomp.mso.db.catalog.beans.VnfResource;
 
+import org.openecomp.mso.logger.MsoLogger;
 /**
  * This structure exists to avoid having issues if the order of the vfResource/vfmodule artifact is not good (tree structure).
  *
  */
 public final class VfResourceStructure {
+       
+       protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);
 
        private boolean isDeployedSuccessfully=false;
        /**
@@ -231,11 +235,11 @@ public final class VfResourceStructure {
                        return listVFModuleMetaData;
 
                } catch (JsonParseException e) {
-                       e.printStackTrace();
+                       LOGGER.debug("JsonParseException : ",e);
                } catch (JsonMappingException e) {
-                       e.printStackTrace();
+                       LOGGER.debug("JsonMappingException : ",e);
                } catch (IOException e) {
-                       e.printStackTrace();
+                       LOGGER.debug("IOException : ",e);
                }
                return null;
        }

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index 3d3c87f..f9fd9c3 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -558,8 +559,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
                        vfResourceStructure.setSuccessfulDeployment();\r
                        \r
                }catch(Exception e){\r
-                       System.out.println("Exception" + e.getMessage());\r
-                       e.printStackTrace();\r
+                       logger.debug("Exception :",e);\r
                        \r
                        Throwable dbExceptionToCapture = e;\r
                        while (!(dbExceptionToCapture instanceof ConstraintViolationException || dbExceptionToCapture instanceof LockAcquisitionException)\r

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
index da356bd..9b38a50 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
@@ -3,6 +3,7 @@
  * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.sdc.api.notification.INotificationData;
 
 
@@ -40,6 +42,8 @@ public class NotificationLogging implements InvocationHandler {
        
        private static Map<Object, List<Method>> objectMethodsToLog = new HashMap<>();
 
+       protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);
+       
        private static InvocationHandler handler = new InvocationHandler() {
                @Override
                public Object invoke(Object arg0, Method arg1, Object[] arg2)
@@ -93,6 +97,7 @@ public class NotificationLogging implements InvocationHandler {
                                        buffer.append(testNull(m.invoke(iNotif, (Object[])null)));
                                } catch (IllegalAccessException | IllegalArgumentException
                                                | InvocationTargetException e) {
+                                       LOGGER.debug("Exception :"+e);
                                        buffer.append("UNREADABLE");
                                }
                                buffer.append(System.lineSeparator());

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 24c881d..89e5ce2 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -358,6 +358,11 @@
                        <classifier>tests</classifier>\r
                        <scope>test</scope>\r
                </dependency>\r
+               <dependency>\r
+            <groupId>org.openecomp.so</groupId>\r
+            <artifactId>common</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
                <dependency>\r
                        <groupId>javax.ws.rs</groupId>\r
                        <artifactId>javax.ws.rs-api</artifactId>\r

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
index 5394ba9..e938a25 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -21,8 +22,10 @@
 package org.openecomp.mso.bpmn.common.util;\r
 \r
 import java.security.GeneralSecurityException;\r
+import org.openecomp.mso.logger.MsoLogger;\r
 \r
 public class CryptoHandler implements ICryptoHandler {\r
+       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);\r
 \r
        private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";\r
        //private static String msoAaiPwd = "mso0206";\r
@@ -32,6 +35,7 @@ public class CryptoHandler implements ICryptoHandler {
                try {\r
                        return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);\r
                } catch (GeneralSecurityException e) {\r
+                       LOGGER.debug("GeneralSecurityException :",e);\r
                        return null;\r
                }\r
        }\r
@@ -41,6 +45,7 @@ public class CryptoHandler implements ICryptoHandler {
                try {\r
                        return CryptoUtils.encrypt(plainMsoPwd, msoKey);\r
                } catch (GeneralSecurityException e) {\r
+                       LOGGER.debug("GeneralSecurityException :",e);\r
                        return null;\r
                }\r
        }\r
@@ -50,6 +55,7 @@ public class CryptoHandler implements ICryptoHandler {
                try {\r
                        return CryptoUtils.decrypt(encryptedPwd, msoKey);\r
                } catch (GeneralSecurityException e) {\r
+                       LOGGER.debug("GeneralSecurityException :",e);\r
                        return null;\r
                }\r
        }\r

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
index 49e42ac..a4a8859 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
@@ -76,6 +76,7 @@ public abstract class AbstractCallbackService {
                        logCallbackSuccess(method, startTime);\r
                        return new CallbackSuccess();\r
                } catch (Exception e) {\r
+                       LOGGER.debug("Exception :",e);\r
                        String msg = "Caught " + e.getClass().getSimpleName()\r
                                + " processing " + messageEventName + " with " + correlationVariable\r
                                + " = '" + correlationValue + "'";\r

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
index 7db4e76..7a53721 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
@@ -3,6 +3,7 @@
  * ONAP - SO\r
  * ================================================================================\r
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -183,8 +184,7 @@ public class WorkflowResource {
                        workflowResponse.setMessageCode(500);\r
                        return Response.status(500).entity(workflowResponse).build();\r
                } catch (Exception ex) {\r
-                       msoLogger.debug(LOGMARKER + "Exception in startProcessInstance by key");\r
-                       ex.printStackTrace();\r
+                       msoLogger.debug(LOGMARKER + "Exception in startProcessInstance by key",ex);\r
                        workflowResponse.setMessage("Fail" );\r
                        workflowResponse.setResponse("Error occurred while executing the process: " + ex.getMessage());\r
                        if (processInstance != null) workflowResponse.setProcessInstanceID(processInstance.getId());\r
@@ -258,6 +258,7 @@ public class WorkflowResource {
                try {\r
                        return pes.getRuntimeService().createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult() == null ? true : false ;\r
                } catch (Exception e) {\r
+                       msoLogger.debug("Exception :",e);\r
                        return true;\r
                }        \r
        }\r
@@ -601,7 +602,7 @@ public class WorkflowResource {
                                        + processKey \r
                                        + " with response: " \r
                                        + response.getResponse());\r
-                       \r
+                       msoLogger.debug("Exception :",ex);\r
                }\r
                \r
                msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, \r