DATAMONGO-1049 - Check for explicitly declared language field.

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-1049-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-1049-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-1049-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-1049-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-1049-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-1049-SNAPSHOT</version>
 <relativePath>../pom.xml</relativePath>
 </parent>
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java

@@ -220,7 +220,7 @@ private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDe
 }
 
 private void appendTextIndexInformation(final String dotPath,
-final TextIndexDefinitionBuilder indexDefinitionBuilder, MongoPersistentEntity<?> entity,
+final TextIndexDefinitionBuilder indexDefinitionBuilder, final MongoPersistentEntity<?> entity,
 final TextIndexIncludeOptions includeOptions, final CycleGuard guard) {
 
 entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
@@ -230,7 +230,7 @@ public void doWithPersistentProperty(MongoPersistentProperty persistentProperty)
 
 guard.protect(persistentProperty, dotPath);
 
-if (persistentProperty.isLanguageProperty()) {
+if (persistentProperty.isExplicitLanguageProperty() && !StringUtils.hasText(dotPath)) {
 indexDefinitionBuilder.withLanguageOverride(persistentProperty.getFieldName());
 }
 
@@ -257,6 +257,10 @@ public void doWithPersistentProperty(MongoPersistentProperty persistentProperty)
 mappingContext.getPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
 } catch (CyclicPropertyReferenceException e) {
 LOGGER.warn(e.getMessage(), e);
+} catch (InvalidDataAccessApiUsageException e) {
+LOGGER.warn(
+String.format("Potentially invald index structure discovered. Breaking operation for %s.",
+entity.getName()), e);
 }
 } else if (includeOptions.isForce() || indexed != null) {
 indexDefinitionBuilder.onField(propertyDotPath, weight);

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

@@ -190,9 +190,18 @@ public DBRef getDBRef() {
  */
 @Override
 public boolean isLanguageProperty() {
-return getFieldName().equals(LANGUAGE_FIELD_NAME) || isAnnotationPresent(Language.class);
+return getFieldName().equals(LANGUAGE_FIELD_NAME) || isExplicitLanguageProperty();
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitLanguageProperty()
+ */
+@Override
+public boolean isExplicitLanguageProperty() {
+return isAnnotationPresent(Language.class);
+};
+
 /*
  * (non-Javadoc)
  * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isTextScoreProperty()

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

@@ -61,14 +61,22 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 boolean isExplicitIdProperty();
 
 /**
- * Returns whether the property indicates the documents language either by having a {@link #getFieldName()} equal to
- * {@literal language} or being annotated with {@link Language}.
+ * Returns true whether the property indicates the documents language either by having a {@link #getFieldName()} equal
+ * to {@literal language} or being annotated with {@link Language}.
  * 
  * @return
  * @since 1.6
  */
 boolean isLanguageProperty();
 
+/**
+ * Returns true when property being annotated with {@link Language}.
+ * 
+ * @return
+ * @since 1.6.1
+ */
+boolean isExplicitLanguageProperty();
+
 /**
  * Returns whether the property holds the documents score calculated by text search. <br/>
  * It's marked with {@link TextScore}.

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java

@@ -26,8 +26,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.hamcrest.collection.IsEmptyCollection;
 import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -491,12 +491,52 @@ public void shouldSetDefaultLanguageCorrectly() {
 }
 
 /**
- * @see DATAMONGO-937
+ * @see DATAMONGO-937, DATAMONGO-1049
  */
 @Test
 public void shouldResolveTextIndexLanguageOverrideCorrectly() {
 
-List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithLanguageOverrideOnNestedElementRoot.class);
+List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithLanguageOverride.class);
+assertThat(indexDefinitions.get(0).getIndexOptions().get("language_override"), IsEqual.<Object> equalTo("lang"));
+}
+
+/**
+ * @see DATAMONGO-1049
+ */
+@Test
+public void shouldIgnoreTextIndexLanguageOverrideOnNestedElements() {
+
+List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithLanguageOverrideOnNestedElement.class);
+assertThat(indexDefinitions.get(0).getIndexOptions().get("language_override"), IsNull.nullValue());
+}
+
+/**
+ * @see DATAMONGO-1049
+ */
+@Test
+public void shouldNotCreateIndexDefinitionWhenOnlyLanguageButNoTextIndexPresent() {
+
+List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithNoTextIndexPropertyButReservedFieldLanguage.class);
+assertThat(indexDefinitions, empty());
+}
+
+/**
+ * @see DATAMONGO-1049
+ */
+@Test
+public void shouldNotCreateIndexDefinitionWhenOnlyAnnotatedLanguageButNoTextIndexPresent() {
+
+List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithNoTextIndexPropertyButReservedFieldLanguageAnnotated.class);
+assertThat(indexDefinitions, empty());
+}
+
+/**
+ * @see DATAMONGO-1049
+ */
+@Test
+public void shouldPreferExplicitlyAnnotatedLanguageProperty() {
+
+List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(DocumentWithOverlappingLanguageProps.class);
 assertThat(indexDefinitions.get(0).getIndexOptions().get("language_override"), IsEqual.<Object> equalTo("lang"));
 }
 
@@ -527,14 +567,12 @@ static class TextIndexOnNestedRoot {
 static class TextIndexOnNested {
 
 String foo;
-
 }
 
 @Document
 static class TextIndexOnNestedWithWeightRoot {
 
 @TextIndexed(weight = 5) TextIndexOnNested nested;
-
 }
 
 @Document
@@ -554,18 +592,39 @@ static class DocumentWithDefaultLanguage {
 }
 
 @Document
-static class DocumentWithLanguageOverrideOnNestedElementRoot {
+static class DocumentWithLanguageOverrideOnNestedElement {
 
-DocumentWithLanguageOverrideOnNestedElement nested;
+DocumentWithLanguageOverride nested;
 }
 
-static class DocumentWithLanguageOverrideOnNestedElement {
+@Document
+static class DocumentWithLanguageOverride {
 
 @TextIndexed String foo;
 
 @Language String lang;
 }
 
+@Document
+static class DocumentWithNoTextIndexPropertyButReservedFieldLanguage {
+
+String language;
+}
+
+@Document
+static class DocumentWithNoTextIndexPropertyButReservedFieldLanguageAnnotated {
+
+@Field("language") String lang;
+}
+
+@Document
+static class DocumentWithOverlappingLanguageProps {
+
+@TextIndexed String foo;
+String language;
+@Language String lang;
+}
+
 }
 
 public static class MixedIndexResolutionTests {
@@ -670,7 +729,7 @@ public void shouldNotDetectCycleInSimilarlyNamedProperties() {
 public void shouldDetectSelfCycleViaCollectionTypeCorrectly() {
 
 List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(SelfCyclingViaCollectionType.class);
-assertThat(indexDefinitions, IsEmptyCollection.empty());
+assertThat(indexDefinitions, empty());
 }
 
 /**
@@ -680,7 +739,7 @@ public void shouldDetectSelfCycleViaCollectionTypeCorrectly() {
 public void shouldNotDetectCycleWhenTypeIsUsedMoreThanOnce() {
 
 List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(MultipleObjectsOfSameType.class);
-assertThat(indexDefinitions, IsEmptyCollection.empty());
+assertThat(indexDefinitions, empty());
 }
 
 /**