Merge pull request #238 from crowdin/string-list-updates

feat: string list params update

Author: yevheniyJ

src/main/java/com/crowdin/client/core/http/HttpRequestConfig.java

@@ -129,4 +129,35 @@ public static <T extends Optional> Map<String, T> buildUrlParams(String k1, T v1
             put(k9, v9);
         }};
     }
+
+    public static <T extends Optional> Map<String, T> buildUrlParams(String k1, T v1, String k2, T v2, String k3, T v3, String k4, T v4, String k5, T v5, String k6, T v6, String k7, T v7, String k8, T v8, String k9, T v9, String k10, T v10) {
+        return new HashMap<String, T>() {{
+            put(k1, v1);
+            put(k2, v2);
+            put(k3, v3);
+            put(k4, v4);
+            put(k5, v5);
+            put(k6, v6);
+            put(k7, v7);
+            put(k8, v8);
+            put(k9, v9);
+            put(k10, v10);
+        }};
+    }
+
+    public static <T extends Optional> Map<String, T> buildUrlParams(String k1, T v1, String k2, T v2, String k3, T v3, String k4, T v4, String k5, T v5, String k6, T v6, String k7, T v7, String k8, T v8, String k9, T v9, String k10, T v10, String k11, T v11) {
+        return new HashMap<String, T>() {{
+            put(k1, v1);
+            put(k2, v2);
+            put(k3, v3);
+            put(k4, v4);
+            put(k5, v5);
+            put(k6, v6);
+            put(k7, v7);
+            put(k8, v8);
+            put(k9, v9);
+            put(k10, v10);
+            put(k11, v11);
+        }};
+    }
 }

src/main/java/com/crowdin/client/sourcestrings/SourceStringsApi.java

@@ -55,6 +55,7 @@ public ResponseObject<UploadStringsProgress> uploadStrings(Long projectId, Uploa
      * <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.projects.strings.getMany" target="_blank"><b>Enterprise API Documentation</b></a></li>
      * </ul>
      */
+    @Deprecated
     public ResponseList<SourceString> listSourceStrings(Long projectId, Long fileId, Integer denormalizePlaceholders, Long branchId, String labelIds, String croql, String filter, String scope, Integer limit, Integer offset) throws HttpException, HttpBadRequestException {
         Map<String, Optional<Object>> queryParams = HttpRequestConfig.buildUrlParams(
                 "fileId", Optional.ofNullable(fileId),
@@ -71,6 +72,24 @@ public ResponseList<SourceString> listSourceStrings(Long projectId, Long fileId,
         return SourceStringResponseList.to(sourceStringResponseList);
     }
 
+    public ResponseList<SourceString> listSourceStrings(Long projectId, ListSourceStringsParams params) throws HttpException, HttpBadRequestException {
+        Map<String, Optional<Object>> queryParams = HttpRequestConfig.buildUrlParams(
+                "orderBy", Optional.ofNullable(params.getOrderBy()),
+                "denormalizePlaceholders", Optional.ofNullable(params.getDenormalizePlaceholders()),
+                "labelIds", Optional.ofNullable(params.getLabelIds()),
+                "fileId", Optional.ofNullable(params.getFileId()),
+                "branchId", Optional.ofNullable(params.getBranchId()),
+                "directoryId", Optional.ofNullable(params.getDirectoryId()),
+                "croql", Optional.ofNullable(params.getCroql()),
+                "filter", Optional.ofNullable(params.getFilter()),
+                "scope", Optional.ofNullable(params.getScope()),
+                "limit", Optional.ofNullable(params.getLimit()),
+                "offset", Optional.ofNullable(params.getOffset())
+        );
+        SourceStringResponseList sourceStringResponseList = this.httpClient.get(this.url + "/projects/" + projectId + "/strings", new HttpRequestConfig(queryParams), SourceStringResponseList.class);
+        return SourceStringResponseList.to(sourceStringResponseList);
+    }
+
     /**
      * @param projectId project identifier
      * @param request request object

src/main/java/com/crowdin/client/sourcestrings/model/ListSourceStringsParams.java

@@ -0,0 +1,21 @@
+package com.crowdin.client.sourcestrings.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ListSourceStringsParams {
+
+    private String orderBy;
+    private Integer denormalizePlaceholders;
+    private String labelIds;
+    private Long fileId;
+    private Long branchId;
+    private Long directoryId;
+    private String croql;
+    private String filter;
+    private String scope;
+    private Integer limit;
+    private Integer offset;
+}

src/test/java/com/crowdin/client/sourcestrings/SourceStringsApiTest.java

@@ -72,7 +72,7 @@ public void uploadStringsTest() {
 
     @Test
     public void listStringsTest() {
-        ResponseList<SourceString> sourceStringResponseList = this.getSourceStringsApi().listSourceStrings(projectId, null, null, null, null, null, null, null, null, null);
+        ResponseList<SourceString> sourceStringResponseList = this.getSourceStringsApi().listSourceStrings(projectId, ListSourceStringsParams.builder().build());
         assertEquals(sourceStringResponseList.getData().size(), 1);
         assertEquals(sourceStringResponseList.getData().get(0).getData().getId(), id);
         assertEquals(sourceStringResponseList.getData().get(0).getData().getText(), text);