Skip to content

Commit 24e5ef6

Browse files
sazzad16sazzad16
committed
Remove 'with' prefix from Builder
1 parent 4c7a9fe commit 24e5ef6

12 files changed

+93
-93
lines changed

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ private void initializeFromClientConfig(JedisClientConfig config) {
124124
}
125125

126126
public BinaryJedis(final String host, final int port, final boolean ssl) {
127-
this(host, port, DefaultJedisClientConfig.builder().withSsl(ssl).build());
127+
this(host, port, DefaultJedisClientConfig.builder().ssl(ssl).build());
128128
}
129129

130130
public BinaryJedis(final String host, final int port, final boolean ssl,
131131
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
132132
final HostnameVerifier hostnameVerifier) {
133-
this(host, port, DefaultJedisClientConfig.builder().withSsl(ssl)
134-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
135-
.withHostnameVerifier(hostnameVerifier).build());
133+
this(host, port, DefaultJedisClientConfig.builder().ssl(ssl)
134+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
135+
.hostnameVerifier(hostnameVerifier).build());
136136
}
137137

138138
public BinaryJedis(final String host, final int port, final int timeout) {
@@ -152,51 +152,51 @@ public BinaryJedis(final String host, final int port, final int timeout, final b
152152
public BinaryJedis(final String host, final int port, final int connectionTimeout,
153153
final int soTimeout) {
154154
this(host, port, DefaultJedisClientConfig.builder()
155-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout).build());
155+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout).build());
156156
}
157157

158158
public BinaryJedis(final String host, final int port, final int connectionTimeout,
159159
final int soTimeout, final int infiniteSoTimeout) {
160160
this(host, port, DefaultJedisClientConfig.builder()
161-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout)
162-
.withBlockingSocketTimeoutMillis(infiniteSoTimeout).build());
161+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout)
162+
.blockingSocketTimeoutMillis(infiniteSoTimeout).build());
163163
}
164164

165165
public BinaryJedis(final String host, final int port, final int connectionTimeout,
166166
final int soTimeout, final boolean ssl) {
167167
this(host, port, DefaultJedisClientConfig.builder()
168-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout).withSsl(ssl)
168+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout).ssl(ssl)
169169
.build());
170170
}
171171

172172
public BinaryJedis(final String host, final int port, final int connectionTimeout,
173173
final int soTimeout, final boolean ssl, final SSLSocketFactory sslSocketFactory,
174174
final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
175175
this(host, port, DefaultJedisClientConfig.builder()
176-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout).withSsl(ssl)
177-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
178-
.withHostnameVerifier(hostnameVerifier).build());
176+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout).ssl(ssl)
177+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
178+
.hostnameVerifier(hostnameVerifier).build());
179179
}
180180

181181
public BinaryJedis(final String host, final int port, final int connectionTimeout,
182182
final int soTimeout, final int infiniteSoTimeout, final boolean ssl,
183183
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
184184
final HostnameVerifier hostnameVerifier) {
185185
this(host, port, DefaultJedisClientConfig.builder()
186-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout)
187-
.withBlockingSocketTimeoutMillis(infiniteSoTimeout).withSsl(ssl)
188-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
189-
.withHostnameVerifier(hostnameVerifier).build());
186+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout)
187+
.blockingSocketTimeoutMillis(infiniteSoTimeout).ssl(ssl)
188+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
189+
.hostnameVerifier(hostnameVerifier).build());
190190
}
191191

192192
public BinaryJedis(final JedisShardInfo shardInfo) {
193193
this(shardInfo.getHost(), shardInfo.getPort(), DefaultJedisClientConfig.builder()
194-
.withConnectionTimeoutMillis(shardInfo.getConnectionTimeout())
195-
.withSocketTimeoutMillis(shardInfo.getSoTimeout()).withUser(shardInfo.getUser())
196-
.withPassword(shardInfo.getPassword()).withDatabse(shardInfo.getDb())
197-
.withSsl(shardInfo.getSsl()).withSslSocketFactory(shardInfo.getSslSocketFactory())
198-
.withSslParameters(shardInfo.getSslParameters())
199-
.withHostnameVerifier(shardInfo.getHostnameVerifier()).build());
194+
.connectionTimeoutMillis(shardInfo.getConnectionTimeout())
195+
.socketTimeoutMillis(shardInfo.getSoTimeout()).user(shardInfo.getUser())
196+
.password(shardInfo.getPassword()).databse(shardInfo.getDb())
197+
.ssl(shardInfo.getSsl()).sslSocketFactory(shardInfo.getSslSocketFactory())
198+
.sslParameters(shardInfo.getSslParameters())
199+
.hostnameVerifier(shardInfo.getHostnameVerifier()).build());
200200
}
201201

202202
public BinaryJedis(URI uri) {
@@ -206,8 +206,8 @@ public BinaryJedis(URI uri) {
206206

207207
public BinaryJedis(URI uri, final SSLSocketFactory sslSocketFactory,
208208
final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
209-
this(uri, DefaultJedisClientConfig.builder().withSslSocketFactory(sslSocketFactory)
210-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier).build());
209+
this(uri, DefaultJedisClientConfig.builder().sslSocketFactory(sslSocketFactory)
210+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build());
211211
}
212212

213213
public BinaryJedis(final URI uri, final int timeout) {
@@ -220,25 +220,25 @@ public BinaryJedis(final URI uri, final int timeout, final SSLSocketFactory sslS
220220
}
221221

222222
public BinaryJedis(final URI uri, final int connectionTimeout, final int soTimeout) {
223-
this(uri, DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
224-
.withSocketTimeoutMillis(soTimeout).build());
223+
this(uri, DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
224+
.socketTimeoutMillis(soTimeout).build());
225225
}
226226

227227
public BinaryJedis(final URI uri, final int connectionTimeout, final int soTimeout,
228228
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
229229
final HostnameVerifier hostnameVerifier) {
230-
this(uri, DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
231-
.withSocketTimeoutMillis(soTimeout).withSslSocketFactory(sslSocketFactory)
232-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier).build());
230+
this(uri, DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
231+
.socketTimeoutMillis(soTimeout).sslSocketFactory(sslSocketFactory)
232+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build());
233233
}
234234

235235
public BinaryJedis(final URI uri, final int connectionTimeout, final int soTimeout,
236236
final int infiniteSoTimeout, final SSLSocketFactory sslSocketFactory,
237237
final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
238-
this(uri, DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
239-
.withSocketTimeoutMillis(soTimeout).withBlockingSocketTimeoutMillis(infiniteSoTimeout)
240-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
241-
.withHostnameVerifier(hostnameVerifier).build());
238+
this(uri, DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
239+
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
240+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
241+
.hostnameVerifier(hostnameVerifier).build());
242242
}
243243

244244
public BinaryJedis(final URI uri, JedisClientConfig config) {
@@ -247,15 +247,15 @@ public BinaryJedis(final URI uri, JedisClientConfig config) {
247247
"Cannot open Redis connection due invalid URI \"%s\".", uri.toString()));
248248
}
249249
client = new Client(new HostAndPort(uri.getHost(), uri.getPort()), DefaultJedisClientConfig
250-
.builder().withConnectionTimeoutMillis(config.getConnectionTimeoutMillis())
251-
.withSocketTimeoutMillis(config.getSocketTimeoutMillis())
252-
.withBlockingSocketTimeoutMillis(config.getBlockingSocketTimeoutMillis())
253-
.withUser(JedisURIHelper.getUser(uri)).withPassword(JedisURIHelper.getPassword(uri))
254-
.withDatabse(JedisURIHelper.getDBIndex(uri)).withClientName(config.getClientName())
255-
.withSsl(JedisURIHelper.isRedisSSLScheme(uri))
256-
.withSslSocketFactory(config.getSslSocketFactory())
257-
.withSslParameters(config.getSslParameters())
258-
.withHostnameVerifier(config.getHostnameVerifier()).build());
250+
.builder().connectionTimeoutMillis(config.getConnectionTimeoutMillis())
251+
.socketTimeoutMillis(config.getSocketTimeoutMillis())
252+
.blockingSocketTimeoutMillis(config.getBlockingSocketTimeoutMillis())
253+
.user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
254+
.databse(JedisURIHelper.getDBIndex(uri)).clientName(config.getClientName())
255+
.ssl(JedisURIHelper.isRedisSSLScheme(uri))
256+
.sslSocketFactory(config.getSslSocketFactory())
257+
.sslParameters(config.getSslParameters())
258+
.hostnameVerifier(config.getHostnameVerifier()).build());
259259
initializeFromURI(uri);
260260
}
261261

@@ -265,7 +265,7 @@ private static Client createClientFromURI(URI uri) {
265265
"Cannot open Redis connection due invalid URI \"%s\".", uri.toString()));
266266
}
267267
return new Client(new HostAndPort(uri.getHost(), uri.getPort()), DefaultJedisClientConfig
268-
.builder().withSsl(JedisURIHelper.isRedisSSLScheme(uri)).build());
268+
.builder().ssl(JedisURIHelper.isRedisSSLScheme(uri)).build());
269269
}
270270

271271
private void initializeFromURI(URI uri) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Connection(final String host, final int port) {
5555
*/
5656
@Deprecated
5757
public Connection(final String host, final int port, final boolean ssl) {
58-
this(new HostAndPort(host, port), DefaultJedisClientConfig.builder().withSsl(ssl).build());
58+
this(new HostAndPort(host, port), DefaultJedisClientConfig.builder().ssl(ssl).build());
5959
}
6060

6161
/**
@@ -65,9 +65,9 @@ public Connection(final String host, final int port, final boolean ssl) {
6565
public Connection(final String host, final int port, final boolean ssl,
6666
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
6767
HostnameVerifier hostnameVerifier) {
68-
this(new HostAndPort(host, port), DefaultJedisClientConfig.builder().withSsl(ssl)
69-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
70-
.withHostnameVerifier(hostnameVerifier).build());
68+
this(new HostAndPort(host, port), DefaultJedisClientConfig.builder().ssl(ssl)
69+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
70+
.hostnameVerifier(hostnameVerifier).build());
7171
}
7272

7373
public Connection(final HostAndPort hostAndPort, final JedisClientConfig clientConfig) {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,62 +131,62 @@ public DefaultJedisClientConfig build() {
131131
sslParameters, hostnameVerifier, hostAndPortMapper);
132132
}
133133

134-
public Builder withConnectionTimeoutMillis(int connectionTimeoutMillis) {
134+
public Builder connectionTimeoutMillis(int connectionTimeoutMillis) {
135135
this.connectionTimeoutMillis = connectionTimeoutMillis;
136136
return this;
137137
}
138138

139-
public Builder withSocketTimeoutMillis(int socketTimeoutMillis) {
139+
public Builder socketTimeoutMillis(int socketTimeoutMillis) {
140140
this.socketTimeoutMillis = socketTimeoutMillis;
141141
return this;
142142
}
143143

144-
public Builder withBlockingSocketTimeoutMillis(int blockingSocketTimeoutMillis) {
144+
public Builder blockingSocketTimeoutMillis(int blockingSocketTimeoutMillis) {
145145
this.blockingSocketTimeoutMillis = blockingSocketTimeoutMillis;
146146
return this;
147147
}
148148

149-
public Builder withUser(String user) {
149+
public Builder user(String user) {
150150
this.user = user;
151151
return this;
152152
}
153153

154-
public Builder withPassword(String password) {
154+
public Builder password(String password) {
155155
this.password = password;
156156
return this;
157157
}
158158

159-
public Builder withDatabse(int databse) {
159+
public Builder databse(int databse) {
160160
this.databse = databse;
161161
return this;
162162
}
163163

164-
public Builder withClientName(String clientName) {
164+
public Builder clientName(String clientName) {
165165
this.clientName = clientName;
166166
return this;
167167
}
168168

169-
public Builder withSsl(boolean ssl) {
169+
public Builder ssl(boolean ssl) {
170170
this.ssl = ssl;
171171
return this;
172172
}
173173

174-
public Builder withSslSocketFactory(SSLSocketFactory sslSocketFactory) {
174+
public Builder sslSocketFactory(SSLSocketFactory sslSocketFactory) {
175175
this.sslSocketFactory = sslSocketFactory;
176176
return this;
177177
}
178178

179-
public Builder withSslParameters(SSLParameters sslParameters) {
179+
public Builder sslParameters(SSLParameters sslParameters) {
180180
this.sslParameters = sslParameters;
181181
return this;
182182
}
183183

184-
public Builder withHostnameVerifier(HostnameVerifier hostnameVerifier) {
184+
public Builder hostnameVerifier(HostnameVerifier hostnameVerifier) {
185185
this.hostnameVerifier = hostnameVerifier;
186186
return this;
187187
}
188188

189-
public Builder withHostAndPortMapper(HostAndPortMapper hostAndPortMapper) {
189+
public Builder hostAndPortMapper(HostAndPortMapper hostAndPortMapper) {
190190
this.hostAndPortMapper = hostAndPortMapper;
191191
return this;
192192
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
7474
int infiniteSoTimeout, String user, String password, String clientName, boolean ssl,
7575
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
7676
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap portMap) {
77-
this(nodes, DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
78-
.withSocketTimeoutMillis(soTimeout).withBlockingSocketTimeoutMillis(infiniteSoTimeout)
79-
.withUser(user).withPassword(password).withClientName(clientName).withSsl(ssl)
80-
.withSslSocketFactory(sslSocketFactory).withSslParameters(sslParameters)
81-
.withHostnameVerifier(hostnameVerifier).build(), poolConfig, DefaultJedisClientConfig
82-
.builder().withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout)
83-
.withBlockingSocketTimeoutMillis(infiniteSoTimeout).withUser(user).withPassword(password)
84-
.withClientName(clientName).withSsl(ssl).withSslSocketFactory(sslSocketFactory)
85-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier)
86-
.withHostAndPortMapper(portMap).build());
77+
this(nodes, DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
78+
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
79+
.user(user).password(password).clientName(clientName).ssl(ssl)
80+
.sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
81+
.hostnameVerifier(hostnameVerifier).build(), poolConfig, DefaultJedisClientConfig
82+
.builder().connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout)
83+
.blockingSocketTimeoutMillis(infiniteSoTimeout).user(user).password(password)
84+
.clientName(clientName).ssl(ssl).sslSocketFactory(sslSocketFactory)
85+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier)
86+
.hostAndPortMapper(portMap).build());
8787
}
8888

8989
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
124124
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
125125
HostnameVerifier hostnameVerifier, HostAndPortMapper hostAndPortMap) {
126126
this(poolConfig, DefaultJedisClientConfig.builder()
127-
.withConnectionTimeoutMillis(connectionTimeout).withSocketTimeoutMillis(soTimeout)
128-
.withBlockingSocketTimeoutMillis(infiniteSoTimeout).withUser(user).withPassword(password)
129-
.withClientName(clientName).withSsl(ssl).withSslSocketFactory(sslSocketFactory)
130-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier)
131-
.withHostAndPortMapper(hostAndPortMap).build());
127+
.connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout)
128+
.blockingSocketTimeoutMillis(infiniteSoTimeout).user(user).password(password)
129+
.clientName(clientName).ssl(ssl).sslSocketFactory(sslSocketFactory)
130+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier)
131+
.hostAndPortMapper(hostAndPortMap).build());
132132
}
133133

134134
public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ class JedisFactory implements PooledObjectFactory<Jedis> {
6767
final String clientName, final boolean ssl, final SSLSocketFactory sslSocketFactory,
6868
final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
6969
this.hostAndPort.set(new HostAndPort(host, port));
70-
this.config = DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
71-
.withSocketTimeoutMillis(soTimeout).withBlockingSocketTimeoutMillis(infiniteSoTimeout).withUser(user)
72-
.withPassword(password).withDatabse(database).withClientName(clientName)
73-
.withSsl(ssl).withSslSocketFactory(sslSocketFactory)
74-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier).build();
70+
this.config = DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
71+
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout).user(user)
72+
.password(password).databse(database).clientName(clientName)
73+
.ssl(ssl).sslSocketFactory(sslSocketFactory)
74+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build();
7575
}
7676

7777
JedisFactory(final URI uri, final int connectionTimeout, final int soTimeout,
@@ -93,12 +93,12 @@ class JedisFactory implements PooledObjectFactory<Jedis> {
9393
"Cannot open Redis connection due invalid URI. %s", uri.toString()));
9494
}
9595
this.hostAndPort.set(new HostAndPort(uri.getHost(), uri.getPort()));
96-
this.config = DefaultJedisClientConfig.builder().withConnectionTimeoutMillis(connectionTimeout)
97-
.withSocketTimeoutMillis(soTimeout).withBlockingSocketTimeoutMillis(infiniteSoTimeout)
98-
.withUser(JedisURIHelper.getUser(uri)).withPassword(JedisURIHelper.getPassword(uri))
99-
.withDatabse(JedisURIHelper.getDBIndex(uri)).withClientName(clientName)
100-
.withSsl(JedisURIHelper.isRedisSSLScheme(uri)).withSslSocketFactory(sslSocketFactory)
101-
.withSslParameters(sslParameters).withHostnameVerifier(hostnameVerifier).build();
96+
this.config = DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
97+
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
98+
.user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
99+
.databse(JedisURIHelper.getDBIndex(uri)).clientName(clientName)
100+
.ssl(JedisURIHelper.isRedisSSLScheme(uri)).sslSocketFactory(sslSocketFactory)
101+
.sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build();
102102
}
103103

104104
public void setHostAndPort(final HostAndPort hostAndPort) {

0 commit comments

Comments
 (0)