Removed compiler warnings.

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

@@ -46,6 +46,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 	 * 
 	 * @param conversionService
 	 */
+	@SuppressWarnings("deprecation")
 	public AbstractMongoConverter(GenericConversionService conversionService) {
 		this.conversionService = conversionService == null ? ConversionServiceFactory.createDefaultConversionService()
 				: conversionService;

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

@@ -99,6 +99,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 */
+	@SuppressWarnings("deprecation")
 	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 

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

@@ -18,12 +18,15 @@ package org.springframework.data.mongodb.config;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionReader;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
@@ -41,6 +44,15 @@ import com.mongodb.WriteConcern;
  * @author Oliver Gierke
  */
 public class MongoDbFactoryParserIntegrationTests {
+	
+	DefaultListableBeanFactory factory;
+	BeanDefinitionReader reader;
+	
+	@Before
+	public void setUp() {
+		factory = new DefaultListableBeanFactory();
+		reader = new XmlBeanDefinitionReader(factory);
+	}
 
 	@Test
 	public void testWriteConcern() throws Exception {
@@ -103,7 +115,8 @@ public class MongoDbFactoryParserIntegrationTests {
 
 	@Test
 	public void createsDbFactoryBean() {
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/db-factory-bean.xml"));
+		
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/db-factory-bean.xml"));
 		factory.getBean("first");
 	}
 	
@@ -113,7 +126,7 @@ public class MongoDbFactoryParserIntegrationTests {
 	@Test
 	public void parsesMaxAutoConnectRetryTimeCorrectly() {
 		
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/db-factory-bean.xml"));
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/db-factory-bean.xml"));
 		Mongo mongo = factory.getBean(Mongo.class);
 		assertThat(mongo.getMongoOptions().maxAutoConnectRetryTime, is(27L));
 	}
@@ -124,7 +137,7 @@ public class MongoDbFactoryParserIntegrationTests {
 	@Test
 	public void setsUpMongoDbFactoryUsingAMongoUri() {
 		
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/mongo-uri.xml"));
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-uri.xml"));
 		BeanDefinition definition = factory.getBeanDefinition("mongoDbFactory");
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 		
@@ -139,7 +152,7 @@ public class MongoDbFactoryParserIntegrationTests {
 	@Test
 	public void setsUpMongoDbFactoryUsingAMongoUriWithoutCredentials() {
 		
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/mongo-uri-no-credentials.xml"));
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-uri-no-credentials.xml"));
 		BeanDefinition definition = factory.getBeanDefinition("mongoDbFactory");
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 		
@@ -150,8 +163,6 @@ public class MongoDbFactoryParserIntegrationTests {
 		MongoDbFactory dbFactory = factory.getBean("mongoDbFactory", MongoDbFactory.class);
 		DB db = dbFactory.getDb();
 		assertThat(db.getName(), is("database"));
-		
-		
 	}
 	
 	/**
@@ -159,6 +170,6 @@ public class MongoDbFactoryParserIntegrationTests {
 	 */
 	@Test(expected = BeanDefinitionParsingException.class)
 	public void rejectsUriPlusDetailedConfiguration() {
-		new XmlBeanFactory(new ClassPathResource("namespace/mongo-uri-and-details.xml"));
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-uri-and-details.xml"));
 	}
 }

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

@@ -20,11 +20,13 @@ import static org.hamcrest.Matchers.*;
 
 import java.util.List;
 
+import org.junit.Before;
 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.beans.factory.support.BeanDefinitionReader;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -33,11 +35,20 @@ import org.springframework.core.io.ClassPathResource;
  * @author Oliver Gierke
  */
 public class MongoParserIntegrationTests {
+	
+	DefaultListableBeanFactory factory;
+	BeanDefinitionReader reader;
+	
+	@Before
+	public void setUp() {
+		factory = new DefaultListableBeanFactory();
+		reader = new XmlBeanDefinitionReader(factory);
+	}
 
 	@Test
 	public void readsMongoAttributesCorrectly() {
 
-		ConfigurableListableBeanFactory factory = new XmlBeanFactory(new ClassPathResource("namespace/mongo-bean.xml"));
+		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-bean.xml"));
 		BeanDefinition definition = factory.getBeanDefinition("mongo");
 
 		List<PropertyValue> values = definition.getPropertyValues().getPropertyValueList();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java

@@ -95,6 +95,7 @@ public class CustomConversionsUnitTests {
 	@Test
 	public void populatesConversionServiceCorrectly() {
 
+		@SuppressWarnings("deprecation")
 		GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService();
 		assertThat(conversionService.canConvert(String.class, UUID.class), is(false));
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java

@@ -69,6 +69,7 @@ public class MappingTests {
 			MongoCollectionUtils.getPreferredCollectionName(PersonMultiDimArrays.class),
 			MongoCollectionUtils.getPreferredCollectionName(PersonMultiCollection.class),
 			MongoCollectionUtils.getPreferredCollectionName(PersonWithDbRef.class),
+			MongoCollectionUtils.getPreferredCollectionName(PersonWithLongDBRef.class),
 			MongoCollectionUtils.getPreferredCollectionName(PersonNullProperties.class),
 			MongoCollectionUtils.getPreferredCollectionName(Account.class),
 			MongoCollectionUtils.getPreferredCollectionName(PrimitiveId.class),
@@ -355,8 +356,8 @@ public class MappingTests {
 	}
 	
 	@Test
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void testUpsert() {		
+	@SuppressWarnings("rawtypes")
+	public void testUpsert() {
 		Address addr = new Address();
 		addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
 		addr.setCity("Anytown");
@@ -385,8 +386,6 @@ public class MappingTests {
 		PersonWithObjectId p2 = new PersonWithObjectId(2, "second", "");
 		template.save(p2);
 
-		Query one = query(where("ssn").is(1));
-		Query two = query(where("ssn").is(2));
 		List<PersonWithObjectId> results = template.find(new Query(
 				new Criteria().orOperator(where("ssn").is(1), where("ssn").is(2))), PersonWithObjectId.class);
 

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

@@ -3,9 +3,12 @@ package org.springframework.data.mongodb.repository.config;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionReader;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.mongodb.repository.AbstractPersonRepositoryIntegrationTests;
 import org.springframework.test.context.ContextConfiguration;
@@ -18,10 +21,21 @@ import org.springframework.test.context.ContextConfiguration;
 @ContextConfiguration
 public class MongoNamespaceIntegrationTests extends AbstractPersonRepositoryIntegrationTests {
 
+	DefaultListableBeanFactory factory;
+	BeanDefinitionReader reader;
+	
+	@Before
+	@Override
+	public void setUp() {
+		super.setUp();
+		factory = new DefaultListableBeanFactory();
+		reader = new XmlBeanDefinitionReader(factory);
+	}
+	
 	@Test
 	public void assertDefaultMappingContextIsWired() {
 
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("MongoNamespaceIntegrationTests-context.xml",
+		reader.loadBeanDefinitions(new ClassPathResource("MongoNamespaceIntegrationTests-context.xml",
 				getClass()));
 		BeanDefinition definition = factory.getBeanDefinition("personRepository");
 		assertThat(definition, is(notNullValue()));