diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml index 8c8919420..2386a000f 100644 --- a/spring-data-mongodb-parent/pom.xml +++ b/spring-data-mongodb-parent/pom.xml @@ -18,7 +18,7 @@ 3.0.7.RELEASE 4.0.0.RELEASE [${org.springframework.version.30}, ${org.springframework.version.40}) - 1.3.1.BUILD-SNAPSHOT + 1.3.2.BUILD-SNAPSHOT 1.6.11.RELEASE true diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java index 8e4fa265d..5974dee0c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java @@ -87,6 +87,7 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope */ @Override public boolean isIdProperty() { + if (super.isIdProperty()) { return true; } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java index 6cfe37802..92fd4847a 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java @@ -37,6 +37,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.dao.DataAccessException; import org.springframework.data.annotation.Id; @@ -81,6 +82,7 @@ public class MongoTemplateTests { MongoTemplate template; @Autowired MongoDbFactory factory; + MongoTemplate mappingTemplate; @Rule @@ -100,7 +102,7 @@ public class MongoTemplateTests { PersonWithIdPropertyOfPrimitiveInt.class, PersonWithIdPropertyOfTypeLong.class, PersonWithIdPropertyOfPrimitiveLong.class))); mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder()); - mappingContext.afterPropertiesSet(); + mappingContext.initialize(); MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext); mappingConverter.setCustomConversions(conversions); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java index c9fac5fb1..3e67dd283 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java @@ -15,13 +15,12 @@ */ package org.springframework.data.mongodb.core.convert; +import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.HashSet; -import com.mongodb.BasicDBObject; -import com.mongodb.DBObject; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; @@ -32,11 +31,12 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.MongoDbFactory; -import org.springframework.data.mongodb.core.convert.CustomConversions; -import org.springframework.data.mongodb.core.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; +import com.mongodb.BasicDBObject; +import com.mongodb.DBObject; + /** * Test case to verify correct usage of custom {@link Converter} implementations to be used. * @@ -71,7 +71,7 @@ public class CustomConvertersUnitTests { context = new MongoMappingContext(); context.setInitialEntitySet(new HashSet>(Arrays.asList(Foo.class, Bar.class))); context.setSimpleTypeHolder(conversions.getSimpleTypeHolder()); - context.afterPropertiesSet(); + context.initialize(); converter = new MappingMongoConverter(mongoDbFactory, context); converter.setCustomConversions(conversions); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java index da320b38d..fa9e77630 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java @@ -46,8 +46,6 @@ public class DataMongo273Tests { public void setupMongoConv() { MongoMappingContext mappingContext = new MongoMappingContext(); - mappingContext.afterPropertiesSet(); - MongoDbFactory factory = mock(MongoDbFactory.class); converter = new MappingMongoConverter(factory, mappingContext); @@ -186,4 +184,4 @@ public class DataMongo273Tests { return boxes; } } -} \ No newline at end of file +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java index 8aff16d87..92a1f2577 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java @@ -15,18 +15,15 @@ */ package org.springframework.data.mongodb.core.mapping; -import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + import java.lang.reflect.Field; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.model.SimpleTypeHolder; -import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity; -import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty; -import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; -import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java index 8ea91b954..17c2ba96b 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java @@ -51,7 +51,7 @@ public class GenericMappingTests { public void setUp() throws Exception { context = new MongoMappingContext(); context.setInitialEntitySet(Collections.singleton(StringWrapper.class)); - context.afterPropertiesSet(); + context.initialize(); converter = new MappingMongoConverter(factory, context); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java index c597acc35..ea53a2808 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java @@ -20,7 +20,8 @@ import java.util.Collections; import java.util.Map; import org.junit.Test; -import org.springframework.data.mongodb.core.mapping.MongoMappingContext; +import org.springframework.data.annotation.Id; +import org.springframework.data.mapping.model.MappingException; /** * Unit tests for {@link MongoMappingContext}. @@ -31,9 +32,26 @@ public class MongoMappingContextUnitTests { @Test public void addsSelfReferencingPersistentEntityCorrectly() throws Exception { + MongoMappingContext context = new MongoMappingContext(); + context.setInitialEntitySet(Collections.singleton(SampleClass.class)); - context.afterPropertiesSet(); + context.initialize(); + } + + @Test(expected = MappingException.class) + public void rejectsEntityWithMultipleIdProperties() { + + MongoMappingContext context = new MongoMappingContext(); + context.getPersistentEntity(ClassWithMultipleIdProperties.class); + } + + class ClassWithMultipleIdProperties { + + @Id + String myId; + + String id; } public class SampleClass { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java index 099bb0d68..aadd62420 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java @@ -15,6 +15,9 @@ */ package org.springframework.data.mongodb.core.mapreduce; +import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*; +import static org.springframework.data.mongodb.core.query.Criteria.*; + import java.util.Arrays; import java.util.HashSet; @@ -37,9 +40,6 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.Mongo; -import static org.springframework.data.mongodb.core.query.Criteria.*; -import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:infrastructure.xml") public class GroupByTests { @@ -50,9 +50,6 @@ public class GroupByTests { @Autowired ApplicationContext applicationContext; - // @Autowired - // MongoTemplate mongoTemplate; - MongoTemplate mongoTemplate; @Autowired @@ -61,7 +58,7 @@ public class GroupByTests { MongoMappingContext mappingContext = new MongoMappingContext(); mappingContext.setInitialEntitySet(new HashSet>(Arrays.asList(XObject.class))); - mappingContext.afterPropertiesSet(); + mappingContext.initialize(); MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext); mappingConverter.afterPropertiesSet(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java index 468a530cc..2c67d4460 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java @@ -15,9 +15,9 @@ */ package org.springframework.data.mongodb.core.mapreduce; -import static org.junit.Assert.assertEquals; -import static org.springframework.data.mongodb.core.query.Criteria.where; -import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.options; +import static org.junit.Assert.*; +import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.*; +import static org.springframework.data.mongodb.core.query.Criteria.*; import java.util.ArrayList; import java.util.Arrays; @@ -69,7 +69,7 @@ public class MapReduceTests { MongoMappingContext mappingContext = new MongoMappingContext(); mappingContext.setInitialEntitySet(new HashSet>(Arrays.asList(ValueObject.class))); - mappingContext.afterPropertiesSet(); + mappingContext.initialize(); MappingMongoConverter mappingConverter = new MappingMongoConverter(factory, mappingContext); mappingConverter.afterPropertiesSet();