From bc635b95879330b0f38b482f0cb08a85f40cc764 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 26 Jun 2017 12:32:19 -0600 Subject: [PATCH] polish --- .../gateway/handler/FilteringWebHandler.java | 4 +--- .../gateway/support/ServerWebExchangeUtils.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java index fb2f81e6..1b07dd6b 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java @@ -24,10 +24,8 @@ import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.filter.OrderedWebFilter; -import org.springframework.cloud.gateway.route.RouteLocator; -import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.cloud.gateway.filter.OrderedWebFilter; import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.route.Route; import org.springframework.core.Ordered; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java index 186490e3..8ba59f5d 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java @@ -29,13 +29,16 @@ public class ServerWebExchangeUtils { private static final Log logger = LogFactory.getLog(ServerWebExchangeUtils.class); - public static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE = - ServerWebExchangeUtils.class.getName() + ".uriTemplateVariables"; + public static final String URI_TEMPLATE_VARIABLES_ATTRIBUTE = qualify("uriTemplateVariables"); - public static final String CLIENT_RESPONSE_ATTR = "webHandlerClientResponse"; - public static final String GATEWAY_ROUTE_ATTR = "gatewayRoute"; - public static final String GATEWAY_REQUEST_URL_ATTR = "gatewayRequestUrl"; - public static final String GATEWAY_HANDLER_MAPPER_ATTR = "gatewayHandlerMapper"; + public static final String CLIENT_RESPONSE_ATTR = qualify("webHandlerClientResponse"); + public static final String GATEWAY_ROUTE_ATTR = qualify("gatewayRoute"); + public static final String GATEWAY_REQUEST_URL_ATTR = qualify("gatewayRequestUrl"); + public static final String GATEWAY_HANDLER_MAPPER_ATTR = qualify("gatewayHandlerMapper"); + + private static String qualify(String attr) { + return ServerWebExchangeUtils.class.getName() + "." + attr; + } public static boolean setResponseStatus(ServerWebExchange exchange, HttpStatus httpStatus) { boolean response = exchange.getResponse().setStatusCode(httpStatus);