Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-491 - Polishing.

Browse Source 
Set EnableRedisRepositories.enableKeyspaceEvents default to OFF. Expiry notifications require to opt-in. Add JavaDoc. Add documentation for delayed/disabled event listener. Fix spelling. Use property value instead of attribute on RedisKeyValueAdapter bean definition. Remove trailing white spaces.

Original pull request: #193.
This commit is contained in:
Mark Paluch
2016-04-29 15:29:51 +02:00
parent 62c704d58a
commit 0e17c9b58d
6 changed files with 120 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java
View File

@@ -185,7 +185,6 @@ public class RedisKeyValueAdapterUnitTests {
adapter.destroy();
adapter = new RedisKeyValueAdapter(template, context);
adapter.setEnableKeyspaceEvents(EnableKeyspaceEvents.OFF);
adapter.afterPropertiesSet();
KeyExpirationEventMessageListener listener = ((AtomicReference<KeyExpirationEventMessageListener>) getField(adapter,

51
src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtensionUnitTests.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.redis.repository.configuration;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import java.util.Collection;
import static org.hamcrest.core.IsEqual.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -39,6 +39,8 @@ import org.springframework.data.repository.config.RepositoryConfiguration;
import org.springframework.data.repository.config.RepositoryConfigurationSource;
/**
* Unit tests for {@link RedisRepositoryConfigurationExtension}.
*
* @author Christoph Strobl
*/
public class RedisRepositoryConfigurationExtensionUnitTests {
@@ -86,18 +88,25 @@ public class RedisRepositoryConfigurationExtensionUnitTests {
* @see DATAREDIS-491
*/
@Test
public void picksUpEnableKeyspaceEventsCorrectly() {
public void picksUpEnableKeyspaceEventsOnStartupCorrectly() {
metadata = new StandardAnnotationMetadata(Config.class, true);
BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry();
assertThat(getEnableKeyspaceEvents(beanDefintionRegistry),
equalTo((Object) EnableKeyspaceEvents.ON_STARTUP));
}
/**
* @see DATAREDIS-491
*/
@Test
public void picksUpEnableKeyspaceEventsDefaultCorrectly() {
metadata = new StandardAnnotationMetadata(ConfigWithKeyspaceEventsDisabled.class, true);
configurationSource = new AnnotationRepositoryConfigurationSource(metadata, EnableRedisRepositories.class, loader,
environment);
BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry();
RedisRepositoryConfigurationExtension extension = new RedisRepositoryConfigurationExtension();
BeanDefinitionRegistry beanDefintionRegistry = new SimpleBeanDefinitionRegistry();
extension.registerBeansForRoot(beanDefintionRegistry, configurationSource);
assertThat(beanDefintionRegistry.getBeanDefinition("redisKeyValueAdapter").getAttribute("enableKeyspaceEvents"),
assertThat(getEnableKeyspaceEvents(beanDefintionRegistry),
equalTo((Object) EnableKeyspaceEvents.OFF));
}
@@ -126,12 +135,30 @@ public class RedisRepositoryConfigurationExtensionUnitTests {
.concat(configs.toString()));
}
@EnableRedisRepositories(considerNestedRepositories = true)
private BeanDefinitionRegistry getBeanDefinitionRegistry() {
RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
EnableRedisRepositories.class, loader, environment);
RedisRepositoryConfigurationExtension extension = new RedisRepositoryConfigurationExtension();
BeanDefinitionRegistry beanDefintionRegistry = new SimpleBeanDefinitionRegistry();
extension.registerBeansForRoot(beanDefintionRegistry, configurationSource);
return beanDefintionRegistry;
}
private Object getEnableKeyspaceEvents(BeanDefinitionRegistry beanDefintionRegistry) {
return beanDefintionRegistry.getBeanDefinition("redisKeyValueAdapter").getPropertyValues()
.getPropertyValue("enableKeyspaceEvents").getValue();
}
@EnableRedisRepositories(considerNestedRepositories = true, enableKeyspaceEvents = EnableKeyspaceEvents.ON_STARTUP)
static class Config {
}
@EnableRedisRepositories(considerNestedRepositories = true, enableKeyspaceEvents = EnableKeyspaceEvents.OFF)
@EnableRedisRepositories(considerNestedRepositories = true)
static class ConfigWithKeyspaceEventsDisabled {
}