Merge pull request #24 from vikadata/fix-uri-variables

Fix uri variables

Author: shawndenggh

client/src/main/java/cn/vika/client/api/model/ApiQueryParam.java

@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import cn.vika.client.api.util.UrlEncoder;
+import cn.vika.core.utils.UrlEncoder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -66,7 +66,7 @@ public ApiQueryParam(int page, int pageSize) {
     }
 
     public ApiQueryParam withSort(String fieldName, Order order) {
-        List<String> values = computeIfAbsent(SORT, k -> new ArrayList<>(1));
+        List<String> values = computeIfAbsent(UrlEncoder.encodeURIComponent(SORT), k -> new ArrayList<>(1));
         values.add(formatSort(fieldName, order));
         return this;
     }
@@ -128,7 +128,7 @@ private String formatSort(String fieldName, Order order) {
         sortMap.put("field", fieldName);
         sortMap.put("order", order.name().toLowerCase());
         try {
-            return new ObjectMapper().writeValueAsString(sortMap);
+            return UrlEncoder.encodeURIComponent(new ObjectMapper().writeValueAsString(sortMap));
         }
         catch (JsonProcessingException e) {
             throw new IllegalArgumentException("can't format sort parameter", e);

client/src/test/java/cn/vika/client/api/model/ApiQueryParamTest.java

@@ -37,7 +37,7 @@ public void testParamWithSort() {
         ApiQueryParam queryParam = new ApiQueryParam()
                 .withSort("id", Order.DESC);
         Map<String, String> queryMap = queryParam.toMap();
-        assertThat(queryMap).containsOnlyKeys("sort[]");
+        assertThat(queryMap).containsOnlyKeys("sort%5B%5D");
     }
 
     @Test
@@ -46,7 +46,7 @@ public void testParamWithSortMulti() {
                 .withSort("id", Order.DESC)
                 .withSort("name", Order.DESC);
         Map<String, String> queryMap = queryParam.toMap();
-        assertThat(queryMap).containsOnlyKeys("sort[].0", "sort[].1");
+        assertThat(queryMap).containsOnlyKeys("sort%5B%5D.0", "sort%5B%5D.1");
     }
 
     @Test

…/cn/vika/client/api/util/UrlEncoder.java …/java/cn/vika/core/utils/UrlEncoder.javaclient/src/main/java/cn/vika/client/api/util/UrlEncoder.java renamed to core/src/main/java/cn/vika/core/utils/UrlEncoder.java client/src/main/java/cn/vika/client/api/util/UrlEncoder.java renamed to core/src/main/java/cn/vika/core/utils/UrlEncoder.java

@@ -20,12 +20,10 @@
  * SOFTWARE.
  */
 
-package cn.vika.client.api.util;
+package cn.vika.core.utils;
 
 import java.nio.charset.StandardCharsets;
 
-import cn.vika.core.utils.StringUtil;
-
 /**
  * URL Query param encoder
  * @author Shawn Deng

core/src/test/java/cn/vika/core/utils/MapUtilTest.java

@@ -1,10 +1,11 @@
 package cn.vika.core.utils;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.assertj.core.util.Maps;
 import org.junit.jupiter.api.Test;
 
+import static cn.vika.core.utils.UrlEncoder.encodeURIComponent;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -14,13 +15,14 @@ public class MapUtilTest {
 
     @Test
     public void testExtractKeyToVariables() {
-        Map<String, String> uriVariables = Maps.newHashMap("page", "1");
+        Map<String, String> uriVariables = new LinkedHashMap<>(6);
+        uriVariables.put("page", "1");
         uriVariables.put("pageSize", "10");
-        uriVariables.put("sort[].0", "{\"field\":\"id\",\"order\":\"desc\"}");
-        uriVariables.put("sort[].1", "{\"field\":\"name\",\"order\":\"desc\"}");
+        uriVariables.put(encodeURIComponent("sort[].0"), encodeURIComponent("{\"field\":\"id\",\"order\":\"desc\"}"));
+        uriVariables.put(encodeURIComponent("sort[].1"), encodeURIComponent("{\"field\":\"name\",\"order\":\"desc\"}"));
         uriVariables.put("recordIds.0", "rec0");
         uriVariables.put("recordIds.1", "rec1");
         String urlParam = MapUtil.extractKeyToVariables(uriVariables);
-        assertThat(urlParam).isEqualTo("?recordIds={recordIds.0}&sort[]={sort[].0}&sort[]={sort[].1}&recordIds={recordIds.1}&pageSize={pageSize}&page={page}");
+        assertThat(urlParam).isEqualTo("?page={page}&pageSize={pageSize}&sort%5B%5D={sort%5B%5D.0}&sort%5B%5D={sort%5B%5D.1}&recordIds={recordIds.0}&recordIds={recordIds.1}");
     }
 }