From 5f01d7bc62d7221d4901a87cc8b7ec60f50c1d62 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Wed, 20 Nov 2019 17:51:57 +0100 Subject: [PATCH] Minor. Declaring modifiers in correct order: The Java Language Specification and convention states that static ought to be listed before the final modifier (https://docs.oracle.com/javase/specs/jls/se11/html/jls-8.html#jls-8.1.1) --- - | 10 ---------- src/main/java/redis/clients/jedis/ScanParams.java | 4 ++-- .../java/redis/clients/jedis/ShardedJedisPipeline.java | 4 ++-- 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 - diff --git a/- b/- deleted file mode 100644 index 5d19798088..0000000000 --- a/- +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by CONFIG REWRITE -daemonize yes -pidfile "/tmp/redis7.pid" -port 6385 -logfile "/tmp/redis7.log" -dir "/home/maskn/warez/java/gitClones/jedis" -masterauth "foobared" -requirepass "foobared" -protected-mode no -slaveof 127.0.0.1 6384 diff --git a/src/main/java/redis/clients/jedis/ScanParams.java b/src/main/java/redis/clients/jedis/ScanParams.java index 4724076553..04bea4a47c 100644 --- a/src/main/java/redis/clients/jedis/ScanParams.java +++ b/src/main/java/redis/clients/jedis/ScanParams.java @@ -19,8 +19,8 @@ public class ScanParams { private final Map params = new EnumMap(Keyword.class); - public final static String SCAN_POINTER_START = String.valueOf(0); - public final static byte[] SCAN_POINTER_START_BINARY = SafeEncoder.encode(SCAN_POINTER_START); + public static final String SCAN_POINTER_START = String.valueOf(0); + public static final byte[] SCAN_POINTER_START_BINARY = SafeEncoder.encode(SCAN_POINTER_START); public ScanParams match(final byte[] pattern) { params.put(MATCH, ByteBuffer.wrap(pattern)); diff --git a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java index a3007718e2..443353ec4a 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java +++ b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java @@ -7,8 +7,8 @@ public class ShardedJedisPipeline extends PipelineBase { private BinaryShardedJedis jedis; - private List results = new ArrayList(); - private Queue clients = new LinkedList(); + private List results = new ArrayList<>(); + private Queue clients = new LinkedList<>(); private static class FutureResult { private Client client;