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

Polishing.

Browse Source 
Reorder methods, reformat code.

Original Pull Request: #2959
This commit is contained in:
Mark Paluch
2024-08-07 10:59:57 +02:00
committed by Christoph Strobl
parent 20688c5a26
commit 4ec61414c2
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListener.java
View File

@@ -29,8 +29,8 @@ import org.springframework.lang.Nullable;
* @author Christoph Strobl
* @since 1.7
*/
public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListener implements
ApplicationEventPublisherAware {
public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListener
implements ApplicationEventPublisherAware {
private static final Topic KEYEVENT_EXPIRED_TOPIC = new PatternTopic("__keyevent@*__:expired");
@@ -45,6 +45,11 @@ public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListe
super(listenerContainer);
}
@Override
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
this.publisher = applicationEventPublisher;
}
@Override
protected void doRegister(RedisMessageListenerContainer listenerContainer) {
listenerContainer.addMessageListener(this, KEYEVENT_EXPIRED_TOPIC);
@@ -67,8 +72,4 @@ public class KeyExpirationEventMessageListener extends KeyspaceEventMessageListe
}
}
@Override
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
this.publisher = applicationEventPublisher;
}
}

57
src/main/java/org/springframework/data/redis/listener/KeyspaceEventMessageListener.java
View File

@@ -22,6 +22,8 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
@@ -40,7 +42,7 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
private final RedisMessageListenerContainer listenerContainer;
private String keyspaceNotificationsConfigParameter = "EA";
private @Nullable String keyspaceNotificationsConfigParameter = "EA";
/**
* Creates new {@link KeyspaceEventMessageListener}.
@@ -53,6 +55,26 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
this.listenerContainer = listenerContainer;
}
/**
* Set the configuration string to use for {@literal notify-keyspace-events}.
*
* @param keyspaceNotificationsConfigParameter can be {@literal null}.
* @since 1.8
*/
public void setKeyspaceNotificationsConfigParameter(@Nullable String keyspaceNotificationsConfigParameter) {
this.keyspaceNotificationsConfigParameter = keyspaceNotificationsConfigParameter;
}
@Override
public void afterPropertiesSet() {
init();
}
@Override
public void destroy() throws Exception {
listenerContainer.removeMessageListener(this);
}
@Override
public void onMessage(Message message, @Nullable byte[] pattern) {
@@ -76,20 +98,18 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
*/
public void init() {
if (StringUtils.hasText(keyspaceNotificationsConfigParameter)) {
RedisConnectionFactory connectionFactory = listenerContainer.getConnectionFactory();
RedisConnection connection = listenerContainer.getConnectionFactory().getConnection();
if (StringUtils.hasText(keyspaceNotificationsConfigParameter) && connectionFactory != null) {
try {
try (RedisConnection connection = connectionFactory.getConnection()) {
Properties config = connection.getConfig("notify-keyspace-events");
RedisServerCommands commands = connection.serverCommands();
Properties config = commands.getConfig("notify-keyspace-events");
if (!StringUtils.hasText(config.getProperty("notify-keyspace-events"))) {
connection.setConfig("notify-keyspace-events", keyspaceNotificationsConfigParameter);
commands.setConfig("notify-keyspace-events", keyspaceNotificationsConfigParameter);
}
} finally {
connection.close();
}
}
@@ -105,23 +125,4 @@ public abstract class KeyspaceEventMessageListener implements MessageListener, I
listenerContainer.addMessageListener(this, TOPIC_ALL_KEYEVENTS);
}
@Override
public void destroy() throws Exception {
listenerContainer.removeMessageListener(this);
}
/**
* Set the configuration string to use for {@literal notify-keyspace-events}.
*
* @param keyspaceNotificationsConfigParameter can be {@literal null}.
* @since 1.8
*/
public void setKeyspaceNotificationsConfigParameter(String keyspaceNotificationsConfigParameter) {
this.keyspaceNotificationsConfigParameter = keyspaceNotificationsConfigParameter;
}
@Override
public void afterPropertiesSet() throws Exception {
init();
}
}