代码格式化

miaoguoxin
1 parent e347e5b2
Showing 17 changed files with 20 additions and 80 deletions
src/main/java/com/diligrp/xtrade/gateway/application/TestAggregationApplication.java
src/main/java/com/diligrp/xtrade/gateway/common/constant/GatewayConst.java
src/main/java/com/diligrp/xtrade/gateway/common/utils/ResponseUtils.java
src/main/java/com/diligrp/xtrade/gateway/common/utils/ValidateUtils.java
src/main/java/com/diligrp/xtrade/gateway/config/property/AuthPathProperties.java
src/main/java/com/diligrp/xtrade/gateway/controller/TestController.java
src/main/java/com/diligrp/xtrade/gateway/domain/TestRequestDto.java
src/main/java/com/diligrp/xtrade/gateway/exception/GlobalGatewayErrorHandler.java
src/main/java/com/diligrp/xtrade/gateway/filters/factory/DispatchGatewayFilterFactory.java
src/main/java/com/diligrp/xtrade/gateway/filters/global/ResponseReadBodyGlobalFilter.java
src/main/java/com/diligrp/xtrade/gateway/filters/web/ReactiveContextWebFilter.java
src/main/java/com/diligrp/xtrade/gateway/predicates/ReadBodyRoutePredicateFactory.java
src/main/java/com/diligrp/xtrade/gateway/repository/GatewayRepository.java
src/main/java/com/diligrp/xtrade/gateway/route/impl/CloudRouteResourceLoader.java
src/main/java/com/diligrp/xtrade/gateway/support/dispatch/DispatchContext.java
src/main/java/com/diligrp/xtrade/gateway/support/dispatch/MappingMetaInfo.java
src/test/java/com/diligrp/xtrade/gateway/XtradeGatewayApplicationTests.java
@@ -9,7 +9,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
  
-import javax.validation.groups.Default;
+import javax.servlet.http.HttpServletRequest;
  
 /**
  * @Auther: miaoguoxin
@@ -23,9 +23,11 @@ public class TestAggregationApplication {
  
     @Autowired
     private ServerHttpRequest serverHttpRequest;
+    @Autowired
+    private HttpServletRequest httpServletRequest;
  
     @DispatchMapping("/test")
-    public String test(DispatchContext<TestRequestDto> dispatchContext){
+    public String test(DispatchContext<TestRequestDto> dispatchContext) {
         return "ffff";
     }
  
 package com.diligrp.xtrade.gateway.common.constant;
  
-import org.springframework.cloud.gateway.filter.factory.StripPrefixGatewayFilterFactory;
-
 import java.util.concurrent.atomic.AtomicBoolean;
  
 /**
@@ -18,15 +18,12 @@ public class ResponseUtils {
  
  
     public static Mono<Void> writeForbidden(ServerHttpResponse response){
-        Message message = Message
-                .builder()
-                .code(HttpStatus.FORBIDDEN.value())
-                .message(HttpStatus.FORBIDDEN.toString())
-                .build();
+        Message<Object> message = Message.failure(
+                HttpStatus.FORBIDDEN.value(),HttpStatus.FORBIDDEN.toString());
         return writeResponse(response,message);
     }
  
-    public static Mono<Void> writeResponse(ServerHttpResponse response,Message message){
+    public static Mono<Void> writeResponse(ServerHttpResponse response,Message<Object> message){
         String respJson = JsonUtils.toJsonString(message);
         response.getHeaders().setContentLength(
                 respJson.getBytes(StandardCharsets.UTF_8).length);
@@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.groups.Default;
 import java.util.Arrays;
@@ -4,13 +4,9 @@ import com.diligrp.xtrade.gateway.common.utils.PathUtils;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.pattern.PathPattern;
-import org.springframework.web.util.pattern.PathPatternParser;
  
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
  
 /**
  * @Auther: miaoguoxin
@@ -2,29 +2,19 @@ package com.diligrp.xtrade.gateway.controller;
  
 import com.diligrp.xtrade.gateway.domain.TestRequestDto;
 import com.diligrp.xtrade.shared.domain.Message;
-import com.diligrp.xtrade.shared.util.DateUtils;
-import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.gateway.config.GatewayProperties;
 import org.springframework.cloud.gateway.route.RouteDefinition;
-import org.springframework.http.server.PathContainer;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.pattern.PathPattern;
-import org.springframework.web.util.pattern.PathPatternParser;
  
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.groups.Default;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
  
 /**
  * @Auther: miaoguoxin
@@ -41,12 +31,6 @@ public class TestController {
     @Value("${ribbon.ServerListRefreshInterval}")
     private String interval;
  
-    @GetMapping("/gateway/{id}")
-    public Message test(@Min(value = 5,message = "id不能小于5") @PathVariable Integer id) {
-        List<RouteDefinition> routes = gatewayProperties.getRoutes();
-        return Message.builder().success();
-    }
-
     @GetMapping("/test_dynamic")
     public Message<String> test1( TestRequestDto testRequestDto) {
         throw new RuntimeException("fffff");
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
  
 import javax.validation.constraints.NotBlank;
-import javax.validation.groups.Default;
 import java.time.LocalDateTime;
  
 /**
@@ -111,10 +111,7 @@ public class GlobalGatewayErrorHandler implements ErrorWebExceptionHandler {
     }
  
     private Map<String, Object> getHttpResult(HttpStatus httpStatus) {
-        Message apiResult= Message.builder()
-                .code(httpStatus.value())
-                .message(httpStatus.toString())
-                .build();
+        Message<String> apiResult= Message.failure(httpStatus.value(),httpStatus.toString());
         Map<String,Object> result=new HashMap<>();
         result.put("httpStatus",httpStatus);
         result.put("body", JSON.toJSONString(apiResult));
@@ -128,10 +125,7 @@ public class GlobalGatewayErrorHandler implements ErrorWebExceptionHandler {
         Map<String, Object> errorAttrs = errorAttributes.getErrorAttributes(request, true);
         String msg = String.format("%s %s",
                 errorAttrs.get("path"), errorAttrs.get("error"));
-        Message message = Message.builder()
-                .code((int)errorAttrs.get("status"))
-                .message(msg)
-                .build();
+        Message<Object> message = Message.failure((int)errorAttrs.get("status"),msg);
         if (message.getCode().equals(500)){
             log.error("[全局异常处理]异常请求路径:{},记录异常信息:{}", errorAttrs.get("path"),errorAttributes.getError(request));
         }
@@ -5,16 +5,12 @@ import com.diligrp.xtrade.gateway.common.utils.ResponseUtils;
 import com.diligrp.xtrade.gateway.support.dispatch.RequestDispatcher;
 import com.diligrp.xtrade.shared.domain.Message;
 import lombok.Data;
-import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
 import org.springframework.core.Ordered;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
-package com.diligrp.xtrade.gateway.filters.global;
+package com.diligrp.xtrade.gateway.filters.global ;
  
 import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
@@ -29,7 +29,7 @@ import java.util.function.BiFunction;
  
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR;
  
-/**
+/*
  * @auther: miaoguoxin
  * @date: 2018/12/26 21:26
  * @description: 读取响应体过滤器
@@ -37,7 +37,6 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.O
 @Component
 @Slf4j
 public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
-
     private final List<HttpMessageReader<?>> messageReaders;
  
     public ResponseReadBodyGlobalFilter() {
@@ -62,10 +61,6 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
  
     /**
      * 响应body处理，添加响应的打印
-     *
-     * @param exchange
-     * @param startTime
-     * @return
      */
     private BodyHandlerServerHttpResponseDecorator.BodyHandlerFunction initBodyHandler(ServerWebExchange exchange, long startTime) {
         return (resp, body) -> {
@@ -77,7 +72,7 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
             HttpHeaders httpHeaders = new HttpHeaders();
             httpHeaders.setContentType(originalResponseContentType);
  
-            ClientResponse clientResponse = this.prepareClientResponse(exchange.getResponse().getStatusCode(),body, httpHeaders);
+            ClientResponse clientResponse = this.prepareClientResponse(exchange.getResponse().getStatusCode(), body, httpHeaders);
             Mono<String> bodyMono = clientResponse.bodyToMono(String.class);
             return bodyMono.flatMap(respBody -> {
                 //打印返回响应日志
@@ -96,8 +91,6 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
         };
     }
  
-
-
     private ClientResponse prepareClientResponse(HttpStatus httpStatus, Publisher<? extends DataBuffer> body,
                                                  HttpHeaders httpHeaders) {
         return ClientResponse.create(httpStatus, messageReaders)
@@ -106,7 +99,7 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
     }
  
  
-    protected static class BodyHandlerServerHttpResponseDecorator extends ServerHttpResponseDecorator{
+    protected static class BodyHandlerServerHttpResponseDecorator extends ServerHttpResponseDecorator {
  
         interface BodyHandlerFunction extends BiFunction<ServerHttpResponse, Publisher<? extends DataBuffer>, Mono<Void>> {
  
@@ -116,11 +109,9 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
          * body 处理拦截器
          */
         private BodyHandlerServerHttpResponseDecorator.BodyHandlerFunction bodyHandler = initDefaultBodyHandler();
+
         /**
          * 构造函数
-         *
-         * @param bodyHandler
-         * @param delegate
          */
         public BodyHandlerServerHttpResponseDecorator(BodyHandlerServerHttpResponseDecorator.BodyHandlerFunction bodyHandler, ServerHttpResponse delegate) {
             super(delegate);
@@ -145,7 +136,6 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
         /**
          * 默认body拦截处理器
          *
-         * @return
          */
         private BodyHandlerServerHttpResponseDecorator.BodyHandlerFunction initDefaultBodyHandler() {
             return ReactiveHttpOutputMessage::writeWith;
@@ -9,9 +9,6 @@ import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
-import reactor.core.publisher.SignalType;
-
-import java.util.function.Consumer;
  
 /**
  * @Auther: miaoguoxin
@@ -9,17 +9,13 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.HandlerStrategies;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.Disposable;
 import reactor.core.publisher.Mono;
  
-import java.time.Duration;
 import java.util.List;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Predicate;
  
 import static com.diligrp.xtrade.gateway.common.constant.GatewayConst.CACHE_REQUEST_BODY_OBJECT_KEY;
@@ -74,12 +70,7 @@ public class ReadBodyRoutePredicateFactory extends AbstractRoutePredicateFactory
                             .create(exchange.mutate().request(serverHttpRequest)
                                     .build(), messageReaders)
                             .bodyToMono(String.class)
-                            .doOnNext(new Consumer<String>() {
-                                @Override
-                                public void accept(String objectValue) {
-                                    exchange.getAttributes().put(CACHE_REQUEST_BODY_OBJECT_KEY, objectValue);
-                                }
-                            })
+                            .doOnNext(objectValue -> exchange.getAttributes().put(CACHE_REQUEST_BODY_OBJECT_KEY, objectValue))
                             .map(objectValue -> Boolean.TRUE));
         };
     }
@@ -17,7 +17,6 @@ import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.UriComponentsBuilder;
-import reactor.core.publisher.Mono;
  
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
@@ -39,7 +39,6 @@ public class CloudRouteResourceLoader implements DynamicRouteLoaderIntf {
     private final static String GROUP = "DEFAULT_GROUP";
     private final static String ROUTE_CONFIG_NAME = "route.properties";
  
-
     @Value("${spring.application.name}")
     private String applicationName;
     @Value("${spring.profiles.active}")
@@ -10,10 +10,10 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
  */
 @Getter
 public class DispatchContext<T> {
-    private ServerHttpRequest request;
-    private ServerHttpResponse response;
+    private final ServerHttpRequest request;
+    private final ServerHttpResponse response;
     /**请求参数*/
-    private T param;
+    private final T param;
  
     public DispatchContext(ServerHttpRequest request, ServerHttpResponse response, T param) {
         this.request = request;
@@ -12,9 +12,9 @@ import java.lang.reflect.Method;
 @Getter
 public class MappingMetaInfo {
     /**方法所属的bean class*/
-    private Class<?> targetClass;
+    private final Class<?> targetClass;
     /** 需要执行的方法 */
-    private Method targetMethod;
+    private final Method targetMethod;
     /***/
     private Validated validated;
     /**泛化参数类型 {@link DispatchContext#getParam()}*/
 package com.diligrp.xtrade.gateway;
  
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
  
 @SpringBootTest