diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
index a30904902..55af4c6e6 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java
@@ -417,7 +417,7 @@ public interface ReactiveRedisConnection extends Closeable {
 	 */
 	class AbsentByteBufferResponse<I> extends ByteBufferResponse<I> {
 
-		private final static ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
+		private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
 
 		public AbsentByteBufferResponse(I input) {
 			super(input, EMPTY_BYTE_BUFFER);
diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
index 9e5dc89fe..93dcf646f 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
@@ -92,7 +92,7 @@ import org.springframework.util.ObjectUtils;
 public class JedisConnectionFactory
 		implements RedisConnectionFactory, InitializingBean, DisposableBean, SmartLifecycle {
 
-	private final static Log log = LogFactory.getLog(JedisConnectionFactory.class);
+	private static final Log log = LogFactory.getLog(JedisConnectionFactory.class);
 	private static final ExceptionTranslationStrategy EXCEPTION_TRANSLATION = new PassThroughExceptionTranslationStrategy(
 			JedisExceptionConverter.INSTANCE);
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
index 1b36fb1f5..41cf19ccb 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
@@ -60,7 +60,7 @@ import org.springframework.util.Assert;
  */
 class LettucePoolingConnectionProvider implements LettuceConnectionProvider, RedisClientProvider, DisposableBean {
 
-	private final static Log log = LogFactory.getLog(LettucePoolingConnectionProvider.class);
+	private static final Log log = LogFactory.getLog(LettucePoolingConnectionProvider.class);
 
 	private final LettuceConnectionProvider connectionProvider;
 	private final GenericObjectPoolConfig poolConfig;
diff --git a/src/main/java/org/springframework/data/redis/core/RedisCommand.java b/src/main/java/org/springframework/data/redis/core/RedisCommand.java
index 0bd33bc64..dc52746c8 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisCommand.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisCommand.java
@@ -222,7 +222,7 @@ public enum RedisCommand {
 	private int minArgs = -1;
 	private int maxArgs = -1;
 
-	private final static Map<String, RedisCommand> commandLookup;
+	private static final Map<String, RedisCommand> commandLookup;
 
 	static {
 		commandLookup = buildCommandLookupTable();
diff --git a/src/main/java/org/springframework/data/redis/core/StreamObjectMapper.java b/src/main/java/org/springframework/data/redis/core/StreamObjectMapper.java
index 36c766790..3d62f1d1a 100644
--- a/src/main/java/org/springframework/data/redis/core/StreamObjectMapper.java
+++ b/src/main/java/org/springframework/data/redis/core/StreamObjectMapper.java
@@ -47,8 +47,8 @@ import org.springframework.util.Assert;
  */
 class StreamObjectMapper {
 
-	private final static RedisCustomConversions customConversions = new RedisCustomConversions();
-	private final static ConversionService conversionService;
+	private static final RedisCustomConversions customConversions = new RedisCustomConversions();
+	private static final ConversionService conversionService;
 
 	private final HashMapper<Object, Object, Object> mapper;
 	private final @Nullable HashMapper<Object, Object, Object> objectHashMapper;
diff --git a/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java b/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
index 4567297be..b2566e910 100644
--- a/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
+++ b/src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java
@@ -30,10 +30,10 @@ import org.springframework.util.Assert;
  */
 class RedisSerializerToSerializationPairAdapter<T> implements SerializationPair<T> {
 
-	private final static RedisSerializerToSerializationPairAdapter<?> BYTE_BUFFER = new RedisSerializerToSerializationPairAdapter<>(
+	private static final RedisSerializerToSerializationPairAdapter<?> BYTE_BUFFER = new RedisSerializerToSerializationPairAdapter<>(
 			null);
 
-	private final static RedisSerializerToSerializationPairAdapter<byte[]> BYTE_ARRAY = new RedisSerializerToSerializationPairAdapter<>(
+	private static final RedisSerializerToSerializationPairAdapter<byte[]> BYTE_ARRAY = new RedisSerializerToSerializationPairAdapter<>(
 			RedisSerializer.byteArray());
 
 	private final DefaultSerializationPair pair;
diff --git a/src/test/java/org/springframework/data/redis/SettingsUtils.java b/src/test/java/org/springframework/data/redis/SettingsUtils.java
index 4b6b34ee0..22e3515fc 100644
--- a/src/test/java/org/springframework/data/redis/SettingsUtils.java
+++ b/src/test/java/org/springframework/data/redis/SettingsUtils.java
@@ -34,7 +34,7 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
  */
 public abstract class SettingsUtils {
 
-	private final static Properties DEFAULTS = new Properties();
+	private static final Properties DEFAULTS = new Properties();
 	private static final Properties SETTINGS;
 
 	static {
diff --git a/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java b/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java
index 5c583304f..a52273188 100644
--- a/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java
+++ b/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java
@@ -54,7 +54,7 @@ import org.springframework.data.redis.test.extension.parametrized.ParameterizedR
 @MethodSource("testParams")
 public class LegacyRedisCacheTests {
 
-	private final static String CACHE_NAME = "testCache";
+	private static final String CACHE_NAME = "testCache";
 	private ObjectFactory<Object> keyFactory;
 	private ObjectFactory<Object> valueFactory;
 	private RedisConnectionFactory connectionFactory;
diff --git a/src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java b/src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java
index d9dc3e4e7..29951d092 100644
--- a/src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java
+++ b/src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java
@@ -25,7 +25,7 @@ import com.thoughtworks.xstream.security.AnyTypePermission;
  */
 public final class XstreamOxmSerializerSingleton {
 
-	private final static XstreamOxmSerializerSingleton instance = new XstreamOxmSerializerSingleton();
+	private static final XstreamOxmSerializerSingleton instance = new XstreamOxmSerializerSingleton();
 
 	private final OxmSerializer serializer;
 
diff --git a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java b/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java
index b0306ca6a..ec8897609 100644
--- a/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java
+++ b/src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java
@@ -42,7 +42,7 @@ import org.springframework.data.redis.ConnectionFactoryTracker.Managed;
  */
 class MethodArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<MethodSource> {
 
-	private final static Namespace NAMESPACE = Namespace.create(MethodArgumentsProvider.class);
+	private static final Namespace NAMESPACE = Namespace.create(MethodArgumentsProvider.class);
 	private String[] methodNames = new String[0];
 
 	@Override