1 files changed, 10 insertions, 6 deletions

diff --git a/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java b/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
index ed7dbecc18..b67d70847c 100644
--- a/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
+++ b/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
@@ -180,12 +180,12 @@ public class CpsPathBuilder extends CpsPathBaseListener {
         if (!isStartOfExpression) {
             currentNormalizedPathBuilder.append(" ").append(getLastElement(booleanOperators)).append(" ");
         }
-        currentNormalizedPathBuilder.append("@")
-                                    .append(name)
-                                    .append(operator)
-                                    .append("'")
-                                    .append(value.toString().replace("'", "''"))
-                                    .append("'");
+        currentNormalizedPathBuilder.append("@").append(name).append(operator);
+        if (operator.equals("=")) {
+            currentNormalizedPathBuilder.append(wrapValueInSingleQuotes(value));
+        } else {
+            currentNormalizedPathBuilder.append(value);
+        }
     }
 
     private static String getLastElement(final List<String> listOfStrings) {
@@ -202,6 +202,10 @@ public class CpsPathBuilder extends CpsPathBaseListener {
         }
     }
 
+    private static String wrapValueInSingleQuotes(final Object value) {
+        return "'" + value.toString().replace("'", "''") + "'";
+    }
+
     private static String stripFirstAndLastCharacter(final String wrappedString) {
         return wrappedString.substring(1, wrappedString.length() - 1);
     }