summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-27 07:47:35 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-27 07:47:35 +0000
commitc76a924dbea9de49d6d858bc66c700583b3cc5b5 (patch)
tree265270ca30957f0cb5bf582ec2ea754e3c3d0ff7
parentd1092f84d9e01aa1980c0239fbc3a9bfa3948d1d (diff)
parent2a392e229f81a0a8228e6160ab4614a0fbc60621 (diff)
Merge "Some minor refinements in CCSDK SLI Core module"
-rw-r--r--sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java4
-rw-r--r--sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java7
2 files changed, 9 insertions, 2 deletions
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
index ee192d62..a33ba476 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
@@ -385,7 +385,7 @@ public class SvcLogicParser {
saxParser.parse(fileName, new SvcLogicHandler(graphs, store));
} catch (Exception e) {
- LOGGER.error("Parsing failed {}", e);
+ LOGGER.error("Parsing failed ", e);
String msg = e.getMessage();
if (msg != null) {
throw new SvcLogicException("Compiler error: " + fileName + " @ " + msg);
@@ -412,7 +412,7 @@ public class SvcLogicParser {
try {
SvcLogicParser.load(xmlfile, store);
} catch (Exception e) {
- LOGGER.error("Load failed {}", e);
+ LOGGER.error("Load failed ", e);
}
} else {
SvcLogicParser.usage();
diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java
index 8bf748aa..7af4c1c5 100644
--- a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java
+++ b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java
@@ -96,6 +96,13 @@ public class ITCaseSvcLogicParser {
store.registerNodeType("release");
store.registerNodeType("for");
store.registerNodeType("set");
+ store.registerNodeType("call");
+ store.registerNodeType("delete");
+ store.registerNodeType("execute");
+ store.registerNodeType("notify");
+ store.registerNodeType("save");
+ store.registerNodeType("update");
+ store.registerNodeType("break");
}
@Before