From 66917a28772a707ca96c4ed6059162e3d6245ef6 Mon Sep 17 00:00:00 2001 From: slavisa-baeldung Date: Mon, 9 Jan 2017 16:47:27 +0100 Subject: [PATCH] BAEL-97 - moving config to test source tree --- .../HandlerMappingCustomPrioritiesConfig.java | 43 --------------- ...HandlerMappingPrioritiesConfigNoOrder.java | 54 ------------------- .../BeanNameUrlHandlerMappingConfig.java | 2 +- ...ntrollerClassNameHandlerMappingConfig.java | 4 +- .../HandlerMappingPrioritiesConfig.java | 2 +- .../config/SimpleUrlHandlerMappingConfig.java | 2 +- .../BeanNameMappingConfigTest.java | 2 +- ...ControllerClassNameHandlerMappingTest.java | 2 +- .../HandlerMappingPriorityConfigTest.java | 3 +- .../SimpleUrlMappingConfigTest.java | 2 +- 10 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingCustomPrioritiesConfig.java delete mode 100644 spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfigNoOrder.java rename spring-mvc-java/src/{main/java/com/baeldung/spring/web => test/java/com/baeldung}/config/BeanNameUrlHandlerMappingConfig.java (94%) rename spring-mvc-java/src/{main/java/com/baeldung/spring/web => test/java/com/baeldung}/config/ControllerClassNameHandlerMappingConfig.java (93%) rename spring-mvc-java/src/{main/java/com/baeldung/spring/web => test/java/com/baeldung}/config/HandlerMappingPrioritiesConfig.java (97%) rename spring-mvc-java/src/{main/java/com/baeldung/spring/web => test/java/com/baeldung}/config/SimpleUrlHandlerMappingConfig.java (96%) diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingCustomPrioritiesConfig.java b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingCustomPrioritiesConfig.java deleted file mode 100644 index 6545d1ec2d..0000000000 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingCustomPrioritiesConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.baeldung.spring.web.config; - -import com.baeldung.web.controller.handlermapping.BeanNameHandlerMappingController; -import com.baeldung.web.controller.handlermapping.SimpleUrlMappingController; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; -import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; - -import java.util.HashMap; -import java.util.Map; - - -@Configuration -public class HandlerMappingCustomPrioritiesConfig { - - @Bean - BeanNameUrlHandlerMapping beanNameUrlHandlerMapping() { - BeanNameUrlHandlerMapping beanNameUrlHandlerMapping = new BeanNameUrlHandlerMapping(); - beanNameUrlHandlerMapping.setOrder(0); - return beanNameUrlHandlerMapping; - } - - @Bean - public SimpleUrlHandlerMapping simpleUrlHandlerMapping() { - SimpleUrlHandlerMapping simpleUrlHandlerMapping = new SimpleUrlHandlerMapping(); - Map urlMap = new HashMap<>(); - urlMap.put("/welcome", simpleUrlMapping()); - simpleUrlHandlerMapping.setUrlMap(urlMap); - simpleUrlHandlerMapping.setOrder(1); - return simpleUrlHandlerMapping; - } - - @Bean - public SimpleUrlMappingController simpleUrlMapping() { - return new SimpleUrlMappingController(); - } - - @Bean("/welcome") - public BeanNameHandlerMappingController beanNameHandlerMapping() { - return new BeanNameHandlerMappingController(); - } -} \ No newline at end of file diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfigNoOrder.java b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfigNoOrder.java deleted file mode 100644 index d4cc30918e..0000000000 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfigNoOrder.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.baeldung.spring.web.config; - -import com.baeldung.web.controller.handlermapping.SimpleUrlMappingController; -import com.baeldung.web.controller.handlermapping.BeanNameHandlerMappingController; -import com.baeldung.web.controller.handlermapping.WelcomeController; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; -import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; -import org.springframework.web.servlet.mvc.support.ControllerClassNameHandlerMapping; - -import java.util.HashMap; -import java.util.Map; - - -@Configuration -public class HandlerMappingPrioritiesConfigNoOrder { - - @Bean - public SimpleUrlHandlerMapping simpleUrlHandlerMapping() { - SimpleUrlHandlerMapping simpleUrlHandlerMapping = new SimpleUrlHandlerMapping(); - Map urlMap = new HashMap<>(); - urlMap.put("/welcome", test()); - simpleUrlHandlerMapping.setUrlMap(urlMap); - return simpleUrlHandlerMapping; - } - - @Bean - public ControllerClassNameHandlerMapping controllerClassNameHandlerMapping() { - ControllerClassNameHandlerMapping bean = new ControllerClassNameHandlerMapping(); - return bean; - } - - @Bean - BeanNameUrlHandlerMapping beanNameUrlHandlerMapping() { - BeanNameUrlHandlerMapping beanNameUrlHandlerMapping = new BeanNameUrlHandlerMapping(); - return beanNameUrlHandlerMapping; - } - - @Bean("/welcome") - public SimpleUrlMappingController welcomeBaeldungController() { - return new SimpleUrlMappingController(); - } - - @Bean - public BeanNameHandlerMappingController test() { - return new BeanNameHandlerMappingController(); - } - - @Bean - public WelcomeController welcomeController() { - return new WelcomeController(); - } -} \ No newline at end of file diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/BeanNameUrlHandlerMappingConfig.java b/spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java similarity index 94% rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/BeanNameUrlHandlerMappingConfig.java rename to spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java index 081db6c6c3..e3dcb15de8 100644 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/BeanNameUrlHandlerMappingConfig.java +++ b/spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.web.config; +package com.baeldung.config; import com.baeldung.web.controller.handlermapping.WelcomeController; import org.springframework.context.annotation.Bean; diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/ControllerClassNameHandlerMappingConfig.java b/spring-mvc-java/src/test/java/com/baeldung/config/ControllerClassNameHandlerMappingConfig.java similarity index 93% rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/ControllerClassNameHandlerMappingConfig.java rename to spring-mvc-java/src/test/java/com/baeldung/config/ControllerClassNameHandlerMappingConfig.java index 0f67624658..6e9318602f 100644 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/ControllerClassNameHandlerMappingConfig.java +++ b/spring-mvc-java/src/test/java/com/baeldung/config/ControllerClassNameHandlerMappingConfig.java @@ -1,14 +1,14 @@ -package com.baeldung.spring.web.config; +package com.baeldung.config; import com.baeldung.web.controller.handlermapping.WelcomeController; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.mvc.support.ControllerClassNameHandlerMapping; import org.springframework.web.servlet.view.InternalResourceViewResolver; -@EnableWebMvc @Configuration public class ControllerClassNameHandlerMappingConfig { diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfig.java b/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java similarity index 97% rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfig.java rename to spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java index da54e5fc98..2b09947e97 100644 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/HandlerMappingPrioritiesConfig.java +++ b/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.web.config; +package com.baeldung.config; import java.util.HashMap; import java.util.Map; diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/SimpleUrlHandlerMappingConfig.java b/spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java similarity index 96% rename from spring-mvc-java/src/main/java/com/baeldung/spring/web/config/SimpleUrlHandlerMappingConfig.java rename to spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java index a81b2fa14e..c7921c2706 100644 --- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/SimpleUrlHandlerMappingConfig.java +++ b/spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.web.config; +package com.baeldung.config; import java.util.HashMap; import java.util.Map; diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigTest.java b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigTest.java index 628fd57e8c..f58e5cb0a1 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigTest.java @@ -1,6 +1,6 @@ package com.baeldung.handlermappings; -import com.baeldung.spring.web.config.BeanNameUrlHandlerMappingConfig; +import com.baeldung.config.BeanNameUrlHandlerMappingConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/ControllerClassNameHandlerMappingTest.java b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/ControllerClassNameHandlerMappingTest.java index e81b46f817..6fdd168d0b 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/ControllerClassNameHandlerMappingTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/ControllerClassNameHandlerMappingTest.java @@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import com.baeldung.spring.web.config.ControllerClassNameHandlerMappingConfig; +import com.baeldung.config.ControllerClassNameHandlerMappingConfig; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigTest.java b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigTest.java index 3157209a73..26d7b88baa 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigTest.java @@ -1,7 +1,6 @@ package com.baeldung.handlermappings; -import com.baeldung.spring.web.config.HandlerMappingCustomPrioritiesConfig; -import com.baeldung.spring.web.config.HandlerMappingPrioritiesConfig; +import com.baeldung.config.HandlerMappingPrioritiesConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigTest.java b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigTest.java index 29420b155f..636339f152 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigTest.java @@ -1,6 +1,6 @@ package com.baeldung.handlermappings; -import com.baeldung.spring.web.config.SimpleUrlHandlerMappingConfig; +import com.baeldung.config.SimpleUrlHandlerMappingConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;