diff --git a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
index bb56a3ca9..05b3efb2b 100644
--- a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
+++ b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
@@ -108,8 +108,10 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap
 		private static final Predicate<? super PersistentProperty<?>> HAS_COLLECTION_PROPERTY = it -> it.isCollectionLike()
 				|| it.isMap();
 
-		private final PersistentPropertyPaths<?, ? extends PersistentProperty<?>> createdByPaths, createdDatePaths,
-				lastModifiedByPaths, lastModifiedDatePaths;
+		private final PersistentPropertyPaths<?, ? extends PersistentProperty<?>> createdByPaths;
+		private final PersistentPropertyPaths<?, ? extends PersistentProperty<?>> createdDatePaths;
+		private final PersistentPropertyPaths<?, ? extends PersistentProperty<?>> lastModifiedByPaths;
+		private final PersistentPropertyPaths<?, ? extends PersistentProperty<?>> lastModifiedDatePaths;
 
 		private final Lazy<Boolean> isAuditable;
 
diff --git a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java
index 9447f4cd1..e0654d278 100644
--- a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java
+++ b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java
@@ -60,7 +60,8 @@ public abstract class SpringDataJaxb {
 	@XmlAccessorType(XmlAccessType.FIELD)
 	public static class PageRequestDto {
 
-		@XmlAttribute int page, size;
+		@XmlAttribute int page;
+		@XmlAttribute int size;
 		@XmlElement(name = "order", namespace = NAMESPACE) List<OrderDto> orders = new ArrayList<>();
 	}
 
diff --git a/src/main/java/org/springframework/data/mapping/AccessOptions.java b/src/main/java/org/springframework/data/mapping/AccessOptions.java
index 84635f3e8..9848d7ba4 100644
--- a/src/main/java/org/springframework/data/mapping/AccessOptions.java
+++ b/src/main/java/org/springframework/data/mapping/AccessOptions.java
@@ -285,7 +285,8 @@ public class AccessOptions {
 		private static final SetOptions DEFAULT = new SetOptions();
 
 		private final SetNulls nullHandling;
-		private final Propagation collectionPropagation, mapPropagation;
+		private final Propagation collectionPropagation;
+		private final Propagation mapPropagation;
 
 		private SetOptions() {
 
diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 52bd769ae..790feb095 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -623,7 +623,8 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 		 */
 		static class PropertyMatch {
 
-			private final @Nullable String namePattern, typeName;
+			private final @Nullable String namePattern;
+			private final @Nullable String typeName;
 
 			/**
 			 * Creates a new {@link PropertyMatch} for the given name pattern and type name. At least one of the parameters
diff --git a/src/main/java/org/springframework/data/mapping/context/InvalidPersistentPropertyPath.java b/src/main/java/org/springframework/data/mapping/context/InvalidPersistentPropertyPath.java
index 4c35bfbb0..c61eb3ae4 100644
--- a/src/main/java/org/springframework/data/mapping/context/InvalidPersistentPropertyPath.java
+++ b/src/main/java/org/springframework/data/mapping/context/InvalidPersistentPropertyPath.java
@@ -39,7 +39,9 @@ public class InvalidPersistentPropertyPath extends MappingException {
 	private static final long serialVersionUID = 2805815643641094488L;
 	private static final String DEFAULT_MESSAGE = "No property '%s' found on %s! Did you mean: %s?";
 
-	private final String source, unresolvableSegment, resolvedPath;
+	private final String source;
+	private final String unresolvableSegment;
+	private final String resolvedPath;
 	private final TypeInformation<?> type;
 
 	/**
diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java
index d629d7a0e..bae1c53f1 100644
--- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java
+++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java
@@ -67,7 +67,9 @@ public class QuerydslBindings {
 
 	private final Map<String, PathAndBinding<?, ?>> pathSpecs;
 	private final Map<Class<?>, PathAndBinding<?, ?>> typeSpecs;
-	private final Set<String> allowList, denyList, aliases;
+	private final Set<String> allowList;
+	private final Set<String> denyList;
+	private final Set<String> aliases;
 
 	private boolean excludeUnlistedProperties;
 
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java b/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java
index 07d061282..750623b37 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java
@@ -33,7 +33,8 @@ import org.springframework.util.ObjectUtils;
  */
 public final class RepositoryFragmentConfiguration {
 
-	private final String interfaceName, className;
+	private final String interfaceName;
+	private final String className;
 	private final Optional<AbstractBeanDefinition> beanDefinition;
 
 	/**
diff --git a/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java b/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java
index d5d60c1a9..d126ce72c 100644
--- a/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java
+++ b/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java
@@ -108,7 +108,8 @@ interface MethodLookups {
 		private static final String DOMAIN_TYPE_NAME = PARAMETERS[0].getName();
 		private static final String ID_TYPE_NAME = PARAMETERS[1].getName();
 
-		private final ResolvableType entityType, idType;
+		private final ResolvableType entityType;
+		private final ResolvableType idType;
 		private final Class<?> repositoryInterface;
 
 		/**
diff --git a/src/main/java/org/springframework/data/repository/query/ReturnedType.java b/src/main/java/org/springframework/data/repository/query/ReturnedType.java
index 384527456..0fc0c4ebb 100644
--- a/src/main/java/org/springframework/data/repository/query/ReturnedType.java
+++ b/src/main/java/org/springframework/data/repository/query/ReturnedType.java
@@ -331,7 +331,8 @@ public abstract class ReturnedType {
 
 	private static final class CacheKey {
 
-		private final Class<?> returnedType, domainType;
+		private final Class<?> returnedType;
+		private final Class<?> domainType;
 		private final int projectionFactoryHashCode;
 
 		private CacheKey(Class<?> returnedType, Class<?> domainType, int projectionFactoryHashCode) {