Merge pull request #617 from microsoft/bugfix/parameter-names-replace…

…ment - fixes parameters names replacement regression
microsoft · Sep 11, 2023 · c47116c · c47116c
2 parents b6cc189 + 25cfbdc
commit c47116c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [0.7.4] - 2023-09-08
+
+### Fixed
+
+- Fixed a regression where query parameters name replacement would fail with group like regex syntax ($ sign)
+
 ## [0.7.3] - 2023-09-04
 
 ### Fixed

diff --git a/...Http/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java b/...Http/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java
@@ -5,6 +5,7 @@
 import java.util.Objects;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -120,7 +121,7 @@ public static String decodeQueryParameters(@Nullable final String original, @Non
 
         for (final Entry<String, String> symbolToReplace : symbolsToReplace) {
             for (final Entry<String, String> queryParameter : toDecode) {
-                queryParameter.setValue(queryParameter.getValue().replaceAll("(?i)"+Pattern.quote(symbolToReplace.getKey()), symbolToReplace.getValue()));
+                queryParameter.setValue(queryParameter.getValue().replaceAll("(?i)"+Pattern.quote(symbolToReplace.getKey()), Matcher.quoteReplacement(symbolToReplace.getValue())));
             }
         }
 

diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 0
 mavenMinorVersion = 7
-mavenPatchVersion = 3
+mavenPatchVersion = 4
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests