Fix spring-session-sample-boot-redis-simple

Author: rwinch

spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/WebMvcConfig.java renamed to spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/IndexController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,22 @@
  * limitations under the License.
  */
 
-package sample.config;
+package sample;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
+/**
+ * An index controller.
+ *
+ * @author Rob Winch
+ */
+@Controller
+public class IndexController {
 
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/").setViewName("index");
+	@GetMapping("/")
+	String index() {
+		return "index";
 	}
 
 }

spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/UserControllerAdvise.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.security.Principal;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+/**
+ * {@link ControllerAdvice} to expose user related attributes.
+ *
+ * @author Rob Winch
+ */
+@ControllerAdvice
+public class UserControllerAdvise {
+
+	@ModelAttribute("currentUserName")
+	String currentUser(Principal principal) {
+		return (principal != null) ? principal.getName() : null;
+	}
+
+}

spring-session-samples/spring-session-sample-boot-redis-simple/src/main/resources/templates/layout.html

@@ -86,13 +86,12 @@
             <div class="container">
                 <a class="brand" th:href="@{/}"><img th:src="@{/images/logo.png}" alt="Spring Security Sample"/></a>
 
-                <div class="nav-collapse collapse"
-                     th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
-                    <div th:if="${currentUser != null}">
+                <div class="nav-collapse collapse">
+                    <div th:if="${currentUserName != null}">
                         <form class="navbar-form pull-right" th:action="@{/logout}" method="post">
                             <input type="submit" value="Log out"/>
                         </form>
-                        <p id="un" class="navbar-text pull-right" th:text="${currentUser.username}">
+                        <p id="un" class="navbar-text pull-right" th:text="${currentUserName}">
                             sample_user
                         </p>
                     </div>