DATAMONGO-456 - Fixed <db-factory /> element documentation in XSD.

If the entity being removed using MongoTemplate.remove(object, collectionName) contained an id that could be converted into an ObjectID it wasn't removed correctly currently. This was caused by the fact that the intermediate call didn't hand over the entity type and thus the id conversion failed. This in turn caused the query not to match the previous saved object.

pom.xml

@@ -6,7 +6,7 @@
   <name>Spring Data MongoDB Distribution</name>
   <description>Spring Data project for MongoDB</description>
   <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.0.4.RELEASE</version>
+  <version>1.0.5.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>spring-data-mongodb</module>

spring-data-mongodb-cross-store/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.4.RELEASE</version>
+    <version>1.0.5.BUILD-SNAPSHOT</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-cross-store</artifactId>

spring-data-mongodb-log4j/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.4.RELEASE</version>
+    <version>1.0.5.BUILD-SNAPSHOT</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-log4j</artifactId>

spring-data-mongodb-parent/pom.xml

@@ -6,7 +6,7 @@
   <name>Spring Data MongoDB Parent</name>
   <description>Spring Data project for MongoDB</description>
   <url>http://www.springsource.org/spring-data/mongodb</url>
-  <version>1.0.4.RELEASE</version>
+  <version>1.0.5.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -198,7 +198,7 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-mongodb</artifactId>
-        <version>1.0.4.RELEASE</version>
+        <version>1.0.5.BUILD-SNAPSHOT</version>
       </dependency>
 
       <!-- Logging -->
@@ -297,7 +297,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.1</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -378,6 +378,10 @@
       <id>spring-plugins-release</id>
       <url>http://repo.springsource.org/plugins-release</url>
     </pluginRepository>
+    <pluginRepository>
+      <id>querydsl</id>
+      <url>http://source.mysema.com/maven2/releases</url>
+    </pluginRepository>
   </pluginRepositories>
   <repositories>
     <repository>

spring-data-mongodb/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.0.4.RELEASE</version>
+		<version>1.0.5.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
@@ -69,19 +69,6 @@
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.code.morphia</groupId>
-					<artifactId>morphia</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl.version}</version>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -131,7 +118,14 @@
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0.2</version>
+				<version>1.0.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.mysema.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl.version}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>

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

@@ -97,10 +97,12 @@ public abstract class MongoDbUtils {
 		boolean credentialsGiven = username != null && password != null;
 		if (credentialsGiven && !db.isAuthenticated()) {
 			// Note, can only authenticate once against the same com.mongodb.DB object.
-			if (!db.authenticate(username, password)) {
-				throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
-						+ "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username,
-						password);
+			synchronized (db) {
+				if (!db.authenticate(username, password)) {
+					throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName
+							+ "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username,
+							password);
+				}
 			}
 		}
 
@@ -144,7 +146,7 @@ public abstract class MongoDbUtils {
 			return false;
 		}
 		DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-		return (dbHolder != null && dbHolder.containsDB(db));
+		return dbHolder != null && dbHolder.containsDB(db);
 	}
 
 	/**

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

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -456,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		} else {
 			query.limit(1);
 			List<T> results = find(query, entityClass, collectionName);
-			return (results.isEmpty() ? null : results.get(0));
+			return results.isEmpty() ? null : results.get(0);
 		}
 	}
 
@@ -879,7 +879,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}
 
-		remove(getIdQueryFor(object), collection);
+		doRemove(collection, getIdQueryFor(object), object.getClass());
 	}
 
 	/**

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

@@ -514,9 +514,28 @@ public class Criteria implements CriteriaDefinition {
 
 		Criteria that = (Criteria) obj;
 
-		boolean keyEqual = this.key == null ? that.key == null : this.key.equals(that.key);
-		boolean criteriaEqual = this.criteria.equals(that.criteria);
-		boolean valueEqual = isEqual(this.isValue, that.isValue);
+		if (this.criteriaChain.size() != that.criteriaChain.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < this.criteriaChain.size(); i++) {
+
+			Criteria left = this.criteriaChain.get(i);
+			Criteria right = that.criteriaChain.get(i);
+
+			if (!simpleCriteriaEquals(left, right)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private boolean simpleCriteriaEquals(Criteria left, Criteria right) {
+
+		boolean keyEqual = left.key == null ? right.key == null : left.key.equals(right.key);
+		boolean criteriaEqual = left.criteria.equals(right.criteria);
+		boolean valueEqual = isEqual(left.isValue, right.isValue);
 
 		return keyEqual && criteriaEqual && valueEqual;
 	}

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 import static org.springframework.util.ObjectUtils.*;
 
 import java.util.ArrayList;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.core;
+package org.springframework.data.mongodb.core.query;
 
 import java.util.Collection;
 import java.util.Iterator;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -117,8 +117,11 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 		}
 
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
-		return from(part.getType(), where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
-				(PotentiallyConvertingIterator) iterator);
+
+		return new Criteria().andOperator(
+				base,
+				from(part.getType(), where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
+						(PotentiallyConvertingIterator) iterator));
 	}
 
 	/*
@@ -265,4 +268,4 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
 		return source.replaceAll("\\*", ".*");
 	}
-}
+}

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

@@ -44,8 +44,9 @@ The name of the mongo definition (by default "mongoDbFactory").]]></xsd:document
 			</xsd:attribute>
 			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
 				<xsd:annotation>
-					<xsd:documentation>
-						The reference to a Mongo. Will default to 'mongo'.
+					<xsd:documentation><![CDATA[
+The reference to a Mongo instance. If not configured a default com.mongodb.Mongo instance will be created.
+					]]>
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>

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

@@ -1226,6 +1226,24 @@ public class MongoTemplateTests {
 		template.remove(query(where("id").is(id)), TypeWithMyId.class);
 	}
 
+	/**
+	 * @see DATAMONGO-539
+	 */
+	@Test
+	public void removesObjectFromExplicitCollection() {
+
+		String collectionName = "explicit";
+		template.remove(new Query(), collectionName);
+
+		PersonWithConvertedId person = new PersonWithConvertedId();
+		person.name = "Dave";
+		template.save(person, collectionName);
+		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(false));
+
+		template.remove(person, collectionName);
+		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(true));
+	}
+
 	static class MyId {
 
 		String first;
@@ -1255,6 +1273,12 @@ public class MongoTemplateTests {
 		}
 	}
 
+	static class PersonWithConvertedId {
+
+		String id;
+		String name;
+	}
+
 	static enum DateTimeToDateConverter implements Converter<DateTime, Date> {
 
 		INSTANCE;

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

@@ -17,12 +17,13 @@ package org.springframework.data.mongodb.core;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.data.mongodb.core.SerializationUtils.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.util.Arrays;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
+import org.springframework.data.mongodb.core.query.SerializationUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 import org.junit.Test;
-import org.springframework.data.mongodb.core.query.Criteria;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -51,4 +51,14 @@ public class CriteriaTests {
 		Criteria c = new Criteria("name").is("Bubba").and("age").lt(21);
 		assertEquals("{ \"name\" : \"Bubba\" , \"age\" : { \"$lt\" : 21}}", c.getCriteriaObject().toString());
 	}
+
+	@Test
+	public void equalIfCriteriaMatches() {
+
+		Criteria left = new Criteria("name").is("Foo").and("lastname").is("Bar");
+		Criteria right = new Criteria("name").is("Bar").and("lastname").is("Bar");
+
+		assertThat(left, is(not(right)));
+		assertThat(right, is(not(left)));
+	}
 }

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

@@ -432,4 +432,21 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		List<Person> result = repository.findByCreatedAtLessThanManually(boyd.createdAt);
 		assertThat(result.isEmpty(), is(false));
 	}
-}
+
+	/**
+	 * @see DATAMONGO-521
+	 */
+	@Test
+	public void executesAndQueryCorrectly() {
+
+		List<Person> result = repository.findByFirstnameAndLastname("Dave", "Matthews");
+
+		assertThat(result, hasSize(1));
+		assertThat(result, hasItem(dave));
+
+		result = repository.findByFirstnameAndLastname("Oliver August", "Matthews");
+
+		assertThat(result, hasSize(1));
+		assertThat(result, hasItem(oliver));
+	}
+}

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

@@ -106,6 +106,8 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	 */
 	List<Person> findByFirstnameNotIn(Collection<String> firstnames);
 
+	List<Person> findByFirstnameAndLastname(String firstname, String lastname);
+
 	/**
 	 * Returns all {@link Person}s with an age between the two given values.
 	 * 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2010-2012 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.

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

@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,11 +45,9 @@ import com.mongodb.MongoException;
 @ContextConfiguration
 public class RepositoryIndexCreationIntegrationTests {
 
-	@Autowired
-	MongoOperations operations;
+	@Autowired MongoOperations operations;
 
-	@Autowired
-	PersonRepository repository;
+	@Autowired PersonRepository repository;
 
 	@After
 	public void tearDown() {
@@ -72,13 +71,18 @@ public class RepositoryIndexCreationIntegrationTests {
 	public void testname() {
 		operations.execute(Person.class, new CollectionCallback<Void>() {
 
+			@SuppressWarnings("unchecked")
 			public Void doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				List<DBObject> indexInfo = collection.getIndexInfo();
 
 				assertThat(indexInfo.isEmpty(), is(false));
 				assertThat(indexInfo.size(), is(greaterThan(2)));
-				assertThat(getIndexNamesFrom(indexInfo), hasItems("findByLastnameLike", "findByFirstnameLike"));
 
+				Matcher<String> lastnameIndex = startsWith("findByLastname");
+				Matcher<String> firstnameIndex = startsWith("findByFirstname");
+				Matcher<Iterable<String>> hasItems = hasItems(lastnameIndex, firstnameIndex);
+
+				assertThat(getIndexNamesFrom(indexInfo), hasItems);
 				return null;
 			}
 		});

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java

@@ -97,7 +97,8 @@ public class MongoQueryCreatorUnitTests {
 				getAccessor(converter, "Oliver", person), context);
 		Query query = creator.createQuery();
 
-		assertThat(query, is(query(where("firstName").is("Oliver").and("friend").is(person))));
+		Criteria criteria = new Criteria().andOperator(where("firstName").is("Oliver"), where("friend").is(person));
+		assertThat(query, is(query(criteria)));
 	}
 
 	@Test
@@ -222,7 +223,7 @@ public class MongoQueryCreatorUnitTests {
 	}
 
 	/**
-	 * @see DATAMONGO
+	 * @see DATAMONGO-413
 	 */
 	@Test
 	public void createsOrQueryCorrectly() {

src/docbkx/introduction/introduction.xml

@@ -12,17 +12,17 @@
       <title>Knowing Spring</title>
 
       <para>Spring Data uses Spring framework's <ulink
-      url="http://static.springframework.org/spring/docs/3.0.x/reference/spring-core.html">core</ulink>
+      url="http://static.springframework.org/spring/docs/3.0.x/reference/html/spring-core.html">core</ulink>
       functionality, such as the <ulink
-      url="http://static.springframework.org/spring/docs/3.0.x/reference/beans.html">IoC</ulink>
+      url="http://static.springframework.org/spring/docs/3.0.x/reference/html/beans.html">IoC</ulink>
       container, <ulink
-      url="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">type
-      conv ersion system</ulink>, <ulink
-      url="http://static.springsource.org/spring/docs/3.0.x/reference/expressions.html">expression
+      url="http://static.springsource.org/spring/docs/3.0.x/reference/html/validation.html#core-convert">type
+      conversion system</ulink>, <ulink
+      url="http://static.springsource.org/spring/docs/3.0.x/reference/html/expressions.html">expression
       language</ulink>, <ulink
-      url="http://static.springsource.org/spring/docs/3.0.x/reference/jmx.html">JMX
+      url="http://static.springsource.org/spring/docs/3.0.x/reference/html/jmx.html">JMX
       integration</ulink>, and portable <ulink
-      url="http://static.springsource.org/spring/docs/3.0.x/reference/dao.html#dao-exceptions">DAO
+      url="http://static.springsource.org/spring/docs/3.0.x/reference/html/dao.html#dao-exceptions">DAO
       exception hierarchy</ulink>. While it is not important to know the
       Spring APIs, understanding the concepts behind them is. At a minimum,
       the idea behind IoC should be familiar for whatever IoC container you