Polishing #871

Align static final declarations, switch final static to static final.

src/main/java/io/lettuce/core/PlainChannelInitializer.java

@@ -40,7 +40,7 @@
  */
 class PlainChannelInitializer extends io.netty.channel.ChannelInitializer<Channel> implements RedisChannelInitializer {
 
-    final static Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
+    static final Supplier<AsyncCommand<?, ?, ?>> NO_PING = () -> null;
 
     private final Supplier<List<ChannelHandler>> handlers;
     private final Supplier<AsyncCommand<?, ?, ?>> pingCommandSupplier;

src/main/java/io/lettuce/core/Range.java

@@ -168,7 +168,7 @@ public String toString() {
      */
     public static class Boundary<T> {
 
-        private final static Boundary<?> UNBOUNDED = new Boundary<>(null, true);
+        private static final Boundary<?> UNBOUNDED = new Boundary<>(null, true);
 
         private final T value;
         private final boolean including;

src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java

@@ -428,8 +428,8 @@ static class SlotIntent {
 
         final int slotHash;
         final Intent intent;
-        private final static SlotIntent[] READ;
-        private final static SlotIntent[] WRITE;
+        private static final SlotIntent[] READ;
+        private static final SlotIntent[] WRITE;
 
         static {
             READ = new SlotIntent[SlotHash.SLOT_COUNT];

src/main/java/io/lettuce/core/dynamic/BatchTasks.java

@@ -29,7 +29,7 @@
  */
 class BatchTasks implements Iterable<RedisCommand<?, ?, ?>> {
 
-    public final static BatchTasks EMPTY = new BatchTasks(Collections.emptyList());
+    public static final BatchTasks EMPTY = new BatchTasks(Collections.emptyList());
 
     private final List<RedisCommand<?, ?, ?>> futures;
 

src/main/java/io/lettuce/core/dynamic/codec/AnnotationRedisCodecResolver.java

@@ -226,9 +226,9 @@ public int compareTo(Voted<?> o) {
      */
     protected static class ParameterWrappers {
 
-        private final static Set<Class<?>> WRAPPERS = new HashSet<>();
-        private final static Set<Class<?>> WITH_KEY_TYPE = new HashSet<>();
-        private final static Set<Class<?>> WITH_VALUE_TYPE = new HashSet<>();
+        private static final Set<Class<?>> WRAPPERS = new HashSet<>();
+        private static final Set<Class<?>> WITH_KEY_TYPE = new HashSet<>();
+        private static final Set<Class<?>> WITH_VALUE_TYPE = new HashSet<>();
 
         static {
 

src/main/java/io/lettuce/core/dynamic/output/OutputRegistry.java

@@ -38,7 +38,7 @@
 @SuppressWarnings("rawtypes")
 public class OutputRegistry {
 
-    private final static Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
+    private static final Map<OutputType, CommandOutputFactory> BUILTIN = new LinkedHashMap<>();
     private final Map<OutputType, CommandOutputFactory> registry = new LinkedHashMap<>();
 
     static {

src/main/java/io/lettuce/core/internal/AbstractInvocationHandler.java

@@ -155,7 +155,7 @@ private static boolean isProxyOfSameInterfaces(Object arg, Class<?> proxyClass)
 
     protected static class MethodTranslator {
 
-        private final static WeakHashMap<Class<?>, MethodTranslator> TRANSLATOR_MAP = new WeakHashMap<>(32);
+        private static final WeakHashMap<Class<?>, MethodTranslator> TRANSLATOR_MAP = new WeakHashMap<>(32);
         private final Map<Method, Method> map;
 
         private MethodTranslator(Class<?> delegate, Class<?>... methodSources) {

src/main/java/io/lettuce/core/internal/AsyncConnectionProvider.java

@@ -207,7 +207,7 @@ static class Sync<K, T extends AsyncCloseable, F extends CompletionStage<T>> {
         private static final int PHASE_CANCELED = 3;
 
         @SuppressWarnings({ "rawtypes", "unchecked" })
-        private final static AtomicIntegerFieldUpdater<Sync> PHASE = AtomicIntegerFieldUpdater.newUpdater(Sync.class, "phase");
+        private static final AtomicIntegerFieldUpdater<Sync> PHASE = AtomicIntegerFieldUpdater.newUpdater(Sync.class, "phase");
 
         // Updated with AtomicIntegerFieldUpdater
         @SuppressWarnings("unused")

src/main/java/io/lettuce/core/internal/DefaultMethods.java

@@ -33,7 +33,7 @@
  */
 public class DefaultMethods {
 
-    private final static MethodHandleLookup methodHandleLookup = MethodHandleLookup.getMethodHandleLookup();
+    private static final MethodHandleLookup methodHandleLookup = MethodHandleLookup.getMethodHandleLookup();
 
     /**
      * Lookup a {@link MethodHandle} for a default {@link Method}.

src/main/java/io/lettuce/core/output/ListSubscriber.java

@@ -27,7 +27,7 @@
  */
 class ListSubscriber<T> extends Subscriber<T> {
 
-    private final static ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
+    private static final ListSubscriber<Object> INSTANCE = new ListSubscriber<>();
 
     private ListSubscriber() {
     }

src/main/java/io/lettuce/core/protocol/Command.java

@@ -32,9 +32,9 @@
  */
 public class Command<K, V, T> implements RedisCommand<K, V, T> {
 
-    protected final static byte ST_INITIAL = 0;
-    protected final static byte ST_COMPLETED = 1;
-    protected final static byte ST_CANCELLED = 2;
+    protected static final byte ST_INITIAL = 0;
+    protected static final byte ST_COMPLETED = 1;
+    protected static final byte ST_CANCELLED = 2;
 
     private final ProtocolKeyword type;
 

src/main/java/io/lettuce/core/protocol/CommandWrapper.java

@@ -31,11 +31,11 @@
 public class CommandWrapper<K, V, T> implements RedisCommand<K, V, T>, CompleteableCommand<T>, DecoratedCommand<K, V, T> {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static AtomicReferenceFieldUpdater<CommandWrapper, Object[]> ONCOMPLETE = AtomicReferenceFieldUpdater
+    private static final AtomicReferenceFieldUpdater<CommandWrapper, Object[]> ONCOMPLETE = AtomicReferenceFieldUpdater
             .newUpdater(CommandWrapper.class, Object[].class, "onComplete");
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    private final static Object[] EMPTY = new Object[0];
+    private static final Object[] EMPTY = new Object[0];
 
     protected final RedisCommand<K, V, T> command;
 

src/test/java/io/lettuce/apigenerator/Constants.java

@@ -22,11 +22,11 @@
  */
 class Constants {
 
-    public final static String[] TEMPLATE_NAMES = { "BaseRedisCommands", "RedisGeoCommands", "RedisHashCommands",
+    public static final String[] TEMPLATE_NAMES = { "BaseRedisCommands", "RedisGeoCommands", "RedisHashCommands",
             "RedisHLLCommands", "RedisKeyCommands", "RedisListCommands", "RedisScriptingCommands", "RedisSentinelCommands",
             "RedisServerCommands", "RedisSetCommands", "RedisSortedSetCommands", "RedisStreamCommands", "RedisStringCommands",
             "RedisTransactionalCommands" };
 
-    public final static File TEMPLATES = new File("src/main/templates");
-    public final static File SOURCES = new File("src/main/java");
+    public static final File TEMPLATES = new File("src/main/templates");
+    public static final File SOURCES = new File("src/main/java");
 }

src/test/java/io/lettuce/core/ConnectionCommandTest.java → src/test/java/io/lettuce/core/ConnectionCommandIntegrationTests.java

@@ -40,16 +40,14 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class ConnectionCommandTest extends TestSupport {
+class ConnectionCommandIntegrationTests extends TestSupport {
 
     private final RedisClient client;
-    private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
-    ConnectionCommandTest(RedisClient client, StatefulRedisConnection<String, String> connection) {
+    ConnectionCommandIntegrationTests(RedisClient client, StatefulRedisConnection<String, String> connection) {
         this.client = client;
-        this.connection = connection;
         this.redis = connection.sync();
     }
 

src/test/java/io/lettuce/core/PipeliningIntegrationTests.java

@@ -23,7 +23,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -35,6 +37,7 @@
  */
 @SuppressWarnings("rawtypes")
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class PipeliningIntegrationTests extends TestSupport {
 
     private final RedisClient client;
@@ -46,6 +49,11 @@ class PipeliningIntegrationTests extends TestSupport {
         this.connection = connection;
     }
 
+    @BeforeEach
+    void setUp() {
+        this.connection.async().flushall();
+    }
+
     @Test
     void basic() {
 

src/test/java/io/lettuce/core/ReactiveConnectionIntegrationTests.java

@@ -27,7 +27,9 @@
 import javax.enterprise.inject.New;
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -43,6 +45,7 @@
 import io.lettuce.test.Wait;
 
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ReactiveConnectionIntegrationTests extends TestSupport {
 
     private final StatefulRedisConnection<String, String> connection;
@@ -54,7 +57,11 @@ class ReactiveConnectionIntegrationTests extends TestSupport {
         this.connection = connection;
         this.redis = connection.sync();
         this.reactive = connection.reactive();
-        this.redis.flushall();
+    }
+
+    @BeforeEach
+    void setUp() {
+        this.connection.async().flushall();
     }
 
     @Test

src/test/java/io/lettuce/core/ReactiveStreamingOutputIntegrationTests.java

@@ -22,7 +22,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.test.StepVerifier;
@@ -38,6 +40,7 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ReactiveStreamingOutputIntegrationTests extends TestSupport {
 
     private final RedisCommands<String, String> redis;
@@ -49,6 +52,11 @@ class ReactiveStreamingOutputIntegrationTests extends TestSupport {
         this.reactive = connection.reactive();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void keyListCommandShouldReturnAllElements() {
 

src/test/java/io/lettuce/core/RedisClientFactoryUnitTests.java

@@ -29,8 +29,8 @@
  */
 class RedisClientFactoryUnitTests {
 
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+    private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private static final RedisURI REDIS_URI = RedisURI.create(URI);
 
     @Test
     void plain() {

src/test/java/io/lettuce/core/ScanIteratorIntegrationTests.java

@@ -25,7 +25,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -37,17 +39,21 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ScanIteratorIntegrationTests extends TestSupport {
 
-    private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
     ScanIteratorIntegrationTests(StatefulRedisConnection<String, String> connection) {
-        this.connection = connection;
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void scanShouldThrowNoSuchElementExceptionOnEmpty() {
 

src/test/java/io/lettuce/core/ScanStreamTest.java → src/test/java/io/lettuce/core/ScanStreamIntegrationTests.java

@@ -20,7 +20,9 @@
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import reactor.core.publisher.Flux;
@@ -34,17 +36,23 @@
  * @author Mark Paluch
  */
 @ExtendWith(LettuceExtension.class)
-class ScanStreamTest extends TestSupport {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ScanStreamIntegrationTests extends TestSupport {
 
     private final StatefulRedisConnection<String, String> connection;
     private final RedisCommands<String, String> redis;
 
     @Inject
-    ScanStreamTest(StatefulRedisConnection<String, String> connection) {
+    ScanStreamIntegrationTests(StatefulRedisConnection<String, String> connection) {
         this.connection = connection;
         this.redis = connection.sync();
     }
 
+    @BeforeEach
+    void setUp() {
+        this.redis.flushall();
+    }
+
     @Test
     void shouldScanIteratively() {
 

src/test/java/io/lettuce/core/SyncAsyncApiConvergenceTest.java → src/test/java/io/lettuce/core/SyncAsyncApiConvergenceUnitTests.java

@@ -32,7 +32,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-class SyncAsyncApiConvergenceTest {
+class SyncAsyncApiConvergenceUnitTests {
 
     @SuppressWarnings("rawtypes")
     private Class<RedisAsyncCommands> asyncClass = RedisAsyncCommands.class;

src/test/java/io/lettuce/core/cluster/RedisClusterClientFactoryTests.java

@@ -33,8 +33,8 @@
  */
 class RedisClusterClientFactoryTests {
 
-    private final static String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
-    private final static RedisURI REDIS_URI = RedisURI.create(URI);
+    private static final String URI = "redis://" + TestSettings.host() + ":" + TestSettings.port();
+    private static final RedisURI REDIS_URI = RedisURI.create(URI);
     private static final List<RedisURI> REDIS_URIS = LettuceLists.newList(REDIS_URI);
 
     @Test