From 9988a78cba853a3f5ea08b8501a933f4f8c3d065 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Mon, 29 Jul 2024 16:13:14 +0200
Subject: [PATCH] Polishing.

Consistently use array access syntax in template. Use page offset to calculate numbering. Use latest MongoDB Docker image.
---
 web/querydsl/src/main/resources/templates/index.html   | 10 +++++-----
 .../src/test/java/example/users/TestApplication.java   |  6 ++++--
 .../example/users/TestcontainersConfiguration.java     |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/web/querydsl/src/main/resources/templates/index.html b/web/querydsl/src/main/resources/templates/index.html
index 42425f2c7..92abc3d0c 100644
--- a/web/querydsl/src/main/resources/templates/index.html
+++ b/web/querydsl/src/main/resources/templates/index.html
@@ -23,11 +23,11 @@ <h3 class="panel-title">Search</h3>
 
 					<div class="form-group col-sm-6">
 						<label for="firstname" class="control-label">Firstname:</label>
-						<input id="firstname" name="firstname" th:value="${param.firstname}" type="text" class="form-control" autofocus="autofocus" />
+						<input id="firstname" name="firstname" th:value="${param['firstname']}" type="text" class="form-control" autofocus="autofocus" />
 					</div>
 					<div class="form-group col-sm-6">
 						<label for="lastname" class="control-label">Lastname:</label>
-						<input id="lastname" name="lastname" th:value="${param.lastname}" type="text" class="form-control" autofocus="autofocus" />
+						<input id="lastname" name="lastname" th:value="${param['lastname']}" type="text" class="form-control" autofocus="autofocus" />
 					</div>
 					<div class="form-group col-sm-6">
 						<label for="address.city" class="control-label">City:</label>
@@ -42,7 +42,7 @@ <h3 class="panel-title">Search</h3>
 					</div>
 					<div class="form-group col-sm-6">
 						<label for="nationality" class="control-label">Nationality:</label>
-						<input id="nationality" name="nationality" th:value="${param.nationality}" type="text"
+						<input id="nationality" name="nationality" th:value="${param['nationality']}" type="text"
 							   class="form-control" />
 					</div>
 					<div class="form-group col-sm-12">
@@ -73,11 +73,11 @@ <h3 class="panel-title">Search</h3>
 					<th>City</th>
 					<th>Street</th>
 					<th>Email</th>
-				</tr>	
+				</tr>
 			</thead>
 			<tbody>
 				<tr th:each="user : ${users}">
-					<td th:text="${users.number * users.size + userStat.index + 1} + '.'">1.</td>
+					<td th:text="${users.pageable.offset + userStat.index + 1} + '.'">1.</td>
 					<td class="text-center">
 						<img th:src="${user.picture.small}" class="rounded-circle" />
 					</td>
diff --git a/web/querydsl/src/test/java/example/users/TestApplication.java b/web/querydsl/src/test/java/example/users/TestApplication.java
index 15f6c4842..054772e49 100644
--- a/web/querydsl/src/test/java/example/users/TestApplication.java
+++ b/web/querydsl/src/test/java/example/users/TestApplication.java
@@ -19,11 +19,13 @@
 
 /**
  * @author Tim Sparg
+ * @author Oliver Drotbohm
  */
 public class TestApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.from(Application::main).with(TestcontainersConfiguration.class).run(args);
+		SpringApplication.from(Application::main)
+				.with(TestcontainersConfiguration.class)
+				.run(args);
 	}
-
 }
diff --git a/web/querydsl/src/test/java/example/users/TestcontainersConfiguration.java b/web/querydsl/src/test/java/example/users/TestcontainersConfiguration.java
index 0749dc685..077a7d4f3 100644
--- a/web/querydsl/src/test/java/example/users/TestcontainersConfiguration.java
+++ b/web/querydsl/src/test/java/example/users/TestcontainersConfiguration.java
@@ -24,6 +24,7 @@
 
 /**
  * @author Tim Sparg
+ * @author Oliver Drotbohm
  */
 @TestConfiguration(proxyBeanMethods = false)
 public class TestcontainersConfiguration {
@@ -32,7 +33,6 @@ public class TestcontainersConfiguration {
 	@ServiceConnection
 	@RestartScope
 	MongoDBContainer mongoDbContainer() {
-		return new MongoDBContainer(DockerImageName.parse("mongo:7"));
+		return new MongoDBContainer(DockerImageName.parse("mongo:latest"));
 	}
-
 }