fix: escapes $$ prior to escaping \$

closes: smallrye#1056 Signed-off-by: Steve Hawkins <[email protected]>
shawkins · Dec 4, 2023 · 889fa9f · 889fa9f
1 parent 5a96de2
commit 889fa9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/ExpressionConfigSourceInterceptor.java b/implementation/src/main/java/io/smallrye/config/ExpressionConfigSourceInterceptor.java
@@ -98,14 +98,18 @@ public void accept(ResolveContext<RuntimeException> resolveContext, StringBuilde
      * dollar.
      */
     private String escapeDollarIfExists(final String value) {
-        int index = value.indexOf("\\$");
+        return escapeIfExists(escapeIfExists(value, "$$", "$$$$"), "\\$", "$$");
+    }
+
+    private String escapeIfExists(final String value, final String toEscape, final String escaped) {
+        int index = value.indexOf(toEscape);
         if (index != -1) {
             int start = 0;
             StringBuilder builder = new StringBuilder();
             while (index != -1) {
-                builder.append(value, start, index).append("$$");
-                start = index + 2;
-                index = value.indexOf("\\$", start);
+                builder.append(value, start, index).append(escaped);
+                start = index + toEscape.length();
+                index = value.indexOf(toEscape, start);
             }
             builder.append(value.substring(start));
             return builder.toString();

diff --git a/implementation/src/test/java/io/smallrye/config/ExpressionConfigSourceInterceptorTest.java b/implementation/src/test/java/io/smallrye/config/ExpressionConfigSourceInterceptorTest.java
@@ -119,10 +119,10 @@ void withoutExpansion() {
 
     @Test
     void escape() {
-        assertEquals("${my.prop}", buildConfig("expression", "$${my.prop}").getRawValue("expression"));
+        assertEquals("$${my.prop}", buildConfig("expression", "$${my.prop}").getRawValue("expression"));
         assertEquals("${my.prop}", buildConfig("expression", "\\${my.prop}").getRawValue("expression"));
 
-        assertEquals("file:target/prices/?fileName=${date:now:yyyyMMddssSS}.txt&charset=utf-8",
+        assertEquals("file:target/prices/?fileName=$${date:now:yyyyMMddssSS}.txt&charset=utf-8",
                 buildConfig("camel.expression",
                         "file:target/prices/?fileName=$${date:now:yyyyMMddssSS}.txt&charset=utf-8")
                         .getRawValue("camel.expression"));