Skip to content

DATAREDIS-976 - Allow extension of Lettuce Connection and Subscription classes. #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

DATAREDIS-976 - Allow extension of Lettuce Connection and Subscription classes. #457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aec235f
DATAREDIS-976 - Prepare issue branch.
mp911de Jun 17, 2019
27585c5
DATAREDIS-976 - Polishing.
brucecloud Apr 29, 2019
5ea0772
DATAREDIS-976 - Add Pub/Sub tests for Redis Cluster.
mp911de Jun 17, 2019
cfc2259
DATAREDIS-976 - Allow extension of Lettuce Connection and Subscriptio…
mp911de Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DATAREDIS-976 - Polishing. 
ClusterConnectionProvider now accepts cluster-specific connection interfaces for Pub/Sub connections.

Original pull request: #450.
  • Loading branch information
@brucecloud @mp911de
brucecloud authored and mp911de committed Jun 18, 2019
commit 27585c5ce4856af5ef91150f2bc7756aee1f5928
5 changes: 4 additions & 1 deletion ...ain/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.lettuce.core.api.StatefulConnection;
import io.lettuce.core.cluster.RedisClusterClient;
import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
import io.lettuce.core.codec.RedisCodec;
import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;

Expand All @@ -33,6 +34,7 @@
*
* @author Mark Paluch
* @author Christoph Strobl
* @author Bruce Cloud
* @since 2.0
*/
class ClusterConnectionProvider implements LettuceConnectionProvider, RedisClientProvider {
Expand Down Expand Up @@ -93,7 +95,8 @@ class ClusterConnectionProvider implements LettuceConnectionProvider, RedisClien
}
}

if (connectionType.equals(StatefulRedisPubSubConnection.class)) {
if (connectionType.equals(StatefulRedisPubSubConnection.class)
|| connectionType.equals(StatefulRedisClusterPubSubConnection.class)) {

return client.connectPubSubAsync(codec) //
.thenApply(connectionType::cast);
Expand Down
1 change: 1 addition & 0 deletions ...main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
import io.lettuce.core.cluster.models.partitions.Partitions;
import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
import lombok.RequiredArgsConstructor;

import java.time.Duration;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ private class LettucePoolConnectionProvider implements LettuceConnectionProvider

private final LettucePool pool;

/*
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnection(java.lang.Class)
*/
Expand All @@ -1263,7 +1263,7 @@ private class LettucePoolConnectionProvider implements LettuceConnectionProvider
return connectionType.cast(pool.getResource());
}

/*
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
*/
Expand All @@ -1272,7 +1272,7 @@ private class LettucePoolConnectionProvider implements LettuceConnectionProvider
throw new UnsupportedOperationException("Async operations not supported!");
}

/*
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#release(io.lettuce.core.api.StatefulConnection)
*/
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/springframework/data/redis/connection/lettuce/LettuceMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,41 @@ class LettuceMessageListener implements RedisPubSubListener<byte[], byte[]> {
this.listener = listener;
}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object)
*/
public void message(byte[] channel, byte[] message) {
listener.onMessage(new DefaultMessage(channel, message), null);
}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#message(java.lang.Object, java.lang.Object, java.lang.Object)
*/
public void message(byte[] pattern, byte[] channel, byte[] message) {
listener.onMessage(new DefaultMessage(channel, message), pattern);
}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#subscribed(java.lang.Object, long)
*/
public void subscribed(byte[] channel, long count) {}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#psubscribed(java.lang.Object, long)
*/
public void psubscribed(byte[] pattern, long count) {}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#unsubscribed(java.lang.Object, long)
*/
public void unsubscribed(byte[] channel, long count) {}

/*
/*
* (non-Javadoc)
* @see io.lettuce.core.pubsub.RedisPubSubListener#punsubscribed(java.lang.Object, long)
*/
Expand Down