Skip to content

S
spring-cloud-netflix
Commit 86d51528 by Dave Syer
Options

Import the autoconfig for server properties

Otherwise there can be duplicate beans with the same type and different names, becasue the autoconfig does not (for some reason) use @EnableConfigurationProperties to create the ServerProperties bean. It isn't an issue until someone writes some autoconfig that itself imports the ZuulConfiguration (i.e. regular concious users of @EnableZuulServer do not see any problems and hence no tests fail here or in integration projects). Fixes gh-821
parent 67258446
Showing with 5 additions and 1 deletion
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulConfiguration.java
......@@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.web.ErrorController;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.boot.context.embedded.ServletRegistrationBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.client.actuator.HasFeatures;
......@@ -42,6 +43,7 @@ import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.event.ContextRefreshedEvent;
import com.netflix.zuul.ZuulFilter;
......@@ -52,8 +54,10 @@ import com.netflix.zuul.http.ZuulServlet;
* @author Dave Syer
*/
@Configuration
@EnableConfigurationProperties({ ZuulProperties.class, ServerProperties.class })
@EnableConfigurationProperties({ ZuulProperties.class })
@ConditionalOnClass(ZuulServlet.class)
// Make sure to get the ServerProperties from the same place as a normal web app would
@Import(ServerPropertiesAutoConfiguration.class)
public class ZuulConfiguration {
@Autowired
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment