Merge "property names correction"

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/aria/AriaVduPlugin.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/aria/AriaVduPlugin.java
index 2d32f85..1c2057d 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/aria/AriaVduPlugin.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/aria/AriaVduPlugin.java
@@ -123,7 +123,7 @@ public class AriaVduPlugin implements VduPlugin {
                     templateId = stemplate.getId();
                 }
             }
-            List<Input> sinputs = new ArrayList<Input>();
+            List<Input> sinputs = new ArrayList<>();
             for (Map.Entry<String, ? extends Object> entry : inputs.entrySet()) {
                 Input inp = new InputImpl(entry.getKey(), entry.getValue().toString(), "");
                 sinputs.add(inp);

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
index 7d6aed4..4d8b65a 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
@@ -67,8 +67,7 @@ public class QueryResourceRecipe extends CatalogQuery{
         try {\r
             jsonStr = mapper.writeValueAsString(valueMap);\r
         } catch(JsonProcessingException e) {\r
-\r
-            e.printStackTrace();\r
+            LOGGER.error("JsonProcessingException", e);\r
         }\r
         return jsonStr;\r
     }\r

diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResource.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResource.java
index a4d9f27..871b132 100644 (file)
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResource.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResource.java
@@ -172,16 +172,6 @@ public class SDNCNotifyResource {
         }
 
         String bpelUrl;
-        /*
-         * TODO Hibernate
-         * try {
-         * bpelUrl = RequestsDatabase.getBpelUrl(reqId);
-         * }
-         * catch (Exception e)
-         * {
-         * logger.error("Unable to get SDNC_CALLBACK_URL from ActiveRequests, using default for reqid:" + reqId, e);
-         * }
-         */
         
         bpelUrl = SDNCAdapterPortTypeImpl.getProperty (Constants.BPEL_URL_PROP, Constants.DEFAULT_BPEL_URL,msoPropertiesFactory);
         if (bpelUrl == null) {

diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
index 5168de8..4d2bf59 100644 (file)
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
@@ -84,7 +84,6 @@ public class RestfulUtil {
             }
         } catch(MsoPropertiesException e) {
             LOGGER.error("Get msb properties failed",e);
-            e.printStackTrace();
         }
         return "http://" + msbIp + ":" + msbPort;
     }

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
index 13b1666..42547fa 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
@@ -288,8 +288,7 @@ public class ResourceInput {
         try {
             jsonStr = mapper.writeValueAsString(this);
         } catch(JsonProcessingException e) {
-               msoLogger.debug("JsonProcessingException", e);
-            e.printStackTrace();
+               msoLogger.error("JsonProcessingException", e);
         }
         return jsonStr;
     }

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
index ec60619..3ec43e1 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
@@ -151,8 +151,7 @@ public class ResourceRecipeRequest {
         try {
             jsonStr = mapper.writeValueAsString(this);
         } catch(JsonProcessingException e) {
-               msoLogger.debug("JsonProcessingException", e);
-            e.printStackTrace();
+               msoLogger.error("JsonProcessingException", e);
         }
         return jsonStr;
     }

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
index e6b1b21..d1ec60a 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
@@ -113,8 +113,7 @@ public class ResourceRequestBuilder {
             Map<String, Object> resourceInputsFromServiceDeclaredLevel = buildResouceRequest(serviceUuid, resourceCustomizationUuid, serviceInput);
             resourceInputsFromUuiMap.putAll(resourceInputsFromServiceDeclaredLevel);
         } catch(SdcToscaParserException e) {
-               LOGGER.debug("SdcToscaParserException", e);
-            e.printStackTrace();
+               LOGGER.error("SdcToscaParserException", e);
         }
         String resourceInputsStr = getJsonString(resourceInputsFromUuiMap);
         String result = "{\n"
@@ -221,8 +220,7 @@ public class ResourceRequestBuilder {
         try {
             jsonStr = mapper.writeValueAsString(srcObj);
         } catch(JsonProcessingException e) {
-               LOGGER.debug("SdcToscaParserException", e);
-            e.printStackTrace();
+               LOGGER.error("SdcToscaParserException", e);
         }
         return jsonStr;
     }

diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
index 85f9753..5fc80ab 100644 (file)
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
@@ -82,8 +82,7 @@ public class URNResource extends AbstractCockpitPluginResource{
                        \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.error("Exception while executing query", e);\r
                } finally {\r
                        try { r.close(); } catch (Exception e) { /* ignored */ }\r
                        try { psData.close(); } catch (Exception e) { /* ignored */ }\r
@@ -131,9 +130,8 @@ public class URNResource extends AbstractCockpitPluginResource{
                        }                        \r
                        \r
                } catch (Exception e) \r
-               {\r
-                       \r
-                       e.printStackTrace();\r
+         {\r
+                       msoLogger.error("Exception while performing JNDI lookup", e);\r
                }\r
          \r
          return conn;\r
@@ -175,8 +173,7 @@ public class URNResource extends AbstractCockpitPluginResource{
                        \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.error("Exception while executing query", e);\r
                } finally {\r
                        try { psData.close(); } catch (Exception e) { /* ignored */ }\r
                        try { conn.close(); } catch (Exception e) { /* ignored */ }\r
@@ -199,8 +196,7 @@ public class URNResource extends AbstractCockpitPluginResource{
                            \r
                } catch (Exception e) \r
                {\r
-                       \r
-                       e.printStackTrace();\r
+                       msoLogger.error("Exception while executing query", e);\r
                } finally {\r
                        try { psData.close(); } catch (Exception e) { /* ignored */ }\r
                        try { conn.close(); } catch (Exception e) { /* ignored */ }\r

diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java
index 421f62a..17904ad 100644 (file)
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java
+++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java
@@ -223,7 +223,7 @@ public class HttpClientConnector implements CloudifyClientConnector {
                }
                catch (Exception e) {
                        // Catchall for anything else, must throw as a RuntimeException
-                       e.printStackTrace();
+                       LOGGER.error("Client exception", e);
                        throw new RuntimeException("Unexpected client exception", e);
                }
                finally {

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java
index 24111c4..1bfe979 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java
@@ -217,17 +217,13 @@ public class ActivateVnfOperationalEnvironment extends OperationalEnvironmentPro
                        AAIResultWrapper aaiResult = aaiHelper.getAaiOperationalEnvironment(operationalEnvironmentId);\r
                        operationalEnv = aaiResult.asBean(AAIOperationalEnvironment.class).get();\r
                } catch (JsonParseException e) {\r
-                       msoLogger.debug(" **** JsonParseException: " + e.getMessage());\r
-                       e.printStackTrace();\r
+                       msoLogger.error(" **** JsonParseException: ", e);\r
                } catch (JsonMappingException e) {\r
-                       msoLogger.debug(" **** JsonMappingException: " + e.getMessage());\r
-                       e.printStackTrace();\r
+                       msoLogger.error(" **** JsonMappingException: ", e);\r
                } catch (IOException e) {\r
-                       msoLogger.debug(" **** IOException: " + e.getMessage());\r
-                       e.printStackTrace();\r
+                       msoLogger.error(" **** IOException: ", e);\r
                } catch (Exception e) {\r
-                       msoLogger.debug(" **** Exception: " + e.getMessage());\r
-                       e.printStackTrace();\r
+                       msoLogger.error(" **** Exception: ", e);\r
                }\r
                \r
                return operationalEnv;\r

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java
index 1ce3c5e..3dd1b72 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java
@@ -67,7 +67,7 @@ public class CreateEcompOperationalEnvironment extends OperationalEnvironmentPro
                        getRequestDb().updateInfraSuccessCompletion("SUCCESSFULLY Created ECOMP OperationalEnvironment.", getRequestId(), getRequest().getOperationalEnvironmentId()); 
                } 
                catch (Exception e) {
-                       e.printStackTrace();
+                       msoLogger.error("exception while publishing operational environment", e);
                        msoLogger.error(MessageEnum.APIH_GENERAL_EXCEPTION, "", "", "", MsoLogger.ErrorCode.UnknownError, e.getMessage());
                        getRequestDb().updateInfraFailureCompletion(e.getMessage(), getRequestId(), getRequest().getOperationalEnvironmentId());
                }       

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 5303ce3..8ea96e9 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -158,8 +158,8 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>openecomp/mso:%l</name>
-                                                       <alias>onap/so:%1</alias>
+                                                       <name>onap/so:%l</name>
+                                                       <alias>openecomp/mso:%l</alias>
                                                        <alias>mso</alias>
                                                        <alias>so</alias>
                                                        <build>