Remove deprecated methods. (#562)

Author: tokuhirom

line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/LineOAuthClientIntegrationTest.java

@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 
 import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
@@ -66,7 +67,7 @@ public void setUp() throws IOException {
         endpoint = (String) map.get("endpoint");
         target = LineOAuthClient
                 .builder()
-                .apiEndPoint(endpoint)
+                .apiEndPoint(URI.create(endpoint))
                 .build();
 
         pemPrivateKey = ((String) map.get("pemPrivateKey")).replaceAll("\n", "");

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

@@ -61,16 +61,6 @@ public class LineBlobClientBuilder {
      */
     private URI apiEndPoint = LineClientConstants.DEFAULT_BLOB_END_POINT;
 
-    /**
-     * API Endpoint.
-     *
-     * @deprecated use {@link #apiEndPoint(URI)}.
-     */
-    @Deprecated
-    public LineBlobClientBuilder apiEndPoint(String apiEndPoint) {
-        return apiEndPoint(URI.create(apiEndPoint));
-    }
-
     /**
      * API Endpoint.
      *

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

@@ -108,15 +108,6 @@ public interface LineMessagingClient {
      */
     CompletableFuture<NarrowcastProgressResponse> getNarrowcastProgress(String requestId);
 
-    /**
-     * Download image, video, and audio data sent from users.
-     *
-     * @see <a href="https://developers.line.me/en/reference/messaging-api/#get-content">//developers.line.me/en/reference/messaging-api/#get-content</a>
-     * @deprecated use {@link LineBlobClient} instead.
-     */
-    @Deprecated
-    CompletableFuture<MessageContentResponse> getMessageContent(String messageId);
-
     /**
      * Gets the target limit for additional messages in the current month. The number of messages retrieved by
      * this operation includes the number of messages sent from LINE Official Account Manager.
@@ -315,25 +306,6 @@ public interface LineMessagingClient {
      */
     CompletableFuture<BotApiResponse> unlinkRichMenuIdFromUsers(List<String> userIds);
 
-    /**
-     * Download rich menu image.
-     *
-     * @see <a href="https://developers.line.me/en/docs/messaging-api/reference/#download-rich-menu-image">//developers.line.me/en/docs/messaging-api/reference/#download-rich-menu-image</a>
-     * @deprecated use {@link LineBlobClient} instead.
-     */
-    @Deprecated
-    CompletableFuture<MessageContentResponse> getRichMenuImage(String richMenuId);
-
-    /**
-     * Set RichMenu image.
-     *
-     * @see <a href="https://developers.line.me/en/docs/messaging-api/reference/#upload-rich-menu-image">//developers.line.me/en/docs/messaging-api/reference/#upload-rich-menu-image</a>
-     * @deprecated use {@link LineBlobClient} instead.
-     */
-    @Deprecated
-    CompletableFuture<BotApiResponse> setRichMenuImage(
-            String richMenuId, String contentType, byte[] content);
-
     /**
      * Gets a list of all uploaded rich menus.
      *

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

@@ -64,16 +64,6 @@ public class LineMessagingClientBuilder {
      */
     private URI apiEndPoint = LineClientConstants.DEFAULT_API_END_POINT;
 
-    /**
-     * API Endpoint.
-     *
-     * @deprecated use {@link #apiEndPoint(URI apiEndPoint)}.
-     */
-    @Deprecated
-    public LineMessagingClientBuilder apiEndPoint(String apiEndPoint) {
-        return apiEndPoint(URI.create(apiEndPoint));
-    }
-
     /**
      * API Endpoint.
      *

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

@@ -105,13 +105,6 @@ public CompletableFuture<NarrowcastProgressResponse> getNarrowcastProgress(Strin
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public CompletableFuture<MessageContentResponse> getMessageContent(String messageId) {
-        return blobDelegationTarget.getMessageContent(messageId);
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
     public CompletableFuture<MessageQuotaResponse> getMessageQuota() {
         return toFuture(retrofitImpl.getMessageQuota());
     }
@@ -241,19 +234,6 @@ public CompletableFuture<BotApiResponse> unlinkRichMenuIdFromUsers(List<String>
                                                                                               .build()));
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public CompletableFuture<MessageContentResponse> getRichMenuImage(final String richMenuId) {
-        return blobDelegationTarget.getRichMenuImage(richMenuId);
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public CompletableFuture<BotApiResponse> setRichMenuImage(
-            final String richMenuId, final String contentType, final byte[] content) {
-        return blobDelegationTarget.setRichMenuImage(richMenuId, contentType, content);
-    }
-
     @Override
     public CompletableFuture<RichMenuListResponse> getRichMenuList() {
         return toFuture(retrofitImpl.getRichMenuList());

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

@@ -59,16 +59,6 @@ public class LineOAuthClientBuilder {
      */
     private URI apiEndPoint = LineClientConstants.DEFAULT_API_END_POINT;
 
-    /**
-     * API Endpoint.
-     *
-     * @deprecated use {@link #apiEndPoint(URI apiEndPoint)}.
-     */
-    @Deprecated
-    public LineOAuthClientBuilder apiEndPoint(String apiEndPoint) {
-        return apiEndPoint(URI.create(apiEndPoint));
-    }
-
     /**
      * API Endpoint.
      *

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

@@ -61,16 +61,6 @@ public class ManageAudienceClientBuilder {
      */
     private URI apiEndPoint = LineClientConstants.DEFAULT_API_END_POINT;
 
-    /**
-     * API Endpoint.
-     *
-     * @deprecated use {@link #apiEndPoint(URI apiEndPoint)}.
-     */
-    @Deprecated
-    public ManageAudienceClientBuilder apiEndPoint(String apiEndPoint) {
-        return apiEndPoint(URI.create(apiEndPoint));
-    }
-
     /**
      * API Endpoint.
      *

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

@@ -19,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.net.URI;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.junit.MockitoJUnit;
@@ -34,7 +36,7 @@ public class LineMessagingClientBuilderTest extends AbstractWiremockTest {
     public void testBuildWithFixedToken() throws InterruptedException {
         lineMessagingClient = new LineMessagingClientBuilder()
                 .channelToken("MOCKED_TOKEN")
-                .apiEndPoint("http://localhost:" + mockWebServer.getPort())
+                .apiEndPoint(URI.create("http://localhost:" + mockWebServer.getPort()))
                 .build();
 
         // Do
@@ -50,7 +52,7 @@ public void testBuildWithFixedToken() throws InterruptedException {
     public void testBuilderWithChannelTokenSupplier() throws InterruptedException {
         lineMessagingClient =
                 LineMessagingClient.builder(() -> "MOCKED_TOKEN")
-                                   .apiEndPoint("http://localhost:" + mockWebServer.getPort())
+                                   .apiEndPoint(URI.create("http://localhost:" + mockWebServer.getPort()))
                                    .build();
 
         // Do

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

@@ -50,7 +50,7 @@ public void setUp() throws Exception {
                 + "/CanContainsRelative/";
         target = LineMessagingClient
                 .builder("SECRET")
-                .apiEndPoint(apiEndPoint)
+                .apiEndPoint(URI.create(apiEndPoint))
                 .build();
     }
 

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

@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.catchThrowableOfType;
 
+import java.net.URI;
 import java.util.concurrent.CompletionException;
 
 import org.junit.After;
@@ -60,7 +61,7 @@ public void setUp() {
         mockWebServer = new MockWebServer();
         final String apiEndPoint = mockWebServer.url("/").toString();
         target = LineOAuthClient.builder()
-                                .apiEndPoint(apiEndPoint)
+                                .apiEndPoint(URI.create(apiEndPoint))
                                 .build();
     }