Skip to content

Commit bf5f58e

Browse files
gkorlandsazzad16
gkorland
and
sazzad16
authored
Some code cleanup (#2288)
Co-authored-by: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
1 parent a783c78 commit bf5f58e

File tree

10 files changed

+40
-57
lines changed

10 files changed

+40
-57
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ public List<byte[]> build(Object data) {
180180
if (null == data) {
181181
return null;
182182
}
183-
List<byte[]> l = (List<byte[]>) data;
184-
185-
return l;
183+
return (List<byte[]>) data;
186184
}
187185

188186
@Override
@@ -622,10 +620,7 @@ public StreamEntry build(Object data) {
622620
map.put(SafeEncoder.encode(hashIterator.next()),
623621
SafeEncoder.encode(hashIterator.next()));
624622
}
625-
StreamEntry streamEntry = new StreamEntry(entryID, map);
626-
627-
628-
return streamEntry;
623+
return new StreamEntry(entryID, map);
629624
}
630625

631626
@Override
@@ -690,9 +685,8 @@ public StreamInfo build(Object data) {
690685
List<Object> streamsEntries = (List<Object>)data;
691686
Iterator<Object> iterator = streamsEntries.iterator();
692687

693-
StreamInfo streamInfo = new StreamInfo(
688+
return new StreamInfo(
694689
createMapFromDecodingFunctions(iterator,mappingFunctions));
695-
return streamInfo;
696690
}
697691

698692
@Override

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,14 @@ public static String convertHost(String host) {
105105
InetAddress inetAddress = InetAddress.getByName(host);
106106

107107
// isLoopbackAddress() handles both IPV4 and IPV6
108-
if (inetAddress.isLoopbackAddress() || host.equals("0.0.0.0") || host.startsWith("169.254"))
108+
if (inetAddress.isLoopbackAddress() || host.equals("0.0.0.0") || host.startsWith("169.254")) {
109109
return getLocalhost();
110-
else
111-
return host;
110+
}
112111
} catch (Exception e) {
113112
// Not a valid IP address
114-
log.warn("{}.convertHost '" + host + "' is not a valid IP address. ", HostAndPort.class.getName(), e);
115-
return host;
113+
log.warn("{}.convertHost '{}' is not a valid IP address. ", HostAndPort.class.getName(), host, e);
116114
}
115+
return host;
117116
}
118117

119118
public static void setLocalhost(String localhost) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,7 @@ public Set<String> hkeys(final String key) {
927927
public List<String> hvals(final String key) {
928928
checkIsInMultiOrPipeline();
929929
client.hvals(key);
930-
final List<String> lresult = client.getMultiBulkReply();
931-
return lresult;
930+
return client.getMultiBulkReply();
932931
}
933932

934933
/**

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ public T runWithAnyNode() {
7474
try {
7575
connection = connectionHandler.getConnection();
7676
return execute(connection);
77-
} catch (JedisConnectionException e) {
78-
throw e;
7977
} finally {
8078
releaseConnection(connection);
8179
}

‎src/main/java/redis/clients/jedis/exceptions/JedisRedirectionException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
public class JedisRedirectionException extends JedisDataException {
66
private static final long serialVersionUID = 3878126572474819403L;
77

8-
private HostAndPort targetNode;
9-
private int slot;
8+
private final HostAndPort targetNode;
9+
private final int slot;
1010

1111
public JedisRedirectionException(String message, HostAndPort targetNode, int slot) {
1212
super(message);

‎src/main/java/redis/clients/jedis/util/Hashing.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ public long hash(byte[] key) {
2727
md5.reset();
2828
md5.update(key);
2929
byte[] bKey = md5.digest();
30-
long res = ((long) (bKey[3] & 0xFF) << 24) | ((long) (bKey[2] & 0xFF) << 16)
30+
return ((long) (bKey[3] & 0xFF) << 24) | ((long) (bKey[2] & 0xFF) << 16)
3131
| ((long) (bKey[1] & 0xFF) << 8) | (long) (bKey[0] & 0xFF);
32-
return res;
3332
}
3433
};
3534

‎src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertTrue;
5+
import static org.junit.Assert.assertSame;
56

67
import java.util.HashSet;
78
import java.util.Set;
@@ -117,7 +118,7 @@ public void returnResourceShouldResetState() {
117118

118119
jedis2 = pool.getResource();
119120

120-
assertTrue(jedis == jedis2);
121+
assertSame(jedis, jedis2);
121122
assertEquals("jedis", jedis2.get("hello"));
122123
} catch (JedisConnectionException e) {
123124
if (jedis2 != null) {

‎src/test/java/redis/clients/jedis/tests/SSLJedisTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,9 @@ public void connectWithShardInfoAndEmptyTrustStore() throws Exception {
251251
static SSLSocketFactory createTrustStoreSslSocketFactory() throws Exception {
252252

253253
KeyStore trustStore = KeyStore.getInstance("jceks");
254-
InputStream inputStream = null;
255-
try {
256-
inputStream = new FileInputStream("src/test/resources/truststore.jceks");
254+
255+
try (InputStream inputStream = new FileInputStream("src/test/resources/truststore.jceks")){
257256
trustStore.load(inputStream, null);
258-
} finally {
259-
inputStream.close();
260257
}
261258

262259
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("PKIX");

‎src/test/java/redis/clients/jedis/tests/SSLJedisWithCompleteCredentialsTest.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,9 @@ public void connectWithShardInfoAndEmptyTrustStore() throws Exception {
291291
static SSLSocketFactory createTrustStoreSslSocketFactory() throws Exception {
292292

293293
KeyStore trustStore = KeyStore.getInstance("jceks");
294-
InputStream inputStream = null;
295-
try {
296-
inputStream = new FileInputStream("src/test/resources/truststore.jceks");
294+
try (InputStream inputStream = new FileInputStream("src/test/resources/truststore.jceks")){
297295
trustStore.load(inputStream, null);
298-
} finally {
299-
inputStream.close();
300-
}
296+
}
301297

302298
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("PKIX");
303299
trustManagerFactory.init(trustStore);

‎src/test/java/redis/clients/jedis/tests/commands/StreamsCommandsTest.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,54 +39,54 @@ public class StreamsCommandsTest extends JedisCommandTestBase {
3939
public void xadd() {
4040

4141
try {
42-
Map<String,String> map1 = new HashMap<String, String>();
42+
Map<String,String> map1 = new HashMap<>();
4343
jedis.xadd("stream1", null, map1);
4444
fail();
4545
} catch (JedisDataException expected) {
4646
assertEquals("ERR wrong number of arguments for 'xadd' command", expected.getMessage());
4747
}
4848

49-
Map<String,String> map1 = new HashMap<String, String>();
49+
Map<String,String> map1 = new HashMap<>();
5050
map1.put("f1", "v1");
5151
StreamEntryID id1 = jedis.xadd("xadd-stream1", null, map1);
5252
assertNotNull(id1);
5353

54-
Map<String,String> map2 = new HashMap<String, String>();
54+
Map<String,String> map2 = new HashMap<>();
5555
map2.put("f1", "v1");
5656
map2.put("f2", "v2");
5757
StreamEntryID id2 = jedis.xadd("xadd-stream1", null, map2);
5858
assertTrue(id2.compareTo(id1) > 0);
5959

60-
Map<String,String> map3 = new HashMap<String, String>();
60+
Map<String,String> map3 = new HashMap<>();
6161
map3.put("f2", "v2");
6262
map3.put("f3", "v3");
6363
StreamEntryID id3 = jedis.xadd("xadd-stream2", null, map3);
6464

65-
Map<String,String> map4 = new HashMap<String, String>();
65+
Map<String,String> map4 = new HashMap<>();
6666
map4.put("f2", "v2");
6767
map4.put("f3", "v3");
6868
StreamEntryID idIn = new StreamEntryID(id3.getTime()+1, 1L);
6969
StreamEntryID id4 = jedis.xadd("xadd-stream2", idIn, map4);
7070
assertEquals(idIn, id4);
7171
assertTrue(id4.compareTo(id3) > 0);
7272

73-
Map<String,String> map5 = new HashMap<String, String>();
74-
map3.put("f4", "v4");
75-
map3.put("f5", "v5");
76-
StreamEntryID id5 = jedis.xadd("xadd-stream2", null, map3);
73+
Map<String,String> map5 = new HashMap<>();
74+
map5.put("f4", "v4");
75+
map5.put("f5", "v5");
76+
StreamEntryID id5 = jedis.xadd("xadd-stream2", null, map5);
7777
assertTrue(id5.compareTo(id4) > 0);
7878

79-
Map<String,String> map6 = new HashMap<String, String>();
80-
map3.put("f4", "v4");
81-
map3.put("f5", "v5");
82-
StreamEntryID id6 = jedis.xadd("xadd-stream2", null, map3, 3, false);
79+
Map<String,String> map6 = new HashMap<>();
80+
map6.put("f4", "v4");
81+
map6.put("f5", "v5");
82+
StreamEntryID id6 = jedis.xadd("xadd-stream2", null, map6, 3, false);
8383
assertTrue(id6.compareTo(id5) > 0);
8484
assertEquals(3L, jedis.xlen("xadd-stream2").longValue());
8585
}
8686

8787
@Test
8888
public void xdel() {
89-
Map<String,String> map1 = new HashMap<String, String>();
89+
Map<String,String> map1 = new HashMap<>();
9090
map1.put("f1", "v1");
9191

9292
StreamEntryID id1 = jedis.xadd("xdel-stream", null, map1);
@@ -105,7 +105,7 @@ public void xdel() {
105105
public void xlen() {
106106
assertEquals(0L, jedis.xlen("xlen-stream").longValue());
107107

108-
Map<String,String> map = new HashMap<String, String>();
108+
Map<String,String> map = new HashMap<>();
109109
map.put("f1", "v1");
110110
jedis.xadd("xlen-stream", null, map);
111111
assertEquals(1L, jedis.xlen("xlen-stream").longValue());
@@ -119,7 +119,7 @@ public void xrange() {
119119
List<StreamEntry> range = jedis.xrange("xrange-stream", (StreamEntryID)null, (StreamEntryID)null, Integer.MAX_VALUE);
120120
assertEquals(0, range.size());
121121

122-
Map<String,String> map = new HashMap<String, String>();
122+
Map<String,String> map = new HashMap<>();
123123
map.put("f1", "v1");
124124
StreamEntryID id1 = jedis.xadd("xrange-stream", null, map);
125125
StreamEntryID id2 = jedis.xadd("xrange-stream", null, map);
@@ -146,13 +146,13 @@ public void xrange() {
146146
@Test
147147
public void xread() {
148148

149-
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xread-stream1", new StreamEntryID());
149+
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<>("xread-stream1", new StreamEntryID());
150150

151151
// Empty Stream
152152
List<Entry<String, List<StreamEntry>>> range = jedis.xread(1, 1L, streamQeury1);
153153
assertEquals(0, range.size());
154154

155-
Map<String,String> map = new HashMap<String, String>();
155+
Map<String,String> map = new HashMap<>();
156156
map.put("f1", "v1");
157157
StreamEntryID id1 = jedis.xadd("xread-stream1", null, map);
158158
StreamEntryID id2 = jedis.xadd("xread-stream2", null, map);
@@ -162,8 +162,8 @@ public void xread() {
162162
assertEquals(1, streams1.size());
163163

164164
// Read from two Streams
165-
Entry<String, StreamEntryID> streamQuery2 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xread-stream1", new StreamEntryID());
166-
Entry<String, StreamEntryID> streamQuery3 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xread-stream2", new StreamEntryID());
165+
Entry<String, StreamEntryID> streamQuery2 = new AbstractMap.SimpleImmutableEntry<>("xread-stream1", new StreamEntryID());
166+
Entry<String, StreamEntryID> streamQuery3 = new AbstractMap.SimpleImmutableEntry<>("xread-stream2", new StreamEntryID());
167167
List<Entry<String, List<StreamEntry>>> streams2 = jedis.xread(2, 1L, streamQuery2, streamQuery3);
168168
assertEquals(2, streams2.size());
169169

@@ -190,7 +190,7 @@ public void xrevrange() {
190190
List<StreamEntry> range = jedis.xrevrange("xrevrange-stream", (StreamEntryID)null, (StreamEntryID)null, Integer.MAX_VALUE);
191191
assertEquals(0, range.size());
192192

193-
Map<String,String> map = new HashMap<String, String>();
193+
Map<String,String> map = new HashMap<>();
194194
map.put("f1", "v1");
195195
StreamEntryID id1 = jedis.xadd("xrevrange-stream", null, map);
196196
StreamEntryID id2 = jedis.xadd("xrevrange-stream", null, map);
@@ -286,7 +286,7 @@ public void xack() {
286286

287287
String status = jedis.xgroupCreate("xack-stream", "xack-group", null, false);
288288

289-
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xack-stream", StreamEntryID.UNRECEIVED_ENTRY);
289+
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<>("xack-stream", StreamEntryID.UNRECEIVED_ENTRY);
290290

291291
// Empty Stream
292292
List<Entry<String, List<StreamEntry>>> range = jedis.xreadGroup("xack-group", "xack-consumer", 1, 1L, false, streamQeury1);
@@ -304,7 +304,7 @@ public void xpendeing() {
304304
assertEquals("OK", jedis.xgroupCreate("xpendeing-stream", "xpendeing-group", null, false));
305305

306306

307-
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<String, StreamEntryID>("xpendeing-stream", StreamEntryID.UNRECEIVED_ENTRY);
307+
Entry<String, StreamEntryID> streamQeury1 = new AbstractMap.SimpleImmutableEntry<>("xpendeing-stream", StreamEntryID.UNRECEIVED_ENTRY);
308308

309309
// Read the event from Stream put it on pending
310310
List<Entry<String, List<StreamEntry>>> range = jedis.xreadGroup("xpendeing-group", "xpendeing-consumer", 1, 1L, false, streamQeury1);

0 commit comments

Comments
 (0)