feat(api): Bundles API: add the includeProjectSourceLanguage property (#173)

Author: innomaxx

src/main/java/com/crowdin/client/bundles/BundlesApi.java

@@ -46,7 +46,7 @@ public ResponseList<Bundle> listBundles(Long projectId) throws HttpException, Ht
      * <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.projects.bundles.post" target="_blank"><b>Enterprise API Documentation</b></a></li>
      * </ul>
      */
-    public ResponseObject<Bundle> addBundle(Long projectId, Bundle request) throws HttpException, HttpBadRequestException {
+    public ResponseObject<Bundle> addBundle(Long projectId, AddBundleRequest request) throws HttpException, HttpBadRequestException {
         BundleResponseObject response = this.httpClient.post(this.url + "/projects/" + projectId + "/bundles", request, new HttpRequestConfig(), BundleResponseObject.class);
         return ResponseObject.of(response.getData());
     }
@@ -139,9 +139,9 @@ public ResponseObject<DownloadLink> downloadBundle(Long projectId, Long bundleId
      * <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.projects.bundles.exports.post" target="_blank"><b>Enterprise API Documentation</b></a></li>
      * </ul>
      */
-    public ResponseObject<BundleExport> exportBundle(Long projectId, Long bundleId, Bundle request) throws HttpException, HttpBadRequestException {
+    public ResponseObject<BundleExport> exportBundle(Long projectId, Long bundleId) throws HttpException, HttpBadRequestException {
         BundleExportResponseObject response = this.httpClient.post(this.url + "/projects/" + projectId + "/bundles/" + bundleId + "/exports",
-                request,
+                null,
                 new HttpRequestConfig(),
                 BundleExportResponseObject.class);
         return ResponseObject.of(response.getData());

src/main/java/com/crowdin/client/bundles/model/AddBundleRequest.java

@@ -0,0 +1,18 @@
+package com.crowdin.client.bundles.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddBundleRequest {
+    private String name;
+    private String format;
+    private List<String> sourcePatterns;
+    private List<String> ignorePatterns;
+    private String exportPattern;
+    private Boolean isMultilingual;
+    private Boolean includeProjectSourceLanguage;
+    private List<Long> labelIds;
+    private List<Long> excludeLabelIds;
+}

src/main/java/com/crowdin/client/bundles/model/Bundle.java

@@ -15,6 +15,7 @@ public class Bundle {
     private List<String> ignorePatterns;
     private String exportPattern;
     private boolean isMultilingual;
+    private Boolean includeProjectSourceLanguage;
     private List<Long> labelIds;
     private Date createdAt;
     private Date updatedAt;

src/test/java/com/crowdin/client/bundles/BundlesApiTest.java

@@ -16,12 +16,13 @@
 import org.apache.http.client.methods.HttpPost;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.Date;
-import java.util.Calendar;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -51,7 +52,7 @@ public List<RequestMock> getMocks() {
                 RequestMock.build(this.url + "/projects/" + projectId + "/bundles/" + fileInfoCollectionResourceId + "/files", HttpGet.METHOD_NAME, "api/bundles/fileInfoCollectionResource.json"),
                 RequestMock.build(this.url + "/projects/" + projectId2 + "/bundles/" + fileCollectionResourceId + "/files", HttpGet.METHOD_NAME, "api/bundles/fileCollectionResource.json"),
                 RequestMock.build(this.url + "/projects/" + projectId + "/bundles/" + bundleId + "/exports/" + exportId + "/download", HttpGet.METHOD_NAME, "api/bundles/downloadBundle.json"),
-                RequestMock.build(this.url + "/projects/" + projectId + "/bundles/" + bundleId + "/exports", HttpPost.METHOD_NAME, "api/bundles/addBundleRequest.json", "api/bundles/exportBundle.json"),
+                RequestMock.build(this.url + "/projects/" + projectId + "/bundles/" + bundleId + "/exports", HttpPost.METHOD_NAME, "api/bundles/exportBundle.json"),
                 RequestMock.build(this.url + "/projects/" + projectId + "/bundles/" + bundleId + "/exports/" + exportId, HttpGet.METHOD_NAME, "api/bundles/exportBundle.json")
         );
     }
@@ -67,13 +68,14 @@ public void listBundlesTest() {
 
     @Test
     public void addBundleTest() {
-        Bundle request = new Bundle();
+        AddBundleRequest request = new AddBundleRequest();
         request.setName(name);
         request.setFormat(format);
         request.setSourcePatterns(Collections.singletonList("/master/"));
         request.setIgnorePatterns(Collections.singletonList("/master/environments/"));
         request.setExportPattern(pattern);
-        request.setMultilingual(true);
+        request.setIsMultilingual(true);
+        request.setIncludeProjectSourceLanguage(true);
         request.setLabelIds(Collections.singletonList(0L));
 
         ResponseObject<Bundle> response = this.getBundlesApi().addBundle(projectId, request);
@@ -89,6 +91,7 @@ public void getBundleTest() {
         assertEquals(response.getData().getId(), projectId);
         assertEquals(response.getData().getName(), name);
         assertTrue(response.getData().isMultilingual());
+        assertTrue(response.getData().getIncludeProjectSourceLanguage());
     }
 
     @Test
@@ -98,10 +101,20 @@ public void deleteBundleTest() {
 
     @Test
     public void editBundleTest() {
-        PatchRequest request = new PatchRequest();
-        request.setOp(PatchOperation.REPLACE);
-        request.setPath("/name");
-        ResponseObject<Bundle> response = this.getBundlesApi().editBundle(projectId, bundleId, Arrays.asList(request));
+        List<PatchRequest> request = new ArrayList<PatchRequest>() {{
+            add(new PatchRequest() {{
+                setOp(PatchOperation.REPLACE);
+                setPath("/name");
+                setValue("New name");
+            }});
+            add(new PatchRequest() {{
+                setOp(PatchOperation.REPLACE);
+                setPath("/includeProjectSourceLanguage");
+                setValue(true);
+            }});
+        }};
+
+        ResponseObject<Bundle> response = this.getBundlesApi().editBundle(projectId, bundleId, request);
         assertEquals(response.getData().getId(), projectId);
         assertEquals(response.getData().getName(), name);
     }
@@ -133,16 +146,7 @@ public void downloadBundleTest() {
 
     @Test
     public void exportBundleTest() {
-        Bundle request = new Bundle();
-        request.setName(name);
-        request.setFormat(format);
-        request.setSourcePatterns(Collections.singletonList("/master/"));
-        request.setIgnorePatterns(Collections.singletonList("/master/environments/"));
-        request.setExportPattern(pattern);
-        request.setMultilingual(true);
-        request.setLabelIds(Collections.singletonList(0L));
-
-        ResponseObject<BundleExport> response = this.getBundlesApi().exportBundle(projectId, bundleId, request);
+        ResponseObject<BundleExport> response = this.getBundlesApi().exportBundle(projectId, bundleId);
         assertEquals(exportId, response.getData().getIdentifier());
         assertEquals(2,response.getData().getAttributes().getBundleId());
     }

src/test/resources/api/bundles/addBundleRequest.json

@@ -9,6 +9,7 @@
   ],
   "exportPattern": "strings-%two_letter_code%.resx",
   "isMultilingual": true,
+  "includeProjectSourceLanguage": true,
   "labelIds": [
     0
   ]

src/test/resources/api/bundles/bundle.json

@@ -11,6 +11,7 @@
     ],
     "exportPattern": "strings-%two_letters_code%.resx",
     "isMultilingual": true,
+    "includeProjectSourceLanguage": true,
     "labelIds": [
       0
     ],

src/test/resources/api/bundles/editBundle.json

@@ -1,6 +1,12 @@
 [
   {
     "op": "replace",
-    "path": "/name"
+    "path": "/name",
+    "value": "New name"
+  },
+  {
+    "op": "replace",
+    "path": "/includeProjectSourceLanguage",
+    "value": true
   }
 ]