summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-12-17 20:52:25 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-17 20:52:25 +0000
commit6bf8fa77703f7afa2e7fa6222ee46ab4aad13d25 (patch)
treede0162d157ba83d5f9ea40f874c6d2e4745d806d
parent04f53bd34109c3773ba0335fd7c28791bb9c478c (diff)
parente2646080e47df8d68e0327d964194a2b6ce04d33 (diff)
Merge "fixed sonar issues in SvcLogicExpressionResolver"
-rw-r--r--sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
index 779be9e9e..0e502035b 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
@@ -5,6 +5,8 @@
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (C) 2018 IBM.
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -41,6 +43,7 @@ public class SvcLogicExpressionResolver {
private static final Logger LOG = LoggerFactory
.getLogger(SvcLogicExpressionResolver.class);
+ private static final String INVALID_EXPRESSION_MSG= "Invalid expression (";
public static String evaluate(SvcLogicExpression expr, SvcLogicNode node,
SvcLogicContext ctx) throws SvcLogicException {
@@ -150,7 +153,7 @@ public class SvcLogicExpressionResolver {
List<OperatorType> operators = binExpr.getOperators();
if (operands.size() != (operators.size()+1))
{
- throw new SvcLogicException("Invalid expression ("+binExpr+")");
+ throw new SvcLogicException(INVALID_EXPRESSION_MSG+binExpr+")");
}
String retval = evaluate(operands.get(0), node, ctx);
String retsval = retval;
@@ -303,7 +306,7 @@ public class SvcLogicExpressionResolver {
if (operands.size() != (operators.size()+1))
{
- throw new SvcLogicException("Invalid expression ("+expr+")");
+ throw new SvcLogicException(INVALID_EXPRESSION_MSG+expr+")");
}
try
@@ -326,7 +329,7 @@ public class SvcLogicExpressionResolver {
}
catch (Exception e)
{
- throw new SvcLogicException("Invalid expression ("+expr+")");
+ throw new SvcLogicException(INVALID_EXPRESSION_MSG+expr+")");
}