Merge pull request #412 from okue/refactor-spring-boot

NON-ISSUE Refactoring line-bot-spring-boot

Author: kazuki-ma

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

@@ -50,22 +50,24 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
             return true;
         }
 
-        HandlerMethod hm = (HandlerMethod) handler;
-        MethodParameter[] methodParameters = hm.getMethodParameters();
+        final HandlerMethod hm = (HandlerMethod) handler;
+        final MethodParameter[] methodParameters = hm.getMethodParameters();
+
         for (MethodParameter methodParameter : methodParameters) {
-            if (methodParameter.getParameterAnnotation(LineBotMessages.class) != null) {
-                try {
-                    CallbackRequest callbackRequest = lineBotCallbackRequestParser.handle(request);
-                    LineBotServerArgumentProcessor.setValue(request, callbackRequest);
-                    return true;
-                } catch (LineBotCallbackException e) {
-                    log.info("LINE Bot callback exception: {}", e.getMessage());
-                    response.sendError(HttpStatus.BAD_REQUEST.value());
-                    try (PrintWriter writer = response.getWriter()) {
-                        writer.println(e.getMessage());
-                    }
-                    return false;
+            if (methodParameter.getParameterAnnotation(LineBotMessages.class) == null) {
+                continue;
+            }
+            try {
+                final CallbackRequest callbackRequest = lineBotCallbackRequestParser.handle(request);
+                LineBotServerArgumentProcessor.setValue(request, callbackRequest);
+                return true;
+            } catch (LineBotCallbackException e) {
+                log.info("LINE Bot callback exception: {}", e.getMessage());
+                response.sendError(HttpStatus.BAD_REQUEST.value());
+                try (PrintWriter writer = response.getWriter()) {
+                    writer.println(e.getMessage());
                 }
+                return false;
             }
         }
         return true;
@@ -78,7 +80,6 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
-                                Exception ex)
-            throws Exception {
+                                Exception ex) throws Exception {
     }
 }

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

@@ -133,8 +133,7 @@ private HandlerMethod getMethodHandlerMethodFunction(Object consumer, Method met
         final Type type = method.getGenericParameterTypes()[0];
 
         final Predicate<Event> predicate = new EventPredicate(type);
-        return new HandlerMethod(predicate, consumer, method,
-                                 getPriority(mapping, type));
+        return new HandlerMethod(predicate, consumer, method, getPriority(mapping, type));
     }
 
     private int getPriority(final EventMapping mapping, final Type type) {
@@ -234,7 +233,6 @@ public boolean test(final Event event) {
         }
 
         private static boolean filterByType(final Class<?> clazz, final Object content) {
-
             return clazz.isAssignableFrom(content.getClass());
         }
 

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

@@ -93,7 +93,7 @@ private void acceptResult(final Object returnValue) {
         if (returnValue instanceof Message) {
             reply(singletonList((Message) returnValue));
         } else if (returnValue instanceof List) {
-            List<?> returnValueAsList = (List<?>) returnValue;
+            final List<?> returnValueAsList = (List<?>) returnValue;
 
             if (returnValueAsList.isEmpty()) {
                 return;
@@ -118,6 +118,7 @@ private void logging(final BotApiResponse botApiResponse, final Throwable throwa
         }
     }
 
+    @SuppressWarnings("unchecked")
     @VisibleForTesting
     static List<Message> checkListContents(final List<?> list) {
         for (int i = 0; i < list.size(); ++i) {
@@ -128,8 +129,6 @@ static List<Message> checkListContents(final List<?> list) {
                                         item.getClass());
         }
 
-        @SuppressWarnings("unchecked")
-        final List<Message> messageList = (List<Message>) list;
-        return messageList;
+        return (List<Message>) list;
     }
 }