Skip to content

Commit 71a86d4

Browse files
gkorlandsazzad16
gkorland
and
sazzad16
authored
Set the GenericObjectPoolConfig type (#2391)
* Set the GenericObjectPoolConfig type * remove unused import * fiux merge * Apply suggestions from code review Co-authored-by: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
1 parent 264019b commit 71a86d4

20 files changed

+500
-461
lines changed

‎src/main/java/redis/clients/jedis/BinaryJedisCluster.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,55 +40,55 @@ public BinaryJedisCluster(Set<HostAndPort> nodes) {
4040
}
4141

4242
public BinaryJedisCluster(Set<HostAndPort> nodes, int timeout) {
43-
this(nodes, timeout, DEFAULT_MAX_ATTEMPTS, new GenericObjectPoolConfig());
43+
this(nodes, timeout, DEFAULT_MAX_ATTEMPTS, new GenericObjectPoolConfig<Jedis>());
4444
}
4545

4646
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int timeout, int maxAttempts,
47-
final GenericObjectPoolConfig poolConfig) {
47+
final GenericObjectPoolConfig<Jedis> poolConfig) {
4848
this(jedisClusterNode, timeout, timeout, maxAttempts, poolConfig);
4949
}
5050

5151
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout,
52-
int soTimeout, int maxAttempts, final GenericObjectPoolConfig poolConfig) {
52+
int soTimeout, int maxAttempts, final GenericObjectPoolConfig<Jedis> poolConfig) {
5353
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, null, poolConfig);
5454
}
5555

56-
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, GenericObjectPoolConfig poolConfig) {
56+
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, GenericObjectPoolConfig<Jedis> poolConfig) {
5757
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, null, poolConfig);
5858
}
5959

60-
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig poolConfig) {
60+
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig) {
6161
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, null, password, clientName, poolConfig);
6262
}
6363

64-
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig) {
64+
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig) {
6565
this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig,
6666
connectionTimeout, soTimeout, user, password, clientName);
6767
this.maxAttempts = maxAttempts;
6868
}
6969

7070
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
71-
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig) {
71+
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig) {
7272
this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig,
7373
connectionTimeout, soTimeout, infiniteSoTimeout, user, password, clientName);
7474
this.maxAttempts = maxAttempts;
7575
}
7676

77-
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig poolConfig,
77+
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig,
7878
boolean ssl) {
7979
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig, ssl, null, null, null, null);
8080
}
8181

8282
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts,
83-
String user, String password, String clientName, GenericObjectPoolConfig poolConfig, boolean ssl) {
83+
String user, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig, boolean ssl) {
8484
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig, ssl, null, null, null, null);
8585
}
8686

8787
/**
8888
* @deprecated This constructor will be removed in future.
8989
*/
9090
@Deprecated
91-
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig poolConfig,
91+
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int maxAttempts, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig,
9292
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
9393
this(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, null, password, clientName,
9494
poolConfig, ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
@@ -99,7 +99,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
9999
*/
100100
@Deprecated
101101
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
102-
int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig,
102+
int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig,
103103
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
104104
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
105105
this(jedisClusterNode, connectionTimeout, soTimeout, 0, maxAttempts, user, password, clientName, poolConfig,
@@ -111,7 +111,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
111111
*/
112112
@Deprecated
113113
public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
114-
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig poolConfig,
114+
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, GenericObjectPoolConfig<Jedis> poolConfig,
115115
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
116116
this.connectionHandler = new JedisSlotBasedConnectionHandler(jedisClusterNode, poolConfig,
117117
connectionTimeout, soTimeout, infiniteSoTimeout, user, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);

‎src/main/java/redis/clients/jedis/JedisCluster.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,47 @@ public JedisCluster(HostAndPort node, int timeout, int maxAttempts) {
3939
this(Collections.singleton(node), timeout, maxAttempts);
4040
}
4141

42-
public JedisCluster(HostAndPort node, final GenericObjectPoolConfig poolConfig) {
42+
public JedisCluster(HostAndPort node, final GenericObjectPoolConfig<Jedis> poolConfig) {
4343
this(Collections.singleton(node), poolConfig);
4444
}
4545

46-
public JedisCluster(HostAndPort node, int timeout, final GenericObjectPoolConfig poolConfig) {
46+
public JedisCluster(HostAndPort node, int timeout, final GenericObjectPoolConfig<Jedis> poolConfig) {
4747
this(Collections.singleton(node), timeout, poolConfig);
4848
}
4949

5050
public JedisCluster(HostAndPort node, int timeout, int maxAttempts,
51-
final GenericObjectPoolConfig poolConfig) {
51+
final GenericObjectPoolConfig<Jedis> poolConfig) {
5252
this(Collections.singleton(node), timeout, maxAttempts, poolConfig);
5353
}
5454

5555
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
56-
int maxAttempts, final GenericObjectPoolConfig poolConfig) {
56+
int maxAttempts, final GenericObjectPoolConfig<Jedis> poolConfig) {
5757
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, poolConfig);
5858
}
5959

6060
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
61-
int maxAttempts, String password, final GenericObjectPoolConfig poolConfig) {
61+
int maxAttempts, String password, final GenericObjectPoolConfig<Jedis> poolConfig) {
6262
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, password, poolConfig);
6363
}
6464

6565
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
66-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig) {
66+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig) {
6767
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig);
6868
}
6969

7070
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
71-
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig) {
71+
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig) {
7272
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig);
7373
}
7474

7575
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
76-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig,
76+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
7777
boolean ssl) {
7878
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig, ssl);
7979
}
8080

8181
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int maxAttempts,
82-
String user, String password, String clientName, final GenericObjectPoolConfig poolConfig, boolean ssl) {
82+
String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig, boolean ssl) {
8383
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig, ssl);
8484
}
8585

@@ -88,7 +88,7 @@ public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int
8888
*/
8989
@Deprecated
9090
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
91-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig,
91+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
9292
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
9393
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
9494
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig,
@@ -100,7 +100,7 @@ public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
100100
*/
101101
@Deprecated
102102
public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout,
103-
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig,
103+
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
104104
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
105105
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
106106
this(Collections.singleton(node), connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig,
@@ -120,56 +120,56 @@ public JedisCluster(Set<HostAndPort> nodes, int timeout) {
120120
}
121121

122122
public JedisCluster(Set<HostAndPort> nodes, int timeout, int maxAttempts) {
123-
this(nodes, timeout, maxAttempts, new GenericObjectPoolConfig());
123+
this(nodes, timeout, maxAttempts, new GenericObjectPoolConfig<Jedis>());
124124
}
125125

126-
public JedisCluster(Set<HostAndPort> nodes, final GenericObjectPoolConfig poolConfig) {
126+
public JedisCluster(Set<HostAndPort> nodes, final GenericObjectPoolConfig<Jedis> poolConfig) {
127127
this(nodes, DEFAULT_TIMEOUT, DEFAULT_MAX_ATTEMPTS, poolConfig);
128128
}
129129

130-
public JedisCluster(Set<HostAndPort> nodes, int timeout, final GenericObjectPoolConfig poolConfig) {
130+
public JedisCluster(Set<HostAndPort> nodes, int timeout, final GenericObjectPoolConfig<Jedis> poolConfig) {
131131
this(nodes, timeout, DEFAULT_MAX_ATTEMPTS, poolConfig);
132132
}
133133

134134
public JedisCluster(Set<HostAndPort> jedisClusterNode, int timeout, int maxAttempts,
135-
final GenericObjectPoolConfig poolConfig) {
135+
final GenericObjectPoolConfig<Jedis> poolConfig) {
136136
super(jedisClusterNode, timeout, maxAttempts, poolConfig);
137137
}
138138

139139
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
140-
int maxAttempts, final GenericObjectPoolConfig poolConfig) {
140+
int maxAttempts, final GenericObjectPoolConfig<Jedis> poolConfig) {
141141
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, poolConfig);
142142
}
143143

144144
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
145-
int maxAttempts, String password, final GenericObjectPoolConfig poolConfig) {
145+
int maxAttempts, String password, final GenericObjectPoolConfig<Jedis> poolConfig) {
146146
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, poolConfig);
147147
}
148148

149149
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
150-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig) {
150+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig) {
151151
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig);
152152
}
153153

154154
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
155-
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig) {
155+
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig) {
156156
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig);
157157
}
158158

159159
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
160-
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig) {
160+
int infiniteSoTimeout, int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig) {
161161
super(jedisClusterNode, connectionTimeout, soTimeout, infiniteSoTimeout, maxAttempts, user, password, clientName, poolConfig);
162162
}
163163

164164
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
165-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig,
165+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
166166
boolean ssl) {
167167
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig, ssl);
168168
}
169169

170170
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
171171
int maxAttempts, String user, String password, String clientName,
172-
final GenericObjectPoolConfig poolConfig, boolean ssl) {
172+
final GenericObjectPoolConfig<Jedis> poolConfig, boolean ssl) {
173173
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, user, password, clientName, poolConfig, ssl);
174174
}
175175

@@ -178,7 +178,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
178178
*/
179179
@Deprecated
180180
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
181-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig,
181+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
182182
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
183183
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
184184
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, clientName, poolConfig,
@@ -190,7 +190,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
190190
*/
191191
@Deprecated
192192
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int infiniteSoTimeout,
193-
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig poolConfig,
193+
int maxAttempts, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
194194
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
195195
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
196196
this(jedisClusterNode, connectionTimeout, soTimeout, infiniteSoTimeout, maxAttempts, null, password,
@@ -202,7 +202,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
202202
*/
203203
@Deprecated
204204
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
205-
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig,
205+
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
206206
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
207207
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
208208
super(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, user,password, clientName, poolConfig,
@@ -214,7 +214,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
214214
*/
215215
@Deprecated
216216
public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout, int infiniteSoTimeout,
217-
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig poolConfig,
217+
int maxAttempts, String user, String password, String clientName, final GenericObjectPoolConfig<Jedis> poolConfig,
218218
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
219219
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap hostAndPortMap) {
220220
super(jedisClusterNode, connectionTimeout, soTimeout, infiniteSoTimeout, maxAttempts, user, password,

0 commit comments

Comments
 (0)