Polish: reorder the modifiers to comply with the Java Language Specification.

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;

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;
 

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;

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<Class<?>, LifecycleMetadata> lifecycleMetadataCache = new ConcurrentHashMap<>(256);
+	private final transient Map<Class<?>, LifecycleMetadata> lifecycleMetadataCache = new ConcurrentHashMap<>(256);
 
 
 	/**

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;
 

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());

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<Object, Exception> failedMessages;
+	private final transient Map<Object, Exception> failedMessages;
 
 	@Nullable
 	private Exception[] messageExceptions;

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<CacheOperation> NULL_CACHING_ATTRIBUTE = Collections.emptyList();
+	private static final Collection<CacheOperation> NULL_CACHING_ATTRIBUTE = Collections.emptyList();
 
 
 	/**

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<String, InjectionMetadata> injectionMetadataCache = new ConcurrentHashMap<>(256);
+	private final transient Map<String, InjectionMetadata> injectionMetadataCache = new ConcurrentHashMap<>(256);
 
 
 	/**

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<String, Entry> index;
 

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<String, Boolean> singletonNames = new ConcurrentHashMap<>(256);
+	private final transient Map<String, Boolean> singletonNames = new ConcurrentHashMap<>(256);
 
 
 	public ApplicationListenerDetector(AbstractApplicationContext applicationContext) {

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.

spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java

@@ -53,7 +53,7 @@ final class NumberToNumberConverterFactory implements ConverterFactory<Number, N
 	}
 
 
-	private final static class NumberToNumber<T extends Number> implements Converter<Number, T> {
+	private static final class NumberToNumber<T extends Number> implements Converter<Number, T> {
 
 		private final Class<T> targetType;
 

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 {

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;
 

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.

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) {

spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java

@@ -46,7 +46,7 @@ class DatabasePopulatorConfigUtils {
 		}
 	}
 
-	static private BeanDefinition createDatabasePopulator(Element element, List<Element> scripts, String execution) {
+	private static BeanDefinition createDatabasePopulator(Element element, List<Element> scripts, String execution) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CompositeDatabasePopulator.class);
 
 		boolean ignoreFailedDrops = element.getAttribute("ignore-failures").equals("DROPS");

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");

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");

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;

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<AnnotationTypeFilter> entityTypeFilters;

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<String, InjectionMetadata> injectionMetadataCache = new ConcurrentHashMap<>(256);
+	private final transient Map<String, InjectionMetadata> injectionMetadataCache = new ConcurrentHashMap<>(256);
 
 	private final Map<Object, EntityManager> extendedEntityManagersToClose = new ConcurrentHashMap<>(16);
 

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<T> implements NamingEnumeration<T> {
+	private abstract static class AbstractNamingEnumeration<T> implements NamingEnumeration<T> {
 
 		private Iterator<T> iterator;
 

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();
 
 
 	/**

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 <a href="https://tools.ietf.org/html/rfc7807#section-6.1">
 	 *     Problem Details for HTTP APIs, 6.1. application/problem+json</a>
 	 */
-	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 <a href="https://tools.ietf.org/html/rfc7807#section-6.1">
 	 *     Problem Details for HTTP APIs, 6.1. application/problem+json</a>
 	 */
-	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 <a href="https://tools.ietf.org/html/rfc7807#section-6.2">
 	 *     Problem Details for HTTP APIs, 6.2. application/problem+xml</a>
 	 */
-	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 <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommendation</a>
 	 */
-	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";
 

spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java

@@ -227,7 +227,7 @@ public class SynchronossPartHttpMessageReader implements HttpMessageReader<Part>
 	}
 
 
-	private static abstract class AbstractSynchronossPart implements Part {
+	private abstract static class AbstractSynchronossPart implements Part {
 
 		private final HttpHeaders headers;
 

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;

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<String,String> NO_PARAMETERS = new LinkedMultiValueMap<>();
+	protected static final MultiValueMap<String,String> NO_PARAMETERS = new LinkedMultiValueMap<>();
 
 	// Position in the pattern where this path element starts
 	protected final int pos;

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<PathPattern> {
 
-	private final static PathContainer EMPTY_PATH = PathContainer.parsePath("");
+	private static final PathContainer EMPTY_PATH = PathContainer.parsePath("");
 
 
 	/** The text of the parsed pattern */

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java

@@ -193,7 +193,7 @@ class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T> {
 	}
 
 
-	private final static class DefaultEntityResponse<T>
+	private static final class DefaultEntityResponse<T>
 			extends DefaultServerResponseBuilder.AbstractServerResponse
 			implements EntityResponse<T> {
 

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<HttpMethod> SAFE_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD);
 

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<T extends ServerResponse> implements RouterFunction<T> {
+	private abstract static class AbstractRouterFunction<T extends ServerResponse> implements RouterFunction<T> {
 
 		@Override
 		public String toString() {
@@ -313,7 +313,7 @@ public abstract class RouterFunctions {
 		}
 	}
 
-	final static class SameComposedRouterFunction<T extends ServerResponse> extends AbstractRouterFunction<T> {
+	static final class SameComposedRouterFunction<T extends ServerResponse> extends AbstractRouterFunction<T> {
 
 		private final RouterFunction<T> first;
 
@@ -337,7 +337,7 @@ public abstract class RouterFunctions {
 		}
 	}
 
-	final static class DifferentComposedRouterFunction extends AbstractRouterFunction<ServerResponse> {
+	static final class DifferentComposedRouterFunction extends AbstractRouterFunction<ServerResponse> {
 
 		private final RouterFunction<?> first;
 
@@ -363,7 +363,7 @@ public abstract class RouterFunctions {
 
 	}
 
-	final static class FilteredRouterFunction<T extends ServerResponse, S extends ServerResponse>
+	static final class FilteredRouterFunction<T extends ServerResponse, S extends ServerResponse>
 			implements RouterFunction<S> {
 
 		private final RouterFunction<T> routerFunction;

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();

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;

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<ConsumesRequestCondition> {
 
-	private final static ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition();
+	private static final ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition();
 
 
 	private final List<ConsumeMediaTypeExpression> expressions;

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<HeadersRequestCondition> {
 
-	private final static HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition();
+	private static final HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition();
 
 
 	private final Set<HeaderExpression> expressions;

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<ProducesRequestCondition> {
 
-	private final static ProducesRequestCondition PRE_FLIGHT_MATCH = new ProducesRequestCondition();
+	private static final ProducesRequestCondition PRE_FLIGHT_MATCH = new ProducesRequestCondition();
 
 
 	private final List<ProduceMediaTypeExpression> mediaTypeAllList =

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<ConsumesRequestCondition> {
 
-	private final static ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition();
+	private static final ConsumesRequestCondition PRE_FLIGHT_MATCH = new ConsumesRequestCondition();
 
 	private final List<ConsumeMediaTypeExpression> expressions;
 

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<HeadersRequestCondition> {
 
-	private final static HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition();
+	private static final HeadersRequestCondition PRE_FLIGHT_MATCH = new HeadersRequestCondition();
 
 
 	private final Set<HeaderExpression> expressions;

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<Object>, Runnable {
+	private abstract static class AbstractEmitterSubscriber implements Subscriber<Object>, Runnable {
 
 		private final ResponseBodyEmitter emitter;
 

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();

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;

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;
 

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

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

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

spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java

@@ -205,7 +205,7 @@ public abstract class ConvertingEncoderDecoderSupport<T, M> {
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Encoder can convert to
 	 */
-	public static abstract class BinaryEncoder<T> extends ConvertingEncoderDecoderSupport<T, ByteBuffer>
+	public abstract static class BinaryEncoder<T> extends ConvertingEncoderDecoderSupport<T, ByteBuffer>
 			implements Encoder.Binary<T> {
 	}
 
@@ -215,7 +215,7 @@ public abstract class ConvertingEncoderDecoderSupport<T, M> {
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Decoder can convert from
 	 */
-	public static abstract class BinaryDecoder<T> extends ConvertingEncoderDecoderSupport<T, ByteBuffer>
+	public abstract static class BinaryDecoder<T> extends ConvertingEncoderDecoderSupport<T, ByteBuffer>
 			implements Decoder.Binary<T> {
 	}
 
@@ -226,7 +226,7 @@ public abstract class ConvertingEncoderDecoderSupport<T, M> {
 	 * details.
 	 * @param <T> the type that this Encoder can convert to
 	 */
-	public static abstract class TextEncoder<T> extends ConvertingEncoderDecoderSupport<T, String>
+	public abstract static class TextEncoder<T> extends ConvertingEncoderDecoderSupport<T, String>
 			implements Encoder.Text<T> {
 	}
 
@@ -236,7 +236,7 @@ public abstract class ConvertingEncoderDecoderSupport<T, M> {
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Decoder can convert from
 	 */
-	public static abstract class TextDecoder<T> extends ConvertingEncoderDecoderSupport<T, String>
+	public abstract static class TextDecoder<T> extends ConvertingEncoderDecoderSupport<T, String>
 			implements Decoder.Text<T> {
 	}
 

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();

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<ResponseEntity<String>> textResponseExtractor =
+	private static final ResponseExtractor<ResponseEntity<String>> textResponseExtractor =
 			response -> {
 				String body = StreamUtils.copyToString(response.getBody(), SockJsFrame.CHARSET);
 				return ResponseEntity.status(response.getRawStatusCode()).headers(response.getHeaders()).body(body);