Add requestFileInfo param to MethodsClient#filesUploadV2 method

Author: seratch

slack-api-client/src/main/java/com/slack/api/methods/impl/FilesUploadV2Helper.java

@@ -10,6 +10,7 @@
 import com.slack.api.methods.response.files.FilesGetUploadURLExternalResponse;
 import com.slack.api.methods.response.files.FilesInfoResponse;
 import com.slack.api.methods.response.files.FilesUploadV2Response;
+import com.slack.api.model.File;
 import com.slack.api.util.http.SlackHttpClient;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -106,12 +107,17 @@ public FilesUploadV2Response completeUploads(
 
         result.setFiles(new ArrayList<>());
         for (FilesCompleteUploadExternalResponse.FileDetails file : response.getFiles()) {
-            FilesInfoResponse fileInfo = this.client.filesInfo(r -> r.token(v2Request.getToken()).file(file.getId()));
-            underlyingException.getFileInfoResponses().add(fileInfo);
-            if (!fileInfo.isOk()) {
-                throw underlyingException;
+            if (v2Request.isRequestFileInfo()) {
+                FilesInfoResponse fileInfo = this.client.filesInfo(r -> r.token(v2Request.getToken()).file(file.getId()));
+                underlyingException.getFileInfoResponses().add(fileInfo);
+                if (!fileInfo.isOk()) {
+                    throw underlyingException;
+                }
+                result.getFiles().add(fileInfo.getFile());
+            } else {
+                File partialFileObject = File.builder().id(file.getId()).title(file.getTitle()).build();
+                result.getFiles().add(partialFileObject);
             }
-            result.getFiles().add(fileInfo.getFile());
         }
 
         result.setOk(true);

slack-api-client/src/main/java/com/slack/api/methods/request/files/FilesUploadV2Request.java

@@ -71,6 +71,12 @@ public class FilesUploadV2Request implements SlackApiRequest {
      */
     private String snippetType;
 
+    /**
+     * Fetches all the file metadata for better v1 compatibility when this property is true.
+     */
+    @Builder.Default
+    private boolean requestFileInfo = true;
+
     @Data
     @Builder
     @NoArgsConstructor

slack-api-client/src/test/java/test_locally/api/methods/FilesTest.java

@@ -133,9 +133,17 @@ public void fileUploadV2_file() throws Exception {
                 r.file(file).filename("sample.txt").title("sample.txt"));
         assertThat(response.isOk(), is(true));
 
+        response = slack.methods(ValidToken).filesUploadV2(r ->
+                r.file(file).filename("sample.txt").title("sample.txt").requestFileInfo(false));
+        assertThat(response.isOk(), is(true));
+
         response = slack.methodsAsync(ValidToken).filesUploadV2(r ->
                 r.file(file).filename("sample.txt").title("sample.txt")).get();
         assertThat(response.isOk(), is(true));
+
+        response = slack.methodsAsync(ValidToken).filesUploadV2(r ->
+                r.file(file).filename("sample.txt").title("sample.txt").requestFileInfo(false)).get();
+        assertThat(response.isOk(), is(true));
     }
 
     @Test

slack-api-client/src/test/java/test_with_remote_apis/methods/files_Test.java

@@ -391,6 +391,45 @@ public void createLongTextFile_v2_full_args() throws Exception {
             );
             assertThat(response.getError(), is(nullValue()));
             assertThat(response.isOk(), is(true));
+            assertThat(response.getFile().getTitle(), is("file title"));
+            assertThat(response.getFile().getName(), is("sample.txt"));
+
+            // I know this is a bit long but this can be necessary for test stability
+            Thread.sleep(10000L);
+            fileObj = slack.methods(botToken).filesInfo(r -> r.file(response.getFile().getId())).getFile();
+
+            assertThat(fileObj.getTitle(), is("file title"));
+            assertThat(fileObj.getName(), is("sample.txt"));
+        }
+        {
+            ChatDeleteResponse response = slack.methods(botToken).chatDelete(r -> r
+                    .channel(channelId)
+                    .ts(fileObj
+                            .getShares()
+                            .getPublicChannels().get(channelId).get(0)
+                            .getTs())
+            );
+            assertThat(response.getError(), is(nullValue()));
+            assertThat(response.isOk(), is(true));
+        }
+    }
+
+    @Test
+    public void createLongTextFile_v2_no_file_info() throws Exception {
+        com.slack.api.model.File fileObj;
+        {
+            FilesUploadV2Response response = slack.methods(botToken).filesUploadV2(r -> r
+                    .content("test")
+                    .channel(channelId)
+                    .initialComment("initial comment")
+                    .filename("sample.txt")
+                    .title("file title")
+                    .requestFileInfo(false) // Added
+            );
+            assertThat(response.getError(), is(nullValue()));
+            assertThat(response.isOk(), is(true));
+            assertThat(response.getFile().getTitle(), is("file title"));
+            assertThat(response.getFile().getName(), is(nullValue())); // this must be absent
 
             // I know this is a bit long but this can be necessary for test stability
             Thread.sleep(10000L);