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;
@@ -39,14 +43,23 @@
 
 /**
  * {@link BeanDefinitionParser} to parse {@code db-factory} elements into {@link BeanDefinition}s.
- * 
+ *
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @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));
 			}
@@ -115,7 +132,7 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 	/**
 	 * Registers a default {@link BeanDefinition} of a {@link Mongo} instance and returns the name under which the
 	 * {@link Mongo} instance was registered under.
-	 * 
+	 *
 	 * @param element must not be {@literal null}.
 	 * @param parserContext must not be {@literal null}.
 	 * @return
@@ -131,7 +148,7 @@ private BeanDefinition registerMongoBeanDefinition(Element element, ParserContex
 
 	/**
 	 * Returns a {@link BeanDefinition} for a {@link UserCredentials} object.
-	 * 
+	 *
 	 * @param element
 	 * @return the {@link BeanDefinition} or {@literal null} if neither username nor password given.
 	 */
@@ -154,7 +171,7 @@ private BeanDefinition getUserCredentialsBeanDefinition(Element element, ParserC
 	/**
 	 * Creates a {@link BeanDefinition} for a {@link MongoURI} or {@link MongoClientURI} depending on configured
 	 * attributes.
-	 * 
+	 *
 	 * @param element must not be {@literal null}.
 	 * @return {@literal null} in case no client-/uri defined.
 	 */