DATADOC-215 - Allow configuring a WriteConcern per MongoFactoryBean.

Added ability to configure a WriteConcern for an entire MongoFactoryBean and exposed the attribute via the namespace.

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

@@ -43,6 +43,7 @@ public class MongoParser extends AbstractSingleBeanDefinitionParser {
 
 		ParsingUtils.setPropertyValue(element, builder, "port", "port");
 		ParsingUtils.setPropertyValue(element, builder, "host", "host");
+		ParsingUtils.setPropertyValue(element, builder, "write-concern", "writeConcern");
 
 		ParsingUtils.parseMongoOptions(parserContext, element, builder);
 		ParsingUtils.parseReplicaSet(parserContext, element, builder);

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

@@ -18,36 +18,37 @@ package org.springframework.data.mongodb.core;
 
 import java.util.List;
 
-import com.mongodb.Mongo;
-import com.mongodb.MongoOptions;
-import com.mongodb.ServerAddress;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.CannotGetMongoDbConnectionException;
-import org.springframework.util.Assert;
+
+import com.mongodb.Mongo;
+import com.mongodb.MongoOptions;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
 
 /**
  * Convenient factory for configuring MongoDB.
  * 
  * @author Thomas Risberg
  * @author Graeme Rocher
+ * @author Oliver Gierke
  * @since 1.0
  */
-public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, PersistenceExceptionTranslator {
+public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptionTranslator {
 
 	/**
 	 * Logger, available to subclasses.
 	 */
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private Mongo mongo;
 	private MongoOptions mongoOptions;
 	private String host;
 	private Integer port;
+	private WriteConcern writeConcern;
 	private List<ServerAddress> replicaSetSeeds;
 	private List<ServerAddress> replicaPair;
 
@@ -73,8 +74,13 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, P
 		this.port = port;
 	}
 
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return exceptionTranslator;
+	/**
+	 * Sets the {@link WriteConcern} to be configured for the {@link Mongo} instance to be created.
+	 * 
+	 * @param writeConcern
+	 */
+	public void setWriteConcern(WriteConcern writeConcern) {
+		this.writeConcern = writeConcern;
 	}
 
 	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
@@ -82,49 +88,64 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, P
 	}
 
 	public Mongo getObject() throws Exception {
-		Assert.notNull(mongo, "Mongo must not be null");
+
+		Mongo mongo;
+
+		if (host == null) {
+			
+			logger.warn("Property host not specified. Using default configuration");
+			mongo = new Mongo();
+			
+		} else {
+			
+			ServerAddress defaultOptions = new ServerAddress();
+			
+			if (mongoOptions == null) {
+				mongoOptions = new MongoOptions();
+			}
+			
+			if (replicaPair != null) {
+				if (replicaPair.size() < 2) {
+					throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
+				}
+				mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
+			} else if (replicaSetSeeds != null) {
+				mongo = new Mongo(replicaSetSeeds, mongoOptions);
+			} else {
+				String mongoHost = host != null ? host : defaultOptions.getHost();
+				mongo = port != null ? new Mongo(new ServerAddress(mongoHost, port), mongoOptions) : new Mongo(mongoHost,
+						mongoOptions);
+			}
+		}
+
+		if (writeConcern != null) {
+			mongo.setWriteConcern(writeConcern);
+		}
+
 		return mongo;
+
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
 	public Class<? extends Mongo> getObjectType() {
 		return Mongo.class;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 */
 	public boolean isSingleton() {
-		return false;
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		// apply defaults - convenient when used to configure for tests
-		// in an application context
-		if (mongo == null) {
-
-			if (host == null) {
-				logger.warn("Property host not specified. Using default configuration");
-				mongo = new Mongo();
-			} else {
-				ServerAddress defaultOptions = new ServerAddress();
-				if (mongoOptions == null)
-					mongoOptions = new MongoOptions();
-				if (replicaPair != null) {
-					if (replicaPair.size() < 2) {
-						throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
-					}
-					mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
-				} else if (replicaSetSeeds != null) {
-					mongo = new Mongo(replicaSetSeeds, mongoOptions);
-				} else {
-					String mongoHost = host != null ? host : defaultOptions.getHost();
-					if (port != null) {
-						mongo = new Mongo(new ServerAddress(mongoHost, port), mongoOptions);
-					} else {
-						mongo = new Mongo(mongoHost, mongoOptions);
-					}
-				}
-			}
-		}
+		return true;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}

spring-data-mongodb/src/main/resources/org/springframework/data/document/mongodb/config/spring-mongo-1.0.xsd

@@ -39,17 +39,6 @@ Defines a MongoDbFactory for connecting to a specific database
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<!-- 
-			<xsd:sequence minOccurs="0" maxOccurs="1">
-				<xsd:element name="mongo" type="mongoType">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-Defines a Mongo instance used for accessing MongoDB'.
-							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			-->
 			<xsd:attribute name="id" type="xsd:ID" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -251,6 +240,19 @@ The name of the Mongo object that determines what server to monitor. (by default
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
 
+	<xsd:attributeGroup name="writeConcern">
+		<xsd:attribute name="write-concern">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="NONE" />
+					<xsd:enumeration value="NORMAL" />
+					<xsd:enumeration value="SAFE" />
+					<xsd:enumeration value="FSYNC_SAFE" />
+					<xsd:enumeration value="REPLICA_SAFE" />
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
 
 	<xsd:complexType name="mongoType">
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -267,6 +269,7 @@ The Mongo driver options
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
+		<xsd:attributeGroup ref="writeConcern" />
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.config;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.*;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * Integration tests for {@link MongoParser}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoParserIntegrationTests {
+
+	@Test
+	public void readsMongoAttributesCorrectly() {
+
+		ConfigurableListableBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/mongo-bean.xml"));
+		BeanDefinition definition = factory.getBeanDefinition("mongo");
+
+		List<PropertyValue> values = definition.getPropertyValues().getPropertyValueList();
+		assertThat(values, hasItem(new PropertyValue("writeConcern", "SAFE")));
+
+		factory.getBean("mongo");
+	}
+}

spring-data-mongodb/src/test/resources/namespace/mongo-bean.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<mongo:mongo id="mongo" host="localhost" port="42" write-concern="SAFE" />
+
+</beans>