DATAMONGO-1053 - Type check is now only performed on explicit language properties.

We now only perform a type check on via @language explicitly defined language properties. Prior to this change non-String properties named language caused errors on entity validation.

Original pull request: #228.

Author: christophstrobl

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 {
+
+	}
 }