Uses new @ControllerEndpoint for gateway endpoint.

fixes gh-153
spring-cloud · Jan 22, 2018 · d13f305 · d13f305
1 parent 81943af
commit d13f305
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/...teway/actuate/GatewayWebfluxEndpoint.java → ...ay/actuate/GatewayControllerEndpoint.java b/...teway/actuate/GatewayWebfluxEndpoint.java → ...ay/actuate/GatewayControllerEndpoint.java
@@ -24,6 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpoint;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.factory.GatewayFilterFactory;
 import org.springframework.cloud.gateway.route.RefreshRoutesEvent;
@@ -42,7 +43,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import reactor.core.publisher.Flux;
@@ -52,10 +52,10 @@
  * @author Spencer Gibb
  */
 @RestController
-@RequestMapping("${management.endpoints.web.base-path:/actuator}/gateway")
-public class GatewayWebfluxEndpoint implements ApplicationEventPublisherAware {
+@ControllerEndpoint(id = "gateway")
+public class GatewayControllerEndpoint implements ApplicationEventPublisherAware {
 
-	private static final Log log = LogFactory.getLog(GatewayWebfluxEndpoint.class);
+	private static final Log log = LogFactory.getLog(GatewayControllerEndpoint.class);
 
 	private RouteDefinitionLocator routeDefinitionLocator;
 	private List<GlobalFilter> globalFilters;
@@ -64,9 +64,9 @@ public class GatewayWebfluxEndpoint implements ApplicationEventPublisherAware {
 	private RouteLocator routeLocator;
 	private ApplicationEventPublisher publisher;
 
-	public GatewayWebfluxEndpoint(RouteDefinitionLocator routeDefinitionLocator, List<GlobalFilter> globalFilters,
-								  List<GatewayFilterFactory> GatewayFilters, RouteDefinitionWriter routeDefinitionWriter,
-								  RouteLocator routeLocator) {
+	public GatewayControllerEndpoint(RouteDefinitionLocator routeDefinitionLocator, List<GlobalFilter> globalFilters,
+									 List<GatewayFilterFactory> GatewayFilters, RouteDefinitionWriter routeDefinitionWriter,
+									 RouteLocator routeLocator) {
 		this.routeDefinitionLocator = routeDefinitionLocator;
 		this.globalFilters = globalFilters;
 		this.GatewayFilters = GatewayFilters;

diff --git a/...core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/...core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
@@ -22,7 +22,7 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -32,7 +32,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.gateway.actuate.GatewayWebfluxEndpoint;
+import org.springframework.cloud.gateway.actuate.GatewayControllerEndpoint;
 import org.springframework.cloud.gateway.filter.ForwardRoutingFilter;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.HttpHeadersFilter;
@@ -409,16 +409,16 @@ public SaveSessionGatewayFilterFactory saveSessionGatewayFilterFactory() {
 		return new SaveSessionGatewayFilterFactory();
 	}
 
-	@ManagementContextConfiguration
-	@ConditionalOnProperty(value = "management.gateway.enabled", matchIfMissing = true)
+	@Configuration
 	@ConditionalOnClass(Health.class)
 	protected static class GatewayActuatorConfiguration {
 
 		@Bean
-		public GatewayWebfluxEndpoint gatewayWebfluxEndpoint(RouteDefinitionLocator routeDefinitionLocator, List<GlobalFilter> globalFilters,
-															 List<GatewayFilterFactory> GatewayFilters, RouteDefinitionWriter routeDefinitionWriter,
-															 RouteLocator routeLocator) {
-			return new GatewayWebfluxEndpoint(routeDefinitionLocator, globalFilters, GatewayFilters, routeDefinitionWriter, routeLocator);
+		@ConditionalOnEnabledEndpoint
+		public GatewayControllerEndpoint gatewayControllerEndpoint(RouteDefinitionLocator routeDefinitionLocator, List<GlobalFilter> globalFilters,
+																List<GatewayFilterFactory> GatewayFilters, RouteDefinitionWriter routeDefinitionWriter,
+																RouteLocator routeLocator) {
+			return new GatewayControllerEndpoint(routeDefinitionLocator, globalFilters, GatewayFilters, routeDefinitionWriter, routeLocator);
 		}
 	}
 

diff --git a/...src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java b/...src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java
@@ -20,10 +20,8 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -84,7 +82,6 @@ public void complexPredicate() {
 	}
 
 	@Test
-	@Ignore // waiting on https://github.com/spring-projects/spring-boot/issues/10257
 	public void actuatorManagementPort() {
 		webClient.get()
 				.uri("http://localhost:"+managementPort+"/actuator/gateway/routes")