Minor refactoring

Bumped JDK version to 17
Added TestContainers support
Removed unused imports

Author: NLxAROSA

.java-version

@@ -1 +1 @@
-16
+17

README.md

@@ -19,17 +19,18 @@ Features in this demo:
 
 ## Prerequisites
 
-1. JDK 11 or higher (https://openjdk.java.net/install/index.html)
+1. JDK 17 or higher (https://openjdk.java.net/install/index.html)
 2. Docker Desktop (https://www.docker.com/products/docker-desktop)
 3. Azure CLI (https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
 4. Azure Spring Cloud extension for the Azure CLI (https://docs.microsoft.com/en-us/cli/azure/spring-cloud?view=azure-cli-latest)
 
 ## Running locally
 
 1. Checkout the project
-2. `docker run -p 6379:6379 redislabs/redismod:latest`
-3. `./mvnw clean package spring-boot:run`
-4. Navigate to http://localhost:8080 and login with user lars and password larsje
+2. `./mvnw clean package`
+3. `docker run -p 6379:6379 redislabs/redismod:latest`
+4. `./mvnw spring-boot:run`
+5. Navigate to http://localhost:8080 and login with user lars and password larsje
 
 ## Running on Azure Spring Cloud
 

pom.xml

@@ -13,7 +13,7 @@
 	<name>redisbank</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.20</version>
+			<version>1.18.22</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -76,8 +76,30 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers-bom</artifactId>
+				<version>1.16.2</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>

src/main/java/com/redislabs/demos/redisbank/SerializationUtil.java

@@ -1,6 +1,5 @@
 package com.redislabs.demos.redisbank;
 
-import java.io.File;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Collections;

src/main/java/com/redislabs/demos/redisbank/transactions/TransactionOverviewController.java

@@ -14,8 +14,6 @@
 import com.redislabs.lettusearch.SearchResults;
 import com.redislabs.lettusearch.StatefulRediSearchConnection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -29,8 +27,6 @@
 @CrossOrigin
 public class TransactionOverviewController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TransactionOverviewController.class);
-
     private static final String ACCOUNT_INDEX = "transaction_account_idx";
     private static final String SEARCH_INDEX = "transaction_description_idx";
     private static final String BALANCE_TS = "balance_ts";

src/test/java/com/redislabs/demos/redisbank/RedisbankApplicationTests.java

@@ -1,13 +1,27 @@
 package com.redislabs.demos.redisbank;
 
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 @SpringBootTest
+@Testcontainers
 class RedisbankApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+	static final String REDIS_IMAGE = "redislabs/redismod:latest";
+	static final int REDIS_PORT = 6379;
+
+	@Container
+	static GenericContainer<?> redisContainer = new GenericContainer<>(DockerImageName.parse(REDIS_IMAGE))
+			.withExposedPorts(REDIS_PORT);
 
+	@DynamicPropertySource
+	static void redisProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.redis.host", redisContainer::getContainerIpAddress);
+		registry.add("spring.redis.port", redisContainer::getFirstMappedPort);
+	}
 }