diff --git a/spring-web-modules/spring-mvc-basics-4/pom.xml b/spring-web-modules/spring-mvc-basics-4/pom.xml
index 376e13ed72..455e4e488c 100644
--- a/spring-web-modules/spring-mvc-basics-4/pom.xml
+++ b/spring-web-modules/spring-mvc-basics-4/pom.xml
@@ -15,26 +15,26 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java
new file mode 100644
index 0000000000..9901915b03
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java
@@ -0,0 +1,87 @@
+package com.baeldung.config;
+
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.JstlView;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+
+import com.baeldung.contexts.Greeting;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Web Configuration for the entire app
+ */
+@Configuration
+@EnableWebMvc
+public class WebConfig {
+
+    @Bean
+    public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> enableDefaultServlet() {
+        return factory -> factory.setRegisterDefaultServlet(true);
+    }
+
+    @Bean
+    public Greeting greeting() {
+        Greeting greeting = new Greeting();
+        greeting.setMessage("Hello World !!");
+        return greeting;
+    }
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        return new ObjectMapper();
+    }
+
+    // Thymeleaf configuration
+    @Bean
+    public ViewResolver thymeleafViewResolver() {
+
+        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+
+        viewResolver.setTemplateEngine(thymeleafTemplateEngine());
+        viewResolver.setCharacterEncoding("UTF-8");
+        viewResolver.setOrder(0);
+
+        return viewResolver;
+    }
+
+    // Thymeleaf template engine with Spring integration
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine() {
+
+        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.setTemplateResolver(thymeleafTemplateResolver());
+        templateEngine.setEnableSpringELCompiler(true);
+
+        return templateEngine;
+    }
+
+    @Bean
+    public SpringResourceTemplateResolver springResourceTemplateResolver() {
+        return new SpringResourceTemplateResolver();
+    }
+
+    @Bean
+    public ITemplateResolver thymeleafTemplateResolver() {
+
+        ClassLoaderTemplateResolver templateResolver = new ClassLoaderTemplateResolver();
+
+        templateResolver.setPrefix("/templates/");
+        templateResolver.setCacheable(false);
+        templateResolver.setSuffix(".html");
+        templateResolver.setTemplateMode(TemplateMode.HTML);
+        templateResolver.setCharacterEncoding("UTF-8");
+
+        return templateResolver;
+    }
+}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
deleted file mode 100644
index 1dffad637a..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-public class AnnotationsBasedApplicationAndServletInitializer //extends AbstractDispatcherServletInitializer 
-{
-
-    //uncomment to run the multiple contexts example
-    //@Override
-    protected WebApplicationContext createRootApplicationContext() {
-        //If this is not the only class declaring a root context, we return null because it would clash
-        //with other classes, as there can only be a single root context.
-
-        //AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
-        //rootContext.register(RootApplicationConfig.class);
-        //return rootContext;
-        return null;
-    }
-
-    //@Override
-    protected WebApplicationContext createServletApplicationContext() {
-        AnnotationConfigWebApplicationContext normalWebAppContext = new AnnotationConfigWebApplicationContext();
-        normalWebAppContext.register(NormalWebAppConfig.class);
-        return normalWebAppContext;
-    }
-
-    //@Override
-    protected String[] getServletMappings() {
-        return new String[] { "/api/*" };
-    }
-
-    //@Override
-    protected String getServletName() {
-        return "normal-dispatcher";
-    }
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
deleted file mode 100644
index ffa80d58bf..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-public class AnnotationsBasedApplicationInitializer //extends AbstractContextLoaderInitializer 
-{
-    //uncomment to run the multiple contexts example
-    // @Override
-    protected WebApplicationContext createRootApplicationContext() {
-        AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
-        rootContext.register(RootApplicationConfig.class);
-        return rootContext;
-    }
-
-}
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
deleted file mode 100644
index 15a2631cbb..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.contexts.config;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class ApplicationInitializer //implements WebApplicationInitializer 
-{
-    //uncomment to run the multiple contexts example
-    //@Override
-    public void onStartup(ServletContext servletContext) throws ServletException {
-        //Here, we can define a root context and register servlets, among other things.
-        //However, since we've later defined other classes to do the same and they would clash,
-        //we leave this commented out.
-
-        //Root XML Context
-        //XmlWebApplicationContext rootContext = new XmlWebApplicationContext();
-        //rootContext.setConfigLocations("/WEB-INF/rootApplicationContext.xml");
-        //Annotations Context
-        //AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
-        //rootContext.register(RootApplicationConfig.class);
-        //Registration
-        //servletContext.addListener(new ContextLoaderListener(rootContext));
-
-        //Dispatcher Servlet
-        //XmlWebApplicationContext normalWebAppContext = new XmlWebApplicationContext();
-        //normalWebAppContext.setConfigLocation("/WEB-INF/normal-webapp-servlet.xml");
-        //ServletRegistration.Dynamic normal = servletContext.addServlet("normal-webapp", new DispatcherServlet(normalWebAppContext));
-        //normal.setLoadOnStartup(1);
-        //normal.addMapping("/api/*");
-    }
-
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
deleted file mode 100644
index 3da3d3beb1..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.JstlView;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.contexts.normal" })
-public class NormalWebAppConfig implements WebMvcConfigurer {
-
-    @Bean
-    public ViewResolver viewResolver() {
-        InternalResourceViewResolver resolver = new InternalResourceViewResolver();
-        resolver.setPrefix("/WEB-INF/view/");
-        resolver.setSuffix(".jsp");
-        resolver.setViewClass(JstlView.class);
-        return resolver;
-    }
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
deleted file mode 100644
index 59821076d2..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import com.baeldung.contexts.Greeting;
-
-@Configuration
-@ComponentScan(basePackages = { "com.baeldung.contexts.services" })
-public class RootApplicationConfig {
-
-    @Bean
-    public Greeting greeting() {
-        Greeting greeting = new Greeting();
-        greeting.setMessage("Hello World !!");
-        return greeting;
-    }
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
deleted file mode 100644
index 580e86d2b5..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-public class SecureAnnotationsBasedApplicationAndServletInitializer// extends AbstractDispatcherServletInitializer 
-{
-    
-    //uncomment to run the multiple contexts example
-    //@Override
-    protected WebApplicationContext createRootApplicationContext() {
-        return null;
-    }
-
-    //@Override
-    protected WebApplicationContext createServletApplicationContext() {
-        AnnotationConfigWebApplicationContext secureWebAppContext = new AnnotationConfigWebApplicationContext();
-        secureWebAppContext.register(SecureWebAppConfig.class);
-        return secureWebAppContext;
-    }
-
-    //@Override
-    protected String[] getServletMappings() {
-        return new String[] { "/s/api/*" };
-    }
-
-
-    //@Override
-    protected String getServletName() {
-        return "secure-dispatcher";
-    }
-
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
deleted file mode 100644
index acc1e3092b..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.contexts.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.JstlView;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.contexts.secure" })
-public class SecureWebAppConfig implements WebMvcConfigurer {
-        
-    @Bean
-    public ViewResolver viewResolver() {
-        InternalResourceViewResolver resolver = new InternalResourceViewResolver();
-        resolver.setPrefix("/WEB-INF/secure/view/");
-        resolver.setSuffix(".jsp");
-        resolver.setViewClass(JstlView.class);
-        return resolver;
-    }
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
index 8b58c51eb3..46d1769349 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
@@ -3,9 +3,9 @@ package com.baeldung.contexts.normal;
 import java.util.Arrays;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.context.ContextLoader;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -19,21 +19,22 @@ public class HelloWorldController {
 
     @Autowired
     private GreeterService greeterService;
+
+    @Autowired
+    private ApplicationContext applicationContext;
     
     private void processContext() {
-        WebApplicationContext rootContext = ContextLoader.getCurrentWebApplicationContext();
-        
-        System.out.println("root context : " + rootContext);
-        System.out.println("root context Beans: " + Arrays.asList(rootContext.getBeanDefinitionNames()));
+        System.out.println("root context : " + applicationContext);
+        System.out.println("root context Beans: " + Arrays.asList(applicationContext.getBeanDefinitionNames()));
 
         System.out.println("context : " + webApplicationContext);
         System.out.println("context Beans: " + Arrays.asList(webApplicationContext.getBeanDefinitionNames()));
     }
 
-    @RequestMapping(path = "/welcome")
+    @GetMapping(path = "/welcome")
     public ModelAndView helloWorld() {
         processContext();
         String message = "<br><div style='text-align:center;'>" + "<h3>Normal " + greeterService.greet() + "</h3></div>";
-        return new ModelAndView("welcome", "message", message);
+        return new ModelAndView("/view/welcome", "message", message);
     }
 }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
index 4ebf2d55e0..84d7808000 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
@@ -6,8 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.context.ContextLoader;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -31,19 +30,15 @@ public class HelloWorldSecureController {
         ApplicationContext context = contextUtilService.getApplicationContext();
         System.out.println("application context : " + context);
         System.out.println("application context Beans: " + Arrays.asList(context.getBeanDefinitionNames()));
-        
-        WebApplicationContext rootContext = ContextLoader.getCurrentWebApplicationContext();
-        System.out.println("context : " + rootContext);
-        System.out.println("context Beans: " + Arrays.asList(rootContext.getBeanDefinitionNames()));
 
         System.out.println("context : " + webApplicationContext);
         System.out.println("context Beans: " + Arrays.asList(webApplicationContext.getBeanDefinitionNames()));
     }
 
-    @RequestMapping(path = "/welcome")
+    @GetMapping(path = "/welcome_secure")
     public ModelAndView helloWorld() {
         processContext();
         String message = "<br><div style='text-align:center;'>" + "<h3>Secure " + greeterService.greet() + "</h3></div>";
-        return new ModelAndView("welcome", "message", message);
+        return new ModelAndView("/secure/view/welcome", "message", message);
     }
 }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java
deleted file mode 100644
index b84094132d..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.controller.config;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class StudentControllerConfig //implements WebApplicationInitializer 
-{
-
-    //uncomment to run the student controller example
-    //@Override
-    public void onStartup(ServletContext sc) throws ServletException {
-        AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.register(WebConfig.class);
-        root.setServletContext(sc);
-        sc.addListener(new ContextLoaderListener(root));
-
-        DispatcherServlet dv = new DispatcherServlet(root);
-        
-        ServletRegistration.Dynamic appServlet = sc.addServlet("test-mvc", dv);
-        appServlet.setLoadOnStartup(1);
-        appServlet.addMapping("/test/*");
-    }
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java
deleted file mode 100644
index 364f042ac7..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.controller.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.controller", "com.baeldung.optionalpathvars" })
-public class WebConfig implements WebMvcConfigurer {
-    @Override
-    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        InternalResourceViewResolver bean = new InternalResourceViewResolver();
-        bean.setPrefix("/WEB-INF/");
-        bean.setSuffix(".jsp");
-        return bean;
-    }
-}
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/GreetingsController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/GreetingsController.java
index fbf78b8a0e..1568b94050 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/GreetingsController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/GreetingsController.java
@@ -7,42 +7,26 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
 public class GreetingsController {
     
-    @RequestMapping(
-        value = "/greetings-with-response-body", 
-        method = RequestMethod.GET, 
-        produces="application/json"
-    ) 
-    @ResponseBody
+    @GetMapping(value = "/greetings-with-response-body", produces="application/json")
     public String getGreetingWhileReturnTypeIsString() { 
-        return "{\"test\": \"Hello using @ResponseBody\"}";
+        return "{\"test\": \"Hello\"}";
     }
         
-    @RequestMapping(
-        value = "/greetings-with-response-entity",
-        method = RequestMethod.GET, 
-        produces = "application/json"
-    )
+    @GetMapping(value = "/greetings-with-response-entity", produces = "application/json")
     public ResponseEntity<String> getGreetingWithResponseEntity() {
         final HttpHeaders httpHeaders= new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        return new ResponseEntity<String>("{\"test\": \"Hello with ResponseEntity\"}", httpHeaders, HttpStatus.OK);
+        return new ResponseEntity<>("{\"test\": \"Hello with ResponseEntity\"}", httpHeaders, HttpStatus.OK);
     }
-    @RequestMapping(
-        value = "/greetings-with-map-return-type", 
-        method = RequestMethod.GET, 
-        produces = "application/json"
-    )
-    @ResponseBody
+    @GetMapping(value = "/greetings-with-map-return-type", produces = "application/json")
     public Map<String, Object> getGreetingWhileReturnTypeIsMap() {
-        HashMap<String, Object> map = new HashMap<String, Object>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("test", "Hello from map");
         return map;
     }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java
index d8330333cb..46b7003f3e 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java
@@ -18,19 +18,19 @@ public class PassParametersController {
     @GetMapping("/showViewPage")
     public String passParametersWithModel(Model model) {
         model.addAttribute("message", "Baeldung");
-        return "viewPage";
+        return "view/viewPage";
     }
 
     @GetMapping("/printViewPage")
     public String passParametersWithModelMap(ModelMap map) {
         map.addAttribute("welcomeMessage", "welcome");
         map.addAttribute("message", "Baeldung");
-        return "viewPage";
+        return "view/viewPage";
     }
 
     @GetMapping("/goToViewPage")
     public ModelAndView passParametersWithModelAndView() {
-        ModelAndView modelAndView = new ModelAndView("viewPage");
+        ModelAndView modelAndView = new ModelAndView("view/viewPage");
         modelAndView.addObject("message", "Baeldung");
         return modelAndView;
     }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java
index a529faeed3..eead000621 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java
@@ -1,17 +1,15 @@
 package com.baeldung.controller.controller;
 
-import com.baeldung.controller.student.Student;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-@Controller
+import com.baeldung.controller.student.Student;
+
+@org.springframework.web.bind.annotation.RestController
 public class RestController {
 
     @GetMapping(value = "/student/{studentId}")
-    public @ResponseBody
-    Student getTestData(@PathVariable Integer studentId) {
+    public Student getTestData(@PathVariable Integer studentId) {
         Student student = new Student();
         student.setName("Peter");
         student.setId(studentId);
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java
index 8a82dd5553..5c2b991312 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java
@@ -27,7 +27,14 @@ public class Student {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        return this.name.equals(((Student) obj).getName());
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Student)) {
+            return false;
+        }
+        Student student = (Student) o;
+        return getName().equals(student.getName());
     }
 }
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsConfig.java
deleted file mode 100644
index f2049554ab..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.baeldung.jsonparams.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.jsonparams" })
-public class JsonParamsConfig implements WebMvcConfigurer {
-    @Override
-    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        InternalResourceViewResolver bean = new InternalResourceViewResolver();
-        bean.setPrefix("/WEB-INF/");
-        bean.setSuffix(".jsp");
-        return bean;
-    }
-
-    @Bean
-    public ObjectMapper objectMapper() {
-        return new ObjectMapper();
-    }
-
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsInit.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsInit.java
deleted file mode 100644
index 6db2a92350..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/config/JsonParamsInit.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.baeldung.jsonparams.config;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class JsonParamsInit // implements WebApplicationInitializer 
-{
-
-    //uncomment to run the product controller example
-    //@Override
-    public void onStartup(ServletContext sc) throws ServletException {
-        AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.register(JsonParamsConfig.class);
-        root.setServletContext(sc);
-        sc.addListener(new ContextLoaderListener(root));
-
-        DispatcherServlet dv = new DispatcherServlet(root);
-
-        ServletRegistration.Dynamic appServlet = sc.addServlet("jsonparams-mvc", dv);
-        appServlet.setLoadOnStartup(1);
-        appServlet.addMapping("/");
-    }
-
-}
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/controller/ProductController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/controller/ProductController.java
index e4e2ce085d..915731581e 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/controller/ProductController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/controller/ProductController.java
@@ -1,7 +1,6 @@
 package com.baeldung.jsonparams.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.InitBinder;
@@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.baeldung.jsonparams.model.Product;
 import com.baeldung.jsonparams.propertyeditor.ProductEditor;
@@ -17,7 +16,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-@Controller
+@RestController
 @RequestMapping("/products")
 public class ProductController {
 
@@ -34,21 +33,18 @@ public class ProductController {
     }
 
     @PostMapping("/create")
-    @ResponseBody
     public Product createProduct(@RequestBody Product product) {
         // custom logic
         return product;
     }
 
     @GetMapping("/get")
-    @ResponseBody
-    public Product getProduct(@RequestParam String product) throws JsonMappingException, JsonProcessingException {
+    public Product getProduct(@RequestParam String product) throws JsonProcessingException {
         final Product prod = objectMapper.readValue(product, Product.class);
         return prod;
     }
 
     @GetMapping("/get2")
-    @ResponseBody
     public Product get2Product(@RequestParam Product product) {
         // custom logic
         return product;
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/propertyeditor/ProductEditor.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/propertyeditor/ProductEditor.java
index 11766118cd..41d97bed84 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/propertyeditor/ProductEditor.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/jsonparams/propertyeditor/ProductEditor.java
@@ -18,7 +18,7 @@ public class ProductEditor extends PropertyEditorSupport {
 
     @Override
     public void setAsText(String text) throws IllegalArgumentException {
-        if (StringUtils.isEmpty(text)) {
+        if (!StringUtils.hasText(text)) {
             setValue(null);
         } else {
             Product prod = new Product();
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerController.java
deleted file mode 100644
index 1876798bd6..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.baeldung.optionalpathvars;
-
-import static com.baeldung.optionalpathvars.Article.DEFAULT_ARTICLE;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class ArticleViewerController {
-
-    @RequestMapping(value = {"/article", "/article/{id}"})
-    public Article getArticle(@PathVariable(name = "id") Integer articleId) {
-
-        if (articleId != null) {
-            return new Article(articleId);
-        } else {
-            return DEFAULT_ARTICLE;
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
index 7548747f05..786a56c130 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/optionalpathvars/ArticleViewerWithRequiredAttributeController.java
@@ -4,7 +4,7 @@ import static com.baeldung.optionalpathvars.Article.DEFAULT_ARTICLE;
 
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(value = "/requiredAttribute")
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
index f16d5f877f..3d518c467c 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/validation/listvalidation/SpringListValidationApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-@ComponentScan(basePackages = "com.baeldung.validation.listvalidation")
+@ComponentScan(basePackages = "com.baeldung")
 @Configuration
 @SpringBootApplication
 public class SpringListValidationApplication {
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/secure/view/welcome.html b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/secure/view/welcome.html
new file mode 100644
index 0000000000..fac7234f15
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/secure/view/welcome.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+	<title>Spring Web Contexts</title>
+</head>
+<body>
+	<br>
+    <div style="padding: 10px; border-radius: 10px; font-size: 30px; text-align: center;">Secure Web Application : <span th:utext="${message}"></span>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/viewPage.html b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/viewPage.html
similarity index 58%
rename from spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/viewPage.html
rename to spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/viewPage.html
index 71f766407e..b520d0dd51 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/viewPage.html
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/viewPage.html
@@ -4,6 +4,6 @@
     <title>Title</title>
 </head>
 <body>
-    <div>Web Application. Passed parameter : th:text="${message}"</div>
+    <div>Web Application. Passed parameter : <span th:text="${message}"></span></div>
 </body>
 </html>
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/welcome.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/welcome.html
similarity index 59%
rename from spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/welcome.jsp
rename to spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/welcome.html
index 4eda3c58e2..291f3b8919 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/welcome.jsp
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/view/welcome.html
@@ -1,11 +1,12 @@
-<html>
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
 <head>
     <title>Spring Web Contexts</title>
 </head>
 <body>
     <br>
     <div style="padding: 10px; border-radius: 10px; font-size: 30px; text-align: center;">
-        Normal Web Application : ${message}
+        Normal Web Application : <span th:utext="${message}"></span>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/welcome.html b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/welcome.html
new file mode 100644
index 0000000000..c5b88e135e
--- /dev/null
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/resources/templates/welcome.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Insert title here</title>
+</head>
+<body>
+Data returned is <span th:utext="${data}"></span>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/resources/test-mvc.xml b/spring-web-modules/spring-mvc-basics-4/src/main/resources/test-mvc.xml
deleted file mode 100644
index 44c300dfc6..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/resources/test-mvc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans     
-        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
-    <context:component-scan base-package="com.baeldung.controller.controller"/>
-    <mvc:annotation-driven/>
-
-    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="prefix">
-            <value>/WEB-INF/</value>
-        </property>
-        <property name="suffix">
-            <value>.jsp</value>
-        </property>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/greeting.xml b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/greeting.xml
deleted file mode 100644
index 1ad5484d80..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/greeting.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-    <bean id="greeting" class="com.baeldung.contexts.Greeting">
-        <property name="message" value="Hello World !!"/>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/index.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/index.jsp
deleted file mode 100644
index c38169bb95..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/normal-webapp-servlet.xml b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
deleted file mode 100644
index 8addbe3cf3..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <context:component-scan base-package="com.baeldung.contexts.normal"/>
-
-    <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/WEB-INF/view/"/>
-        <property name="suffix" value=".jsp"/>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/rootApplicationContext.xml
deleted file mode 100644
index 12e5d8f161..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/rootApplicationContext.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-   http://www.springframework.org/schema/context
-   http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
-    <context:component-scan base-package="com.baeldung.contexts.services"/>
-
-    <import resource="greeting.xml"/>
-</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure-webapp-servlet.xml b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
deleted file mode 100644
index 86797ad081..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <context:component-scan base-package="com.baeldung.contexts.secure"/>
-
-    <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/WEB-INF/secure/view/"/>
-        <property name="suffix" value=".jsp"/>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure/view/welcome.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure/view/welcome.jsp
deleted file mode 100644
index 49ca0f8e87..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/secure/view/welcome.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-	<title>Spring Web Contexts</title>
-</head>
-<body>
-	<br>
-	<div style="padding: 10px; border-radius: 10px; font-size: 30px; text-align: center;">
-		Secure Web Application : ${message}
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/sample.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/sample.jsp
deleted file mode 100644
index 4c64bf97f2..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/sample.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head></head>
-
-<body>
-<h1>This is the body of the sample view</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/scopesExample.jsp
deleted file mode 100644
index e9abcf194c..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head></head>
-
-<body>
-    <h1>Bean Scopes Examples</h1>
-    <br> Previous Message: ${previousMessage }
-    <br> Current Message: ${currentMessage }
-    <br>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/web-old.xml b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/web-old.xml
deleted file mode 100644
index 1344362d19..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/web-old.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<web-app
-        xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-        version="3.0">
-
-    <!-- Uncommented, this disallows org.springframework.web.SpringServletContainerInitializer to run and execute
-         application initializers. -->
-    <!--<absolute-ordering>
-    </absolute-ordering>-->
-
-    <!-- root application context -->
-    <!--<listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>-->
-    <!--<context-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>/WEB-INF/rootApplicationContext.xml</param-value>
-  </context-param>-->
-    <!--<context-param>
-        <param-name>contextClass</param-name>
-        <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>com.baeldung.contexts.config.RootApplicationConfig, com.baeldung.contexts.config.NormalWebAppConfig</param-value>
-    </context-param>-->
-    <!--<context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>com.baeldung.bean.config</param-value>
-    </context-param>-->
-
-    <!-- secure web app context -->
-    <!--<servlet>
-        <servlet-name>secure-webapp</servlet-name>
-        <servlet-class>
-            org.springframework.web.servlet.DispatcherServlet
-        </servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>/WEB-INF/secure-webapp-servlet.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>secure-webapp</servlet-name>
-        <url-pattern>/s/api/*</url-pattern>
-    </servlet-mapping>-->
-
-    <!-- normal web app context -->
-    <!--<servlet>
-        <servlet-name>normal-webapp</servlet-name>
-        <servlet-class>
-            org.springframework.web.servlet.DispatcherServlet
-        </servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>normal-webapp</servlet-name>
-        <url-pattern>/api/*</url-pattern>
-    </servlet-mapping>-->
-    <!-- normal webapp with annotations-based context -->
-    <servlet>
-        <servlet-name>normal-webapp-annotations</servlet-name>
-        <servlet-class>
-            org.springframework.web.servlet.DispatcherServlet
-        </servlet-class>
-        <init-param>
-            <param-name>contextClass</param-name>
-            <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
-        </init-param>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>com.baeldung.contexts.config.NormalWebAppConfig</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>normal-webapp-annotations</servlet-name>
-        <url-pattern>/api-ann/*</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list>
-        <welcome-file>/WEB-INF/index.jsp</welcome-file>
-    </welcome-file-list>
-</web-app>
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/welcome.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/welcome.jsp
deleted file mode 100644
index c34223b411..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/WEB-INF/welcome.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Insert title here</title>
-</head>
-<body>
-Data returned is ${data}
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/index.jsp b/spring-web-modules/spring-mvc-basics-4/src/main/webapp/index.jsp
deleted file mode 100644
index c38169bb95..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java
index f378357548..7fd8f0c97f 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java
@@ -1,26 +1,24 @@
 package com.baeldung.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.baeldung.controller.config.WebConfig;
-import com.baeldung.controller.student.Student;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class }, loader = AnnotationConfigWebContextLoader.class)
+import com.baeldung.controller.student.Student;
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class ControllerAnnotationIntegrationTest {
 
     private MockMvc mockMvc;
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java
index 7e5cf1532e..a7e6bd6c4b 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java
@@ -5,9 +5,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -15,11 +14,11 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.baeldung.controller.student.Student;
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration({ "classpath:test-mvc.xml" })
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class ControllerIntegrationTest {
 
     private MockMvc mockMvc;
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/GreetingsControllerUnitTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/GreetingsControllerUnitTest.java
index ee9a8da8d4..4917d68ef4 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/GreetingsControllerUnitTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/GreetingsControllerUnitTest.java
@@ -1,24 +1,21 @@
 package com.baeldung.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.baeldung.controller.controller.GreetingsController;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { GreetingsController.class }, loader = AnnotationConfigWebContextLoader.class)
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class GreetingsControllerUnitTest {
     
     private MockMvc mockMvc;
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
index aa8148c1ef..c1311acba0 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
@@ -5,24 +5,24 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+
 /**
  * This is the test class for {@link com.baeldung.controller.controller.PassParametersController} class.
  * 09/09/2017
  *
  * @author Ahmet Cetin
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration({"classpath:test-mvc.xml"})
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class PassParametersControllerIntegrationTest {
     private MockMvc mockMvc;
 
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/jsonparams/JsonParamsIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/jsonparams/JsonParamsIntegrationTest.java
index bceadc4896..9d414ed4ca 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/jsonparams/JsonParamsIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/jsonparams/JsonParamsIntegrationTest.java
@@ -1,26 +1,25 @@
 package com.baeldung.jsonparams;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
 
-import com.baeldung.jsonparams.config.JsonParamsConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { JsonParamsConfig.class }, loader = AnnotationConfigWebContextLoader.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class JsonParamsIntegrationTest {
 
     private MockMvc mockMvc;
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java
deleted file mode 100644
index 0e2313c2ac..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.baeldung.optionalpathvars;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-import com.baeldung.controller.config.WebConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class })
-public class ArticleViewerControllerIntegrationTest {
-
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() throws Exception {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-
-    @Test
-    public void whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
-        
-        int articleId = 5;
-        
-        this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/article/{id}", articleId))
-            .andExpect(MockMvcResultMatchers.status().isOk())
-            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
-               
-    }
-
-    @Test
-    public void whenIdPathVariableIsNotPassed_thenResponse500() throws Exception {
-                
-        this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/article"))
-            .andExpect(MockMvcResultMatchers.status().isInternalServerError());
-               
-    }
-
-    
-}
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
index 094995ba67..2685946b4c 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java
@@ -4,19 +4,18 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
-import com.baeldung.controller.config.WebConfig;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class })
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class ArticleViewerControllerWithOptionalParamIntegrationTest {
 
     @Autowired
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
index a4b12c7163..6e087a1640 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
@@ -12,42 +12,39 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
-import com.baeldung.controller.config.WebConfig;
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class })
+@ContextConfiguration(classes = { SpringListValidationApplication.class })
 public class ArticleViewerControllerWithRequiredAttributeIntegrationTest {
 
     @Autowired
     private WebApplicationContext wac;
- 
+
     private MockMvc mockMvc;
 
     @Before
-    public void setup() throws Exception {
+    public void setup() {
         this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
     }
 
     @Test
-    public void givenRequiredAttributeIsFalse_whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
-    
-        int articleId = 154;
+    public void whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+        int articleId = 5;
         
         this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article/{id}", articleId))
+            .perform(MockMvcRequestBuilders.get("/article/{id}", articleId))
             .andExpect(MockMvcResultMatchers.status().isOk())
             .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
-                
+               
     }
-    
+
     @Test
-    public void givenRequiredAttributeIsFalse_whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
-            
+    public void whenIdPathVariableIsNotPassed_thenResponse500() throws Exception {
         this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article"))
-            .andExpect(MockMvcResultMatchers.status().isOk())
-            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(Article.DEFAULT_ARTICLE.getId()));
-                
+            .perform(MockMvcRequestBuilders.get("/article"))
+            .andExpect(MockMvcResultMatchers.status().isInternalServerError());
+               
     }
 }
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
index 044a1c8bce..2be6d1e679 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java
@@ -4,19 +4,18 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
-import com.baeldung.controller.config.WebConfig;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class })
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class ArticleViewerWithMapParamIntegrationTest {
 
     @Autowired
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
index 1ca926277d..e70ac5e5a6 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java
@@ -4,19 +4,18 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
-import com.baeldung.controller.config.WebConfig;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class })
+import com.baeldung.validation.listvalidation.SpringListValidationApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringListValidationApplication.class)
 public class ArticleViewerWithTwoSeparateMethodsIntegrationTest {
 
     @Autowired
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
index cddc6c6bd9..14ceb651d7 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/validation/listvalidation/MovieControllerIntegrationTest.java
@@ -34,7 +34,7 @@ public class MovieControllerIntegrationTest {
         Movie movie = new Movie("Movie3");
         movies.add(movie);
         mvc.perform(MockMvcRequestBuilders.post("/movies")
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .content(objectMapper.writeValueAsString(movies)))
             .andExpect(MockMvcResultMatchers.status()
                 .isOk());
@@ -44,7 +44,7 @@ public class MovieControllerIntegrationTest {
     public void givenEmptyMovieList_whenAddingMovieList_thenThrowBadRequest() throws Exception {
         List<Movie> movies = new ArrayList<>();
         mvc.perform(MockMvcRequestBuilders.post("/movies")
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .content(objectMapper.writeValueAsString(movies)))
             .andExpect(MockMvcResultMatchers.status()
                 .isBadRequest());
@@ -54,7 +54,7 @@ public class MovieControllerIntegrationTest {
     public void givenEmptyMovieName_whenAddingMovieList_thenThrowBadRequest() throws Exception {
         Movie movie = new Movie("");
         mvc.perform(MockMvcRequestBuilders.post("/movies")
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .content(objectMapper.writeValueAsString(Arrays.asList(movie))))
             .andExpect(MockMvcResultMatchers.status()
                 .isBadRequest());
@@ -74,7 +74,7 @@ public class MovieControllerIntegrationTest {
         movies.add(movie4);
         movies.add(movie5);
         mvc.perform(MockMvcRequestBuilders.post("/movies")
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .content(objectMapper.writeValueAsString(movies)))
             .andExpect(MockMvcResultMatchers.status()
                 .isBadRequest());
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/resources/test-mvc.xml b/spring-web-modules/spring-mvc-basics-4/src/test/resources/test-mvc.xml
deleted file mode 100644
index f1aa8e9504..0000000000
--- a/spring-web-modules/spring-mvc-basics-4/src/test/resources/test-mvc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="
-        http://www.springframework.org/schema/beans     
-        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
- <context:component-scan base-package="com.baeldung.controller.controller" />
- <mvc:annotation-driven />
- 
-  	 <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-	        <property name="prefix">
-	            <value>/WEB-INF/</value>
-	        </property>
-	        <property name="suffix">
-	            <value>.jsp</value>
-	        </property>
-	  </bean>
-  </beans>
\ No newline at end of file