diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java similarity index 92% rename from spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java rename to spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java index f68716b7..2619988b 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java @@ -19,9 +19,9 @@ import com.netflix.zuul.monitoring.MonitoringHelper; * Time: 9:23 PM * TODO: .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) */ -public class FilterIntializer implements ServletContextListener { +public class FilterInitializer implements ServletContextListener { - private static final Logger LOGGER = LoggerFactory.getLogger(FilterIntializer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FilterInitializer.class); @Autowired private Map filters; @@ -29,7 +29,7 @@ public class FilterIntializer implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { - LOGGER.info("Starting filter initialzer context listener"); + LOGGER.info("Starting filter initializer context listener"); //FIXME: mocks monitoring infrastructure as we don't need it for this simple app MonitoringHelper.initMocks(); diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java index 1045e32c..7a2912b4 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java @@ -57,8 +57,8 @@ public class ZuulProxyConfiguration { } @Bean - FilterIntializer filterIntializer() { - return new FilterIntializer(); + FilterInitializer zuulFilterInitializer() { + return new FilterInitializer(); } // pre filters diff --git a/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java b/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java index 7a03bee6..30c28edd 100644 --- a/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java +++ b/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java @@ -2,13 +2,15 @@ package org.springframework.platform.netflix.eureka.sample; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) @WebAppConfiguration +@IntegrationTest("server.port=0") public class ApplicationTests { @Test diff --git a/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java b/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java index b6302d97..81d29905 100644 --- a/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java +++ b/spring-platform-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java @@ -2,15 +2,17 @@ package org.springframework.platform.netflix.zuul.sample; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) @WebAppConfiguration +@IntegrationTest("server.port=0") public class ApplicationTests { - + @Test public void contextLoads() { }