BAEL-97 - simplifying code

2017-01-08 16:46:47 +01:00
parent e36d928219
commit adccc13c32
9 changed files with 120 additions and 37 deletions
@@ -0,0 +1,43 @@
+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<String, Object> 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();
+    }
+}
@@ -3,14 +3,13 @@ package com.baeldung.spring.web.config;
 import java.util.HashMap;
 import java.util.Map;

-import com.baeldung.web.controller.handlermapping.BaeldungController;
-import com.baeldung.web.controller.handlermapping.TestController;
+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;


@Configuration
@@ -19,7 +18,7 @@ public class HandlerMappingPrioritiesConfig {
    @Bean
    BeanNameUrlHandlerMapping beanNameUrlHandlerMapping() {
        BeanNameUrlHandlerMapping beanNameUrlHandlerMapping = new BeanNameUrlHandlerMapping();
-        beanNameUrlHandlerMapping.setOrder(2);
+        beanNameUrlHandlerMapping.setOrder(0);
        return beanNameUrlHandlerMapping;
    }

@@ -27,31 +26,18 @@ public class HandlerMappingPrioritiesConfig {
    public SimpleUrlHandlerMapping simpleUrlHandlerMapping() {
        SimpleUrlHandlerMapping simpleUrlHandlerMapping = new SimpleUrlHandlerMapping();
        Map<String, Object> urlMap = new HashMap<>();
-        urlMap.put("/welcome", test());
+        urlMap.put("/welcome", simpleUrlMapping());
        simpleUrlHandlerMapping.setUrlMap(urlMap);
-        simpleUrlHandlerMapping.setOrder(0);
        return simpleUrlHandlerMapping;
    }

    @Bean
-    public ControllerClassNameHandlerMapping controllerClassNameHandlerMapping() {
-        ControllerClassNameHandlerMapping bean = new ControllerClassNameHandlerMapping();
-        bean.setOrder(1);
-        return bean;
+    public SimpleUrlMappingController simpleUrlMapping() {
+        return new SimpleUrlMappingController();
    }

    @Bean("/welcome")
-    public BaeldungController welcomeBaeldungController() {
-        return new BaeldungController();
-    }
-
-    @Bean
-    public TestController test() {
-        return new TestController();
-    }
-
-    @Bean
-    public WelcomeController welcomeController() {
-        return new WelcomeController();
+    public BeanNameHandlerMappingController beanNameHandlerMapping() {
+        return new BeanNameHandlerMappingController();
    }
 }
@@ -0,0 +1,54 @@
+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<String, Object> 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();
+    }
+}
@@ -6,10 +6,10 @@ import org.springframework.web.servlet.mvc.AbstractController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-public class TestController extends AbstractController {
+public class BeanNameHandlerMappingController extends AbstractController {
    @Override
    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
-         ModelAndView model = new ModelAndView("test");
+         ModelAndView model = new ModelAndView("bean-name-handler-mapping");
        return model;
    }

@@ -6,10 +6,10 @@ import org.springframework.web.servlet.mvc.AbstractController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-public class BaeldungController extends AbstractController {
+public class SimpleUrlMappingController extends AbstractController {
    @Override
    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        ModelAndView model = new ModelAndView("baeldung");
+        ModelAndView model = new ModelAndView("simple-url-handler-mapping");
        return model;
    }