Skip to content

Commit 9f9def3

Browse files
author
antonfilatov
authored
opentracing-jedis3: sync constructors (#59)
* opentracing-jedis3: bugfixes * opentracing-jedis3: sync constructors
1 parent fddb2dc commit 9f9def3

File tree

4 files changed

+521
-214
lines changed

4 files changed

+521
-214
lines changed

‎opentracing-redis-jedis3/src/main/java/io/opentracing/contrib/redis/jedis3/TracingJedis.java

+74-31
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
import javax.net.ssl.HostnameVerifier;
1919
import javax.net.ssl.SSLParameters;
2020
import javax.net.ssl.SSLSocketFactory;
21+
import redis.clients.jedis.HostAndPort;
2122
import redis.clients.jedis.Jedis;
23+
import redis.clients.jedis.JedisClientConfig;
2224
import redis.clients.jedis.JedisShardInfo;
25+
import redis.clients.jedis.JedisSocketFactory;
2326
import redis.clients.jedis.TracingJedisWrapper;
2427

2528
public class TracingJedis extends TracingJedisWrapper {
@@ -28,63 +31,83 @@ public TracingJedis(TracingConfiguration tracingConfiguration) {
2831
super(new Jedis(), tracingConfiguration);
2932
}
3033

31-
public TracingJedis(final String host, TracingConfiguration tracingConfiguration) {
32-
super(new Jedis(host), tracingConfiguration);
34+
public TracingJedis(String uri, TracingConfiguration tracingConfiguration) {
35+
super(new Jedis(uri), tracingConfiguration);
36+
}
37+
38+
public TracingJedis(HostAndPort hp, TracingConfiguration tracingConfiguration) {
39+
super(new Jedis(hp), tracingConfiguration);
3340
}
3441

35-
public TracingJedis(final String host, final int port,
42+
public TracingJedis(HostAndPort hp, JedisClientConfig config,
3643
TracingConfiguration tracingConfiguration) {
44+
super(new Jedis(hp, config), tracingConfiguration);
45+
}
46+
47+
public TracingJedis(String host, int port, TracingConfiguration tracingConfiguration) {
3748
super(new Jedis(host, port), tracingConfiguration);
3849
}
3950

40-
public TracingJedis(final String host, final int port, final boolean ssl,
51+
public TracingJedis(String host, int port, boolean ssl,
4152
TracingConfiguration tracingConfiguration) {
4253
super(new Jedis(host, port, ssl), tracingConfiguration);
4354
}
4455

45-
public TracingJedis(final String host, final int port, final boolean ssl,
46-
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
47-
final HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
56+
public TracingJedis(String host, int port, boolean ssl, SSLSocketFactory sslSocketFactory,
57+
SSLParameters sslParameters, HostnameVerifier hostnameVerifier,
58+
TracingConfiguration tracingConfiguration) {
4859
super(new Jedis(host, port, ssl, sslSocketFactory, sslParameters, hostnameVerifier),
4960
tracingConfiguration);
5061
}
5162

52-
public TracingJedis(final String host, final int port, final int timeout,
63+
public TracingJedis(String host, int port, int timeout,
5364
TracingConfiguration tracingConfiguration) {
5465
super(new Jedis(host, port, timeout), tracingConfiguration);
5566
}
5667

57-
public TracingJedis(final String host, final int port, final int timeout, final boolean ssl,
68+
public TracingJedis(String host, int port, int timeout, boolean ssl,
5869
TracingConfiguration tracingConfiguration) {
5970
super(new Jedis(host, port, timeout, ssl), tracingConfiguration);
6071
}
6172

62-
public TracingJedis(final String host, final int port, final int timeout, final boolean ssl,
63-
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
64-
final HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
73+
public TracingJedis(String host, int port, int timeout, boolean ssl,
74+
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
75+
HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
6576
super(new Jedis(host, port, timeout, ssl, sslSocketFactory, sslParameters, hostnameVerifier),
6677
tracingConfiguration);
6778
}
6879

69-
public TracingJedis(final String host, final int port, final int connectionTimeout,
70-
final int soTimeout, TracingConfiguration tracingConfiguration) {
80+
public TracingJedis(String host, int port, int connectionTimeout, int soTimeout,
81+
TracingConfiguration tracingConfiguration) {
7182
super(new Jedis(host, port, connectionTimeout, soTimeout), tracingConfiguration);
7283
}
7384

74-
public TracingJedis(final String host, final int port, final int connectionTimeout,
75-
final int soTimeout,
76-
final boolean ssl, TracingConfiguration tracingConfiguration) {
85+
public TracingJedis(String host, int port, int connectionTimeout, int soTimeout,
86+
int infiniteSoTimeout, TracingConfiguration tracingConfiguration) {
87+
super(new Jedis(host, port, connectionTimeout, soTimeout, infiniteSoTimeout),
88+
tracingConfiguration);
89+
}
90+
91+
public TracingJedis(String host, int port, int connectionTimeout, int soTimeout, boolean ssl,
92+
TracingConfiguration tracingConfiguration) {
7793
super(new Jedis(host, port, connectionTimeout, soTimeout, ssl), tracingConfiguration);
7894
}
7995

80-
public TracingJedis(final String host, final int port, final int connectionTimeout,
81-
final int soTimeout,
82-
final boolean ssl, final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
83-
final HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
96+
public TracingJedis(String host, int port, int connectionTimeout, int soTimeout, boolean ssl,
97+
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
98+
HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
8499
super(new Jedis(host, port, connectionTimeout, soTimeout, ssl, sslSocketFactory, sslParameters,
85100
hostnameVerifier), tracingConfiguration);
86101
}
87102

103+
public TracingJedis(String host, int port, int connectionTimeout, int soTimeout,
104+
int infiniteSoTimeout, boolean ssl, SSLSocketFactory sslSocketFactory,
105+
SSLParameters sslParameters, HostnameVerifier hostnameVerifier,
106+
TracingConfiguration tracingConfiguration) {
107+
super(new Jedis(host, port, connectionTimeout, soTimeout, infiniteSoTimeout, ssl,
108+
sslSocketFactory, sslParameters, hostnameVerifier), tracingConfiguration);
109+
}
110+
88111
public TracingJedis(JedisShardInfo shardInfo, TracingConfiguration tracingConfiguration) {
89112
super(new Jedis(shardInfo), tracingConfiguration);
90113
}
@@ -93,33 +116,53 @@ public TracingJedis(URI uri, TracingConfiguration tracingConfiguration) {
93116
super(new Jedis(uri), tracingConfiguration);
94117
}
95118

96-
public TracingJedis(URI uri, final SSLSocketFactory sslSocketFactory,
97-
final SSLParameters sslParameters,
98-
final HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
119+
public TracingJedis(URI uri, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
120+
HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
99121
super(new Jedis(uri, sslSocketFactory, sslParameters, hostnameVerifier), tracingConfiguration);
100122
}
101123

102-
public TracingJedis(final URI uri, final int timeout, TracingConfiguration tracingConfiguration) {
124+
public TracingJedis(URI uri, int timeout, TracingConfiguration tracingConfiguration) {
103125
super(new Jedis(uri, timeout), tracingConfiguration);
104126
}
105127

106-
public TracingJedis(final URI uri, final int timeout, final SSLSocketFactory sslSocketFactory,
107-
final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier,
128+
public TracingJedis(URI uri, int timeout, SSLSocketFactory sslSocketFactory,
129+
SSLParameters sslParameters, HostnameVerifier hostnameVerifier,
108130
TracingConfiguration tracingConfiguration) {
109131
super(new Jedis(uri, timeout, sslSocketFactory, sslParameters, hostnameVerifier),
110132
tracingConfiguration);
111133
}
112134

113-
public TracingJedis(final URI uri, final int connectionTimeout, final int soTimeout,
135+
public TracingJedis(URI uri, int connectionTimeout, int soTimeout,
114136
TracingConfiguration tracingConfiguration) {
115137
super(new Jedis(uri, connectionTimeout, soTimeout), tracingConfiguration);
116138
}
117139

118-
public TracingJedis(final URI uri, final int connectionTimeout, final int soTimeout,
119-
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
120-
final HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
140+
public TracingJedis(URI uri, int connectionTimeout, int soTimeout,
141+
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
142+
HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
121143
super(new Jedis(uri, connectionTimeout, soTimeout, sslSocketFactory, sslParameters,
122144
hostnameVerifier), tracingConfiguration);
123145
}
124146

147+
public TracingJedis(URI uri, int connectionTimeout, int soTimeout, int infiniteSoTimeout,
148+
SSLSocketFactory sslSocketFactory, SSLParameters sslParameters,
149+
HostnameVerifier hostnameVerifier, TracingConfiguration tracingConfiguration) {
150+
super(new Jedis(uri, connectionTimeout, soTimeout, infiniteSoTimeout, sslSocketFactory,
151+
sslParameters, hostnameVerifier), tracingConfiguration);
152+
}
153+
154+
public TracingJedis(URI uri, JedisClientConfig config,
155+
TracingConfiguration tracingConfiguration) {
156+
super(new Jedis(uri, config), tracingConfiguration);
157+
}
158+
159+
public TracingJedis(JedisSocketFactory jedisSocketFactory,
160+
TracingConfiguration tracingConfiguration) {
161+
super(new Jedis(jedisSocketFactory), tracingConfiguration);
162+
}
163+
164+
public TracingJedis(JedisSocketFactory jedisSocketFactory, JedisClientConfig clientConfig,
165+
TracingConfiguration tracingConfiguration) {
166+
super(new Jedis(jedisSocketFactory, clientConfig), tracingConfiguration);
167+
}
125168
}

0 commit comments

Comments
 (0)