From 03bcc56429d95d36016eb51a65c4fb61453ed14b Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Fri, 14 Nov 2014 16:49:45 +0100 Subject: [PATCH] DATAMONGO-1094 - Fixed ambiguous field mapping error message in BasicMongoPersistentEntity. Original pull request: #245. --- .../data/mongodb/core/mapping/BasicMongoPersistentEntity.java | 2 +- .../data/mongodb/core/mapping/MongoMappingContextUnitTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java index b4f4f1a2b..1de1072ab 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; public class BasicMongoPersistentEntity extends BasicPersistentEntity implements MongoPersistentEntity, ApplicationContextAware { - private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @DocumentField annotation!"; + private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @Field annotation!"; private final String collection; private final String language; private final SpelExpressionParser parser; 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 5eccf368b..99e74c523 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 @@ -106,6 +106,7 @@ public class MongoMappingContextUnitTests { exception.expectMessage("firstname"); exception.expectMessage("lastname"); exception.expectMessage("foo"); + exception.expectMessage("@Field"); MongoMappingContext context = new MongoMappingContext(); context.setApplicationContext(applicationContext);