diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java
index a04c85d86..a98d5f6cb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java
@@ -16,28 +16,23 @@
 package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.springframework.util.StringUtils;
-
-import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;
 
 /**
- * Parse a string to a WriteConcern.  If it is a well know String as identified by the WriteConcern.valueOf, use the
- * well known WriteConcern value, otherwise pass the string as is to the constructor of the write concern.
- * There is no support for other constructor signatures when parsing from a string value.
+ * Parse a string to a {@link WriteConcern}. If it is a well know {@link String} as identified by the
+ * {@link WriteConcern#valueOf(String)}, use the well known {@link WriteConcern} value, otherwise pass the string as is
+ * to the constructor of the write concern. There is no support for other constructor signatures when parsing from a
+ * string value.
  * 
  * @author Mark Pollack
- *
  */
 public class WriteConcernPropertyEditor extends PropertyEditorSupport {
 
 	/**
 	 * Parse a string to a List<ServerAddress>
 	 */
+	@Override
 	public void setAsText(String writeConcernString) {
 
 		WriteConcern writeConcern = WriteConcern.valueOf(writeConcernString);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java
index 771332d2d..2271de441 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java
@@ -96,6 +96,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 	 * 
 	 * Defaults to false
 	 */
+	@SuppressWarnings("deprecation")
 	private boolean slaveOk = MONGO_OPTIONS.slaveOk;
 
 	/**
@@ -204,6 +205,7 @@ public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, Initi
 		this.slaveOk = slaveOk;
 	}
 
+	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() {
 		MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
 		MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index a6dbed911..f7cc8d579 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -135,7 +135,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	private WriteResultChecking writeResultChecking = WriteResultChecking.NONE;
 
 	/**
-	 * Set the ReadPreference when operating on a collection.  See {@link #prepareCollection(DBCollection)} 
+	 * Set the ReadPreference when operating on a collection.  See {@link #prepareCollection(DBCollection)}
 	 */
 	private ReadPreference readPreference = null;
 
@@ -539,7 +539,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	public <T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName) {
-		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(), 
+		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(), query.getSortObject(),
 				entityClass, update, options);
 	}
 	
@@ -840,7 +840,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				}
 
 				WriteResult wr;
-				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass, updateObj, queryObj);				
+				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass, updateObj, queryObj);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 				if (writeConcernToUse == null) {
 					wr = collection.update(queryObj, updateObj, upsert, multi);
@@ -920,7 +920,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				DBObject dboq = mapper.getMappedObject(queryObject, entity);
 				WriteResult wr = null;
-				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass, null, queryObject);		
+				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass, null, queryObject);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 				if (LOGGER.isDebugEnabled()) {
 					LOGGER.debug("remove using query: " + queryObject + " in collection: " + collection.getName());
@@ -1035,7 +1035,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				  String initialAsString = replaceWithResourceIfNecessary((String)initialObj);
 					dbo.put("initial", JSON.parse(initialAsString));
 			}
-		}		
+		}
 
 		if (dbo.containsField("$reduce")) {
 			dbo.put("$reduce", replaceWithResourceIfNecessary(dbo.get("$reduce").toString()));
@@ -1069,6 +1069,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			LOGGER.debug("Group command result = [" + commandResult + "]");
 		}
 		
+		@SuppressWarnings("unchecked")
 		Iterable<DBObject> resultSet = (Iterable<DBObject>) commandResult.get( "retval" );
 		
 		List<T> mappedResults = new ArrayList<T>();