From 96b74199166adcab90c0a2439a2d16426b842baf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 21 Mar 2016 11:02:22 +0100 Subject: [PATCH] Polish contribution Closes gh-5455 --- .../data/redis/RedisRepositoriesAutoConfiguration.java | 2 ++ .../data/redis/RedisRepositoriesAutoConfigureRegistrar.java | 5 +++-- .../META-INF/additional-spring-configuration-metadata.json | 6 ++++++ .../data/redis/RedisRepositoriesAutoConfigurationTests.java | 6 ++---- .../src/main/asciidoc/appendix-application-properties.adoc | 3 +++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java index f6be07d3fb..a6d4da3159 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.data.redis; import redis.clients.jedis.Jedis; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -40,5 +41,6 @@ import org.springframework.data.redis.repository.support.RedisRepositoryFactoryB @ConditionalOnProperty(prefix = "spring.data.redis.repositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnMissingBean(RedisRepositoryFactoryBean.class) @Import(RedisRepositoriesAutoConfigureRegistrar.class) +@AutoConfigureAfter(RedisAutoConfiguration.class) public class RedisRepositoriesAutoConfiguration { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigureRegistrar.java index 324d5ed340..44dcdd7cd6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigureRegistrar.java @@ -30,8 +30,9 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi * @author Eddú Meléndez * @since 1.4.0 */ -public class RedisRepositoriesAutoConfigureRegistrar extends - AbstractRepositoryConfigurationSourceSupport { +class RedisRepositoriesAutoConfigureRegistrar + extends AbstractRepositoryConfigurationSourceSupport { + @Override protected Class getAnnotation() { return EnableRedisRepositories.class; diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index cd67e529fb..fba5f4e02c 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -90,6 +90,12 @@ "description": "Enable Mongo repositories.", "defaultValue": true }, + { + "name": "spring.data.redis.repositories.enabled", + "type": "java.lang.Boolean", + "description": "Enable Redis repositories.", + "defaultValue": true + }, { "name": "spring.data.solr.repositories.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java index 7f55fce7a8..2c5fc4eb79 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java @@ -43,7 +43,8 @@ public class RedisRepositoriesAutoConfigurationTests { @Rule public RedisTestServer redis = new RedisTestServer(); - private AnnotationConfigApplicationContext context; + private AnnotationConfigApplicationContext context + = new AnnotationConfigApplicationContext(); @After public void close() { @@ -52,7 +53,6 @@ public class RedisRepositoriesAutoConfigurationTests { @Test public void testDefaultRepositoryConfiguration() { - this.context = new AnnotationConfigApplicationContext(); this.context.register(TestConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -62,7 +62,6 @@ public class RedisRepositoriesAutoConfigurationTests { @Test public void testNoRepositoryConfiguration() { - this.context = new AnnotationConfigApplicationContext(); this.context.register(EmptyConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class, @@ -73,7 +72,6 @@ public class RedisRepositoriesAutoConfigurationTests { @Test public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() { - this.context = new AnnotationConfigApplicationContext(); this.context.register(CustomizedConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class, diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index bd38422b17..e20caa1241 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -533,6 +533,9 @@ content into your application; rather pick only the properties that you need. spring.data.mongodb.uri=mongodb://localhost/test # Mongo database URI. When set, host and port are ignored. spring.data.mongodb.username= # Login user of the mongo server. + # DATA REDIS + spring.data.redis.repositories.enabled=true # Enable Redis repositories. + # DATA REST ({sc-spring-boot-autoconfigure}/data/rest/RepositoryRestProperties.{sc-ext}[RepositoryRestProperties]) spring.data.rest.base-path= # Base path to be used by Spring Data REST to expose repository resources. spring.data.rest.default-page-size= # Default size of pages.