From 9a6fbf59c5fba6b44da7c946aa644c3a71aec21c Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sat, 10 Feb 2018 02:07:15 +0300 Subject: [PATCH] Polish: follow name convention - make immutable fields final --- ...ntiationModelAwarePointcutAdvisorImpl.java | 2 +- .../aop/support/Pointcuts.java | 4 +-- .../support/AutowireCandidateQualifier.java | 2 +- .../org/springframework/core/io/VfsUtils.java | 36 +++++++++---------- .../expression/spel/ast/Operator.java | 4 +-- .../expression/spel/ast/SpelNodeImpl.java | 2 +- .../jdbc/object/BatchSqlUpdate.java | 2 +- .../jms/support/SimpleJmsHeaderMapper.java | 2 +- .../broker/AbstractSubscriptionRegistry.java | 2 +- .../test/web/servlet/MockMvc.java | 2 +- .../ServletServerHttpAsyncRequestControl.java | 2 +- .../context/request/ServletWebRequest.java | 2 +- .../StompSubProtocolErrorHandler.java | 2 +- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java index 85c49d46e8..d6e06e5bc7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java @@ -45,7 +45,7 @@ import org.springframework.lang.Nullable; class InstantiationModelAwarePointcutAdvisorImpl implements InstantiationModelAwarePointcutAdvisor, AspectJPrecedenceInformation, Serializable { - private static Advice EMPTY_ADVICE = new Advice() {}; + private static final Advice EMPTY_ADVICE = new Advice() {}; private final AspectJExpressionPointcut declaredPointcut; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java index ddc4495cd6..42475d9bb8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java @@ -95,7 +95,7 @@ public abstract class Pointcuts { @SuppressWarnings("serial") private static class SetterPointcut extends StaticMethodMatcherPointcut implements Serializable { - public static SetterPointcut INSTANCE = new SetterPointcut(); + public static final SetterPointcut INSTANCE = new SetterPointcut(); @Override public boolean matches(Method method, @Nullable Class targetClass) { @@ -116,7 +116,7 @@ public abstract class Pointcuts { @SuppressWarnings("serial") private static class GetterPointcut extends StaticMethodMatcherPointcut implements Serializable { - public static GetterPointcut INSTANCE = new GetterPointcut(); + public static final GetterPointcut INSTANCE = new GetterPointcut(); @Override public boolean matches(Method method, @Nullable Class targetClass) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java index f5991ac930..9674e5ccb6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; @SuppressWarnings("serial") public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor { - public static String VALUE_KEY = "value"; + public static final String VALUE_KEY = "value"; private final String typeName; diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java index dddf8bfd18..3eea2f8d9d 100644 --- a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java @@ -47,24 +47,24 @@ public abstract class VfsUtils { private static final String VFS3_PKG = "org.jboss.vfs."; private static final String VFS_NAME = "VFS"; - private static Method VFS_METHOD_GET_ROOT_URL; - private static Method VFS_METHOD_GET_ROOT_URI; - - private static Method VIRTUAL_FILE_METHOD_EXISTS; - private static Method VIRTUAL_FILE_METHOD_GET_INPUT_STREAM; - private static Method VIRTUAL_FILE_METHOD_GET_SIZE; - private static Method VIRTUAL_FILE_METHOD_GET_LAST_MODIFIED; - private static Method VIRTUAL_FILE_METHOD_TO_URL; - private static Method VIRTUAL_FILE_METHOD_TO_URI; - private static Method VIRTUAL_FILE_METHOD_GET_NAME; - private static Method VIRTUAL_FILE_METHOD_GET_PATH_NAME; - private static Method VIRTUAL_FILE_METHOD_GET_CHILD; - - protected static Class VIRTUAL_FILE_VISITOR_INTERFACE; - protected static Method VIRTUAL_FILE_METHOD_VISIT; - - private static Field VISITOR_ATTRIBUTES_FIELD_RECURSE; - private static Method GET_PHYSICAL_FILE; + private static final Method VFS_METHOD_GET_ROOT_URL; + private static final Method VFS_METHOD_GET_ROOT_URI; + + private static final Method VIRTUAL_FILE_METHOD_EXISTS; + private static final Method VIRTUAL_FILE_METHOD_GET_INPUT_STREAM; + private static final Method VIRTUAL_FILE_METHOD_GET_SIZE; + private static final Method VIRTUAL_FILE_METHOD_GET_LAST_MODIFIED; + private static final Method VIRTUAL_FILE_METHOD_TO_URL; + private static final Method VIRTUAL_FILE_METHOD_TO_URI; + private static final Method VIRTUAL_FILE_METHOD_GET_NAME; + private static final Method VIRTUAL_FILE_METHOD_GET_PATH_NAME; + private static final Method VIRTUAL_FILE_METHOD_GET_CHILD; + + protected static final Class VIRTUAL_FILE_VISITOR_INTERFACE; + protected static final Method VIRTUAL_FILE_METHOD_VISIT; + + private static final Field VISITOR_ATTRIBUTES_FIELD_RECURSE; + private static final Method GET_PHYSICAL_FILE; static { ClassLoader loader = VfsUtils.class.getClassLoader(); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java index 90d345334f..9bbadb372c 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java @@ -238,9 +238,9 @@ public abstract class Operator extends SpelNodeImpl { */ protected static class DescriptorComparison { - static DescriptorComparison NOT_NUMBERS = new DescriptorComparison(false, false, ' '); + static final DescriptorComparison NOT_NUMBERS = new DescriptorComparison(false, false, ' '); - static DescriptorComparison INCOMPATIBLE_NUMBERS = new DescriptorComparison(true, false, ' '); + static final DescriptorComparison INCOMPATIBLE_NUMBERS = new DescriptorComparison(true, false, ' '); final boolean areNumbers; // Were the two compared descriptor both for numbers? diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java index 06a843f483..0143c9d257 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java @@ -44,7 +44,7 @@ import org.springframework.util.ObjectUtils; */ public abstract class SpelNodeImpl implements SpelNode, Opcodes { - private static SpelNodeImpl[] NO_CHILDREN = new SpelNodeImpl[0]; + private static final SpelNodeImpl[] NO_CHILDREN = new SpelNodeImpl[0]; protected int pos; // start = top 16bits, end = bottom 16bits diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java index bd2ff06d95..c51c7c58f7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java @@ -48,7 +48,7 @@ public class BatchSqlUpdate extends SqlUpdate { /** * Default number of inserts to accumulate before commiting a batch (5000). */ - public static int DEFAULT_BATCH_SIZE = 5000; + public static final int DEFAULT_BATCH_SIZE = 5000; private int batchSize = DEFAULT_BATCH_SIZE; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java index 4909821cdd..3ba0150018 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; */ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper implements JmsHeaderMapper { - private static Set> SUPPORTED_PROPERTY_TYPES = new HashSet<>(Arrays.asList(new Class[] { + private static final Set> SUPPORTED_PROPERTY_TYPES = new HashSet<>(Arrays.asList(new Class[] { Boolean.class, Byte.class, Double.class, Float.class, Integer.class, Long.class, Short.class, String.class})); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java index 7a8903e091..e12655de4a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java @@ -37,7 +37,7 @@ import org.springframework.util.MultiValueMap; */ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegistry { - private static MultiValueMap EMPTY_MAP = + private static final MultiValueMap EMPTY_MAP = CollectionUtils.unmodifiableMultiValueMap(new LinkedMultiValueMap<>(0)); protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java index 76b884a7cc..cac1ad5d33 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java @@ -65,7 +65,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; */ public final class MockMvc { - static String MVC_RESULT_ATTRIBUTE = MockMvc.class.getName().concat(".MVC_RESULT_ATTRIBUTE"); + static final String MVC_RESULT_ATTRIBUTE = MockMvc.class.getName().concat(".MVC_RESULT_ATTRIBUTE"); private final TestDispatcherServlet servlet; diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java index 68ec1f8a50..2387524bff 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; */ public class ServletServerHttpAsyncRequestControl implements ServerHttpAsyncRequestControl, AsyncListener { - private static long NO_TIMEOUT_VALUE = Long.MIN_VALUE; + private static final long NO_TIMEOUT_VALUE = Long.MIN_VALUE; private final ServletServerHttpRequest request; diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index 9d2bcdde7b..4c13fae123 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -78,7 +78,7 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ "EEE MMM dd HH:mm:ss yyyy" }; - private static TimeZone GMT = TimeZone.getTimeZone("GMT"); + private static final TimeZone GMT = TimeZone.getTimeZone("GMT"); private boolean notModified = false; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java index 68201480d1..bb4d032502 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; */ public class StompSubProtocolErrorHandler implements SubProtocolErrorHandler { - private static byte[] EMPTY_PAYLOAD = new byte[0]; + private static final byte[] EMPTY_PAYLOAD = new byte[0]; @Override