make content-type configurable (#1010)

Author: tokuhirom

clients/line-bot-client-base/src/main/java/com/linecorp/bot/client/base/BotAwareJacksonConverter.java

@@ -65,9 +65,9 @@ public Converter<?, RequestBody> requestBodyConverter(Type type,
 
     private RequestBody buildRequestBodyFromUploadFile(Object o) {
         if (o instanceof UploadFile.StringUploadFile uploadFile) {
-            return RequestBody.create(uploadFile.src(), MediaType.parse("text/plain"));
+            return RequestBody.create(uploadFile.src(), MediaType.parse(uploadFile.contentType()));
         } else if (o instanceof UploadFile.FileUploadFile uploadFile) {
-            return RequestBody.create(uploadFile.src(), MediaType.parse("text/plain"));
+            return RequestBody.create(uploadFile.src(), MediaType.parse(uploadFile.contentType()));
         }
 
         throw new IllegalArgumentException("Unsupported object: " + o);

clients/line-bot-client-base/src/main/java/com/linecorp/bot/client/base/UploadFile.java

@@ -21,28 +21,51 @@
 import java.io.File;
 
 public interface UploadFile {
+    /**
+     * Upload file from String.
+     */
+    static StringUploadFile fromString(String src, String contentType) {
+        return new StringUploadFile(src, contentType);
+    }
 
     /**
      * Upload file from String.
+     * content-type is hard-coded as `text/plain`.
+     *
+     * @deprecated use `fromString(String, String)` instead.
      */
+    @Deprecated
     static StringUploadFile fromString(String src) {
-        return new StringUploadFile(src);
+        return new StringUploadFile(src, "text/plain");
+    }
+
+    /**
+     * Upload file from File.
+     */
+    static FileUploadFile fromFile(File src, String contentType) {
+        return new FileUploadFile(src, contentType);
     }
 
     /**
      * Upload file from File.
+     * content-type is hard-coded as `text/plain`.
+     *
+     * @deprecated use `fromFile(File, String)` instead.
      */
+    @Deprecated
     static FileUploadFile fromFile(File src) {
-        return new FileUploadFile(src);
+        return new FileUploadFile(src, "text/plain");
     }
 
     record StringUploadFile(
-            String src
+            String src,
+            String contentType
     ) implements UploadFile {
     }
 
     record FileUploadFile(
-            File src
+            File src,
+            String contentType
     ) implements UploadFile {
     }
 }

clients/line-bot-messaging-api-client/src/test/java/com/linecorp/bot/messaging/client/MessagingApiBlobClientExTest.java

@@ -18,18 +18,22 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathTemplate;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.Map;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,9 +44,12 @@
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.ocadotechnology.gembus.test.Arranger;
 
 import com.linecorp.bot.client.base.BlobContent;
 import com.linecorp.bot.client.base.Result;
+import com.linecorp.bot.client.base.UploadFile;
+import com.linecorp.bot.messaging.model.TextMessage;
 
 @ExtendWith(MockitoExtension.class)
 @Timeout(5)
@@ -108,4 +115,22 @@ public void getMessageContent() throws IOException {
         assertThat(result.requestId()).isEqualTo("ppp");
         assertThat(requireNonNull(result.body()).string()).isEqualTo("JPG]]]]]]");
     }
+
+    @Test
+    public void setRichMenuImageTest() {
+        stubFor(post(urlPathTemplate("/v2/bot/richmenu/{richMenuId}/content"))
+                .withHeader("content-type", containing("image/jpeg")).willReturn(
+                        aResponse()
+                                .withStatus(200)
+                                .withHeader("content-type", "application/json")
+                                .withBody("{}")));
+
+        String richMenuId = Arranger.some(String.class, Map.of(
+                "message", () -> new TextMessage("hello"),
+                "recipient", () -> null,
+                "filter", () -> null));
+        UploadFile body = UploadFile.fromString("HELLO_FILE", "image/jpeg");
+
+        target.setRichMenuImage(richMenuId, body).join();
+    }
 }

samples/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/ManageAudienceController.java

@@ -137,7 +137,7 @@ public CompletableFuture<RedirectView> postUploadByFile(
 
         return blobClient.createAudienceForUploadingUserIds(
                 description, isIfaAudience, uploadDescription,
-                UploadFile.fromFile(convFile)
+                UploadFile.fromFile(convFile, "text/plain")
         ).thenApply(
                 result -> new RedirectView("/manage_audience/" + result.body().audienceGroupId())
         ).whenComplete((a, b) -> {
@@ -259,7 +259,7 @@ public CompletableFuture<RedirectView> postAddAudienceByFile(
 
         return blobClient.addUserIdsToAudience(
                 audienceGroupId, uploadDescription,
-                UploadFile.fromFile(convFile)
+                UploadFile.fromFile(convFile, "text/plain")
         ).thenApply(
                 it -> new RedirectView("/manage_audience/" + audienceGroupId)
         ).whenComplete((a, b) -> {

templates/api_test.mustache

@@ -87,7 +87,7 @@ public class {{classname}}Test {
 
         {{#allParams}}
         {{#isFile}}
-            UploadFile {{paramName}} = UploadFile.fromString("HELLO_FILE");
+            UploadFile {{paramName}} = UploadFile.fromString("HELLO_FILE", "text/plain");
         {{/isFile}}
         {{^isFile}}
             {{{dataType}}} {{paramName}} = Arranger.some({{dataType}}.class{{#mockMessage}}, Map.of("message", () -> new TextMessage("hello"), "recipient", () -> null, "filter", () -> null){{/mockMessage}});