[Fix apache#3712] Allow concatenation of secrets and const (apache#3713)

kiegroup · Oct 10, 2024 · 6f869c8 · 6f869c8
1 parent b887866
commit 6f869c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...to-jsonpath-expression/src/main/java/org/kie/kogito/expr/jsonpath/JsonPathExpression.java b/...to-jsonpath-expression/src/main/java/org/kie/kogito/expr/jsonpath/JsonPathExpression.java
@@ -52,7 +52,7 @@ public JsonPathExpression(String expr) {
 
     private static final String replaceMagic(String expr, String magic) {
         magic = "$" + magic;
-        return expr.replace(magic, "@." + magic);
+        return expr.replace(magic, "$." + magic);
     }
 
     private Configuration getConfiguration(KogitoProcessContext context) {

diff --git a/...-expression/src/test/java/org/kie/kogito/expr/jsonpath/JsonPathExpressionHandlerTest.java b/...-expression/src/test/java/org/kie/kogito/expr/jsonpath/JsonPathExpressionHandlerTest.java
@@ -230,14 +230,16 @@ void testWorkflowPropertyFromJsonAccessible() {
     @MethodSource("provideMagicWordExpressionsToTest")
     void testMagicWordsExpressions(String expression, String expectedResult, KogitoProcessContext context) {
         Expression parsedExpression = ExpressionHandlerFactory.get("jsonpath", expression);
-        assertThat(parsedExpression.isValid()).isTrue();
+        assertThat(parsedExpression.isValid()).overridingErrorMessage(() -> parsedExpression.validationError().getMessage()).isTrue();
         assertThat(parsedExpression.eval(getObjectNode(), String.class, context)).isEqualTo(expectedResult);
     }
 
     private static Stream<Arguments> provideMagicWordExpressionsToTest() {
         return Stream.of(
                 Arguments.of("$WORKFLOW.instanceId", "1111-2222-3333", getContext()),
                 Arguments.of("$SECRET.lettersonly", "secretlettersonly", getContext()),
+                Arguments.of("$SECRET.lettersonly$SECRET.lettersonly", "secretlettersonlysecretlettersonly", getContext()),
+                Arguments.of("$.propertyString$.propertyNum", "string12", getContext()),
                 Arguments.of("$SECRET.none", "", getContext()),
                 Arguments.of("$SECRET.dot.secret", "secretdotsecret", getContext()),
                 Arguments.of("$SECRET[\"dot.secret\"]", "secretdotsecret", getContext()),