appc-dg-common sonar fixes part 1

[appc.git] / appc-dg / appc-dg-shared / appc-dg-common / src / main / java / org / onap / appc / dg / common / impl / DgResolverPluginImpl.java

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DgResolverPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DgResolverPluginImpl.java
index c68fde5..5b98dd9 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DgResolverPluginImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DgResolverPluginImpl.java
@@ -24,14 +24,12 @@
 
 package org.onap.appc.dg.common.impl;
 
-import org.onap.appc.exceptions.APPCException;
-import org.onap.appc.i18n.Msg;
 import com.att.eelf.i18n.EELFResourceManager;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-
 import java.util.Map;
-
 import org.onap.appc.dg.common.DgResolverPlugin;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class DgResolverPluginImpl implements DgResolverPlugin {
 
@@ -44,10 +42,14 @@ public class DgResolverPluginImpl implements DgResolverPlugin {
         FlowKey flowKey = null;
         try {
 
-            if(params.get("DGResolutionType").equalsIgnoreCase("VNFC")) {
-                 flowKey = resolver.resolve(params.get(Constants.IN_PARAM_ACTION), params.get(Constants.IN_PARAM_VNF_TYPE), params.get(Constants.IN_PARAM_VNFC_TYPE), params.get(Constants.IN_PARAM_API_VERSION));
-            }else if(params.get("DGResolutionType").equalsIgnoreCase("VNF")){
-                 flowKey = resolver.resolve(params.get(Constants.IN_PARAM_ACTION), params.get(Constants.IN_PARAM_VNF_TYPE), params.get("vnfVersion"), params.get(Constants.IN_PARAM_API_VERSION));
+            if (params.get("DGResolutionType").equalsIgnoreCase("VNFC")) {
+                flowKey = resolver
+                    .resolve(params.get(Constants.IN_PARAM_ACTION), params.get(Constants.IN_PARAM_VNF_TYPE),
+                        params.get(Constants.IN_PARAM_VNFC_TYPE), params.get(Constants.IN_PARAM_API_VERSION));
+            } else if (params.get("DGResolutionType").equalsIgnoreCase("VNF")) {
+                flowKey = resolver
+                    .resolve(params.get(Constants.IN_PARAM_ACTION), params.get(Constants.IN_PARAM_VNF_TYPE),
+                        params.get("vnfVersion"), params.get(Constants.IN_PARAM_API_VERSION));
             }
             if (flowKey != null) {
                 DGName = flowKey.name();
@@ -57,14 +59,16 @@ public class DgResolverPluginImpl implements DgResolverPlugin {
                 DGModule = flowKey.module();
                 ctx.setAttribute(prefix + Constants.OUT_PARAM_DG_MODULE, DGModule);
             } else {
-                throw new RuntimeException(params.get("DGResolutionType")+ " DG not found for vnf type :" + params.get(Constants.IN_PARAM_VNF_TYPE)
-                        + " vnfc type : " + params.get(Constants.IN_PARAM_VNFC_TYPE)
-                        + " action : " + params.get(Constants.IN_PARAM_ACTION)
-                        + " api version : " + params.get(Constants.IN_PARAM_API_VERSION));
+                throw new RuntimeException(params.get("DGResolutionType") + " DG not found for vnf type :" + params
+                    .get(Constants.IN_PARAM_VNF_TYPE)
+                    + " vnfc type : " + params.get(Constants.IN_PARAM_VNFC_TYPE)
+                    + " action : " + params.get(Constants.IN_PARAM_ACTION)
+                    + " api version : " + params.get(Constants.IN_PARAM_API_VERSION));
             }
         } catch (Exception e) {
-            String msg = EELFResourceManager.format(Msg.FAILURE_RETRIEVE_VNFC_DG,params.get(Constants.IN_PARAM_VNFC_TYPE), e.getMessage());
-            ctx.setAttribute(Constants.ATTRIBUTE_ERROR_MESSAGE,msg);
+            String msg = EELFResourceManager
+                .format(Msg.FAILURE_RETRIEVE_VNFC_DG, params.get(Constants.IN_PARAM_VNFC_TYPE), e.getMessage());
+            ctx.setAttribute(Constants.ATTRIBUTE_ERROR_MESSAGE, msg);
             throw new RuntimeException(e);
         }
     }