diff --git a/src/main/java/org/springframework/data/domain/Range.java b/src/main/java/org/springframework/data/domain/Range.java index 9948c9b0e6..bb60651f2b 100644 --- a/src/main/java/org/springframework/data/domain/Range.java +++ b/src/main/java/org/springframework/data/domain/Range.java @@ -31,7 +31,7 @@ */ public final class Range { - private final static Range UNBOUNDED = Range.of(Bound.unbounded(), Bound.unbounded()); + private static final Range UNBOUNDED = Range.of(Bound.unbounded(), Bound.unbounded()); /** * The lower bound of the range. diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java index b6e26ca4ca..58b790a383 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java @@ -215,7 +215,7 @@ private Class> createAccessorClass(PersistentEntit /** * Generates {@link PersistentPropertyAccessor} classes to access properties of a {@link PersistentEntity}. This code - * uses {@code private final static} held method handles which perform about the speed of native method invocations + * uses {@code private static final} held method handles which perform about the speed of native method invocations * for property access which is restricted due to Java rules (such as private fields/methods) or private inner * classes. All other scoped members (package default, protected and public) are accessed via field or property access * to bypass reflection overhead. That's only possible if the type and the member access is possible from another diff --git a/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java b/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java index c5701b1286..4c09ec97a1 100644 --- a/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java +++ b/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java @@ -51,7 +51,7 @@ */ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware { - final static GenericConversionService CONVERSION_SERVICE = new DefaultConversionService(); + static final GenericConversionService CONVERSION_SERVICE = new DefaultConversionService(); static { Jsr310Converters.getConvertersToRegister().forEach(CONVERSION_SERVICE::addConverter); diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java index be3488aee2..9b295a6827 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java @@ -84,7 +84,7 @@ */ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, BeanFactoryAware { - final static GenericConversionService CONVERSION_SERVICE = new DefaultConversionService(); + static final GenericConversionService CONVERSION_SERVICE = new DefaultConversionService(); private static final Log logger = LogFactory.getLog(RepositoryFactorySupport.class); static { diff --git a/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java b/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java index e3ba15cb61..1f908fc66d 100644 --- a/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java +++ b/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java @@ -39,7 +39,7 @@ */ public class SpelEvaluator { - private final static SpelExpressionParser PARSER = new SpelExpressionParser(); + private static final SpelExpressionParser PARSER = new SpelExpressionParser(); private final QueryMethodEvaluationContextProvider evaluationContextProvider; private final Parameters parameters; diff --git a/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java b/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java index f03b5a9ef7..c56ba4eb1b 100644 --- a/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java +++ b/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java @@ -59,8 +59,8 @@ */ public class SpelQueryContext { - private final static String SPEL_PATTERN_STRING = "([:?])#\\{([^}]+)}"; - private final static Pattern SPEL_PATTERN = Pattern.compile(SPEL_PATTERN_STRING); + private static final String SPEL_PATTERN_STRING = "([:?])#\\{([^}]+)}"; + private static final Pattern SPEL_PATTERN = Pattern.compile(SPEL_PATTERN_STRING); /** * A function from the index of a SpEL expression in a query and the actual SpEL expression to the parameter name to diff --git a/src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java b/src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java index 37bef6f568..cda21361f6 100644 --- a/src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java +++ b/src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java @@ -70,7 +70,7 @@ @Deprecated public class ChainedTransactionManager implements PlatformTransactionManager { - private final static Log logger = LogFactory.getLog(ChainedTransactionManager.class); + private static final Log logger = LogFactory.getLog(ChainedTransactionManager.class); private final List transactionManagers; private final SynchronizationManager synchronizationManager; diff --git a/src/main/java/org/springframework/data/util/QTypeContributor.java b/src/main/java/org/springframework/data/util/QTypeContributor.java index c3be1d09f0..fea69994cd 100644 --- a/src/main/java/org/springframework/data/util/QTypeContributor.java +++ b/src/main/java/org/springframework/data/util/QTypeContributor.java @@ -29,7 +29,7 @@ */ public class QTypeContributor { - private final static Log logger = LogFactory.getLog(QTypeContributor.class); + private static final Log logger = LogFactory.getLog(QTypeContributor.class); public static void contributeEntityPath(Class type, GenerationContext context, @Nullable ClassLoader classLoader) { diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java index 8d05613cb9..376279d529 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java @@ -509,7 +509,7 @@ public void setStringArray(String[] stringArray) { // DATACMNS-916 @AccessType(Type.FIELD) - private final static class PrivateFinalFieldAccess { + private static final class PrivateFinalFieldAccess { int primitiveInteger; int[] primitiveIntegerArray; @@ -558,7 +558,7 @@ private final static class PrivateFinalFieldAccess { // DATACMNS-916 @AccessType(Type.PROPERTY) - private final static class PrivateFinalPropertyAccess { + private static final class PrivateFinalPropertyAccess { int primitiveInteger; int[] primitiveIntegerArray; diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java index 71e74b713c..43f3aa7382 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java @@ -41,8 +41,8 @@ @SuppressWarnings("WeakerAccess") // public required for class generation due to visibility rules public class ClassGeneratingPropertyAccessorFactoryTests { - private final static ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory(); - private final static SampleMappingContext mappingContext = new SampleMappingContext(); + private static final ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory(); + private static final SampleMappingContext mappingContext = new SampleMappingContext(); @SuppressWarnings("unchecked") diff --git a/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java b/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java index 885dc240dc..06c80004ca 100644 --- a/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java @@ -39,7 +39,7 @@ */ public class PersistentPropertyAccessorTests { - private final static SampleMappingContext MAPPING_CONTEXT = new SampleMappingContext(); + private static final SampleMappingContext MAPPING_CONTEXT = new SampleMappingContext(); @SuppressWarnings("unchecked") public static List parameters() {