Skip to content

Commit 95d5b82

Browse files
thachlpmp911de
authored andcommitted
Fix misordered 'final static' modifiers.
Per the Java Language Specification (Java 17; https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.3.1), 'static' should appear before 'final'. This is also consistent with source code analysis tools, like Checkstyle, rules: https://checkstyle.sourceforge.io/apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html. Original pull request: #2640
1 parent b8a9d5f commit 95d5b82

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

src/main/java/org/springframework/data/redis/connection/ReactiveRedisConnection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public ByteBufferResponse(I input, @Nullable ByteBuffer output) {
417417
*/
418418
class AbsentByteBufferResponse<I> extends ByteBufferResponse<I> {
419419

420-
private final static ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
420+
private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
421421

422422
public AbsentByteBufferResponse(I input) {
423423
super(input, EMPTY_BYTE_BUFFER);

src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
public class JedisConnectionFactory
9393
implements RedisConnectionFactory, InitializingBean, DisposableBean, SmartLifecycle {
9494

95-
private final static Log log = LogFactory.getLog(JedisConnectionFactory.class);
95+
private static final Log log = LogFactory.getLog(JedisConnectionFactory.class);
9696
private static final ExceptionTranslationStrategy EXCEPTION_TRANSLATION = new PassThroughExceptionTranslationStrategy(
9797
JedisExceptionConverter.INSTANCE);
9898

src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
class LettucePoolingConnectionProvider implements LettuceConnectionProvider, RedisClientProvider, DisposableBean {
6262

63-
private final static Log log = LogFactory.getLog(LettucePoolingConnectionProvider.class);
63+
private static final Log log = LogFactory.getLog(LettucePoolingConnectionProvider.class);
6464

6565
private final LettuceConnectionProvider connectionProvider;
6666
private final GenericObjectPoolConfig poolConfig;

src/main/java/org/springframework/data/redis/core/RedisCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public enum RedisCommand {
222222
private int minArgs = -1;
223223
private int maxArgs = -1;
224224

225-
private final static Map<String, RedisCommand> commandLookup;
225+
private static final Map<String, RedisCommand> commandLookup;
226226

227227
static {
228228
commandLookup = buildCommandLookupTable();

src/main/java/org/springframework/data/redis/core/StreamObjectMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
*/
4848
class StreamObjectMapper {
4949

50-
private final static RedisCustomConversions customConversions = new RedisCustomConversions();
51-
private final static ConversionService conversionService;
50+
private static final RedisCustomConversions customConversions = new RedisCustomConversions();
51+
private static final ConversionService conversionService;
5252

5353
private final HashMapper<Object, Object, Object> mapper;
5454
private final @Nullable HashMapper<Object, Object, Object> objectHashMapper;

src/main/java/org/springframework/data/redis/serializer/RedisSerializerToSerializationPairAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
*/
3131
class RedisSerializerToSerializationPairAdapter<T> implements SerializationPair<T> {
3232

33-
private final static RedisSerializerToSerializationPairAdapter<?> BYTE_BUFFER = new RedisSerializerToSerializationPairAdapter<>(
33+
private static final RedisSerializerToSerializationPairAdapter<?> BYTE_BUFFER = new RedisSerializerToSerializationPairAdapter<>(
3434
null);
3535

36-
private final static RedisSerializerToSerializationPairAdapter<byte[]> BYTE_ARRAY = new RedisSerializerToSerializationPairAdapter<>(
36+
private static final RedisSerializerToSerializationPairAdapter<byte[]> BYTE_ARRAY = new RedisSerializerToSerializationPairAdapter<>(
3737
RedisSerializer.byteArray());
3838

3939
private final DefaultSerializationPair pair;

src/test/java/org/springframework/data/redis/SettingsUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
public abstract class SettingsUtils {
3636

37-
private final static Properties DEFAULTS = new Properties();
37+
private static final Properties DEFAULTS = new Properties();
3838
private static final Properties SETTINGS;
3939

4040
static {

src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@MethodSource("testParams")
5555
public class LegacyRedisCacheTests {
5656

57-
private final static String CACHE_NAME = "testCache";
57+
private static final String CACHE_NAME = "testCache";
5858
private ObjectFactory<Object> keyFactory;
5959
private ObjectFactory<Object> valueFactory;
6060
private RedisConnectionFactory connectionFactory;

src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
public final class XstreamOxmSerializerSingleton {
2727

28-
private final static XstreamOxmSerializerSingleton instance = new XstreamOxmSerializerSingleton();
28+
private static final XstreamOxmSerializerSingleton instance = new XstreamOxmSerializerSingleton();
2929

3030
private final OxmSerializer serializer;
3131

src/test/java/org/springframework/data/redis/test/extension/parametrized/MethodArgumentsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
class MethodArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<MethodSource> {
4444

45-
private final static Namespace NAMESPACE = Namespace.create(MethodArgumentsProvider.class);
45+
private static final Namespace NAMESPACE = Namespace.create(MethodArgumentsProvider.class);
4646
private String[] methodNames = new String[0];
4747

4848
@Override

0 commit comments

Comments
 (0)