From 20fbf859e7d51791f0c78f8c8e80bedbe2ffa129 Mon Sep 17 00:00:00 2001
From: Marcus Hert Da Coregio <marcusdacoregio@gmail.com>
Date: Mon, 27 Nov 2023 10:42:39 -0300
Subject: [PATCH] Fix tests

(cherry picked from commit f9b321c42999a8f0cc2c570401ed62dc1b104d93)
---
 .../spring-session-sample-boot-redis-json.gradle            | 1 -
 .../src/main/java/sample/web/HomeController.java            | 6 +++++-
 .../src/main/resources/templates/home.html                  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle
index afc7784d..2d5137c5 100644
--- a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle
+++ b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle
@@ -12,7 +12,6 @@ dependencies {
 	implementation  "org.webjars:bootstrap"
 	implementation  "org.webjars:html5shiv"
 	implementation  "org.webjars:webjars-locator-core"
-	implementation  "org.apache.httpcomponents:httpclient"
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
 	testImplementation "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java
index 81d14db1..76e9aa17 100644
--- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java
+++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java
@@ -16,9 +16,12 @@
 
 package sample.web;
 
+import java.util.Collections;
+
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,10 +34,11 @@ public class HomeController {
 
 	@RequestMapping("/setValue")
 	public String setValue(@RequestParam(name = "key", required = false) String key,
-			@RequestParam(name = "value", required = false) String value, HttpServletRequest request) {
+			@RequestParam(name = "value", required = false) String value, HttpServletRequest request, Model model) {
 		if (!ObjectUtils.isEmpty(key) && !ObjectUtils.isEmpty(value)) {
 			request.getSession().setAttribute(key, value);
 		}
+		model.addAttribute("sessionAttributeNames", Collections.list(request.getSession().getAttributeNames()));
 		return "home";
 	}
 
diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html
index 3345c95f..d8823abf 100644
--- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html
+++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html
@@ -23,7 +23,7 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr th:each="name : ${T(org.springframework.util.CollectionUtils).toIterator(httpSession?.getAttributeNames())}">
+				<tr th:each="name : ${sessionAttributeNames}">
 					<td th:text="${name}"></td>
 					<td th:text="${httpSession.getAttribute(name)}"></td>
 				</tr>