DATACMNS-1318 - Polishing.

Moved to newly introduced varargs-based factory method for PersistentEntities where applicable.

Author: odrotbohm

src/main/java/org/springframework/data/auditing/AuditingHandler.java

@@ -16,7 +16,6 @@
 package org.springframework.data.auditing;
 
 import java.time.temporal.TemporalAccessor;
-import java.util.Collections;
 import java.util.Optional;
 
 import org.joda.time.DateTime;
@@ -61,7 +60,7 @@ public class AuditingHandler implements InitializingBean {
 	@Deprecated
 	public AuditingHandler(
 			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext) {
-		this(new PersistentEntities(Collections.singletonList(mappingContext)));
+		this(PersistentEntities.of(mappingContext));
 	}
 
 	/**

src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.auditing;
 
-import java.util.Collections;
 import java.util.Optional;
 
 import org.springframework.data.mapping.PersistentEntity;
@@ -50,7 +49,7 @@ public class IsNewAwareAuditingHandler extends AuditingHandler {
 	@Deprecated
 	public IsNewAwareAuditingHandler(
 			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext) {
-		this(new PersistentEntities(Collections.singletonList(mappingContext)));
+		this(PersistentEntities.of(mappingContext));
 	}
 
 	/**

src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java

@@ -18,7 +18,6 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Collections;
 import java.util.function.Function;
 
 import org.springframework.data.mapping.PersistentEntity;
@@ -50,7 +49,7 @@ public class MappingContextIsNewStrategyFactory extends IsNewStrategyFactorySupp
 	 */
 	@Deprecated
 	public MappingContextIsNewStrategyFactory(MappingContext<? extends PersistentEntity<?, ?>, ?> context) {
-		this(new PersistentEntities(Collections.singletonList(context)));
+		this(PersistentEntities.of(context));
 	}
 
 	/**

src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Before;
@@ -51,7 +50,7 @@ public void setUp() {
 	}
 
 	protected AuditingHandler getHandler() {
-		return new AuditingHandler(new PersistentEntities(Collections.emptySet()));
+		return new AuditingHandler(PersistentEntities.of());
 	}
 
 	/**

src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Before;
@@ -80,7 +79,7 @@ public void rejectsNullMappingContext() {
 
 	@Test // DATACMNS-365
 	public void setsUpHandlerWithMappingContext() {
-		new IsNewAwareAuditingHandler(new PersistentEntities(Collections.emptySet()));
+		new IsNewAwareAuditingHandler(PersistentEntities.of());
 	}
 
 	@Test // DATACMNS-638

src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java

@@ -24,7 +24,6 @@
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Optional;
@@ -63,7 +62,7 @@ public void setUp() {
 		context.getPersistentEntity(SampleWithInstant.class);
 		context.getPersistentEntity(WithEmbedded.class);
 
-		PersistentEntities entities = new PersistentEntities(Collections.singleton(context));
+		PersistentEntities entities = PersistentEntities.of(context);
 		factory = new MappingAuditableBeanWrapperFactory(entities);
 	}
 

src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 
 import org.junit.Before;
@@ -46,7 +45,7 @@ public void setUp() {
 				new HashSet<>(Arrays.asList(Entity.class, VersionedEntity.class, PrimitiveIdEntity.class)));
 		context.afterPropertiesSet();
 
-		factory = new MappingContextIsNewStrategyFactory(new PersistentEntities(Collections.singleton(context)));
+		factory = new MappingContextIsNewStrategyFactory(PersistentEntities.of(context));
 	}
 
 	@Test

src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 import org.junit.Test;
@@ -52,7 +51,7 @@ public void returnsPersistentEntitiesFromMappingContexts() {
 		when(first.hasPersistentEntityFor(Sample.class)).thenReturn(false);
 		when(second.hasPersistentEntityFor(Sample.class)).thenReturn(true);
 
-		new PersistentEntities(Arrays.asList(first, second)).getPersistentEntity(Sample.class);
+		PersistentEntities.of(first, second).getPersistentEntity(Sample.class);
 
 		verify(first, times(1)).hasPersistentEntityFor(Sample.class);
 		verify(first, times(0)).getRequiredPersistentEntity(Sample.class);
@@ -68,7 +67,7 @@ public void indicatesManagedType() {
 		context.setInitialEntitySet(Collections.singleton(Sample.class));
 		context.initialize();
 
-		PersistentEntities entities = new PersistentEntities(Collections.singletonList(context));
+		PersistentEntities entities = PersistentEntities.of(context);
 
 		assertThat(entities.getPersistentEntity(Sample.class)).isPresent();
 		assertThat(entities.getPersistentEntity(Object.class)).isNotPresent();