Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-1318 - Polishing.

Browse Source 
Moved to newly introduced varargs-based factory method for PersistentEntities where applicable.
This commit is contained in:
Oliver Gierke
2018-05-17 11:44:38 +02:00
parent 61e489b67e
commit 7ab2c84ea8
8 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java
View File

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

3
src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java
View File

@@ -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

3
src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java
View File

@@ -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);
}

3
src/test/java/org/springframework/data/mapping/context/MappingContextIsNewStrategyFactoryUnitTests.java
View File

@@ -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

5
src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java
View File

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