DATA-1293 - Rather than list disallowed attributes - calculate count of allowed attributes and compare it to total attributes count.

Author: vkhoroshko

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java

@@ -18,6 +18,10 @@
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -47,6 +51,15 @@
  * @author Viktor Khoroshko
  */
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
+	private static final Set<String> MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES;
+
+	static {
+		Set<String> mongoUriAllowedAdditionalAttributes = new HashSet<String>();
+		mongoUriAllowedAdditionalAttributes.add("id");
+		mongoUriAllowedAdditionalAttributes.add("write-concern");
+
+		MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES = Collections.unmodifiableSet(mongoUriAllowedAdditionalAttributes);
+	}
 
 	/* 
 	 * (non-Javadoc)
@@ -74,10 +87,14 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 		BeanDefinition mongoUri = getMongoUri(element);
 
 		if (mongoUri != null) {
-			if (element.hasAttribute("mongo-ref") || element.hasAttribute("dbname")
-					|| element.hasAttribute("authentication-dbname")
-					|| element.hasAttribute("port") || element.hasAttribute("host")
-					|| element.hasAttribute("username") || element.hasAttribute("password")) {
+			int allowedAttributesCount = 1;
+			for (String attribute : MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES) {
+				if (element.hasAttribute(attribute)) {
+					allowedAttributesCount++;
+				}
+			}
+
+			if (element.getAttributes().getLength() > allowedAttributesCount) {
 				parserContext.getReaderContext().error("Configure either Mongo URI or details individually!",
 						parserContext.extractSource(element));
 			}