From a25e4083988d7612aab6ca2c6c9eb845e3dcab4d Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Mon, 30 Jul 2018 11:19:13 -0400
Subject: [PATCH] Autoconfigure GatewayDiscoveryClientAutoConfiguration after
 CompositeDiscoveryClientAutoConfiguration.  Fixes #450.

---
 .../discovery/GatewayDiscoveryClientAutoConfiguration.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java
index e7bb34e2..f2ccfa17 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java
@@ -16,12 +16,14 @@
 
 package org.springframework.cloud.gateway.discovery;
 
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.gateway.config.GatewayAutoConfiguration;
 import org.springframework.cloud.gateway.filter.FilterDefinition;
 import org.springframework.cloud.gateway.filter.factory.RewritePathGatewayFilterFactory;
@@ -46,6 +48,7 @@ import static org.springframework.cloud.gateway.support.NameUtils.normalizeRoute
 @Configuration
 @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
 @AutoConfigureBefore(GatewayAutoConfiguration.class)
+@AutoConfigureAfter(CompositeDiscoveryClientAutoConfiguration.class)
 @ConditionalOnClass({DispatcherHandler.class, DiscoveryClient.class})
 @EnableConfigurationProperties
 public class GatewayDiscoveryClientAutoConfiguration {