X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyAdapter.java;h=343a19f1aa3b3333df12da238a6492d6fd07c766;hp=cff9dd57c8dd5f637a8dc502dec8ffb698cd653e;hb=f36e53a3637e1204a42491ec0eeed7b3c763f681;hpb=b86c95c99240e8ed0ef91932a70ebed313dbd60c

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
index cff9dd57c..343a19f1a 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
@@ -69,28 +69,25 @@ public class PolicyAdapter {
     }
 
     private String getConfigPolicyName(PolicyRestAdapter policyAdapter) {
-        String configPolicyName = null;
         if (policyAdapter.getPolicyName().startsWith("Config_PM")) {
-            configPolicyName = "ClosedLoop_PM";
+            return "ClosedLoop_PM";
         } else if (policyAdapter.getPolicyName().startsWith("Config_Fault")) {
-            configPolicyName = "ClosedLoop_Fault";
+            return "ClosedLoop_Fault";
         } else if (policyAdapter.getPolicyName().startsWith("Config_FW")) {
-            configPolicyName = "Firewall Config";
+            return "Firewall Config";
         } else if (policyAdapter.getPolicyName().startsWith("Config_BRMS_Raw")) {
-            configPolicyName = "BRMS_Raw";
+            return "BRMS_Raw";
         } else if (policyAdapter.getPolicyName().startsWith("Config_BRMS_Param")) {
-            configPolicyName = "BRMS_Param";
+            return "BRMS_Param";
         } else if (policyAdapter.getPolicyName().startsWith("Config_MS")) {
-            configPolicyName = "Micro Service";
+            return "Micro Service";
         } else if (policyAdapter.getPolicyName().startsWith("Config_OOF")) {
-            configPolicyName = "Optimization";
+            return "Optimization";
         } else if (policyAdapter.getPolicyName().startsWith("Action")
                 || policyAdapter.getPolicyName().startsWith("Decision")) {
-            // No configPolicyName is applicable
-        } else {
-            configPolicyName = "Base";
+            return null;
         }
-        return configPolicyName;
+        return "Base";
     }
 
     private void prePopulatePolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {