From 44b8d42a6449df1788d17ddcb602b6e2ff62a35f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 19 Sep 2018 15:17:17 +0200
Subject: [PATCH] #396 - Polishing.

Add SpringBootApplication to ApplicationConfiguration. Use SpringRunner instead of SpringJUnit4ClassRunner. Fix application.properties.

Original pull request: #401.
---
 .../redis/repositories/ApplicationConfiguration.java  | 10 ++--------
 .../src/main/resources/application.properties         | 11 ++++++++---
 .../redis/repositories/PersonRepositoryTests.java     | 10 +++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/redis/repositories/src/main/java/example/springdata/redis/repositories/ApplicationConfiguration.java b/redis/repositories/src/main/java/example/springdata/redis/repositories/ApplicationConfiguration.java
index 772a6241..5d45b143 100644
--- a/redis/repositories/src/main/java/example/springdata/redis/repositories/ApplicationConfiguration.java
+++ b/redis/repositories/src/main/java/example/springdata/redis/repositories/ApplicationConfiguration.java
@@ -15,12 +15,7 @@
  */
 package example.springdata.redis.repositories;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * Redis connection, template, etc autoconfigured via application.properties.
@@ -28,6 +23,5 @@ import org.springframework.data.redis.repository.configuration.EnableRedisReposi
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@Configuration
-@EnableRedisRepositories
+@SpringBootApplication
 public class ApplicationConfiguration {}
diff --git a/redis/repositories/src/main/resources/application.properties b/redis/repositories/src/main/resources/application.properties
index 1fb12bdc..168d1369 100644
--- a/redis/repositories/src/main/resources/application.properties
+++ b/redis/repositories/src/main/resources/application.properties
@@ -1,3 +1,8 @@
-spring.data.redis.repositories.enabled=true # Whether to enable Redis repositories.
-spring.redis.host=localhost # Redis server host, default localhost
-spring.redis.port=6379 # Redis server port. default 6379
+# Whether to enable Redis repositories.
+spring.data.redis.repositories.enabled=true
+
+# Redis server host, default localhost
+spring.redis.host=localhost
+
+# Redis server port. default 6379
+spring.redis.port=6379
diff --git a/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java b/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java
index 275d7ba9..bad639e8 100644
--- a/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java
+++ b/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java
@@ -44,16 +44,16 @@ import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.index.GeoIndexed;
 import org.springframework.data.redis.core.index.Indexed;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Christoph Strobl
  * @author Oliver Gierke
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = ApplicationConfiguration.class)
-public class PersonRepositoryTests<K, V> {
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class PersonRepositoryTests {
 
 	/**
 	 * We need to have a Redis server instance available. <br />
@@ -67,7 +67,7 @@ public class PersonRepositoryTests<K, V> {
 	/** {@link Charset} for String conversion **/
 	private static final Charset CHARSET = StandardCharsets.UTF_8;
 
-	@Autowired RedisOperations<K, V> operations;
+	@Autowired RedisOperations<Object, Object> operations;
 	@Autowired PersonRepository repository;
 
 	/*