Browse Source

Disable tests on Java 16 that require class-based proxies.

Original pull request: #3687.
Resolves #3656
3.2.x
Christoph Strobl 5 years ago committed by Mark Paluch
parent
commit
c7faedf85d
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 8
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
  2. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java
  3. 20
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java

8
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java

@ -26,6 +26,7 @@ import org.springframework.data.mapping.model.FieldNamingStrategy;
import org.springframework.data.mapping.model.Property; import org.springframework.data.mapping.model.Property;
import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy; import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.mapping.model.SimpleTypeHolder;
import org.springframework.data.util.NullableWrapperConverters;
import org.springframework.data.util.TypeInformation; import org.springframework.data.util.TypeInformation;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
@ -69,6 +70,11 @@ public class MongoMappingContext extends AbstractMappingContext<MongoPersistentE
*/ */
@Override @Override
protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) { protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
if (NullableWrapperConverters.supports(type.getType())) {
return false;
}
return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType()) && !AbstractMap.class.isAssignableFrom(type.getType()); return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType()) && !AbstractMap.class.isAssignableFrom(type.getType());
} }
@ -133,7 +139,7 @@ public class MongoMappingContext extends AbstractMappingContext<MongoPersistentE
MongoPersistentEntity<?> entity = super.getPersistentEntity(persistentProperty); MongoPersistentEntity<?> entity = super.getPersistentEntity(persistentProperty);
if(entity == null || !persistentProperty.isUnwrapped()) { if (entity == null || !persistentProperty.isUnwrapped()) {
return entity; return entity;
} }

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java

@ -36,6 +36,8 @@ import org.bson.conversions.Bson;
import org.bson.types.ObjectId; import org.bson.types.ObjectId;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
@ -179,6 +181,7 @@ public class DbRefMappingMongoConverterUnitTests {
} }
@Test // DATAMONGO-348 @Test // DATAMONGO-348
@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg. ArrayList require to open java.util.")
public void lazyLoadingProxyForLazyDbRefOnConcreteCollection() { public void lazyLoadingProxyForLazyDbRefOnConcreteCollection() {
String id = "42"; String id = "42";
@ -506,6 +509,7 @@ public class DbRefMappingMongoConverterUnitTests {
} }
@Test // DATAMONGO-1076 @Test // DATAMONGO-1076
@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg. ArrayList require to open java.util.")
public void shouldNotTriggerResolvingOfLazyLoadedProxyWhenFinalizeMethodIsInvoked() throws Exception { public void shouldNotTriggerResolvingOfLazyLoadedProxyWhenFinalizeMethodIsInvoked() throws Exception {
MongoPersistentEntity<?> entity = mappingContext MongoPersistentEntity<?> entity = mappingContext
@ -524,6 +528,7 @@ public class DbRefMappingMongoConverterUnitTests {
} }
@Test // DATAMONGO-1194 @Test // DATAMONGO-1194
@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg. ArrayList require to open java.util.")
public void shouldBulkFetchListOfReferences() { public void shouldBulkFetchListOfReferences() {
String id1 = "1"; String id1 = "1";
@ -574,6 +579,7 @@ public class DbRefMappingMongoConverterUnitTests {
} }
@Test // DATAMONGO-1194 @Test // DATAMONGO-1194
@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg. ArrayList require to open java.util.")
public void shouldFallbackToOneByOneFetchingWhenElementsInListOfReferencesPointToDifferentCollections() { public void shouldFallbackToOneByOneFetchingWhenElementsInListOfReferencesPointToDifferentCollections() {
String id1 = "1"; String id1 = "1";

20
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java

@ -22,14 +22,15 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith; import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit.jupiter.SpringExtension;
/** /**
* Integration test for {@link PersonRepository} for lazy loading support. * Integration test for {@link PersonRepository} for lazy loading support.
@ -38,13 +39,13 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Oliver Gierke * @author Oliver Gierke
*/ */
@ContextConfiguration(locations = "PersonRepositoryIntegrationTests-context.xml") @ContextConfiguration(locations = "PersonRepositoryIntegrationTests-context.xml")
@RunWith(SpringRunner.class) @ExtendWith(SpringExtension.class)
public class PersonRepositoryLazyLoadingIntegrationTests { public class PersonRepositoryLazyLoadingIntegrationTests {
@Autowired PersonRepository repository; @Autowired PersonRepository repository;
@Autowired MongoOperations operations; @Autowired MongoOperations operations;
@Before @BeforeEach
public void setUp() throws InterruptedException { public void setUp() throws InterruptedException {
repository.deleteAll(); repository.deleteAll();
@ -61,7 +62,6 @@ public class PersonRepositoryLazyLoadingIntegrationTests {
Person person = new Person(); Person person = new Person();
person.setFirstname("Oliver"); person.setFirstname("Oliver");
person.setFans(Arrays.asList(thomas)); person.setFans(Arrays.asList(thomas));
person.setRealFans(new ArrayList<User>(Arrays.asList(thomas)));
repository.save(person); repository.save(person);
Person oliver = repository.findById(person.id).get(); Person oliver = repository.findById(person.id).get();
@ -75,7 +75,8 @@ public class PersonRepositoryLazyLoadingIntegrationTests {
} }
@Test // DATAMONGO-348 @Test // DATAMONGO-348
public void shouldLoadAssociationWithDbRefOnConcreteCollectionAndLazyLoadingEnabled() throws Exception { @DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg. ArrayList require to open java.util.")
public void shouldLoadAssociationWithDbRefOnConcreteCollectionAndLazyLoadingEnabled() {
User thomas = new User(); User thomas = new User();
thomas.username = "Thomas"; thomas.username = "Thomas";
@ -83,7 +84,6 @@ public class PersonRepositoryLazyLoadingIntegrationTests {
Person person = new Person(); Person person = new Person();
person.setFirstname("Oliver"); person.setFirstname("Oliver");
person.setFans(Arrays.asList(thomas));
person.setRealFans(new ArrayList<User>(Arrays.asList(thomas))); person.setRealFans(new ArrayList<User>(Arrays.asList(thomas)));
repository.save(person); repository.save(person);

Loading…
Cancel
Save