Address sonar/Checkstyle Issues

Sweep through Apex codebase to fix most ceheckstyle and
straightforward sonar issues.

Issue-ID: POLICY-1034
Change-Id: I149d9a94ad893affc93573e8de5e3304b6bdde2d
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
index aa57be552..a40a8100f 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
@@ -107,11 +107,11 @@ public class PolicyLogicReader implements AxLogicReader {
             } else {
                 // Return the java class name for the logic
                 if (axLogic.getKey().getParentLocalName().equals(AxKey.NULL_KEY_NAME)) {
-                    return logicPackage + DOT_JAVA + axLogic.getKey().getParentKeyName() + '_'
+                    return logicPackage + DOT_JAVA + axLogic.getKey().getParentKeyName()
                             + axLogic.getKey().getLocalName();
                 } else {
-                    return logicPackage + DOT_JAVA + axLogic.getKey().getParentKeyName() + '_'
-                            + axLogic.getKey().getParentLocalName() + '_' + axLogic.getKey().getLocalName();
+                    return logicPackage + DOT_JAVA + axLogic.getKey().getParentKeyName()
+                            + axLogic.getKey().getParentLocalName()  + axLogic.getKey().getLocalName();
                 }
             }
         }
@@ -129,10 +129,10 @@ public class PolicyLogicReader implements AxLogicReader {
             fullLogicFilePath += "/" + defaultLogic;
         } else {
             if (axLogic.getKey().getParentLocalName().equals(AxKey.NULL_KEY_NAME)) {
-                fullLogicFilePath += "/" + axLogic.getKey().getParentKeyName() + "_" + axLogic.getKey().getLocalName();
+                fullLogicFilePath += "/" + axLogic.getKey().getParentKeyName() + axLogic.getKey().getLocalName();
             } else {
-                fullLogicFilePath += "/" + axLogic.getKey().getParentKeyName() + "_"
-                        + axLogic.getKey().getParentLocalName() + "_" + axLogic.getKey().getLocalName();
+                fullLogicFilePath += "/" + axLogic.getKey().getParentKeyName()
+                        + axLogic.getKey().getParentLocalName() + axLogic.getKey().getLocalName();
             }
         }
 
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java
index bb16c90d1..528898d30 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java
@@ -63,7 +63,7 @@ public class TestPolicyLogicReader {
             fail("test should throw an exception here");
         } catch (final Exception e) {
             assertEquals("logic not found for logic "
-                            + "\"somewhere/over/the/rainbow/funkylogic/LogicParent_LogicInstanceName.funkylogic\"",
+                            + "\"somewhere/over/the/rainbow/funkylogic/LogicParentLogicInstanceName.funkylogic\"",
                             e.getMessage());
         }
 
@@ -73,7 +73,7 @@ public class TestPolicyLogicReader {
             fail("test should throw an exception here");
         } catch (final Exception e) {
             assertEquals("logic not found for logic " + "\"somewhere/over/the/rainbow/funkylogic/"
-                            + "LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic\"", e.getMessage());
+                            + "LogicParentLogicParentLocalNameLogicInstanceName.funkylogic\"", e.getMessage());
         }
 
         plReader.setLogicPackage("path.to.apex.logic");
@@ -97,7 +97,7 @@ public class TestPolicyLogicReader {
         plReader.setDefaultLogic(null);
         try {
             final AxLogic logic = new AxLogic(logicKey, "JAVA", plReader);
-            assertEquals("somewhere.over.the.rainbow.java.LogicParent_LogicParentLocalName_LogicInstanceName",
+            assertEquals("somewhere.over.the.rainbow.java.LogicParentLogicParentLocalNameLogicInstanceName",
                             logic.getLogic());
         } catch (final Exception e) {
             fail("test should not throw an exception");
@@ -106,7 +106,7 @@ public class TestPolicyLogicReader {
         logicKey.setParentLocalName(AxKey.NULL_KEY_NAME);
         try {
             final AxLogic logic = new AxLogic(logicKey, "JAVA", plReader);
-            assertEquals("somewhere.over.the.rainbow.java.LogicParent_LogicInstanceName", logic.getLogic());
+            assertEquals("somewhere.over.the.rainbow.java.LogicParentLogicInstanceName", logic.getLogic());
         } catch (final Exception e) {
             fail("test should not throw an exception");
         }
diff --git a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic b/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic
index 7ccf3da88..7ccf3da88 100644
--- a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic
+++ b/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic