From 0f7485b01d1d52492dc5b6f4501d8b8c9ca21bdd Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Thu, 8 Mar 2018 19:36:00 +0300 Subject: [PATCH] Polish: reorder the modifiers to comply with the Java Language Specification. --- .../aop/aspectj/AbstractAspectJAdvice.java | 2 +- .../aop/aspectj/RuntimeTestWalker.java | 2 +- .../DefaultAdvisorAutoProxyCreator.java | 2 +- ...nitDestroyAnnotationBeanPostProcessor.java | 2 +- .../factory/annotation/InjectionMetadata.java | 2 +- ...AbstractFallbackJCacheOperationSource.java | 2 +- .../mail/MailSendException.java | 2 +- .../AbstractFallbackCacheOperationSource.java | 2 +- .../CommonAnnotationBeanPostProcessor.java | 2 +- .../index/CandidateComponentsIndex.java | 2 +- .../support/ApplicationListenerDetector.java | 4 +- .../org/springframework/asm/TypePath.java | 8 +- .../NumberToNumberConverterFactory.java | 2 +- .../springframework/util/MimeTypeUtils.java | 36 ++++---- .../expression/spel/ast/BeanReference.java | 2 +- .../spel/standard/SpelCompiler.java | 2 +- .../expression/spel/standard/TokenKind.java | 2 +- .../config/DatabasePopulatorConfigUtils.java | 2 +- .../jdbc/core/simple/AbstractJdbcCall.java | 2 +- .../jdbc/core/simple/AbstractJdbcInsert.java | 2 +- .../jdbc/support/xml/Jdbc4SqlXmlHandler.java | 2 +- .../DefaultPersistenceUnitManager.java | 6 +- ...ersistenceAnnotationBeanPostProcessor.java | 2 +- .../mock/jndi/SimpleNamingContext.java | 2 +- ...actFallbackTransactionAttributeSource.java | 2 +- .../org/springframework/http/MediaType.java | 88 +++++++++---------- .../SynchronossPartHttpMessageReader.java | 2 +- .../jsf/DelegatingNavigationHandlerProxy.java | 2 +- .../web/util/pattern/PathElement.java | 2 +- .../web/util/pattern/PathPattern.java | 2 +- .../server/DefaultEntityResponseBuilder.java | 2 +- .../server/DefaultServerResponseBuilder.java | 2 +- .../function/server/RouterFunctions.java | 8 +- .../resource/CssLinkResourceTransformer.java | 2 +- .../resource/WebJarsResourceResolver.java | 4 +- .../condition/ConsumesRequestCondition.java | 2 +- .../condition/HeadersRequestCondition.java | 2 +- .../condition/ProducesRequestCondition.java | 2 +- .../condition/ConsumesRequestCondition.java | 2 +- .../condition/HeadersRequestCondition.java | 2 +- .../annotation/ReactiveTypeHandler.java | 2 +- .../resource/CssLinkResourceTransformer.java | 2 +- .../resource/WebJarsResourceResolver.java | 4 +- .../servlet/theme/AbstractThemeResolver.java | 2 +- .../servlet/theme/CookieThemeResolver.java | 2 +- .../view/ResourceBundleViewResolver.java | 2 +- .../web/servlet/view/XmlViewResolver.java | 2 +- .../ConvertingEncoderDecoderSupport.java | 8 +- .../WebSphereRequestUpgradeStrategy.java | 2 +- .../client/RestTemplateXhrTransport.java | 2 +- 50 files changed, 124 insertions(+), 124 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java index abdff8ebf1b..049a21c0350 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java @@ -374,7 +374,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence * to which argument name. There are multiple strategies for determining * this binding, which are arranged in a ChainOfResponsibility. */ - public synchronized final void calculateArgumentBindings() { + public final synchronized void calculateArgumentBindings() { // The simple case... nothing to bind. if (this.argumentsIntrospected || this.parameterTypes.length == 0) { return; diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java index 30a3213de15..450c4b9201d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java @@ -175,7 +175,7 @@ class RuntimeTestWalker { } - private static abstract class InstanceOfResidueTestVisitor extends TestVisitorAdapter { + private abstract static class InstanceOfResidueTestVisitor extends TestVisitorAdapter { private final Class matchClass; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java index 778188a4f7c..24b8c48475e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java @@ -39,7 +39,7 @@ import org.springframework.lang.Nullable; public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator implements BeanNameAware { /** Separator between prefix and remainder of bean name */ - public final static String SEPARATOR = "."; + public static final String SEPARATOR = "."; private boolean usePrefix = false; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java index 819b5babad9..f5bf27a64f1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java @@ -87,7 +87,7 @@ public class InitDestroyAnnotationBeanPostProcessor private int order = Ordered.LOWEST_PRECEDENCE; @Nullable - private transient final Map, LifecycleMetadata> lifecycleMetadataCache = new ConcurrentHashMap<>(256); + private final transient Map, LifecycleMetadata> lifecycleMetadataCache = new ConcurrentHashMap<>(256); /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java index a0f609260e4..58c7296f6f8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java @@ -113,7 +113,7 @@ public class InjectionMetadata { } - public static abstract class InjectedElement { + public abstract static class InjectedElement { protected final Member member; diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java index 3466475a038..56233656e19 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java @@ -47,7 +47,7 @@ public abstract class AbstractFallbackJCacheOperationSource implements JCacheOpe * Canonical value held in cache to indicate no caching attribute was * found for this method and we don't need to look again. */ - private final static Object NULL_CACHING_ATTRIBUTE = new Object(); + private static final Object NULL_CACHING_ATTRIBUTE = new Object(); protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java index 1625af12fda..52616be5aa2 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java @@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils; @SuppressWarnings("serial") public class MailSendException extends MailException { - private transient final Map failedMessages; + private final transient Map failedMessages; @Nullable private Exception[] messageExceptions; diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java index 9cd38014786..aaf09ab849b 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java @@ -56,7 +56,7 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera * Canonical value held in cache to indicate no caching attribute was * found for this method and we don't need to look again. */ - private final static Collection NULL_CACHING_ATTRIBUTE = Collections.emptyList(); + private static final Collection NULL_CACHING_ATTRIBUTE = Collections.emptyList(); /** diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index 39adf0647ee..6e5df87641a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -188,7 +188,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean @Nullable private transient StringValueResolver embeddedValueResolver; - private transient final Map injectionMetadataCache = new ConcurrentHashMap<>(256); + private final transient Map injectionMetadataCache = new ConcurrentHashMap<>(256); /** diff --git a/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndex.java b/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndex.java index 22fe77c1154..f0cde6bf051 100644 --- a/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndex.java +++ b/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndex.java @@ -48,7 +48,7 @@ import org.springframework.util.MultiValueMap; */ public class CandidateComponentsIndex { - private final static AntPathMatcher pathMatcher = new AntPathMatcher("."); + private static final AntPathMatcher pathMatcher = new AntPathMatcher("."); private final MultiValueMap index; diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationListenerDetector.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationListenerDetector.java index 4c3a9612871..834df05c34d 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ApplicationListenerDetector.java +++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationListenerDetector.java @@ -46,9 +46,9 @@ class ApplicationListenerDetector implements DestructionAwareBeanPostProcessor, private static final Log logger = LogFactory.getLog(ApplicationListenerDetector.class); - private transient final AbstractApplicationContext applicationContext; + private final transient AbstractApplicationContext applicationContext; - private transient final Map singletonNames = new ConcurrentHashMap<>(256); + private final transient Map singletonNames = new ConcurrentHashMap<>(256); public ApplicationListenerDetector(AbstractApplicationContext applicationContext) { diff --git a/spring-core/src/main/java/org/springframework/asm/TypePath.java b/spring-core/src/main/java/org/springframework/asm/TypePath.java index 87df7c2aba6..b21029ec24e 100644 --- a/spring-core/src/main/java/org/springframework/asm/TypePath.java +++ b/spring-core/src/main/java/org/springframework/asm/TypePath.java @@ -42,25 +42,25 @@ public class TypePath { * A type path step that steps into the element type of an array type. See * {@link #getStep getStep}. */ - public final static int ARRAY_ELEMENT = 0; + public static final int ARRAY_ELEMENT = 0; /** * A type path step that steps into the nested type of a class type. See * {@link #getStep getStep}. */ - public final static int INNER_TYPE = 1; + public static final int INNER_TYPE = 1; /** * A type path step that steps into the bound of a wildcard type. See * {@link #getStep getStep}. */ - public final static int WILDCARD_BOUND = 2; + public static final int WILDCARD_BOUND = 2; /** * A type path step that steps into a type argument of a generic type. See * {@link #getStep getStep}. */ - public final static int TYPE_ARGUMENT = 3; + public static final int TYPE_ARGUMENT = 3; /** * The byte array where the path is stored, in Java class file format. diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java index a0d467c58b6..4f396c399fd 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java @@ -53,7 +53,7 @@ final class NumberToNumberConverterFactory implements ConverterFactory implements Converter { + private static final class NumberToNumber implements Converter { private final Class targetType; diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java index b1ee00961f4..e538c33b812 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java +++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java @@ -65,92 +65,92 @@ public abstract class MimeTypeUtils { /** * Public constant mime type for {@code application/json}. * */ - public final static MimeType APPLICATION_JSON; + public static final MimeType APPLICATION_JSON; /** * A String equivalent of {@link MimeTypeUtils#APPLICATION_JSON}. */ - public final static String APPLICATION_JSON_VALUE = "application/json"; + public static final String APPLICATION_JSON_VALUE = "application/json"; /** * Public constant mime type for {@code application/octet-stream}. * */ - public final static MimeType APPLICATION_OCTET_STREAM; + public static final MimeType APPLICATION_OCTET_STREAM; /** * A String equivalent of {@link MimeTypeUtils#APPLICATION_OCTET_STREAM}. */ - public final static String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream"; + public static final String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream"; /** * Public constant mime type for {@code application/xml}. */ - public final static MimeType APPLICATION_XML; + public static final MimeType APPLICATION_XML; /** * A String equivalent of {@link MimeTypeUtils#APPLICATION_XML}. */ - public final static String APPLICATION_XML_VALUE = "application/xml"; + public static final String APPLICATION_XML_VALUE = "application/xml"; /** * Public constant mime type for {@code image/gif}. */ - public final static MimeType IMAGE_GIF; + public static final MimeType IMAGE_GIF; /** * A String equivalent of {@link MimeTypeUtils#IMAGE_GIF}. */ - public final static String IMAGE_GIF_VALUE = "image/gif"; + public static final String IMAGE_GIF_VALUE = "image/gif"; /** * Public constant mime type for {@code image/jpeg}. */ - public final static MimeType IMAGE_JPEG; + public static final MimeType IMAGE_JPEG; /** * A String equivalent of {@link MimeTypeUtils#IMAGE_JPEG}. */ - public final static String IMAGE_JPEG_VALUE = "image/jpeg"; + public static final String IMAGE_JPEG_VALUE = "image/jpeg"; /** * Public constant mime type for {@code image/png}. */ - public final static MimeType IMAGE_PNG; + public static final MimeType IMAGE_PNG; /** * A String equivalent of {@link MimeTypeUtils#IMAGE_PNG}. */ - public final static String IMAGE_PNG_VALUE = "image/png"; + public static final String IMAGE_PNG_VALUE = "image/png"; /** * Public constant mime type for {@code text/html}. * */ - public final static MimeType TEXT_HTML; + public static final MimeType TEXT_HTML; /** * A String equivalent of {@link MimeTypeUtils#TEXT_HTML}. */ - public final static String TEXT_HTML_VALUE = "text/html"; + public static final String TEXT_HTML_VALUE = "text/html"; /** * Public constant mime type for {@code text/plain}. * */ - public final static MimeType TEXT_PLAIN; + public static final MimeType TEXT_PLAIN; /** * A String equivalent of {@link MimeTypeUtils#TEXT_PLAIN}. */ - public final static String TEXT_PLAIN_VALUE = "text/plain"; + public static final String TEXT_PLAIN_VALUE = "text/plain"; /** * Public constant mime type for {@code text/xml}. * */ - public final static MimeType TEXT_XML; + public static final MimeType TEXT_XML; /** * A String equivalent of {@link MimeTypeUtils#TEXT_XML}. */ - public final static String TEXT_XML_VALUE = "text/xml"; + public static final String TEXT_XML_VALUE = "text/xml"; static { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java index 545f865d97b..71c64083903 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java @@ -32,7 +32,7 @@ import org.springframework.expression.spel.SpelMessage; */ public class BeanReference extends SpelNodeImpl { - private final static String FACTORY_BEAN_PREFIX = "&"; + private static final String FACTORY_BEAN_PREFIX = "&"; private final String beanName; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java index bc55559c2b7..56589819fa7 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java @@ -68,7 +68,7 @@ public class SpelCompiler implements Opcodes { private static final Log logger = LogFactory.getLog(SpelCompiler.class); - private final static int CLASSES_DEFINED_LIMIT = 100; + private static final int CLASSES_DEFINED_LIMIT = 100; // A compiler is created for each classloader, it manages a child class loader of that // classloader and the child is used to load the compiled expressions. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java index 0b577554d74..3a568be788c 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java @@ -125,7 +125,7 @@ enum TokenKind { final char[] tokenChars; - final private boolean hasPayload; // is there more to this token than simply the kind + private final boolean hasPayload; // is there more to this token than simply the kind private TokenKind(String tokenString) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java index 7a91f1b7f36..101560ef161 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java @@ -46,7 +46,7 @@ class DatabasePopulatorConfigUtils { } } - static private BeanDefinition createDatabasePopulator(Element element, List scripts, String execution) { + private static BeanDefinition createDatabasePopulator(Element element, List scripts, String execution) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CompositeDatabasePopulator.class); boolean ignoreFailedDrops = element.getAttribute("ignore-failures").equals("DROPS"); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java index 6cf4cc8880a..d070f28e248 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java @@ -282,7 +282,7 @@ public abstract class AbstractJdbcCall { * @throws org.springframework.dao.InvalidDataAccessApiUsageException if the object hasn't * been correctly initialized, for example if no DataSource has been provided */ - public synchronized final void compile() throws InvalidDataAccessApiUsageException { + public final synchronized void compile() throws InvalidDataAccessApiUsageException { if (!isCompiled()) { if (getProcedureName() == null) { throw new InvalidDataAccessApiUsageException("Procedure or Function name is required"); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java index af11cf708be..b772898c0b7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java @@ -245,7 +245,7 @@ public abstract class AbstractJdbcInsert { * @throws InvalidDataAccessApiUsageException if the object hasn't been correctly initialized, * for example if no DataSource has been provided */ - public synchronized final void compile() throws InvalidDataAccessApiUsageException { + public final synchronized void compile() throws InvalidDataAccessApiUsageException { if (!isCompiled()) { if (getTableName() == null) { throw new InvalidDataAccessApiUsageException("Table name is required"); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java index f3a2f6aef0a..8530983c89c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java @@ -177,7 +177,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { /** * Internal base class for {@link SqlXmlValue} implementations. */ - private static abstract class AbstractJdbc4SqlXmlValue implements SqlXmlValue { + private abstract static class AbstractJdbc4SqlXmlValue implements SqlXmlValue { @Nullable private SQLXML xmlObject; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java index bd5cae9ae5d..d9fc42ac7fd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java @@ -101,15 +101,15 @@ public class DefaultPersistenceUnitManager * Default location of the {@code persistence.xml} file: * "classpath*:META-INF/persistence.xml". */ - public final static String DEFAULT_PERSISTENCE_XML_LOCATION = "classpath*:META-INF/" + PERSISTENCE_XML_FILENAME; + public static final String DEFAULT_PERSISTENCE_XML_LOCATION = "classpath*:META-INF/" + PERSISTENCE_XML_FILENAME; /** * Default location for the persistence unit root URL: * "classpath:", indicating the root of the classpath. */ - public final static String ORIGINAL_DEFAULT_PERSISTENCE_UNIT_ROOT_LOCATION = "classpath:"; + public static final String ORIGINAL_DEFAULT_PERSISTENCE_UNIT_ROOT_LOCATION = "classpath:"; - public final static String ORIGINAL_DEFAULT_PERSISTENCE_UNIT_NAME = "default"; + public static final String ORIGINAL_DEFAULT_PERSISTENCE_UNIT_NAME = "default"; private static final Set entityTypeFilters; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java index 40b7fbceae9..e3f2af72452 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java @@ -191,7 +191,7 @@ public class PersistenceAnnotationBeanPostProcessor @Nullable private transient ListableBeanFactory beanFactory; - private transient final Map injectionMetadataCache = new ConcurrentHashMap<>(256); + private final transient Map injectionMetadataCache = new ConcurrentHashMap<>(256); private final Map extendedEntityManagersToClose = new ConcurrentHashMap<>(16); diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java index c7466d417fc..841de69fa92 100644 --- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -296,7 +296,7 @@ public class SimpleNamingContext implements Context { } - private static abstract class AbstractNamingEnumeration implements NamingEnumeration { + private abstract static class AbstractNamingEnumeration implements NamingEnumeration { private Iterator iterator; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java index 364b4472d2e..7846f6f2d71 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java @@ -55,7 +55,7 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran * Canonical value held in cache to indicate no transaction attribute was * found for this method, and we don't need to look again. */ - private final static TransactionAttribute NULL_TRANSACTION_ATTRIBUTE = new DefaultTransactionAttribute(); + private static final TransactionAttribute NULL_TRANSACTION_ATTRIBUTE = new DefaultTransactionAttribute(); /** diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java index bc8ae26ab49..17cd1e233e8 100644 --- a/spring-web/src/main/java/org/springframework/http/MediaType.java +++ b/spring-web/src/main/java/org/springframework/http/MediaType.java @@ -65,66 +65,66 @@ public class MediaType extends MimeType implements Serializable { /** * Public constant media type for {@code application/atom+xml}. */ - public final static MediaType APPLICATION_ATOM_XML; + public static final MediaType APPLICATION_ATOM_XML; /** * A String equivalent of {@link MediaType#APPLICATION_ATOM_XML}. */ - public final static String APPLICATION_ATOM_XML_VALUE = "application/atom+xml"; + public static final String APPLICATION_ATOM_XML_VALUE = "application/atom+xml"; /** * Public constant media type for {@code application/x-www-form-urlencoded}. */ - public final static MediaType APPLICATION_FORM_URLENCODED; + public static final MediaType APPLICATION_FORM_URLENCODED; /** * A String equivalent of {@link MediaType#APPLICATION_FORM_URLENCODED}. */ - public final static String APPLICATION_FORM_URLENCODED_VALUE = "application/x-www-form-urlencoded"; + public static final String APPLICATION_FORM_URLENCODED_VALUE = "application/x-www-form-urlencoded"; /** * Public constant media type for {@code application/json}. * @see #APPLICATION_JSON_UTF8 */ - public final static MediaType APPLICATION_JSON; + public static final MediaType APPLICATION_JSON; /** * A String equivalent of {@link MediaType#APPLICATION_JSON}. * @see #APPLICATION_JSON_UTF8_VALUE */ - public final static String APPLICATION_JSON_VALUE = "application/json"; + public static final String APPLICATION_JSON_VALUE = "application/json"; /** * Public constant media type for {@code application/json;charset=UTF-8}. */ - public final static MediaType APPLICATION_JSON_UTF8; + public static final MediaType APPLICATION_JSON_UTF8; /** * A String equivalent of {@link MediaType#APPLICATION_JSON_UTF8}. */ - public final static String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8"; + public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8"; /** * Public constant media type for {@code application/octet-stream}. */ - public final static MediaType APPLICATION_OCTET_STREAM; + public static final MediaType APPLICATION_OCTET_STREAM; /** * A String equivalent of {@link MediaType#APPLICATION_OCTET_STREAM}. */ - public final static String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream"; + public static final String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream"; /** * Public constant media type for {@code application/pdf}. * @since 4.3 */ - public final static MediaType APPLICATION_PDF; + public static final MediaType APPLICATION_PDF; /** * A String equivalent of {@link MediaType#APPLICATION_PDF}. * @since 4.3 */ - public final static String APPLICATION_PDF_VALUE = "application/pdf"; + public static final String APPLICATION_PDF_VALUE = "application/pdf"; /** * Public constant media type for {@code application/problem+json}. @@ -132,13 +132,13 @@ public class MediaType extends MimeType implements Serializable { * @see * Problem Details for HTTP APIs, 6.1. application/problem+json */ - public final static MediaType APPLICATION_PROBLEM_JSON; + public static final MediaType APPLICATION_PROBLEM_JSON; /** * A String equivalent of {@link MediaType#APPLICATION_PROBLEM_JSON}. * @since 5.0 */ - public final static String APPLICATION_PROBLEM_JSON_VALUE = "application/problem+json"; + public static final String APPLICATION_PROBLEM_JSON_VALUE = "application/problem+json"; /** * Public constant media type for {@code application/problem+json}. @@ -146,13 +146,13 @@ public class MediaType extends MimeType implements Serializable { * @see * Problem Details for HTTP APIs, 6.1. application/problem+json */ - public final static MediaType APPLICATION_PROBLEM_JSON_UTF8; + public static final MediaType APPLICATION_PROBLEM_JSON_UTF8; /** * A String equivalent of {@link MediaType#APPLICATION_PROBLEM_JSON_UTF8}. * @since 5.0 */ - public final static String APPLICATION_PROBLEM_JSON_UTF8_VALUE = "application/problem+json;charset=UTF-8"; + public static final String APPLICATION_PROBLEM_JSON_UTF8_VALUE = "application/problem+json;charset=UTF-8"; /** * Public constant media type for {@code application/problem+xml}. @@ -160,152 +160,152 @@ public class MediaType extends MimeType implements Serializable { * @see * Problem Details for HTTP APIs, 6.2. application/problem+xml */ - public final static MediaType APPLICATION_PROBLEM_XML; + public static final MediaType APPLICATION_PROBLEM_XML; /** * A String equivalent of {@link MediaType#APPLICATION_PROBLEM_XML}. * @since 5.0 */ - public final static String APPLICATION_PROBLEM_XML_VALUE = "application/problem+xml"; + public static final String APPLICATION_PROBLEM_XML_VALUE = "application/problem+xml"; /** * Public constant media type for {@code application/rss+xml}. * @since 4.3.6 */ - public final static MediaType APPLICATION_RSS_XML; + public static final MediaType APPLICATION_RSS_XML; /** * A String equivalent of {@link MediaType#APPLICATION_RSS_XML}. * @since 4.3.6 */ - public final static String APPLICATION_RSS_XML_VALUE = "application/rss+xml"; + public static final String APPLICATION_RSS_XML_VALUE = "application/rss+xml"; /** * Public constant media type for {@code application/stream+json}. * @since 5.0 */ - public final static MediaType APPLICATION_STREAM_JSON; + public static final MediaType APPLICATION_STREAM_JSON; /** * A String equivalent of {@link MediaType#APPLICATION_STREAM_JSON}. * @since 5.0 */ - public final static String APPLICATION_STREAM_JSON_VALUE = "application/stream+json"; + public static final String APPLICATION_STREAM_JSON_VALUE = "application/stream+json"; /** * Public constant media type for {@code application/xhtml+xml}. */ - public final static MediaType APPLICATION_XHTML_XML; + public static final MediaType APPLICATION_XHTML_XML; /** * A String equivalent of {@link MediaType#APPLICATION_XHTML_XML}. */ - public final static String APPLICATION_XHTML_XML_VALUE = "application/xhtml+xml"; + public static final String APPLICATION_XHTML_XML_VALUE = "application/xhtml+xml"; /** * Public constant media type for {@code application/xml}. */ - public final static MediaType APPLICATION_XML; + public static final MediaType APPLICATION_XML; /** * A String equivalent of {@link MediaType#APPLICATION_XML}. */ - public final static String APPLICATION_XML_VALUE = "application/xml"; + public static final String APPLICATION_XML_VALUE = "application/xml"; /** * Public constant media type for {@code image/gif}. */ - public final static MediaType IMAGE_GIF; + public static final MediaType IMAGE_GIF; /** * A String equivalent of {@link MediaType#IMAGE_GIF}. */ - public final static String IMAGE_GIF_VALUE = "image/gif"; + public static final String IMAGE_GIF_VALUE = "image/gif"; /** * Public constant media type for {@code image/jpeg}. */ - public final static MediaType IMAGE_JPEG; + public static final MediaType IMAGE_JPEG; /** * A String equivalent of {@link MediaType#IMAGE_JPEG}. */ - public final static String IMAGE_JPEG_VALUE = "image/jpeg"; + public static final String IMAGE_JPEG_VALUE = "image/jpeg"; /** * Public constant media type for {@code image/png}. */ - public final static MediaType IMAGE_PNG; + public static final MediaType IMAGE_PNG; /** * A String equivalent of {@link MediaType#IMAGE_PNG}. */ - public final static String IMAGE_PNG_VALUE = "image/png"; + public static final String IMAGE_PNG_VALUE = "image/png"; /** * Public constant media type for {@code multipart/form-data}. */ - public final static MediaType MULTIPART_FORM_DATA; + public static final MediaType MULTIPART_FORM_DATA; /** * A String equivalent of {@link MediaType#MULTIPART_FORM_DATA}. */ - public final static String MULTIPART_FORM_DATA_VALUE = "multipart/form-data"; + public static final String MULTIPART_FORM_DATA_VALUE = "multipart/form-data"; /** * Public constant media type for {@code text/event-stream}. * @since 4.3.6 * @see Server-Sent Events W3C recommendation */ - public final static MediaType TEXT_EVENT_STREAM; + public static final MediaType TEXT_EVENT_STREAM; /** * A String equivalent of {@link MediaType#TEXT_EVENT_STREAM}. * @since 4.3.6 */ - public final static String TEXT_EVENT_STREAM_VALUE = "text/event-stream"; + public static final String TEXT_EVENT_STREAM_VALUE = "text/event-stream"; /** * Public constant media type for {@code text/html}. */ - public final static MediaType TEXT_HTML; + public static final MediaType TEXT_HTML; /** * A String equivalent of {@link MediaType#TEXT_HTML}. */ - public final static String TEXT_HTML_VALUE = "text/html"; + public static final String TEXT_HTML_VALUE = "text/html"; /** * Public constant media type for {@code text/markdown}. * @since 4.3 */ - public final static MediaType TEXT_MARKDOWN; + public static final MediaType TEXT_MARKDOWN; /** * A String equivalent of {@link MediaType#TEXT_MARKDOWN}. * @since 4.3 */ - public final static String TEXT_MARKDOWN_VALUE = "text/markdown"; + public static final String TEXT_MARKDOWN_VALUE = "text/markdown"; /** * Public constant media type for {@code text/plain}. */ - public final static MediaType TEXT_PLAIN; + public static final MediaType TEXT_PLAIN; /** * A String equivalent of {@link MediaType#TEXT_PLAIN}. */ - public final static String TEXT_PLAIN_VALUE = "text/plain"; + public static final String TEXT_PLAIN_VALUE = "text/plain"; /** * Public constant media type for {@code text/xml}. */ - public final static MediaType TEXT_XML; + public static final MediaType TEXT_XML; /** * A String equivalent of {@link MediaType#TEXT_XML}. */ - public final static String TEXT_XML_VALUE = "text/xml"; + public static final String TEXT_XML_VALUE = "text/xml"; private static final String PARAM_QUALITY_FACTOR = "q"; diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java index 023efa1f9e4..e3d6baeaaad 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java @@ -227,7 +227,7 @@ public class SynchronossPartHttpMessageReader implements HttpMessageReader } - private static abstract class AbstractSynchronossPart implements Part { + private abstract static class AbstractSynchronossPart implements Part { private final HttpHeaders headers; diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java index cd83c19589e..2495949b9c0 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java @@ -77,7 +77,7 @@ public class DelegatingNavigationHandlerProxy extends NavigationHandler { * Default name of the target bean in the Spring application context: * "jsfNavigationHandler" */ - public final static String DEFAULT_TARGET_BEAN_NAME = "jsfNavigationHandler"; + public static final String DEFAULT_TARGET_BEAN_NAME = "jsfNavigationHandler"; @Nullable private NavigationHandler originalNavigationHandler; diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathElement.java index 63de7014fff..9971bf72719 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathElement.java @@ -34,7 +34,7 @@ abstract class PathElement { protected static final int CAPTURE_VARIABLE_WEIGHT = 1; - protected final static MultiValueMap NO_PARAMETERS = new LinkedMultiValueMap<>(); + protected static final MultiValueMap NO_PARAMETERS = new LinkedMultiValueMap<>(); // Position in the pattern where this path element starts protected final int pos; diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index 0d1605826eb..41dede580bb 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -71,7 +71,7 @@ import org.springframework.util.StringUtils; */ public class PathPattern implements Comparable { - private final static PathContainer EMPTY_PATH = PathContainer.parsePath(""); + private static final PathContainer EMPTY_PATH = PathContainer.parsePath(""); /** The text of the parsed pattern */ diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java index 31d74a50790..cc930304a66 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java @@ -193,7 +193,7 @@ class DefaultEntityResponseBuilder implements EntityResponse.Builder { } - private final static class DefaultEntityResponse + private static final class DefaultEntityResponse extends DefaultServerResponseBuilder.AbstractServerResponse implements EntityResponse { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java index a32acabb309..99bd3f47c82 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java @@ -278,7 +278,7 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder { } - static abstract class AbstractServerResponse implements ServerResponse { + abstract static class AbstractServerResponse implements ServerResponse { private static final Set SAFE_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java index a20c1e17c8b..7274ac0b18c 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java @@ -303,7 +303,7 @@ public abstract class RouterFunctions { } - private static abstract class AbstractRouterFunction implements RouterFunction { + private abstract static class AbstractRouterFunction implements RouterFunction { @Override public String toString() { @@ -313,7 +313,7 @@ public abstract class RouterFunctions { } } - final static class SameComposedRouterFunction extends AbstractRouterFunction { + static final class SameComposedRouterFunction extends AbstractRouterFunction { private final RouterFunction first; @@ -337,7 +337,7 @@ public abstract class RouterFunctions { } } - final static class DifferentComposedRouterFunction extends AbstractRouterFunction { + static final class DifferentComposedRouterFunction extends AbstractRouterFunction { private final RouterFunction first; @@ -363,7 +363,7 @@ public abstract class RouterFunctions { } - final static class FilteredRouterFunction + static final class FilteredRouterFunction implements RouterFunction { private final RouterFunction routerFunction; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java index 63fdc2dfd9e..4d5695d76de 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java @@ -167,7 +167,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport { } - protected static abstract class AbstractLinkParser implements LinkParser { + protected abstract static class AbstractLinkParser implements LinkParser { /** Return the keyword to use to search for links, e.g. "@import", "url(" */ protected abstract String getKeyword(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java index 178ea1ab810..de6fd3be4e6 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java @@ -47,9 +47,9 @@ import org.springframework.web.server.ServerWebExchange; */ public class WebJarsResourceResolver extends AbstractResourceResolver { - private final static String WEBJARS_LOCATION = "META-INF/resources/webjars/"; + private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/"; - private final static int WEBJARS_LOCATION_LENGTH = WEBJARS_LOCATION.length(); + private static final int WEBJARS_LOCATION_LENGTH = WEBJARS_LOCATION.length(); private final WebJarAssetLocator webJarAssetLocator; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java index 37fafc379a6..f187441794f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java @@ -44,7 +44,7 @@ import org.springframework.web.server.UnsupportedMediaTypeStatusException; */ public final class ConsumesRequestCondition extends AbstractRequestCondition { - private final static ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition(); + private static final ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition(); private final List expressions; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java index 93d42efc12a..74e7d5c1739 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java @@ -39,7 +39,7 @@ import org.springframework.web.server.ServerWebExchange; */ public final class HeadersRequestCondition extends AbstractRequestCondition { - private final static HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition(); + private static final HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition(); private final Set expressions; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java index ccbef65eca7..4e28666f634 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java @@ -47,7 +47,7 @@ import org.springframework.web.server.ServerWebExchange; */ public final class ProducesRequestCondition extends AbstractRequestCondition { - private final static ProducesRequestCondition PRE_FLIGHT_MATCH = new ProducesRequestCondition(); + private static final ProducesRequestCondition PRE_FLIGHT_MATCH = new ProducesRequestCondition(); private final List mediaTypeAllList = diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java index 5dc25bae4d0..0274dc5e1be 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java @@ -46,7 +46,7 @@ import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.Hea */ public final class ConsumesRequestCondition extends AbstractRequestCondition { - private final static ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition(); + private static final ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition(); private final List expressions; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java index 78ad24eaf98..61d043eec93 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java @@ -41,7 +41,7 @@ import org.springframework.web.cors.CorsUtils; */ public final class HeadersRequestCondition extends AbstractRequestCondition { - private final static HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition(); + private static final HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition(); private final Set expressions; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java index c3bcb304a82..0a6a2fd15c1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java @@ -174,7 +174,7 @@ class ReactiveTypeHandler { } - private static abstract class AbstractEmitterSubscriber implements Subscriber, Runnable { + private abstract static class AbstractEmitterSubscriber implements Subscriber, Runnable { private final ResponseBodyEmitter emitter; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java index e9ec79ef2f9..38a1e7da468 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java @@ -136,7 +136,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport { } - protected static abstract class AbstractLinkParser implements LinkParser { + protected abstract static class AbstractLinkParser implements LinkParser { /** Return the keyword to use to search for links, e.g. "@import", "url(" */ protected abstract String getKeyword(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java index fea5933e3ba..1045ded59f7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java @@ -45,9 +45,9 @@ import org.springframework.lang.Nullable; */ public class WebJarsResourceResolver extends AbstractResourceResolver { - private final static String WEBJARS_LOCATION = "META-INF/resources/webjars/"; + private static final String WEBJARS_LOCATION = "META-INF/resources/webjars/"; - private final static int WEBJARS_LOCATION_LENGTH = WEBJARS_LOCATION.length(); + private static final int WEBJARS_LOCATION_LENGTH = WEBJARS_LOCATION.length(); private final WebJarAssetLocator webJarAssetLocator; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java index 0403bed6073..51ccb96a2cf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java @@ -31,7 +31,7 @@ public abstract class AbstractThemeResolver implements ThemeResolver { /** * Out-of-the-box value for the default theme name: "theme". */ - public final static String ORIGINAL_DEFAULT_THEME_NAME = "theme"; + public static final String ORIGINAL_DEFAULT_THEME_NAME = "theme"; private String defaultThemeName = ORIGINAL_DEFAULT_THEME_NAME; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java index 2bec033b15d..da02ef9417a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java @@ -42,7 +42,7 @@ import org.springframework.web.util.WebUtils; */ public class CookieThemeResolver extends CookieGenerator implements ThemeResolver { - public final static String ORIGINAL_DEFAULT_THEME_NAME = "theme"; + public static final String ORIGINAL_DEFAULT_THEME_NAME = "theme"; /** * Name of the request attribute that holds the theme name. Only used diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java index 02fa9c7cd26..fe8cca9d3fb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java @@ -64,7 +64,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver implements Ordered, InitializingBean, DisposableBean { /** The default basename if no other basename is supplied. */ - public final static String DEFAULT_BASENAME = "views"; + public static final String DEFAULT_BASENAME = "views"; private int order = Integer.MAX_VALUE; // default: same as non-Ordered diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java index dd4fe9b0b34..36a44440823 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java @@ -59,7 +59,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver implements Ordered, InitializingBean, DisposableBean { /** Default if no other location is supplied */ - public final static String DEFAULT_LOCATION = "/WEB-INF/views.xml"; + public static final String DEFAULT_LOCATION = "/WEB-INF/views.xml"; private int order = Integer.MAX_VALUE; // default: same as non-Ordered diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java index c4905bdfbaa..7735275b211 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java @@ -205,7 +205,7 @@ public abstract class ConvertingEncoderDecoderSupport { * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details. * @param the type that this Encoder can convert to */ - public static abstract class BinaryEncoder extends ConvertingEncoderDecoderSupport + public abstract static class BinaryEncoder extends ConvertingEncoderDecoderSupport implements Encoder.Binary { } @@ -215,7 +215,7 @@ public abstract class ConvertingEncoderDecoderSupport { * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details. * @param the type that this Decoder can convert from */ - public static abstract class BinaryDecoder extends ConvertingEncoderDecoderSupport + public abstract static class BinaryDecoder extends ConvertingEncoderDecoderSupport implements Decoder.Binary { } @@ -226,7 +226,7 @@ public abstract class ConvertingEncoderDecoderSupport { * details. * @param the type that this Encoder can convert to */ - public static abstract class TextEncoder extends ConvertingEncoderDecoderSupport + public abstract static class TextEncoder extends ConvertingEncoderDecoderSupport implements Encoder.Text { } @@ -236,7 +236,7 @@ public abstract class ConvertingEncoderDecoderSupport { * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details. * @param the type that this Decoder can convert from */ - public static abstract class TextDecoder extends ConvertingEncoderDecoderSupport + public abstract static class TextDecoder extends ConvertingEncoderDecoderSupport implements Decoder.Text { } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java index c850e3f9fd1..dfd7c471b18 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java @@ -47,7 +47,7 @@ import org.springframework.web.socket.server.HandshakeFailureException; */ public class WebSphereRequestUpgradeStrategy extends AbstractStandardUpgradeStrategy { - private final static Method upgradeMethod; + private static final Method upgradeMethod; static { ClassLoader loader = WebSphereRequestUpgradeStrategy.class.getClassLoader(); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java index 3d21b2c86f4..bc9984a3c56 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java @@ -152,7 +152,7 @@ public class RestTemplateXhrTransport extends AbstractXhrTransport { /** * A simple ResponseExtractor that reads the body into a String. */ - private final static ResponseExtractor> textResponseExtractor = + private static final ResponseExtractor> textResponseExtractor = response -> { String body = StreamUtils.copyToString(response.getBody(), SockJsFrame.CHARSET); return ResponseEntity.status(response.getRawStatusCode()).headers(response.getHeaders()).body(body);