Skip to content

Commit 987229a

Browse files
committed
fix: encode record query with sort parameter
1 parent 02f4066 commit 987229a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.List;
2828
import java.util.Map;
2929

30-
import cn.vika.client.api.util.UrlEncoder;
30+
import cn.vika.core.utils.UrlEncoder;
3131
import com.fasterxml.jackson.core.JsonProcessingException;
3232
import com.fasterxml.jackson.databind.ObjectMapper;
3333

@@ -66,7 +66,7 @@ public ApiQueryParam(int page, int pageSize) {
6666
}
6767

6868
public ApiQueryParam withSort(String fieldName, Order order) {
69-
List<String> values = computeIfAbsent(SORT, k -> new ArrayList<>(1));
69+
List<String> values = computeIfAbsent(UrlEncoder.encodeURIComponent(SORT), k -> new ArrayList<>(1));
7070
values.add(formatSort(fieldName, order));
7171
return this;
7272
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020
* SOFTWARE.
2121
*/
2222

23-
package cn.vika.client.api.util;
23+
package cn.vika.core.utils;
2424

2525
import java.nio.charset.StandardCharsets;
2626

27-
import cn.vika.core.utils.StringUtil;
28-
2927
/**
3028
* URL Query param encoder
3129
* @author Shawn Deng

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public void testExtractKeyToVariables() {
2121
uriVariables.put("recordIds.0", "rec0");
2222
uriVariables.put("recordIds.1", "rec1");
2323
String urlParam = MapUtil.extractKeyToVariables(uriVariables);
24-
assertThat(urlParam).isEqualTo("?recordIds={recordIds.0}&sort[]={sort[].0}&sort[]={sort[].1}&recordIds={recordIds.1}&pageSize={pageSize}&page={page}");
24+
assertThat(urlParam).isEqualTo("?recordIds={recordIds.0}&sort%5B%5D={sort[].0}&sort%5B%5D={sort[].1}&recordIds={recordIds.1}&pageSize={pageSize}&page={page}");
2525
}
2626
}

0 commit comments

Comments
 (0)