aboutsummaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-09-14 13:19:52 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-14 13:19:52 +0000
commitec351d2ee36a37af78476feaff401fac47afe524 (patch)
treeba9de9c01422f471c18120e5e5be618597f3d706 /model
parent330836ad1aa9c88dd3c308fcd750ccd1aaf3e4b9 (diff)
parentcd68fc9bae7d6258f77ff59c1431e4f925f61a4c (diff)
Merge "Address sonar/Checkstyle Issues"
Diffstat (limited to 'model')
-rw-r--r--model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java12
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java8
-rw-r--r--model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic (renamed from model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic)0
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