From 7ab2c84ea8151404c47d43ee9200234c761afdc0 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 17 May 2018 11:44:38 +0200 Subject: [PATCH] DATACMNS-1318 - Polishing. Moved to newly introduced varargs-based factory method for PersistentEntities where applicable. --- .../org/springframework/data/auditing/AuditingHandler.java | 3 +-- .../data/auditing/IsNewAwareAuditingHandler.java | 3 +-- .../mapping/context/MappingContextIsNewStrategyFactory.java | 3 +-- .../data/auditing/AuditingHandlerUnitTests.java | 3 +-- .../data/auditing/IsNewAwareAuditingHandlerUnitTests.java | 3 +-- .../MappingAuditableBeanWrapperFactoryUnitTests.java | 3 +-- .../context/MappingContextIsNewStrategyFactoryUnitTests.java | 3 +-- .../data/mapping/context/PersistentEntitiesUnitTests.java | 5 ++--- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/springframework/data/auditing/AuditingHandler.java b/src/main/java/org/springframework/data/auditing/AuditingHandler.java index b40a49f96..19966a684 100644 --- a/src/main/java/org/springframework/data/auditing/AuditingHandler.java +++ b/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 PersistentProperty> mappingContext) { - this(new PersistentEntities(Collections.singletonList(mappingContext))); + this(PersistentEntities.of(mappingContext)); } /** diff --git a/src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java b/src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java index b124420d9..db855b304 100644 --- a/src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java +++ b/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 PersistentProperty> mappingContext) { - this(new PersistentEntities(Collections.singletonList(mappingContext))); + this(PersistentEntities.of(mappingContext)); } /** diff --git a/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java b/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java index fabb489b3..a83bda2a6 100644 --- a/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java +++ b/src/main/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactory.java @@ -18,7 +18,6 @@ package org.springframework.data.mapping.context; 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, ?> context) { - this(new PersistentEntities(Collections.singletonList(context))); + this(PersistentEntities.of(context)); } /** diff --git a/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java b/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java index dac4dc5b5..6bcf57fe4 100755 --- a/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java @@ -18,7 +18,6 @@ package org.springframework.data.auditing; 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 class AuditingHandlerUnitTests { } protected AuditingHandler getHandler() { - return new AuditingHandler(new PersistentEntities(Collections.emptySet())); + return new AuditingHandler(PersistentEntities.of()); } /** diff --git a/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java b/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java index c9a8be1c4..acbb35d13 100755 --- a/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java @@ -18,7 +18,6 @@ package org.springframework.data.auditing; 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 class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests @Test // DATACMNS-365 public void setsUpHandlerWithMappingContext() { - new IsNewAwareAuditingHandler(new PersistentEntities(Collections.emptySet())); + new IsNewAwareAuditingHandler(PersistentEntities.of()); } @Test // DATACMNS-638 diff --git a/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java b/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java index 38e92862a..4e4723102 100755 --- a/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java @@ -24,7 +24,6 @@ import java.time.ZoneOffset; 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 class MappingAuditableBeanWrapperFactoryUnitTests { context.getPersistentEntity(SampleWithInstant.class); context.getPersistentEntity(WithEmbedded.class); - PersistentEntities entities = new PersistentEntities(Collections.singleton(context)); + PersistentEntities entities = PersistentEntities.of(context); factory = new MappingAuditableBeanWrapperFactory(entities); } diff --git a/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java b/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java index 7efc00101..5016fd26a 100755 --- a/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java @@ -18,7 +18,6 @@ package org.springframework.data.mapping.context; 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 class MappingContextIsNewStrategyFactoryUnitTests { 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 diff --git a/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java b/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java index ddf9ae07a..6cbf80ae2 100755 --- a/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java @@ -18,7 +18,6 @@ package org.springframework.data.mapping.context; 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 class PersistentEntitiesUnitTests { 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 class PersistentEntitiesUnitTests { 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();