From cd68fc9bae7d6258f77ff59c1431e4f925f61a4c Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 13 Sep 2018 23:48:50 +0100 Subject: 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 --- .../apex/model/policymodel/handling/PolicyLogicReader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'model/policy-model/src/main') 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(); } } -- cgit 1.2.3-korg