Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/redis/clients/jedis/BinaryJedisCluster.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
}

public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, JedisClientConfig clientConfig,
int maxAttempts, GenericObjectPoolConfig poolConfig) {
int maxAttempts, GenericObjectPoolConfig<Jedis> poolConfig) {
this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig, clientConfig);
this.maxAttempts = maxAttempts;
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/redis/clients/jedis/JedisCluster.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
}

public JedisCluster(HostAndPort node, final JedisClientConfig clientConfig, int maxAttempts, final GenericObjectPoolConfig poolConfig) {
public JedisCluster(HostAndPort node, final JedisClientConfig clientConfig, int maxAttempts,
final GenericObjectPoolConfig<Jedis> poolConfig) {
this(Collections.singleton(node), clientConfig, maxAttempts, poolConfig);
}

Expand Down Expand Up @@ -222,7 +223,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
}

public JedisCluster(Set<HostAndPort> nodes, final JedisClientConfig clientConfig, int maxAttempts,
final GenericObjectPoolConfig poolConfig) {
final GenericObjectPoolConfig<Jedis> poolConfig) {
super(nodes, clientConfig, maxAttempts, poolConfig);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final GenericObject
*/
@Deprecated
public JedisClusterConnectionHandler(Set<HostAndPort> nodes, final JedisClientConfig seedNodesClientConfig,
final GenericObjectPoolConfig poolConfig, final JedisClientConfig clusterNodesClientConfig) {
final GenericObjectPoolConfig<Jedis> poolConfig, final JedisClientConfig clusterNodesClientConfig) {
this.cache = new JedisClusterInfoCache(poolConfig, clusterNodesClientConfig);
initializeSlotsCache(nodes, seedNodesClientConfig);
}

public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
final GenericObjectPoolConfig poolConfig, final JedisClientConfig clientConfig) {
final GenericObjectPoolConfig<Jedis> poolConfig, final JedisClientConfig clientConfig) {
this.cache = new JedisClusterInfoCache(poolConfig, clientConfig);
initializeSlotsCache(nodes, clientConfig);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes, GenericObjectPool
super(nodes, poolConfig, connectionTimeout, soTimeout, infiniteSoTimeout, user, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier, portMap);
}

public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes, GenericObjectPoolConfig poolConfig,
public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes, GenericObjectPoolConfig<Jedis> poolConfig,
JedisClientConfig clientConfig) {
super(nodes, poolConfig, clientConfig);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void checkResourceIsClosableAndReusable() {

@Test
public void checkResourceWithConfigIsClosableAndReusable() {
GenericObjectPoolConfig config = new GenericObjectPoolConfig();
GenericObjectPoolConfig<Jedis> config = new GenericObjectPoolConfig<>();
config.setMaxTotal(1);
config.setBlockWhenExhausted(false);
try (JedisPool pool = new JedisPool(config, hnp, DefaultJedisClientConfig.builder()
Expand Down