Merge pull request #7003 from amit2103/BAEL-14777

[BAEL-14777] - Removed old spring 4 and xml related settings

spring-security-rest-custom/pom.xml

@@ -26,6 +26,14 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring5</artifactId>
+        </dependency>
 
         <!-- Spring -->
 

spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java

@@ -2,21 +2,34 @@ package org.baeldung.config.child;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring5.ISpringTemplateEngine;
+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.ITemplateResolver;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan("org.baeldung.web")
-// @ImportResource({ "classpath:prop.xml" })
+//@ImportResource({ "classpath:prop.xml" })    
-// @PropertySource("classpath:foo.properties")
+//@PropertySource("classpath:foo.properties")
 public class WebConfig implements WebMvcConfigurer {
+    
+    @Autowired
+    private ApplicationContext applicationContext;
 
     public WebConfig() {
         super();
@@ -37,5 +50,31 @@ public class WebConfig implements WebMvcConfigurer {
         ppc.setIgnoreUnresolvablePlaceholders(true);
         return ppc;
     }
+    
+    @Bean
+    public ViewResolver viewResolver() {
+      ThymeleafViewResolver resolver = new ThymeleafViewResolver();
+      resolver.setTemplateEngine(templateEngine());
+      resolver.setCharacterEncoding("UTF-8");
+      return resolver;
+    }
+
+    @Bean
+    public ISpringTemplateEngine templateEngine() {
+      SpringTemplateEngine engine = new SpringTemplateEngine();
+      engine.setEnableSpringELCompiler(true);
+      engine.setTemplateResolver(templateResolver());
+      engine.addDialect(new SpringSecurityDialect());
+      return engine;
+    }
+
+    private ITemplateResolver templateResolver() {
+      SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+      resolver.setApplicationContext(applicationContext);
+      resolver.setPrefix("/WEB-INF/templates/");
+      resolver.setSuffix(".html");
+      resolver.setTemplateMode(TemplateMode.HTML);
+      return resolver;
+    }
 
 }

spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java

@@ -10,7 +10,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
-// @ImportResource({ "classpath:webSecurityConfig.xml" })
+//@ImportResource({ "classpath:webSecurityConfig.xml" })
 @EnableWebSecurity
 @ComponentScan("org.baeldung.security")
 public class SecurityConfig extends WebSecurityConfigurerAdapter {

spring-security-rest-custom/src/main/java/org/baeldung/web/controller/ViewController.java

@@ -0,0 +1,13 @@
+package org.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class ViewController {
+
+    @RequestMapping({ "/index", "/" })
+    public String index() {
+        return "index";
+    }
+}

spring-security-rest-custom/src/main/resources/prop.xml

@@ -4,9 +4,9 @@
    xmlns:context="http://www.springframework.org/schema/context"
    xsi:schemaLocation="
       http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+      http://www.springframework.org/schema/beans/spring-beans.xsd
       http://www.springframework.org/schema/context
-      http://www.springframework.org/schema/context/spring-context-4.2.xsd">
+      http://www.springframework.org/schema/context/spring-context.xsd">
  
       <context:property-placeholder location="classpath:foo.properties" />
  

spring-security-rest-custom/src/main/resources/webSecurityConfig.xml

@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
         http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        http://www.springframework.org/schema/security/spring-security.xsd
         http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        http://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http use-expressions="true">

spring-security-rest-custom/src/main/webapp/WEB-INF/templates/index.html

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html xmlns:th="https://www.thymeleaf.org" 
+      xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+<body>
+	<div sec:authorize="isAuthenticated()">Authenticated as <span sec:authentication="name"></span></div>
+</body>
+</html>