Merge pull request #407 from okue/code-refactoring

NON-ISSUE Code refactoring

Author: kazuki-ma

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

@@ -187,8 +187,7 @@ public interface LineMessagingClient {
      * @see <a href="https://developers.line.me/en/reference/messaging-api/#get-group-member-user-ids">//developers.line.me/en/reference/messaging-api/#get-group-member-user-ids</a>
      * @see MembersIdsResponse#getNext()
      */
-    CompletableFuture<MembersIdsResponse> getGroupMembersIds(
-            String groupId, String start);
+    CompletableFuture<MembersIdsResponse> getGroupMembersIds(String groupId, String start);
 
     /**
      * Get (a part of) room member list.
@@ -198,8 +197,7 @@ CompletableFuture<MembersIdsResponse> getGroupMembersIds(
      * @see <a href="https://developers.line.me/en/reference/messaging-api/#get-room-member-user-ids">//developers.line.me/en/reference/messaging-api/#get-room-member-user-ids</a>
      * @see MembersIdsResponse#getNext()
      */
-    CompletableFuture<MembersIdsResponse> getRoomMembersIds(
-            String roomId, String start);
+    CompletableFuture<MembersIdsResponse> getRoomMembersIds(String roomId, String start);
 
     /**
      * Leave a group.

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

@@ -135,7 +135,7 @@ public class LineMessagingClientBuilder {
      * @see #channelTokenSupplier(ChannelTokenSupplier)
      */
     public LineMessagingClientBuilder channelToken(String channelToken) {
-        this.channelTokenSupplier(FixedChannelTokenSupplier.of(channelToken));
+        channelTokenSupplier(FixedChannelTokenSupplier.of(channelToken));
         return this;
     }
 
@@ -151,7 +151,7 @@ public LineMessagingClientBuilder channelToken(String channelToken) {
      *         You should insert authentication headers yourself.
      */
     public LineMessagingClientBuilder okHttpClientBuilder(
-            @NonNull final OkHttpClient.Builder okHttpClientBuilder,
+            final @NonNull OkHttpClient.Builder okHttpClientBuilder,
             final boolean addAuthenticationHeader) {
         this.okHttpClientBuilder = okHttpClientBuilder;
         this.addAuthenticationHeader = addAuthenticationHeader;

line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/LineBotProperties.java

@@ -41,53 +41,39 @@ public class LineBotProperties {
      *
      * @see ChannelTokenSupplyMode
      */
-    @NotNull
-    private ChannelTokenSupplyMode channelTokenSupplyMode = ChannelTokenSupplyMode.FIXED;
+    private @NotNull ChannelTokenSupplyMode channelTokenSupplyMode = ChannelTokenSupplyMode.FIXED;
 
     /**
      * Channel acccess token.
      */
-    @Valid
-    private String channelToken;
+    private @Valid String channelToken;
 
     /**
      * Channel secret.
      */
-    @Valid
-    @NotNull
-    private String channelSecret;
+    private @Valid @NotNull String channelSecret;
 
-    @Valid
-    @NotNull
-    private String apiEndPoint = LineClientConstants.DEFAULT_API_END_POINT;
+    private @Valid @NotNull String apiEndPoint = LineClientConstants.DEFAULT_API_END_POINT;
 
     /**
      * Connection timeout in milliseconds.
      */
-    @Valid
-    @NotNull
-    private long connectTimeout = LineClientConstants.DEFAULT_CONNECT_TIMEOUT_MILLIS;
+    private @Valid @NotNull long connectTimeout = LineClientConstants.DEFAULT_CONNECT_TIMEOUT_MILLIS;
 
     /**
      * Read timeout in milliseconds.
      */
-    @Valid
-    @NotNull
-    private long readTimeout = LineClientConstants.DEFAULT_READ_TIMEOUT_MILLIS;
+    private @Valid @NotNull long readTimeout = LineClientConstants.DEFAULT_READ_TIMEOUT_MILLIS;
 
     /**
      * Write timeout in milliseconds.
      */
-    @Valid
-    @NotNull
-    private long writeTimeout = LineClientConstants.DEFAULT_WRITE_TIMEOUT_MILLIS;
+    private @Valid @NotNull long writeTimeout = LineClientConstants.DEFAULT_WRITE_TIMEOUT_MILLIS;
 
     /**
      * Configuration for {@link LineMessageHandler} and {@link EventMapping}.
      */
-    @Valid
-    @NotNull
-    private Handler handler = new Handler();
+    private @Valid @NotNull Handler handler = new Handler();
 
     @Data
     public static class Handler {

line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/annotation/EventMapping.java

@@ -21,15 +21,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.google.common.annotations.Beta;
-
 /**
  * Indicates that an annotated method is a LINE Messaging Event Handler.
  *
  * <p>Note: Only {@link EventMapping @EventMapping} annotated method
  * in the class annotated by {@link LineMessageHandler @LineMessageHandler} is enabled.
  */
-@Beta
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EventMapping {

line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/annotation/LineMessageHandler.java

@@ -23,15 +23,12 @@
 
 import org.springframework.stereotype.Component;
 
-import com.google.common.annotations.Beta;
-
 /**
  * Indicates that an annotated class has a LINE Messaging Event Handler method.
  *
  * <p>This annotation serves as a specialization of {@link Component @Component},
  * allowing for implementation classes to be autodetected through classpath scanning.
  */
-@Beta
 @Target(ElementType.TYPE)
 @Component
 @Retention(RetentionPolicy.RUNTIME)

line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/support/LineMessageHandlerSupport.java

@@ -38,7 +38,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 
@@ -70,7 +69,6 @@
  * </ul>
  */
 @Slf4j
-@Beta
 @RestController
 @Import(ReplyByReturnValueConsumer.Factory.class)
 @ConditionalOnProperty(name = "line.bot.handler.enabled", havingValue = "true", matchIfMissing = true)