DATAMONGO-1053 - Only type check explicit language properties.

pom.xml

@@ -5,7 +5,7 @@
 
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb-parent</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 <packaging>pom</packaging>
 
 <name>Spring Data MongoDB</name>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 <parent>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb-parent</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 
@@ -48,7 +48,7 @@
 <dependency>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 </dependency>
 
 <dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 <parent>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb-parent</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 <parent>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb-parent</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 <parent>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-mongodb-parent</artifactId>
-<version>1.7.0.BUILD-SNAPSHOT</version>
+<version>1.7.0.DATAMONGO-1053-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 

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

@@ -284,7 +284,7 @@ public void doWithPersistentProperty(MongoPersistentProperty persistentProperty)
 
 private void potentiallyAssertLanguageType(MongoPersistentProperty persistentProperty) {
 
-if (persistentProperty.isLanguageProperty()) {
+if (persistentProperty.isExplicitLanguageProperty()) {
 assertPropertyType(persistentProperty, String.class);
 }
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java

@@ -24,6 +24,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.util.ClassTypeInformation;
 
 /**
@@ -36,6 +37,7 @@
 public class BasicMongoPersistentEntityUnitTests {
 
 @Mock ApplicationContext context;
+@Mock MongoPersistentProperty propertyMock;
 
 @Test
 public void subclassInheritsAtDocumentAnnotation() {
@@ -80,6 +82,61 @@ public void shouldDetectLanguageCorrectly() {
 assertThat(entity.getLanguage(), is("spanish"));
 }
 
+/**
+ * @see DATAMONGO-1053
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+@Test(expected = MappingException.class)
+public void verifyShouldThrowExceptionForInvalidTypeOfExplicitLanguageProperty() {
+
+BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
+ClassTypeInformation.from(AnyDocument.class));
+
+when(propertyMock.isExplicitLanguageProperty()).thenReturn(true);
+when(propertyMock.getActualType()).thenReturn((Class) Number.class);
+
+entity.addPersistentProperty(propertyMock);
+entity.verify();
+}
+
+/**
+ * @see DATAMONGO-1053
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+@Test
+public void verifyShouldPassForStringAsExplicitLanguageProperty() {
+
+BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
+ClassTypeInformation.from(AnyDocument.class));
+when(propertyMock.isExplicitLanguageProperty()).thenReturn(true);
+when(propertyMock.getActualType()).thenReturn((Class) String.class);
+entity.addPersistentProperty(propertyMock);
+
+entity.verify();
+
+verify(propertyMock, times(1)).isExplicitLanguageProperty();
+verify(propertyMock, times(1)).getActualType();
+}
+
+/**
+ * @see DATAMONGO-1053
+ */
+@SuppressWarnings({ "unchecked", "rawtypes" })
+@Test
+public void verifyShouldIgnoreNonExplicitLanguageProperty() {
+
+BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
+ClassTypeInformation.from(AnyDocument.class));
+when(propertyMock.isExplicitLanguageProperty()).thenReturn(false);
+when(propertyMock.getActualType()).thenReturn((Class) Number.class);
+entity.addPersistentProperty(propertyMock);
+
+entity.verify();
+
+verify(propertyMock, times(1)).isExplicitLanguageProperty();
+verify(propertyMock, never()).getActualType();
+}
+
 @Document(collection = "contacts")
 class Contact {
 
@@ -111,4 +168,8 @@ public String getCollectionName() {
 static class DocumentWithLanguage {
 
 }
+
+static class AnyDocument {
+
+}
 }