Merge pull request #408 from okue/fix-typo-richmenu

NON-ISSUE Fix class names of rich menu link/unlink request

Author: kazuki-ma

line-bot-api-client/src/main/java/com/linecorp/bot/client/LineMessagingClientImpl.java

@@ -38,8 +38,8 @@
 import com.linecorp.bot.model.response.QuotaConsumptionResponse;
 import com.linecorp.bot.model.response.demographics.GetFriendsDemographicsResponse;
 import com.linecorp.bot.model.richmenu.RichMenu;
-import com.linecorp.bot.model.richmenu.RichMenuBlukLinkRequest;
-import com.linecorp.bot.model.richmenu.RichMenuBlukUnlinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkLinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkUnlinkRequest;
 import com.linecorp.bot.model.richmenu.RichMenuIdResponse;
 import com.linecorp.bot.model.richmenu.RichMenuListResponse;
 import com.linecorp.bot.model.richmenu.RichMenuResponse;
@@ -190,7 +190,7 @@ public CompletableFuture<BotApiResponse> linkRichMenuIdToUser(
 
     @Override
     public CompletableFuture<BotApiResponse> linkRichMenuIdToUsers(List<String> userIds, String richMenuId) {
-        return toBotApiFuture(retrofitImpl.linkRichMenuToUsers(RichMenuBlukLinkRequest.builder()
+        return toBotApiFuture(retrofitImpl.linkRichMenuToUsers(RichMenuBulkLinkRequest.builder()
                                                                                       .richMenuId(richMenuId)
                                                                                       .userIds(userIds)
                                                                                       .build()));
@@ -203,7 +203,7 @@ public CompletableFuture<BotApiResponse> unlinkRichMenuIdFromUser(final String u
 
     @Override
     public CompletableFuture<BotApiResponse> unlinkRichMenuIdFromUsers(List<String> userIds) {
-        return toBotApiFuture(retrofitImpl.unlinkRichMenuIdFromUsers(RichMenuBlukUnlinkRequest.builder()
+        return toBotApiFuture(retrofitImpl.unlinkRichMenuIdFromUsers(RichMenuBulkUnlinkRequest.builder()
                                                                                               .userIds(userIds)
                                                                                               .build()));
     }

line-bot-api-client/src/main/java/com/linecorp/bot/client/LineMessagingService.java

@@ -33,8 +33,8 @@
 import com.linecorp.bot.model.response.QuotaConsumptionResponse;
 import com.linecorp.bot.model.response.demographics.GetFriendsDemographicsResponse;
 import com.linecorp.bot.model.richmenu.RichMenu;
-import com.linecorp.bot.model.richmenu.RichMenuBlukLinkRequest;
-import com.linecorp.bot.model.richmenu.RichMenuBlukUnlinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkLinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkUnlinkRequest;
 import com.linecorp.bot.model.richmenu.RichMenuIdResponse;
 import com.linecorp.bot.model.richmenu.RichMenuListResponse;
 import com.linecorp.bot.model.richmenu.RichMenuResponse;
@@ -254,7 +254,7 @@ Call<Void> linkRichMenuToUser(
      * @see LineMessagingClient#linkRichMenuIdToUsers(List, String)
      */
     @POST("v2/bot/richmenu/bulk/link")
-    Call<Void> linkRichMenuToUsers(@Body RichMenuBlukLinkRequest request);
+    Call<Void> linkRichMenuToUsers(@Body RichMenuBulkLinkRequest request);
 
     /**
      * Method for Retrofit.
@@ -270,7 +270,7 @@ Call<Void> linkRichMenuToUser(
      * @see LineMessagingClient#unlinkRichMenuIdFromUser(String)
      */
     @DELETE("v2/bot/richmenu/bulk/unlink")
-    Call<Void> unlinkRichMenuIdFromUsers(@Body RichMenuBlukUnlinkRequest request);
+    Call<Void> unlinkRichMenuIdFromUsers(@Body RichMenuBulkUnlinkRequest request);
 
     /**
      * Method for Retrofit.

line-bot-api-client/src/test/java/com/linecorp/bot/client/LineMessagingClientImplTest.java

@@ -54,8 +54,8 @@
 import com.linecorp.bot.model.response.NumberOfMessagesResponse;
 import com.linecorp.bot.model.response.QuotaConsumptionResponse;
 import com.linecorp.bot.model.richmenu.RichMenu;
-import com.linecorp.bot.model.richmenu.RichMenuBlukLinkRequest;
-import com.linecorp.bot.model.richmenu.RichMenuBlukUnlinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkLinkRequest;
+import com.linecorp.bot.model.richmenu.RichMenuBulkUnlinkRequest;
 import com.linecorp.bot.model.richmenu.RichMenuIdResponse;
 import com.linecorp.bot.model.richmenu.RichMenuListResponse;
 import com.linecorp.bot.model.richmenu.RichMenuResponse;
@@ -392,7 +392,7 @@ public void linkRichMenuToUsers() {
                                                     .join();
 
         // Verify
-        verify(retrofitMock, only()).linkRichMenuToUsers(RichMenuBlukLinkRequest.builder()
+        verify(retrofitMock, only()).linkRichMenuToUsers(RichMenuBulkLinkRequest.builder()
                                                                                 .richMenuId("RICH_MENU_ID")
                                                                                 .userId("USER_ID")
                                                                                 .build());
@@ -423,7 +423,7 @@ public void unlinkRichMenuIdFromUsers() throws Exception {
 
         // Verify
         verify(retrofitMock, only()).unlinkRichMenuIdFromUsers(
-                RichMenuBlukUnlinkRequest.builder().userId("ID").build());
+                RichMenuBulkUnlinkRequest.builder().userId("ID").build());
         assertThat(botApiResponse).isEqualTo(BOT_API_SUCCESS_RESPONSE);
     }
 

line-bot-model/src/main/java/com/linecorp/bot/model/richmenu/RichMenuBlukLinkRequest.java renamed to line-bot-model/src/main/java/com/linecorp/bot/model/richmenu/RichMenuBulkLinkRequest.java

@@ -24,7 +24,7 @@
 
 @Value
 @Builder
-public class RichMenuBlukLinkRequest {
+public class RichMenuBulkLinkRequest {
     String richMenuId;
     @Singular
     List<String> userIds;

line-bot-model/src/main/java/com/linecorp/bot/model/richmenu/RichMenuBlukUnlinkRequest.java renamed to line-bot-model/src/main/java/com/linecorp/bot/model/richmenu/RichMenuBulkUnlinkRequest.java

@@ -24,7 +24,7 @@
 
 @Value
 @Builder
-public class RichMenuBlukUnlinkRequest {
+public class RichMenuBulkUnlinkRequest {
     @Singular
     List<String> userIds;
 }