Escape special characters such as '$' in replacement because it has a…

… special meaning in Replacer::replaceAll
jhipster · Jan 20, 2024 · f45671f · f45671f
1 parent 2040b57
commit f45671f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexNeedleAfterReplacer.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexNeedleAfterReplacer.java
@@ -19,7 +19,13 @@ public boolean notMatchIn(String content) {
   @Override
   public BiFunction<String, String, String> replacement() {
     return (content, replacement) ->
-      linePattern().matcher(content).replaceAll(result -> result.group() + JHipsterModule.LINE_BREAK + replacement);
+      linePattern()
+        .matcher(content)
+        .replaceAll(result -> result.group() + JHipsterModule.LINE_BREAK + escapeSpecialCharacters(replacement));
+  }
+
+  private String escapeSpecialCharacters(String replacement) {
+    return replacement.replace("$", "\\$");
   }
 
   private Pattern linePattern() {

diff --git a/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexNeedleBeforeReplacer.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexNeedleBeforeReplacer.java
@@ -19,7 +19,13 @@ public boolean notMatchIn(String content) {
   @Override
   public BiFunction<String, String, String> replacement() {
     return (content, replacement) ->
-      linePattern().matcher(content).replaceAll(result -> replacement + JHipsterModule.LINE_BREAK + result.group());
+      linePattern()
+        .matcher(content)
+        .replaceAll(result -> escapeSpecialCharacters(replacement) + JHipsterModule.LINE_BREAK + result.group());
+  }
+
+  private String escapeSpecialCharacters(String replacement) {
+    return replacement.replace("$", "\\$");
   }
 
   private Pattern linePattern() {