Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(sdk-java): keep a path query string when adding query params

Yudhi Armyndharis7e19d4240994
diff --git a/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java b/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
index 1ef1deb51..98f8f719b 100644
--- a/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
+++ b/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
@@ -63,7 +63,7 @@ public final class Http {
qs.add(encodeQuery(e.getKey()) + "=" + encodeQuery(value));
}
String q = qs.toString();
- return q.isEmpty() ? url : url + "?" + q;
+ return q.isEmpty() ? url : url + (url.contains("?") ? "&" : "?") + q;
}
private static String encodeQuery(String s) {
diff --git a/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java b/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
index 0ee0f6018..8f4b85964 100644
--- a/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
+++ b/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
@@ -65,6 +65,14 @@ class HttpTest {
assertFalse(url.contains("cursor"));
}
+ @Test
+ void buildUrlAppendsQueryToPathThatAlreadyHasOne() {
+ // A second "?" would fold the query into the last value of the path's own query string.
+ assertEquals(
+ "http://h/m?a=1&limit=50",
+ Http.buildUrl("http://h", "/m?a=1", new Query(null, 50, null), gson));
+ }
+
@Test
void mergeHeadersAuthAndJsonWin() {
Map<String, String> defaults = new LinkedHashMap<>();