DATAMONGO-463 - Release 1.0.2.RELEASE.

Upgrade to Log4J 1.2.16 to remove the need for the exclusions. Replaced ${pom.version} with ${project.version}.

pom.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb-dist</artifactId>
   <name>Spring Data MongoDB Distribution</name>
-  <version>1.0.0.RELEASE</version>
+  <description>Spring Data project for MongoDB</description>
+  <url>http://www.springsource.org/spring-data/mongodb</url>
+  <version>1.0.2.RELEASE</version>
   <packaging>pom</packaging>
   <modules>
     <module>spring-data-mongodb</module>
@@ -14,7 +15,18 @@
     <module>spring-data-mongodb-parent</module>
   </modules>
 
-  <developers>
+   <developers>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
     <developer>
       <id>trisberg</id>
       <name>Thomas Risberg</name>
@@ -39,17 +51,6 @@
       </roles>
       <timezone>-5</timezone>
     </developer>
-    <developer>
-      <id>ogierke</id>
-      <name>Oliver Gierke</name>
-      <email>ogierke at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.springsource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
     <developer>
       <id>jbrisbin</id>
       <name>Jon Brisbin</name>
@@ -145,37 +146,35 @@
           <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
           <useExtensions>1</useExtensions>
           <highlightSource>1</highlightSource>
-          <highlightDefaultLanguage></highlightDefaultLanguage>
+          <highlightDefaultLanguage />
           <!-- callouts -->
           <entities>
             <entity>
               <name>version</name>
-              <value>${pom.version}</value>
+              <value>${project.version}</value>
             </entity>
           </entities>
           <postProcess>
             <copy todir="${project.basedir}/target/site/reference">
               <fileset dir="${project.basedir}/target/docbkx">
-                <include name="**/*.html"/>
-                <include name="**/*.pdf"/>
+                <include name="**/*.html" />
+                <include name="**/*.pdf" />
               </fileset>
             </copy>
             <copy todir="${project.basedir}/target/site/reference/html">
               <fileset dir="${project.basedir}/src/docbkx/resources">
-                <include name="**/*.css"/>
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
+                <include name="**/*.css" />
+                <include name="**/*.png" />
+                <include name="**/*.gif" />
+                <include name="**/*.jpg" />
               </fileset>
             </copy>
             <copy todir="${project.basedir}/target/site/reference/html">
               <fileset dir="${project.basedir}/src/docbkx/resources/images">
-                <include name="*.png"/>
+                <include name="*.png" />
               </fileset>
             </copy>
-            <move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-                  tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf"
-                  failonerror="false"/>
+            <move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-mongo-reference.pdf" failonerror="false" />
           </postProcess>
         </configuration>
       </plugin>
@@ -184,7 +183,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.5</version>
         <configuration>
-          <javadoc:aggregate>true</javadoc:aggregate>
+          <aggregate>true</aggregate>
           <breakiterator>true</breakiterator>
           <header>Spring Data Document</header>
           <source>1.5</source>
@@ -234,7 +233,7 @@
             <configuration>
               <tasks>
                 <ant antfile="${basedir}/src/ant/upload-dist.xml">
-                  <target name="upload-dist"/>
+                  <target name="upload-dist" />
                 </ant>
               </tasks>
             </configuration>
@@ -270,9 +269,9 @@
       <url>http://repository.springsource.com/maven/bundles/release</url>
     </pluginRepository>
     <pluginRepository>
-      <id>repository.springframework.maven.release</id>
+      <id>spring-libs-release</id>
       <name>Spring Framework Maven Release Repository</name>
-      <url>http://repo.springsource.org/release</url>
+      <url>http://repo.springsource.org/libs-release</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -282,7 +281,7 @@
     <site>
       <id>static.springframework.org</id>
       <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/docs/${project.version}
+        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
       </url>
     </site>
     <repository>
@@ -296,5 +295,7 @@
       <url>s3://maven.springframework.org/snapshot</url>
     </snapshotRepository>
   </distributionManagement>
-
+  <scm>
+    <url>https://github.com/SpringSource/spring-data-mongodb</url>
+  </scm>
 </project>

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

@@ -1,10 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.0.RELEASE</version>
+    <version>1.0.2.RELEASE</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-cross-store</artifactId>
@@ -68,24 +68,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>runtime</scope>
     </dependency>
 
@@ -95,17 +77,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
@@ -151,25 +122,7 @@
     </dependency>
 
   </dependencies>
-  <repositories>
-    <repository>
-      <id>jboss-repository</id>
-      <name>JBoss Public Repository</name>
-      <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>spring-maven-milestones</id>
-      <name>Springframework Maven Milestone Repository</name>
-      <url>http://maven.springframework.org/milestone</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>spring-maven-release</id>
-      <name>Springframework Maven Release Repository</name>
-      <url>http://maven.springframework.org/release</url>
-    </pluginRepository>
-  </pluginRepositories>
+
   <build>
     <plugins>
       <plugin>

spring-data-mongodb-log4j/pom.xml

@@ -1,11 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>1.0.0.RELEASE</version>
+    <version>1.0.2.RELEASE</version>
     <relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-log4j</artifactId>
@@ -28,47 +27,9 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>compile</scope>
     </dependency>
 
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>

spring-data-mongodb-parent/pom.xml

@@ -1,63 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb-parent</artifactId>
   <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.0.RELEASE</version>
+  <version>1.0.2.RELEASE</version>
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- versions for commonly-used dependencies -->
-    <junit.version>4.8.1</junit.version>
-    <log4j.version>1.2.15</log4j.version>
+    <junit.version>4.10</junit.version>
+    <log4j.version>1.2.16</log4j.version>
     <org.mockito.version>1.8.4</org.mockito.version>
+    <hamcrest.version>1.2.1</hamcrest.version>
     <org.slf4j.version>1.5.10</org.slf4j.version>
     <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
     <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
     <org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
     <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
-    <data.commons.version>1.2.0.RELEASE</data.commons.version>
+    <data.commons.version>1.2.1.RELEASE</data.commons.version>
     <aspectj.version>1.6.11.RELEASE</aspectj.version>
   </properties>
-  <profiles>
-    <profile>
-      <id>strict</id>
-      <properties>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-      </properties>
-    </profile>
-    <profile>
-      <id>fast</id>
-      <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-      </properties>
-    </profile>
-    <profile>
-      <id>staging</id>
-      <distributionManagement>
-        <site>
-          <id>spring-site-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/mongodb/docs</url>
-        </site>
-        <repository>
-          <id>spring-milestone-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/mongodb/milestone</url>
-        </repository>
-        <snapshotRepository>
-          <id>spring-snapshot-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/mongodb/snapshot</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>bootstrap</id>
-      <!-- TODO: move the repositories in here before release -->
-    </profile>
-  </profiles>
+
+  <developers>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>trisberg</id>
+      <name>Thomas Risberg</name>
+      <email>trisberg at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>mpollack</id>
+      <name>Mark Pollack</name>
+      <email>mpollack at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>jbrisbin</id>
+      <name>Jon Brisbin</name>
+      <email>jbrisbin at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>
+        Copyright 2010 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.
+      </comments>
+    </license>
+  </licenses>
+
   <distributionManagement>
     <!-- see 'staging' profile for dry-run deployment settings -->
     <downloadUrl>http://www.springsource.com/download/community
@@ -65,7 +103,7 @@
     <site>
       <id>static.springframework.org</id>
       <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/docs/${project.version}
+        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site
       </url>
     </site>
     <repository>
@@ -79,6 +117,9 @@
       <url>s3://maven.springframework.org/snapshot</url>
     </snapshotRepository>
   </distributionManagement>
+  <scm>
+  	<url>https://github.com/SpringSource/spring-data-mongodb</url>
+  </scm>
   <dependencyManagement>
     <!--
         inheritable <dependency> declarations for child poms. children still
@@ -111,6 +152,11 @@
         <artifactId>spring-tx</artifactId>
         <version>${org.springframework.version.range}</version>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${org.springframework.version.range}</version>
+      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-orm</artifactId>
@@ -152,7 +198,7 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-mongodb</artifactId>
-        <version>${project.version}</version>
+        <version>1.0.2.RELEASE</version>
       </dependency>
 
       <!-- Logging -->
@@ -178,24 +224,6 @@
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jdmk</groupId>
-            <artifactId>jmxtools</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jmx</groupId>
-            <artifactId>jmxri</artifactId>
-          </exclusion>
-        </exclusions>
         <scope>runtime</scope>
       </dependency>
 
@@ -208,14 +236,14 @@
 
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
+        <artifactId>mockito-core</artifactId>
         <version>${org.mockito.version}</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
+        <artifactId>junit-dep</artifactId>
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
@@ -223,19 +251,34 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <!--
-        dependency definitions to be inherited by child poms. any
-        <dependency> declarations here will automatically show up on child
-        project classpaths. only items that are truly common across all
-        projects (modules and samples) should go here. otherwise, consider
-        <dependencyManagement> above
-      -->
+    
+    <!-- Test dependencies -->
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
   </dependencies>
 
   <build>
@@ -250,48 +293,11 @@
         <version>3.1.0.RELEASE</version>
       </extension>
     </extensions>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${project.basedir}/src/test/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>2.4</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -311,13 +317,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.10</version>
         <configuration>
           <useFile>false</useFile>
           <includes>
             <include>**/*Tests.java</include>
           </includes>
-          <junitArtifactName>junit:junit</junitArtifactName>
+          <junitArtifactName>junit:junit-dep</junitArtifactName>
         </configuration>
       </plugin>
       <plugin>
@@ -369,22 +375,14 @@
   </build>
   <pluginRepositories>
     <pluginRepository>
-      <!-- necessary for bundlor and utils -->
-      <id>repository.plugin.springsource.release</id>
-      <name>SpringSource Maven Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://repo.springsource.org/release</url>
+      <id>spring-plugins-release</id>
+      <url>http://repo.springsource.org/plugins-release</url>
     </pluginRepository>
   </pluginRepositories>
   <repositories>
     <repository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://repo.springsource.org/release</url>
+      <id>spring-libs-release</id>
+      <url>http://repo.springsource.org/libs-release</url>
     </repository>
   </repositories>
   <reporting>

spring-data-mongodb/pom.xml

@@ -1,11 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.0.2.RELEASE</version>
 		<relativePath>../spring-data-mongodb-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
@@ -19,10 +18,22 @@
 	<dependencies>
 
 		<!--  Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
@@ -80,25 +91,6 @@
 		</dependency>
 
 		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
@@ -109,8 +101,8 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<scope>test</scope>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
@@ -128,6 +120,7 @@
 		</dependency>
 
 	</dependencies>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -154,15 +147,5 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<repositories>
-		<repository>
-			<id>querydsl</id>
-			<name>Mysema QueryDsl</name>
-			<url>http://source.mysema.com/maven2/releases</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+	
 </project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2011-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.
@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.config;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.mongodb.Mongo;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
@@ -35,6 +34,14 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.Mongo;
+
+/**
+ * Abstract base class to ease JavaConfig setup for Spring Data MongoDB.
+ * 
+ * @author Mark Pollack
+ * @author Oliver Gierke
+ */
 @Configuration
 public abstract class AbstractMongoConfiguration {
 
@@ -50,10 +57,11 @@ public abstract class AbstractMongoConfiguration {
 
 	@Bean
 	public MongoDbFactory mongoDbFactory() throws Exception {
-		if (getUserCredentials() == null) {
+		UserCredentials credentials = getUserCredentials();
+		if (credentials == null) {
 			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
 		} else {
-			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), credentials);
 		}
 	}
 

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

@@ -143,11 +143,11 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
 
 		if (customConvertersElements.size() == 1) {
-			
+
 			Element customerConvertersElement = customConvertersElements.get(0);
 			ManagedList<BeanMetadataElement> converterBeans = new ManagedList<BeanMetadataElement>();
 			List<Element> converterElements = DomUtils.getChildElementsByTagName(customerConvertersElement, "converter");
-			
+
 			if (converterElements != null) {
 				for (Element listenerElement : converterElements) {
 					converterBeans.add(parseConverter(listenerElement, parserContext));
@@ -158,9 +158,9 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 			String packageToScan = customerConvertersElement.getAttribute(BASE_PACKAGE);
 			if (StringUtils.hasText(packageToScan)) {
 				ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true);
-				provider.addExcludeFilter(new NegatingFilter(new AssignableTypeFilter(Converter.class), new AssignableTypeFilter(
-						GenericConverter.class)));
-	
+				provider.addExcludeFilter(new NegatingFilter(new AssignableTypeFilter(Converter.class),
+						new AssignableTypeFilter(GenericConverter.class)));
+
 				for (BeanDefinition candidate : provider.findCandidateComponents(packageToScan)) {
 					converterBeans.add(candidate);
 				}
@@ -221,7 +221,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
 
 	/**
 	 * {@link TypeFilter} that returns {@literal false} in case any of the given delegates matches.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	private static class NegatingFilter implements TypeFilter {

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

@@ -17,7 +17,11 @@ package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
 import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ServerAddress;
@@ -30,6 +34,8 @@ import com.mongodb.ServerAddress;
  */
 public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
+	private static final Log LOG = LogFactory.getLog(ServerAddressPropertyEditor.class);
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
@@ -38,21 +44,49 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	public void setAsText(String replicaSetString) {
 
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
-		ServerAddress[] serverAddresses = new ServerAddress[replicaSetStringArray.length];
+		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);
 
-		for (int i = 0; i < replicaSetStringArray.length; i++) {
+		for (String element : replicaSetStringArray) {
 
-			String[] hostAndPort = StringUtils.delimitedListToStringArray(replicaSetStringArray[i], ":");
+			ServerAddress address = parseServerAddress(element);
 
-			try {
-				serverAddresses[i] = new ServerAddress(hostAndPort[0], Integer.parseInt(hostAndPort[1]));
-			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException("Could not parse port " + hostAndPort[1], e);
-			} catch (UnknownHostException e) {
-				throw new IllegalArgumentException("Could not parse host " + hostAndPort[0], e);
+			if (address != null) {
+				serverAddresses.add(address);
 			}
 		}
 
-		setValue(serverAddresses);
+		if (serverAddresses.isEmpty()) {
+			throw new IllegalArgumentException(
+					"Could not resolve at least one server of the replica set configuration! Validate your config!");
+		}
+
+		setValue(serverAddresses.toArray(new ServerAddress[serverAddresses.size()]));
+	}
+
+	/**
+	 * Parses the given source into a {@link ServerAddress}.
+	 * 
+	 * @param source
+	 * @return the
+	 */
+	private ServerAddress parseServerAddress(String source) {
+
+		String[] hostAndPort = StringUtils.delimitedListToStringArray(source.trim(), ":");
+
+		if (!StringUtils.hasText(source) || hostAndPort.length > 2) {
+			LOG.warn(String.format("Could not parse address source '%s'. Check your replica set configuration!", source));
+			return null;
+		}
+
+		try {
+			return hostAndPort.length == 1 ? new ServerAddress(hostAndPort[0]) : new ServerAddress(hostAndPort[0],
+					Integer.parseInt(hostAndPort[1]));
+		} catch (UnknownHostException e) {
+			LOG.warn(String.format("Could not parse host '%s'. Check your replica set configuration!", hostAndPort[0]));
+		} catch (NumberFormatException e) {
+			LOG.warn(String.format("Could not parse port '%s'. Check your replica set configuration!", hostAndPort[1]));
+		}
+
+		return null;
 	}
 }

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright 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.
+ * 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 org.springframework.core.convert.converter.Converter;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Converter to create {@link WriteConcern} instances from String representations.
+ * 
+ * @author Oliver Gierke
+ */
+public class StringToWriteConcernConverter implements Converter<String, WriteConcern> {
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
+	 */
+	public WriteConcern convert(String source) {
+
+		WriteConcern writeConcern = WriteConcern.valueOf(source);
+		return writeConcern != null ? writeConcern : new WriteConcern(source);
+	}
+}

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

@@ -16,14 +16,13 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
+import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.util.Assert;
@@ -123,25 +122,30 @@ public class DefaultIndexOperations implements IndexOperations {
 				return getIndexData(dbObjectList);
 			}
 
-			@SuppressWarnings("unchecked")
 			private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 
 				List<IndexInfo> indexInfoList = new ArrayList<IndexInfo>();
 
 				for (DBObject ix : dbObjectList) {
 
-					Map<String, Order> keyOrderMap = new LinkedHashMap<String, Order>();
 					DBObject keyDbObject = (DBObject) ix.get("key");
-					Iterator<?> entries = keyDbObject.toMap().entrySet().iterator();
+					int numberOfElements = keyDbObject.keySet().size();
 
-					while (entries.hasNext()) {
-						Entry<Object, Integer> thisEntry = (Entry<Object, Integer>) entries.next();
-						String key = thisEntry.getKey().toString();
-						int value = thisEntry.getValue();
-						if (value == 1) {
+					Map<String, Order> keyOrderMap = new HashMap<String, Order>();
+					List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
+
+					for (String key : keyDbObject.keySet()) {
+
+						Object value = keyDbObject.get(key);
+
+						if (Integer.valueOf(1).equals(value)) {
 							keyOrderMap.put(key, Order.ASCENDING);
-						} else {
+							indexFields.add(IndexField.create(key, Order.ASCENDING));
+						} else if (Integer.valueOf(-1).equals(value)) {
 							keyOrderMap.put(key, Order.DESCENDING);
+							indexFields.add(IndexField.create(key, Order.DESCENDING));
+						} else if ("2d".equals(value)) {
+							indexFields.add(IndexField.geo(key));
 						}
 					}
 
@@ -151,12 +155,11 @@ public class DefaultIndexOperations implements IndexOperations {
 					boolean dropDuplicates = ix.containsField("dropDups") ? (Boolean) ix.get("dropDups") : false;
 					boolean sparse = ix.containsField("sparse") ? (Boolean) ix.get("sparse") : false;
 
-					indexInfoList.add(new IndexInfo(keyOrderMap, name, unique, dropDuplicates, sparse));
+					indexInfoList.add(new IndexInfo(keyOrderMap, indexFields, name, unique, dropDuplicates, sparse));
 				}
 
 				return indexInfoList;
 			}
 		});
 	}
-
 }

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

@@ -21,15 +21,16 @@ import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 
 /**
- * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document basis.  
- * Implementations of this interface perform the actual work of prcoessing each document but don't need to worry about 
- * exception handling.  {@MongoException}s will be caught and translated by the calling MongoTemplate
+ * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document
+ * basis. Implementations of this interface perform the actual work of prcoessing each document but don't need to worry
+ * about exception handling. {@MongoException}s will be caught and translated by the calling
+ * MongoTemplate
  * 
- * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later for later
- * inspection.
+ * An DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later
+ * for later inspection.
  * 
  * @author Mark Pollack
- *
+ * 
  */
 public interface DocumentCallbackHandler {
 

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

@@ -18,9 +18,9 @@ package org.springframework.data.mongodb.core;
 public class FindAndModifyOptions {
 
 	boolean returnNew;
-	
+
 	boolean upsert;
-	
+
 	boolean remove;
 
 	/**
@@ -31,17 +31,17 @@ public class FindAndModifyOptions {
 	public static FindAndModifyOptions options() {
 		return new FindAndModifyOptions();
 	}
-	
+
 	public FindAndModifyOptions returnNew(boolean returnNew) {
 		this.returnNew = returnNew;
 		return this;
 	}
-	
+
 	public FindAndModifyOptions upsert(boolean upsert) {
 		this.upsert = upsert;
 		return this;
 	}
-	
+
 	public FindAndModifyOptions remove(boolean remove) {
 		this.remove = remove;
 		return this;
@@ -58,7 +58,5 @@ public class FindAndModifyOptions {
 	public boolean isRemove() {
 		return remove;
 	}
-	
-	
 
 }

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

@@ -20,35 +20,38 @@ import com.mongodb.DBObject;
 import com.mongodb.WriteConcern;
 
 /**
- * Represents an action taken against the collection.  Used by {@link WriteConcernResolver} to determine a custom
+ * Represents an action taken against the collection. Used by {@link WriteConcernResolver} to determine a custom
  * WriteConcern based on this information.
  * 
- * Properties that will always be not-null are collectionName and defaultWriteConcern.  
- * The EntityClass is null only for the MongoActionOperaton.INSERT_LIST.
+ * Properties that will always be not-null are collectionName and defaultWriteConcern. The EntityClass is null only for
+ * the MongoActionOperaton.INSERT_LIST.
  * 
- * INSERT, SAVE have null query, 
- * REMOVE has null document
- * INSERT_LIST has null entityClass, document, and query.
+ * <ul>
+ * <li>INSERT, SAVE have null query</li>
+ * <li>REMOVE has null document</li>
+ * <li>INSERT_LIST has null entityClass, document, and query</li>
+ * </ul>
  * 
  * @author Mark Pollack
- *
+ * 
  */
 public class MongoAction {
-	
+
 	private String collectionName;
-	
+
 	private WriteConcern defaultWriteConcern;
-	
+
 	private Class<?> entityClass;
-	
+
 	private MongoActionOperation mongoActionOperation;
-	
+
 	private DBObject query;
-	
+
 	private DBObject document;
 
 	/**
 	 * Create an instance of a MongoAction
+	 * 
 	 * @param defaultWriteConcern the default write concern
 	 * @param mongoActionOperation action being taken against the collection
 	 * @param collectionName the collection name
@@ -90,7 +93,5 @@ public class MongoAction {
 	public DBObject getDocument() {
 		return document;
 	}
-	
-	
-	
+
 }

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

@@ -16,18 +16,14 @@
 package org.springframework.data.mongodb.core;
 
 /**
- * Enumeration for operations on a collection.  Used with {@link MongoAction} to help determine the
- * WriteConcern to use for a given mutating operation
+ * Enumeration for operations on a collection. Used with {@link MongoAction} to help determine the WriteConcern to use
+ * for a given mutating operation
  * 
  * @author Mark Pollack
  * @see MongoAction
- *
+ * 
  */
 public enum MongoActionOperation {
-	
-		REMOVE,
-		UPDATE,
-		INSERT,
-		INSERT_LIST,
-		SAVE
+
+	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 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.
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mongodb.core;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
 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;
@@ -39,12 +38,10 @@ import com.mongodb.WriteConcern;
  * @author Oliver Gierke
  * @since 1.0
  */
-public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptionTranslator {
+public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, DisposableBean,
+		PersistenceExceptionTranslator {
 
-	/**
-	 * Logger, available to subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
+	private Mongo mongo;
 
 	private MongoOptions mongoOptions;
 	private String host;
@@ -89,34 +86,7 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptio
 	}
 
 	public Mongo getObject() throws Exception {
-
-		Mongo mongo;
-
-		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;
-
 	}
 
 	/*
@@ -142,4 +112,45 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, PersistenceExceptio
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	public void afterPropertiesSet() throws Exception {
+
+		Mongo mongo;
+		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);
+		}
+
+		this.mongo = mongo;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
+	 */
+	public void destroy() throws Exception {
+		this.mongo.close();
+	}
 }

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

@@ -50,6 +50,7 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.convert.EntityReader;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
@@ -938,7 +939,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 						entityClass, null, queryObject);
 				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("remove using query: " + queryObject + " in collection: " + collection.getName());
+					LOGGER.debug("remove using query: " + dboq + " in collection: " + collection.getName());
 				}
 				if (writeConcernToUse == null) {
 					wr = collection.remove(dboq);
@@ -1337,13 +1338,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
 		}
 
+		DBObject mappedQuery = mapper.getMappedObject(query, entity);
+
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("findAndModify using query: " + query + " fields: " + fields + " sort: " + sort + " for class: "
-					+ entityClass + " and update: " + updateObj + " in collection: " + collectionName);
+			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
+					+ " for class: " + entityClass + " and update: " + updateObj + " in collection: " + collectionName);
 		}
 
-		return executeFindOneInternal(new FindAndModifyCallback(mapper.getMappedObject(query, entity), fields, sort,
-				updateObj, options), new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
+		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, updateObj, options),
+				new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
 	}
 
 	/**
@@ -1364,9 +1367,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}
 
+		ConversionService conversionService = mongoConverter.getConversionService();
+		BeanWrapper<PersistentEntity<Object, ?>, Object> wrapper = BeanWrapper.create(savedObject, conversionService);
+
 		try {
-			BeanWrapper.create(savedObject, mongoConverter.getConversionService()).setProperty(idProp, id);
-			return;
+
+			Object idValue = wrapper.getProperty(idProp);
+
+			if (idValue != null) {
+				return;
+			}
+
+			wrapper.setProperty(idProp, id);
+
 		} catch (IllegalAccessException e) {
 			throw new MappingException(e.getMessage(), e);
 		} catch (InvocationTargetException e) {

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

@@ -30,6 +30,7 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
 
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
@@ -41,6 +42,9 @@ import com.mongodb.DBObject;
  */
 public class QueryMapper {
 
+	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
+	private static final String N_OR_PATTERN = "\\$.*or";
+
 	private final ConversionService conversionService;
 	private final MongoConverter converter;
 
@@ -59,8 +63,8 @@ public class QueryMapper {
 	 * Replaces the property keys used in the given {@link DBObject} with the appropriate keys by using the
 	 * {@link PersistentEntity} metadata.
 	 * 
-	 * @param query
-	 * @param entity
+	 * @param query must not be {@literal null}.
+	 * @param entity can be {@literal null}.
 	 * @return
 	 */
 	public DBObject getMappedObject(DBObject query, MongoPersistentEntity<?> entity) {
@@ -68,8 +72,10 @@ public class QueryMapper {
 		DBObject newDbo = new BasicDBObject();
 
 		for (String key : query.keySet()) {
+
 			String newKey = key;
 			Object value = query.get(key);
+
 			if (isIdKey(key, entity)) {
 				if (value instanceof DBObject) {
 					DBObject valueDbo = (DBObject) value;
@@ -81,34 +87,51 @@ public class QueryMapper {
 						}
 						valueDbo.put(inKey, ids.toArray(new Object[ids.size()]));
 					} else {
-						value = getMappedObject((DBObject) value, entity);
+						value = getMappedObject((DBObject) value, null);
 					}
 				} else {
 					value = convertId(value);
 				}
 				newKey = "_id";
-			} else if (key.startsWith("$") && key.endsWith("or")) {
+			} else if (key.matches(N_OR_PATTERN)) {
 				// $or/$nor
-				BasicBSONList conditions = (BasicBSONList) value;
+				Iterable<?> conditions = (Iterable<?>) value;
 				BasicBSONList newConditions = new BasicBSONList();
-				Iterator<Object> iter = conditions.iterator();
+				Iterator<?> iter = conditions.iterator();
 				while (iter.hasNext()) {
-					newConditions.add(getMappedObject((DBObject) iter.next(), entity));
+					newConditions.add(getMappedObject((DBObject) iter.next(), null));
 				}
 				value = newConditions;
 			} else if (key.equals("$ne")) {
 				value = convertId(value);
-			} else if (value instanceof DBObject) {
-				newDbo.put(newKey, getMappedObject((DBObject) value, entity));
-				return newDbo;
 			}
 
-			newDbo.put(newKey, converter.convertToMongoType(value));
+			newDbo.put(newKey, convertSimpleOrDBObject(value, null));
 		}
 
 		return newDbo;
 	}
 
+	/**
+	 * Retriggers mapping if the given source is a {@link DBObject} or simply invokes the
+	 * 
+	 * @param source
+	 * @param entity
+	 * @return
+	 */
+	private Object convertSimpleOrDBObject(Object source, MongoPersistentEntity<?> entity) {
+
+		if (source instanceof BasicDBList) {
+			return converter.convertToMongoType(source);
+		}
+
+		if (source instanceof DBObject) {
+			return getMappedObject((DBObject) source, entity);
+		}
+
+		return converter.convertToMongoType(source);
+	}
+
 	/**
 	 * Returns whether the given key will be considered an id key.
 	 * 
@@ -123,7 +146,7 @@ public class QueryMapper {
 			return idProperty.getName().equals(key) || idProperty.getFieldName().equals(key);
 		}
 
-		return Arrays.asList("id", "_id").contains(key);
+		return DEFAULT_ID_NAMES.contains(key);
 	}
 
 	/**

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright 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.
+ * 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.core;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.springframework.core.convert.converter.Converter;
+
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
+
+/**
+ * Utility methods for JSON serialization.
+ * 
+ * @author Oliver Gierke
+ */
+public abstract class SerializationUtils {
+
+	private SerializationUtils() {
+
+	}
+
+	/**
+	 * Serializes the given object into pseudo-JSON meaning it's trying to create a JSON representation as far as possible
+	 * but falling back to the given object's {@link Object#toString()} method if it's not serializable. Useful for
+	 * printing raw {@link DBObject}s containing complex values before actually converting them into Mongo native types.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	public static String serializeToJsonSafely(Object value) {
+
+		if (value == null) {
+			return null;
+		}
+
+		try {
+			return JSON.serialize(value);
+		} catch (Exception e) {
+			if (value instanceof Collection) {
+				return toString((Collection<?>) value);
+			} else if (value instanceof Map) {
+				return toString((Map<?, ?>) value);
+			} else if (value instanceof DBObject) {
+				return toString(((DBObject) value).toMap());
+			} else {
+				return String.format("{ $java : %s }", value.toString());
+			}
+		}
+	}
+
+	private static String toString(Map<?, ?> source) {
+		return iterableToDelimitedString(source.entrySet(), "{ ", " }", new Converter<Entry<?, ?>, Object>() {
+			public Object convert(Entry<?, ?> source) {
+				return String.format("\"%s\" : %s", source.getKey(), serializeToJsonSafely(source.getValue()));
+			}
+		});
+	}
+
+	private static String toString(Collection<?> source) {
+		return iterableToDelimitedString(source, "[ ", " ]", new Converter<Object, Object>() {
+			public Object convert(Object source) {
+				return serializeToJsonSafely(source);
+			}
+		});
+	}
+
+	/**
+	 * Creates a string representation from the given {@link Iterable} prepending the postfix, applying the given
+	 * {@link Converter} to each element before adding it to the result {@link String}, concatenating each element with
+	 * {@literal ,} and applying the postfix.
+	 * 
+	 * @param source
+	 * @param prefix
+	 * @param postfix
+	 * @param transformer
+	 * @return
+	 */
+	private static <T> String iterableToDelimitedString(Iterable<T> source, String prefix, String postfix,
+			Converter<? super T, Object> transformer) {
+
+		StringBuilder builder = new StringBuilder(prefix);
+		Iterator<T> iterator = source.iterator();
+
+		while (iterator.hasNext()) {
+			builder.append(transformer.convert(iterator.next()));
+			if (iterator.hasNext()) {
+				builder.append(", ");
+			}
+		}
+
+		return builder.append(postfix).toString();
+	}
+}

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

@@ -17,8 +17,6 @@ package org.springframework.data.mongodb.core;
 
 import java.net.UnknownHostException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.authentication.UserCredentials;
@@ -39,12 +37,10 @@ import com.mongodb.WriteConcern;
  */
 public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
-	protected final Log logger = LogFactory.getLog(getClass());
-
 	private final Mongo mongo;
 	private final String databaseName;
-	private String username;
-	private String password;
+	private final boolean mongoInstanceCreated;
+	private final UserCredentials credentials;
 	private WriteConcern writeConcern;
 
 	/**
@@ -54,11 +50,7 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @param databaseName database name, not be {@literal null}.
 	 */
 	public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
-		Assert.notNull(mongo, "Mongo must not be null");
-		Assert.hasText(databaseName, "Database name must not be empty");
-		Assert.isTrue(databaseName.matches("[\\w-]+"), "Database name must only contain letters, numbers, underscores and dashes!");
-		this.mongo = mongo;
-		this.databaseName = databaseName;
+		this(mongo, databaseName, new UserCredentials(), false);
 	}
 
 	/**
@@ -66,14 +58,12 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * 
 	 * @param mongo Mongo instance, must not be {@literal null}.
 	 * @param databaseName Database name, must not be {@literal null}.
-	 * @param userCredentials username and password must not be {@literal null}.
+	 * @param credentials username and password.
 	 */
-	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials userCredentials) {
-		this(mongo, databaseName);
-		this.username = userCredentials.getUsername();
-		this.password = userCredentials.getPassword();
+	public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials) {
+		this(mongo, databaseName, credentials, false);
 	}
-	
+
 	/**
 	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoURI}.
 	 * 
@@ -82,8 +72,22 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	 * @throws UnknownHostException
 	 * @see MongoURI
 	 */
-	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {		
-		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())));
+	public SimpleMongoDbFactory(MongoURI uri) throws MongoException, UnknownHostException {
+		this(new Mongo(uri), uri.getDatabase(), new UserCredentials(uri.getUsername(), parseChars(uri.getPassword())), true);
+	}
+
+	private SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials credentials,
+			boolean mongoInstanceCreated) {
+
+		Assert.notNull(mongo, "Mongo must not be null");
+		Assert.hasText(databaseName, "Database name must not be empty");
+		Assert.isTrue(databaseName.matches("[\\w-]+"),
+				"Database name must only contain letters, numbers, underscores and dashes!");
+
+		this.mongo = mongo;
+		this.databaseName = databaseName;
+		this.mongoInstanceCreated = mongoInstanceCreated;
+		this.credentials = credentials == null ? new UserCredentials() : credentials;
 	}
 
 	/**
@@ -94,10 +98,6 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	public void setWriteConcern(WriteConcern writeConcern) {
 		this.writeConcern = writeConcern;
 	}
-	
-	public WriteConcern getWriteConcern() {
-		return writeConcern;
-	}
 
 	/*
 	 * (non-Javadoc)
@@ -115,6 +115,9 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
 
+		String username = credentials.getUsername();
+		String password = credentials.getPassword();
+
 		DB db = MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
 
 		if (writeConcern != null) {
@@ -125,17 +128,17 @@ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory {
 	}
 
 	/**
-	 * Clean up the Mongo instance.
+	 * Clean up the Mongo instance if it was created by the factory itself.
+	 * 
+	 * @see DisposableBean#destroy()
 	 */
 	public void destroy() throws Exception {
-		mongo.close();
-	}
-	
-	public static String parseChars(char[] chars) {
-		if (chars == null) {
-			return null;
-		} else {
-			return String.valueOf(chars);
+		if (mongoInstanceCreated) {
+			mongo.close();
 		}
 	}
+
+	private static String parseChars(char[] chars) {
+		return chars == null ? null : String.valueOf(chars);
+	}
 }

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

@@ -24,14 +24,16 @@ import com.mongodb.WriteConcern;
  * Return the passed in default WriteConcern (a property on MongoAction) if no determination can be made.
  * 
  * @author Mark Pollack
- *
+ * 
  */
 public interface WriteConcernResolver {
 
-		/**
-		 * Resolve the WriteConcern given the MongoAction
-		 * @param action describes the context of the Mongo action. Contains a default WriteConcern to use if one should not be resolved.
-		 * @return a WriteConcern based on the passed in MongoAction value, maybe null
-		 */
-		WriteConcern resolve(MongoAction action);
+	/**
+	 * Resolve the WriteConcern given the MongoAction
+	 * 
+	 * @param action describes the context of the Mongo action. Contains a default WriteConcern to use if one should not
+	 *          be resolved.
+	 * @return a WriteConcern based on the passed in MongoAction value, maybe null
+	 */
+	WriteConcern resolve(MongoAction action);
 }

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

@@ -38,6 +38,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalT
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.StringToURLConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.URLToStringConverter;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.util.Assert;
 
@@ -89,6 +91,8 @@ public class CustomConversions {
 		this.converters.add(StringToBigDecimalConverter.INSTANCE);
 		this.converters.add(BigIntegerToStringConverter.INSTANCE);
 		this.converters.add(StringToBigIntegerConverter.INSTANCE);
+		this.converters.add(URLToStringConverter.INSTANCE);
+		this.converters.add(StringToURLConverter.INSTANCE);
 		this.converters.addAll(converters);
 
 		for (Object c : this.converters) {

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright 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.
+ * 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.core.convert;
+
+import java.util.Map;
+
+import org.springframework.context.expression.MapAccessor;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.PropertyAccessor;
+import org.springframework.expression.TypedValue;
+
+import com.mongodb.DBObject;
+
+/**
+ * {@link PropertyAccessor} to allow entity based field access to {@link DBObject}s.
+ * 
+ * @author Oliver Gierke
+ */
+class DBObjectPropertyAccessor extends MapAccessor {
+
+	static MapAccessor INSTANCE = new DBObjectPropertyAccessor();
+
+	@Override
+	public Class<?>[] getSpecificTargetClasses() {
+		return new Class[] { DBObject.class };
+	}
+
+	@Override
+	public boolean canRead(EvaluationContext context, Object target, String name) {
+		return true;
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public TypedValue read(EvaluationContext context, Object target, String name) {
+
+		Map<String, Object> source = (Map<String, Object>) target;
+
+		Object value = source.get(name);
+		return value == null ? TypedValue.NULL : new TypedValue(value);
+	}
+}

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

@@ -50,23 +50,22 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implemen
 	public DefaultMongoTypeMapper() {
 		this(DEFAULT_TYPE_KEY, Arrays.asList(SimpleTypeInformationMapper.INSTANCE));
 	}
-	
+
 	public DefaultMongoTypeMapper(String typeKey) {
 		super(new DBObjectTypeAliasAccessor(typeKey));
 		this.typeKey = typeKey;
 	}
-	
-	public DefaultMongoTypeMapper(String typeKey, MappingContext<? extends PersistentEntity<?,?>, ?> mappingContext) {
+
+	public DefaultMongoTypeMapper(String typeKey, MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext) {
 		super(new DBObjectTypeAliasAccessor(typeKey), mappingContext, Arrays.asList(SimpleTypeInformationMapper.INSTANCE));
 		this.typeKey = typeKey;
 	}
-	
+
 	public DefaultMongoTypeMapper(String typeKey, List<? extends TypeInformationMapper> mappers) {
 		super(new DBObjectTypeAliasAccessor(typeKey), mappers);
 		this.typeKey = typeKey;
 	}
-	
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#isTypeKey(java.lang.String)
@@ -75,7 +74,6 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implemen
 		return typeKey == null ? false : typeKey.equals(key);
 	}
 
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)
 	 */
@@ -83,29 +81,29 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<DBObject> implemen
 	protected TypeInformation<?> getFallbackTypeFor(DBObject source) {
 		return source instanceof BasicDBList ? LIST_TYPE_INFO : MAP_TYPE_INFO;
 	}
-	
+
 	/**
 	 * 
 	 * @author Oliver Gierke
 	 */
 	public static final class DBObjectTypeAliasAccessor implements TypeAliasAccessor<DBObject> {
-		
+
 		private final String typeKey;
-		
+
 		public DBObjectTypeAliasAccessor(String typeKey) {
 			this.typeKey = typeKey;
 		}
-		
+
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object)
 		 */
 		public Object readAliasFrom(DBObject source) {
-			
+
 			if (source instanceof BasicDBList) {
 				return null;
 			}
-			
+
 			return source.get(typeKey);
 		}
 

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

@@ -0,0 +1,180 @@
+/*
+ * Copyright 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.
+ * 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.core.convert;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.util.Assert;
+
+/**
+ * Abstraction for a {@link PreferredConstructor} alongside mapping information.
+ * 
+ * @author Oliver Gierke
+ */
+class MappedConstructor {
+
+	private static final String REJECT_CONSTRUCTOR = String.format("Entity doesn't have a usable constructor, either "
+			+ "provide a custom converter or annotate a constructor with @%s!", PersistenceConstructor.class.getSimpleName());
+
+	private final Set<MappedConstructor.MappedParameter> parameters;
+
+	/**
+	 * Creates a new {@link MappedConstructor} from the given {@link MongoPersistentEntity} and {@link MappingContext}.
+	 * 
+	 * @param entity must not be {@literal null}.
+	 * @param context must not be {@literal null}.
+	 * @throws MappingException in case the {@link MongoPersistentEntity} handed in does not have a
+	 *           {@link PreferredConstructor}.
+	 */
+	public MappedConstructor(MongoPersistentEntity<?> entity,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) throws MappingException {
+
+		Assert.notNull(entity);
+		Assert.notNull(context);
+
+		if (entity.getPreferredConstructor() == null) {
+			throw new MappingException(REJECT_CONSTRUCTOR);
+		}
+
+		this.parameters = new HashSet<MappedConstructor.MappedParameter>();
+
+		for (Parameter<?> parameter : entity.getPreferredConstructor().getParameters()) {
+			parameters.add(new MappedParameter(parameter, entity, context));
+		}
+	}
+
+	/**
+	 * Returns whether the given {@link PersistentProperty} is referenced in a constructor argument of the
+	 * {@link PersistentEntity} backing this {@link MappedConstructor}.
+	 * 
+	 * @param property must not be {@literal null}.
+	 * @return
+	 */
+	public boolean isConstructorParameter(PersistentProperty<?> property) {
+
+		Assert.notNull(property);
+
+		for (MappedConstructor.MappedParameter parameter : parameters) {
+			if (parameter.maps(property)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the {@link MappedParameter} for the given {@link Parameter}.
+	 * 
+	 * @param parameter must not be {@literal null}.
+	 * @return
+	 * @throws MappingException in case no {@link MappedParameter} can be found for the given {@link Parameter}.
+	 */
+	public MappedParameter getFor(Parameter<?> parameter) {
+
+		for (MappedParameter mappedParameter : parameters) {
+			if (mappedParameter.parameter.equals(parameter)) {
+				return mappedParameter;
+			}
+		}
+
+		throw new MappingException(String.format("Didn't find a MappedParameter for %s!", parameter.toString()));
+	}
+
+	/**
+	 * Abstraction of a {@link Parameter} alongside mapping information.
+	 * 
+	 * @author Oliver Gierke
+	 */
+	static class MappedParameter {
+
+		private final MongoPersistentProperty property;
+		private final Parameter<?> parameter;
+
+		/**
+		 * Creates a new {@link MappedParameter} for the given {@link Parameter}, {@link MongoPersistentProperty} and
+		 * {@link MappingContext}.
+		 * 
+		 * @param parameter must not be {@literal null}.
+		 * @param entity must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 */
+		public MappedParameter(Parameter<?> parameter, MongoPersistentEntity<?> entity,
+				MappingContext<? extends MongoPersistentEntity<?>, ? extends MongoPersistentProperty> context) {
+
+			Assert.notNull(parameter);
+			Assert.notNull(entity);
+			Assert.notNull(context);
+
+			this.parameter = parameter;
+
+			PropertyPath propertyPath = PropertyPath.from(parameter.getName(), entity.getType());
+			PersistentPropertyPath<? extends MongoPersistentProperty> path = context.getPersistentPropertyPath(propertyPath);
+			this.property = path == null ? null : path.getLeafProperty();
+		}
+
+		/**
+		 * Returns whether there is a SpEL expression configured for this parameter.
+		 * 
+		 * @return
+		 */
+		public boolean hasSpELExpression() {
+			return parameter.getKey() != null;
+		}
+
+		/**
+		 * Returns the field name to be used to lookup the value which in turn shall be converted into the constructor
+		 * parameter.
+		 * 
+		 * @return
+		 */
+		public String getFieldName() {
+			return property.getFieldName();
+		}
+
+		/**
+		 * Returns the type of the property backing the {@link Parameter}.
+		 * 
+		 * @return
+		 */
+		public TypeInformation<?> getPropertyTypeInformation() {
+			return property.getTypeInformation();
+		}
+
+		/**
+		 * Returns whether the given {@link PersistentProperty} is mapped by the parameter.
+		 * 
+		 * @param property
+		 * @return
+		 */
+		public boolean maps(PersistentProperty<?> property) {
+			return this.property.equals(property);
+		}
+	}
+}

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

@@ -37,7 +37,7 @@ import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.PreferredConstructor;
+import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
@@ -81,6 +81,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	protected ApplicationContext applicationContext;
 	protected boolean useFieldAccessOnly = true;
 	protected MongoTypeMapper typeMapper;
+	protected String mapKeyDotReplacement = null;
 
 	/**
 	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
@@ -116,6 +117,18 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				mappingContext) : typeMapper;
 	}
 
+	/**
+	 * Configure the characters dots potentially contained in a {@link Map} shall be replaced with. By default we don't do
+	 * any translation but rather reject a {@link Map} with keys containing dots causing the conversion for the entire
+	 * object to fail. If further customization of the translation is needed, have a look at
+	 * {@link #potentiallyEscapeMapKey(String)} as well as {@link #potentiallyUnescapeMapKey(String)}.
+	 * 
+	 * @param mapKeyDotReplacement the mapKeyDotReplacement to set
+	 */
+	public void setMapKeyDotReplacement(String mapKeyDotReplacement) {
+		this.mapKeyDotReplacement = mapKeyDotReplacement;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.EntityConverter#getMappingContext()
@@ -164,7 +177,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		if (conversions.hasCustomReadTarget(dbo.getClass(), rawType)) {
 			return conversionService.convert(dbo, rawType);
 		}
-		
+
 		if (DBObject.class.isAssignableFrom(rawType)) {
 			return (S) dbo;
 		}
@@ -189,52 +202,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final DBObject dbo) {
 
-		final StandardEvaluationContext spelCtx = new StandardEvaluationContext();
-		if (null != applicationContext) {
+		final StandardEvaluationContext spelCtx = new StandardEvaluationContext(dbo);
+		spelCtx.addPropertyAccessor(DBObjectPropertyAccessor.INSTANCE);
+
+		if (applicationContext != null) {
 			spelCtx.setBeanResolver(new BeanFactoryResolver(applicationContext));
 		}
-		if (!(dbo instanceof BasicDBList)) {
-			String[] keySet = dbo.keySet().toArray(new String[dbo.keySet().size()]);
-			for (String key : keySet) {
-				spelCtx.setVariable(key, dbo.get(key));
-			}
-		}
 
-		final List<String> ctorParamNames = new ArrayList<String>();
-		final MongoPersistentProperty idProperty = entity.getIdProperty();
+		final MappedConstructor constructor = new MappedConstructor(entity, mappingContext);
 
-		ParameterValueProvider provider = new SpELAwareParameterValueProvider(spelExpressionParser, spelCtx) {
-			@Override
-			@SuppressWarnings("unchecked")
-			public <T> T getParameterValue(PreferredConstructor.Parameter<T> parameter) {
-
-				if (parameter.getKey() != null) {
-					return super.getParameterValue(parameter);
-				}
-
-				String name = parameter.getName();
-				TypeInformation<T> type = parameter.getType();
-				Class<T> rawType = parameter.getRawType();
-				String key = idProperty == null ? name : idProperty.getName().equals(name) ? idProperty.getFieldName() : name;
-				Object obj = dbo.get(key);
-
-				ctorParamNames.add(name);
-				if (obj instanceof DBRef) {
-					return read(type, ((DBRef) obj).fetch());
-				} else if (obj instanceof BasicDBList) {
-					BasicDBList objAsDbList = (BasicDBList) obj;
-					return conversionService.convert(readCollectionOrArray(type, objAsDbList), rawType);
-				} else if (obj instanceof DBObject) {
-					return read(type, ((DBObject) obj));
-				} else if (null != obj && obj.getClass().isAssignableFrom(rawType)) {
-					return (T) obj;
-				} else if (null != obj) {
-					return conversionService.convert(obj, rawType);
-				}
-
-				return null;
-			}
-		};
+		SpELAwareParameterValueProvider delegate = new SpELAwareParameterValueProvider(spelExpressionParser, spelCtx);
+		ParameterValueProvider provider = new DelegatingParameterValueProvider(constructor, dbo, delegate);
 
 		final BeanWrapper<MongoPersistentEntity<S>, S> wrapper = BeanWrapper.create(entity, provider, conversionService);
 
@@ -242,7 +220,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				boolean isConstructorProperty = ctorParamNames.contains(prop.getName());
+				boolean isConstructorProperty = constructor.isConstructorParameter(prop);
 				boolean hasValueForProperty = dbo.containsField(prop.getFieldName());
 
 				if (!hasValueForProperty || isConstructorProperty) {
@@ -286,7 +264,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		boolean handledByCustomConverter = conversions.getCustomWriteTarget(obj.getClass(), DBObject.class) != null;
 		TypeInformation<? extends Object> type = ClassTypeInformation.from(obj.getClass());
-		
+
 		if (!handledByCustomConverter && !(dbo instanceof BasicDBList)) {
 			typeMapper.writeType(type, dbo);
 		}
@@ -345,7 +323,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		// Write the ID
 		final MongoPersistentProperty idProperty = entity.getIdProperty();
 		if (!dbo.containsField("_id") && null != idProperty) {
-			
+
 			try {
 				Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
 				dbo.put("_id", idMapper.convertId(id));
@@ -356,13 +334,13 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		// Write the properties
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
-				
+
 				if (prop.equals(idProperty)) {
 					return;
 				}
-				
+
 				Object propertyObj = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
-				
+
 				if (null != propertyObj) {
 					if (!conversions.isSimpleType(propertyObj.getClass())) {
 						writePropertyInternal(propertyObj, dbo, prop);
@@ -461,7 +439,6 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * 
 	 * @param collection must not be {@literal null}.
 	 * @param property must not be {@literal null}.
-	 * 
 	 * @return
 	 */
 	protected DBObject createCollection(Collection<?> collection, MongoPersistentProperty property) {
@@ -499,13 +476,9 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		for (Object element : source) {
 
-			if (element == null) {
-				continue;
-			}
+			Class<?> elementType = element == null ? null : element.getClass();
 
-			Class<?> elementType = element.getClass();
-
-			if (conversions.isSimpleType(elementType)) {
+			if (elementType == null || conversions.isSimpleType(elementType)) {
 				sink.add(getPotentiallyConvertedSimpleWrite(element));
 			} else if (element instanceof Collection || elementType.isArray()) {
 				sink.add(writeCollectionInternal(asCollection(element), componentType, new BasicDBList()));
@@ -528,14 +501,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @return
 	 */
 	protected DBObject writeMapInternal(Map<Object, Object> obj, DBObject dbo, TypeInformation<?> propertyType) {
-		
+
 		for (Map.Entry<Object, Object> entry : obj.entrySet()) {
 			Object key = entry.getKey();
 			Object val = entry.getValue();
 			if (conversions.isSimpleType(key.getClass())) {
 				// Don't use conversion service here as removal of ObjectToString converter results in some primitive types not
 				// being convertable
-				String simpleKey = key.toString();
+				String simpleKey = potentiallyEscapeMapKey(key.toString());
 				if (val == null || conversions.isSimpleType(val.getClass())) {
 					writeSimpleInternal(val, dbo, simpleKey);
 				} else if (val instanceof Collection || val.getClass().isArray()) {
@@ -543,7 +516,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 							writeCollectionInternal(asCollection(val), propertyType.getMapValueType(), new BasicDBList()));
 				} else {
 					DBObject newDbo = new BasicDBObject();
-					TypeInformation<?> valueTypeInfo = propertyType.isMap() ? propertyType.getMapValueType() : ClassTypeInformation.OBJECT;
+					TypeInformation<?> valueTypeInfo = propertyType.isMap() ? propertyType.getMapValueType()
+							: ClassTypeInformation.OBJECT;
 					writeInternal(val, newDbo, valueTypeInfo);
 					dbo.put(simpleKey, newDbo);
 				}
@@ -551,10 +525,43 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				throw new MappingException("Cannot use a complex object as a key value.");
 			}
 		}
-		
+
 		return dbo;
 	}
 
+	/**
+	 * Potentially replaces dots in the given map key with the configured map key replacement if configured or aborts
+	 * conversion if none is configured.
+	 * 
+	 * @see #setMapKeyDotReplacement(String)
+	 * @param source
+	 * @return
+	 */
+	protected String potentiallyEscapeMapKey(String source) {
+
+		if (!source.contains(".")) {
+			return source;
+		}
+
+		if (mapKeyDotReplacement == null) {
+			throw new MappingException(String.format("Map key %s contains dots but no replacement was configured! Make "
+					+ "sure map keys don't contain dots in the first place or configure an appropriate replacement!", source));
+		}
+
+		return source.replaceAll("\\.", mapKeyDotReplacement);
+	}
+
+	/**
+	 * Translates the map key replacements in the given key just read with a dot in case a map key replacement has been
+	 * configured.
+	 * 
+	 * @param source
+	 * @return
+	 */
+	protected String potentiallyUnescapeMapKey(String source) {
+		return mapKeyDotReplacement == null ? source : source.replaceAll(mapKeyDotReplacement, "\\.");
+	}
+
 	/**
 	 * Adds custom type information to the given {@link DBObject} if necessary. That is if the value is not the same as
 	 * the one given. This is usually the case if you store a subtype of the actual declared type of the property.
@@ -643,7 +650,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		MongoPersistentProperty idProperty = targetEntity.getIdProperty();
 		BeanWrapper<MongoPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(target, conversionService);
 		Object id = wrapper.getProperty(idProperty, Object.class, useFieldAccessOnly);
-		
+
 		if (null == id) {
 			throw new MappingException("Cannot create a reference to an object with a NULL id.");
 		}
@@ -696,7 +703,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 							(BasicDBList) sourceValue);
 				}
 
-				TypeInformation<?> toType = typeMapper.readType((DBObject) sourceValue);
+				TypeInformation<?> toType = typeMapper.readType((DBObject) sourceValue, prop.getTypeInformation());
 
 				// It's a complex object, have to read it in
 				if (toType != null) {
@@ -725,8 +732,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		Assert.notNull(targetType);
 
+		Class<?> collectionType = targetType.getType();
+		collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
+
 		Collection<Object> items = targetType.getType().isArray() ? new ArrayList<Object>() : CollectionFactory
-				.createCollection(targetType.getType(), sourceValue.size());
+				.createCollection(collectionType, sourceValue.size());
 
 		for (int i = 0; i < sourceValue.size(); i++) {
 			Object dbObjItem = sourceValue.get(i);
@@ -735,7 +745,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			} else if (dbObjItem instanceof DBObject) {
 				items.add(read(targetType.getComponentType(), (DBObject) dbObjItem));
 			} else {
-				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, targetType.getComponentType().getType()));
+				TypeInformation<?> componentType = targetType.getComponentType();
+				items.add(getPotentiallyConvertedSimpleRead(dbObjItem, componentType == null ? null : componentType.getType()));
 			}
 		}
 
@@ -763,12 +774,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 				continue;
 			}
 
-			Object key = entry.getKey();
+			Object key = potentiallyUnescapeMapKey(entry.getKey());
 
 			TypeInformation<?> keyTypeInformation = type.getComponentType();
 			if (keyTypeInformation != null) {
 				Class<?> keyType = keyTypeInformation.getType();
-				key = conversionService.convert(entry.getKey(), keyType);
+				key = conversionService.convert(key, keyType);
 			}
 
 			Object value = entry.getValue();
@@ -807,7 +818,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return null;
 		}
 
-		Class<?> target = conversions.getCustomWriteTarget(getClass());
+		Class<?> target = conversions.getCustomWriteTarget(obj.getClass());
 		if (target != null) {
 			return conversionService.convert(obj, target);
 		}
@@ -838,14 +849,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			return result;
 		}
 
-		if (obj instanceof List) {
-			return maybeConvertList((List<?>) obj);
-		}
-
 		if (obj.getClass().isArray()) {
 			return maybeConvertList(Arrays.asList((Object[]) obj));
 		}
 
+		if (obj instanceof Collection) {
+			return maybeConvertList((Collection<?>) obj);
+		}
+
 		DBObject newDbo = new BasicDBObject();
 		this.write(obj, newDbo);
 		return removeTypeInfoRecursively(newDbo);
@@ -858,7 +869,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		}
 		return newDbl;
 	}
-	
+
 	/**
 	 * Removes the type information from the conversion result.
 	 * 
@@ -895,4 +906,55 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		return dbObject;
 	}
+
+	private class DelegatingParameterValueProvider implements ParameterValueProvider {
+
+		private final DBObject source;
+		private final ParameterValueProvider delegate;
+		private final MappedConstructor constructor;
+
+		/**
+		 * {@link ParameterValueProvider} to delegate source object lookup to a {@link SpELAwareParameterValueProvider} in
+		 * case a MappCon
+		 * 
+		 * @param constructor must not be {@literal null}.
+		 * @param source must not be {@literal null}.
+		 * @param delegate must not be {@literal null}.
+		 */
+		public DelegatingParameterValueProvider(MappedConstructor constructor, DBObject source,
+				SpELAwareParameterValueProvider delegate) {
+
+			Assert.notNull(constructor);
+			Assert.notNull(source);
+			Assert.notNull(delegate);
+
+			this.constructor = constructor;
+			this.source = source;
+			this.delegate = delegate;
+		}
+
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mapping.model.ParameterValueProvider#getParameterValue(org.springframework.data.mapping.PreferredConstructor.Parameter)
+		 */
+		@SuppressWarnings("unchecked")
+		public <T> T getParameterValue(Parameter<T> parameter) {
+
+			MappedConstructor.MappedParameter mappedParameter = constructor.getFor(parameter);
+			Object value = mappedParameter.hasSpELExpression() ? delegate.getParameterValue(parameter) : source
+					.get(mappedParameter.getFieldName());
+
+			TypeInformation<?> type = mappedParameter.getPropertyTypeInformation();
+
+			if (value instanceof DBRef) {
+				return (T) read(type, ((DBRef) value).fetch());
+			} else if (value instanceof BasicDBList) {
+				return (T) getPotentiallyConvertedSimpleRead(readCollectionOrArray(type, (BasicDBList) value), type.getType());
+			} else if (value instanceof DBObject) {
+				return (T) read(type, (DBObject) value);
+			} else {
+				return (T) getPotentiallyConvertedSimpleRead(value, type.getType());
+			}
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -17,8 +17,12 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 import org.bson.types.ObjectId;
+import org.springframework.core.convert.ConversionFailedException;
+import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.util.StringUtils;
 
@@ -119,4 +123,28 @@ abstract class MongoConverters {
 			return StringUtils.hasText(source) ? new BigInteger(source) : null;
 		}
 	}
+
+	public static enum URLToStringConverter implements Converter<URL, String> {
+		INSTANCE;
+
+		public String convert(URL source) {
+			return source == null ? null : source.toString();
+		}
+	}
+
+	public static enum StringToURLConverter implements Converter<String, URL> {
+		INSTANCE;
+
+		private static final TypeDescriptor SOURCE = TypeDescriptor.valueOf(String.class);
+		private static final TypeDescriptor TARGET = TypeDescriptor.valueOf(URL.class);
+
+		public URL convert(String source) {
+
+			try {
+				return source == null ? null : new URL(source);
+			} catch (MalformedURLException e) {
+				throw new ConversionFailedException(SOURCE, TARGET, source, e);
+			}
+		}
+	}
 }

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

@@ -66,7 +66,7 @@ public class Box implements Shape {
 		list.add(getUpperRight().asList());
 		return list;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
@@ -74,7 +74,7 @@ public class Box implements Shape {
 	public String getCommand() {
 		return "$box";
 	}
-	
+
 	@Override
 	public String toString() {
 		return String.format("Box [%s, %s]", first, second);

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

@@ -40,10 +40,10 @@ public class Circle implements Shape {
 	 */
 	@PersistenceConstructor
 	public Circle(Point center, double radius) {
-		
+
 		Assert.notNull(center);
 		Assert.isTrue(radius >= 0, "Radius must not be negative!");
-		
+
 		this.center = center;
 		this.radius = radius;
 	}
@@ -76,7 +76,7 @@ public class Circle implements Shape {
 	public double getRadius() {
 		return radius;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
@@ -87,7 +87,7 @@ public class Circle implements Shape {
 		result.add(getRadius());
 		return result;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
@@ -104,26 +104,26 @@ public class Circle implements Shape {
 	public String toString() {
 		return String.format("Circle [center=%s, radius=%f]", center, radius);
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		
+
 		if (this == obj) {
 			return true;
 		}
-		
+
 		if (obj == null || !getClass().equals(obj.getClass())) {
 			return false;
 		}
-		
+
 		Circle that = (Circle) obj;
-		
+
 		return this.center.equals(that.center) && this.radius == that.radius;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#hashCode()

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

@@ -50,22 +50,22 @@ public class Polygon implements Shape, Iterable<Point> {
 		this.points.addAll(Arrays.asList(x, y, z));
 		this.points.addAll(Arrays.asList(others));
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#asList()
 	 */
 	public List<List<Double>> asList() {
-		
+
 		List<List<Double>> result = new ArrayList<List<Double>>();
-		
+
 		for (Point point : points) {
 			result.add(point.asList());
 		}
-		
+
 		return result;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.geo.Shape#getCommand()
@@ -73,7 +73,7 @@ public class Polygon implements Shape, Iterable<Point> {
 	public String getCommand() {
 		return "$polygon";
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Iterable#iterator()
@@ -88,20 +88,20 @@ public class Polygon implements Shape, Iterable<Point> {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		
+
 		if (this == obj) {
 			return true;
 		}
-		
+
 		if (obj == null || !getClass().equals(obj.getClass())) {
 			return false;
 		}
-		
+
 		Polygon that = (Polygon) obj;
-		
+
 		return this.points.equals(that.points);
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#hashCode()

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * Common interface for all shapes. Allows building MongoDB representations of them.
- *
+ * 
  * @author Oliver Gierke
  */
 public interface Shape {
@@ -31,7 +31,7 @@ public interface Shape {
 	 * @return
 	 */
 	List<? extends Object> asList();
-	
+
 	/**
 	 * Returns the command to be used to create the {@literal $within} criterion.
 	 * 

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

@@ -0,0 +1,132 @@
+/*
+ * Copyright 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.
+ * 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.core.index;
+
+import org.springframework.data.mongodb.core.query.Order;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value object for an index field.
+ * 
+ * @author Oliver Gierke
+ */
+public final class IndexField {
+
+	private final String key;
+	private final Order order;
+	private final boolean isGeo;
+
+	private IndexField(String key, Order order, boolean isGeo) {
+
+		Assert.hasText(key);
+		Assert.isTrue(order != null ^ isGeo);
+
+		this.key = key;
+		this.order = order;
+		this.isGeo = isGeo;
+	}
+
+	/**
+	 * Creates a default {@link IndexField} with the given key and {@link Order}.
+	 * 
+	 * @param key must not be {@literal null} or emtpy.
+	 * @param order must not be {@literal null}.
+	 * @return
+	 */
+	public static IndexField create(String key, Order order) {
+		Assert.notNull(order);
+		return new IndexField(key, order, false);
+	}
+
+	/**
+	 * Creates a geo {@link IndexField} for the given key.
+	 * 
+	 * @param key must not be {@literal null} or empty.
+	 * @return
+	 */
+	public static IndexField geo(String key) {
+		return new IndexField(key, null, true);
+	}
+
+	/**
+	 * @return the key
+	 */
+	public String getKey() {
+		return key;
+	}
+
+	/**
+	 * Returns the order of the {@link IndexField} or {@literal null} in case we have a geo index field.
+	 * 
+	 * @return the order
+	 */
+	public Order getOrder() {
+		return order;
+	}
+
+	/**
+	 * Returns whether the {@link IndexField} is a geo index field.
+	 * 
+	 * @return the isGeo
+	 */
+	public boolean isGeo() {
+		return isGeo;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof IndexField)) {
+			return false;
+		}
+
+		IndexField that = (IndexField) obj;
+
+		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.order, that.order) && this.isGeo == that.isGeo;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int result = 17;
+		result += 31 * ObjectUtils.nullSafeHashCode(key);
+		result += 31 * ObjectUtils.nullSafeHashCode(order);
+		result += 31 * ObjectUtils.nullSafeHashCode(isGeo);
+		return result;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return String.format("IndexField [ key: %s, order: %s, isGeo: %s]", key, order, isGeo);
+	}
+}

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

@@ -15,36 +15,52 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.data.mongodb.core.query.Order;
+import org.springframework.util.ObjectUtils;
 
 public class IndexInfo {
 
 	private final Map<String, Order> fieldSpec;
+	private final List<IndexField> indexFields;
 
-	private String name;
+	private final String name;
+	private final boolean unique;
+	private final boolean dropDuplicates;
+	private final boolean sparse;
 
-	private boolean unique = false;
+	public IndexInfo(Map<String, Order> fieldSpec, List<IndexField> indexFields, String name, boolean unique,
+			boolean dropDuplicates, boolean sparse) {
 
-	private boolean dropDuplicates = false;
-
-	private boolean sparse = false;
-
-
-	public IndexInfo(Map<String, Order> fieldSpec, String name, boolean unique, boolean dropDuplicates, boolean sparse) {
-		super();
 		this.fieldSpec = fieldSpec;
+		this.indexFields = Collections.unmodifiableList(indexFields);
 		this.name = name;
 		this.unique = unique;
 		this.dropDuplicates = dropDuplicates;
 		this.sparse = sparse;
 	}
 
+	/**
+	 * @deprecated use {@link #getIndexFields()} instead as this {@link Map} does not contain geo indexes.
+	 * @return
+	 */
+	@Deprecated
 	public Map<String, Order> getFieldSpec() {
 		return fieldSpec;
 	}
 
+	/**
+	 * Returns the individual index fields of the index.
+	 * 
+	 * @return
+	 */
+	public List<IndexField> getIndexFields() {
+		return this.indexFields;
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -63,7 +79,7 @@ public class IndexInfo {
 
 	@Override
 	public String toString() {
-		return "IndexInfo [fieldSpec=" + fieldSpec + ", name=" + name + ", unique=" + unique + ", dropDuplicates="
+		return "IndexInfo [indexFields=" + indexFields + ", name=" + name + ", unique=" + unique + ", dropDuplicates="
 				+ dropDuplicates + ", sparse=" + sparse + "]";
 	}
 
@@ -72,7 +88,7 @@ public class IndexInfo {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + (dropDuplicates ? 1231 : 1237);
-		result = prime * result + ((fieldSpec == null) ? 0 : fieldSpec.hashCode());
+		result = prime * result + ObjectUtils.nullSafeHashCode(indexFields);
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + (sparse ? 1231 : 1237);
 		result = prime * result + (unique ? 1231 : 1237);
@@ -81,35 +97,39 @@ public class IndexInfo {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		IndexInfo other = (IndexInfo) obj;
-		if (dropDuplicates != other.dropDuplicates)
+		if (dropDuplicates != other.dropDuplicates) {
 			return false;
-		if (fieldSpec == null) {
-			if (other.fieldSpec != null)
+		}
+		if (indexFields == null) {
+			if (other.indexFields != null) {
 				return false;
-		} else if (!fieldSpec.equals(other.fieldSpec))
+			}
+		} else if (!indexFields.equals(other.indexFields)) {
 			return false;
+		}
 		if (name == null) {
-			if (other.name != null)
+			if (other.name != null) {
 				return false;
-		} else if (!name.equals(other.name))
+			}
+		} else if (!name.equals(other.name)) {
 			return false;
-		if (sparse != other.sparse)
+		}
+		if (sparse != other.sparse) {
 			return false;
-		if (unique != other.unique)
+		}
+		if (unique != other.unique) {
 			return false;
+		}
 		return true;
 	}
-
-
-	/**
-	 * [{ "v" : 1 , "key" : { "_id" : 1} ,  "ns" : "database.person" , "name" : "_id_"}, 
-      { "v" : 1 , "key" : { "age" : -1} , "ns" : "database.person" , "name" : "age_-1" ,  "unique" : true , "dropDups" : true}]
-	 */
 }

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

@@ -23,12 +23,12 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
 /**
- * An implementation of ApplicationEventPublisher that will only fire MappingContextEvents for use by the index creator when
- * MongoTemplate is used 'stand-alone', that is not declared inside a Spring ApplicationContext.
+ * An implementation of ApplicationEventPublisher that will only fire MappingContextEvents for use by the index creator
+ * when MongoTemplate is used 'stand-alone', that is not declared inside a Spring ApplicationContext.
+ * 
+ * Declare MongoTemplate inside an ApplicationContext to enable the publishing of all persistence events such as
+ * {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc.
  * 
- * Declare MongoTemplate inside an ApplicationContext to enable the publishing of all persistence events such as 
- * {@link AfterLoadEvent}, {@link AfterSaveEvent}, etc. 
- *
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MongoMappingEventPublisher implements ApplicationEventPublisher {

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

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.event.MappingContextEvent;
 import org.springframework.data.mongodb.MongoDbFactory;
@@ -76,7 +77,13 @@ public class MongoPersistentEntityIndexCreator implements
 	 */
 	public void onApplicationEvent(
 			MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty> event) {
-		checkForIndexes(event.getPersistentEntity());
+
+		PersistentEntity<?, ?> entity = event.getPersistentEntity();
+
+		// Double check type as Spring infrastructure does not consider nested generics
+		if (entity instanceof MongoPersistentEntity) {
+			checkForIndexes(event.getPersistentEntity());
+		}
 	}
 
 	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {

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

@@ -30,7 +30,8 @@ import org.springframework.data.util.TypeInformation;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke ogierke@vmware.com
  */
-public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersistentEntity<?>, MongoPersistentProperty> implements ApplicationContextAware {
+public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersistentEntity<?>, MongoPersistentProperty>
+		implements ApplicationContextAware {
 
 	private ApplicationContext context;
 
@@ -57,16 +58,16 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 	 */
 	@Override
 	protected <T> BasicMongoPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
-		
+
 		BasicMongoPersistentEntity<T> entity = new BasicMongoPersistentEntity<T>(typeInformation);
-		
+
 		if (context != null) {
 			entity.setApplicationContext(context);
 		}
-		
+
 		return entity;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)

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

@@ -19,8 +19,10 @@ import java.math.BigInteger;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 import java.util.regex.Pattern;
 
+import org.bson.types.Binary;
 import org.bson.types.CodeWScope;
 import org.bson.types.ObjectId;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -36,7 +38,7 @@ import com.mongodb.DBRef;
 public abstract class MongoSimpleTypes {
 
 	public static final Set<Class<?>> AUTOGENERATED_ID_TYPES;
-	
+
 	static {
 		Set<Class<?>> classes = new HashSet<Class<?>>();
 		classes.add(ObjectId.class);
@@ -50,6 +52,8 @@ public abstract class MongoSimpleTypes {
 		simpleTypes.add(CodeWScope.class);
 		simpleTypes.add(DBObject.class);
 		simpleTypes.add(Pattern.class);
+		simpleTypes.add(Binary.class);
+		simpleTypes.add(UUID.class);
 		MONGO_SIMPLE_TYPES = Collections.unmodifiableSet(simpleTypes);
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java

@@ -31,7 +31,7 @@ public abstract class AbstractMongoEventListener<E> implements ApplicationListen
 
 	protected final Log LOG = LogFactory.getLog(getClass());
 	private final Class<?> domainClass;
-	
+
 	/**
 	 * Creates a new {@link AbstractMongoEventListener}.
 	 */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterLoadEvent.java

@@ -39,9 +39,9 @@ public class AfterLoadEvent<T> extends MongoMappingEvent<DBObject> {
 	 * @param type must not be {@literal null}.
 	 */
 	public AfterLoadEvent(DBObject dbo, Class<T> type) {
-		
+
 		super(dbo, dbo);
-		
+
 		Assert.notNull(type, "Type must not be null!");
 		this.type = type;
 	}

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

@@ -19,24 +19,19 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
- * Collects the parameters required to perform a group operation on a collection.  The query condition and the input collection are specified on the group method as method arguments
- * to be consistent with other operations, e.g. map-reduce.
+ * Collects the parameters required to perform a group operation on a collection. The query condition and the input
+ * collection are specified on the group method as method arguments to be consistent with other operations, e.g.
+ * map-reduce.
  * 
  * @author Mark Pollack
- *
  */
 public class GroupBy {
 
 	private DBObject dboKeys;
-
 	private String keyFunction;
-
 	private String initial;
-	
 	private DBObject initialDbObject;
-
 	private String reduce;
-
 	private String finalize;
 
 	public GroupBy(String... keys) {
@@ -71,24 +66,22 @@ public class GroupBy {
 		initial = initialDocument;
 		return this;
 	}
-	
+
 	public GroupBy initialDocument(DBObject initialDocument) {
 		initialDbObject = initialDocument;
 		return this;
 	}
-	
+
 	public GroupBy reduceFunction(String reduceFunction) {
 		reduce = reduceFunction;
 		return this;
 	}
-	
+
 	public GroupBy finalizeFunction(String finalizeFunction) {
 		finalize = finalizeFunction;
 		return this;
 	}
 
-	
-
 	public DBObject getGroupByObject() {
 		// return new GroupCommand(dbCollection, dboKeys, condition, initial, reduce, finalize);
 		BasicDBObject dbo = new BasicDBObject();
@@ -100,19 +93,15 @@ public class GroupBy {
 		}
 
 		dbo.put("$reduce", reduce);
-		
-		dbo.put("initial", initialDbObject); 					
+
+		dbo.put("initial", initialDbObject);
 		if (initial != null) {
 			dbo.put("initial", initial);
 		}
 		if (finalize != null) {
 			dbo.put("finalize", finalize);
 		}
-		return dbo;				
+		return dbo;
 	}
 
-
-
-
-
 }

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

@@ -26,31 +26,27 @@ import com.mongodb.DBObject;
  * Collects the results of executing a group operation.
  * 
  * @author Mark Pollack
- *
  * @param <T> The class in which the results are mapped onto, accessible via an interator.
  */
 public class GroupByResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
-	
-	private DBObject rawResults;
-	
+	private final DBObject rawResults;
+
 	private double count;
-	
 	private int keys;
-	
 	private String serverUsed;
-	
+
 	public GroupByResults(List<T> mappedResults, DBObject rawResults) {
 		Assert.notNull(mappedResults);
 		Assert.notNull(rawResults);
 		this.mappedResults = mappedResults;
 		this.rawResults = rawResults;
-		parseKeys();		
+		parseKeys();
 		parseCount();
 		parseServerUsed();
 	}
-	
+
 	public double getCount() {
 		return count;
 	}
@@ -58,36 +54,36 @@ public class GroupByResults<T> implements Iterable<T> {
 	public int getKeys() {
 		return keys;
 	}
-	
+
 	public String getServerUsed() {
 		return serverUsed;
 	}
 
 	public Iterator<T> iterator() {
-			return mappedResults.iterator();
+		return mappedResults.iterator();
 	}
-		
+
 	public DBObject getRawResults() {
 		return rawResults;
 	}
-	
+
 	private void parseCount() {
 		Object object = rawResults.get("count");
 		if (object instanceof Double) {
 			count = (Double) object;
 		}
-		
+
 	}
 
 	private void parseKeys() {
 		Object object = rawResults.get("keys");
 		if (object instanceof Integer) {
 			keys = (Integer) object;
-		}		
+		}
 	}
-	
+
 	private void parseServerUsed() {
-		//"serverUsed" : "127.0.0.1:27017"
+		// "serverUsed" : "127.0.0.1:27017"
 		Object object = rawResults.get("serverUsed");
 		if (object instanceof String) {
 			serverUsed = (String) object;

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

@@ -15,13 +15,14 @@
  */
 package org.springframework.data.mongodb.core.mapreduce;
 
+/**
+ * @author Mark Pollack
+ */
 public class MapReduceCounts {
 
-	private int inputCount;
-	
-	private int emitCount;
-	
-	private int outputCount;
+	private final int inputCount;
+	private final int emitCount;
+	private final int outputCount;
 
 	public MapReduceCounts(int inputCount, int emitCount, int outputCount) {
 		super();
@@ -42,12 +43,20 @@ public class MapReduceCounts {
 		return outputCount;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString() {
 		return "MapReduceCounts [inputCount=" + inputCount + ", emitCount=" + emitCount + ", outputCount=" + outputCount
 				+ "]";
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
 	@Override
 	public int hashCode() {
 		final int prime = 31;
@@ -58,24 +67,31 @@ public class MapReduceCounts {
 		return result;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		MapReduceCounts other = (MapReduceCounts) obj;
-		if (emitCount != other.emitCount)
+		if (emitCount != other.emitCount) {
 			return false;
-		if (inputCount != other.inputCount)
+		}
+		if (inputCount != other.inputCount) {
 			return false;
-		if (outputCount != other.outputCount)
+		}
+		if (outputCount != other.outputCount) {
 			return false;
+		}
 		return true;
 	}
-
-	
-	
 }

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

@@ -39,10 +39,9 @@ public class MapReduceOptions {
 	private Boolean jsMode;
 
 	private Boolean verbose = true;
-	
+
 	private Map<String, Object> extraOptions = new HashMap<String, Object>();
-	
-	
+
 	/**
 	 * Static factory method to create a MapReduceOptions instance
 	 * 
@@ -189,12 +188,12 @@ public class MapReduceOptions {
 		this.verbose = verbose;
 		return this;
 	}
-	
+
 	/**
-	 * Add additional extra options that may not have a method on this class.  This method will help if you use a 
-	 * version of this client library with a server version that has added additional map-reduce options that do not 
-	 * yet have an method for use in setting them.
-	 * options
+	 * Add additional extra options that may not have a method on this class. This method will help if you use a version
+	 * of this client library with a server version that has added additional map-reduce options that do not yet have an
+	 * method for use in setting them. options
+	 * 
 	 * @param key The key option
 	 * @param value The value of the option
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
@@ -203,40 +202,39 @@ public class MapReduceOptions {
 		extraOptions.put(key, value);
 		return this;
 	}
-	
+
 	public Map<String, Object> getExtraOptions() {
-			return extraOptions;
+		return extraOptions;
 	}
-	
+
 	public String getFinalizeFunction() {
 		return this.finalizeFunction;
 	}
-	
+
 	public Boolean getJavaScriptMode() {
 		return this.jsMode;
 	}
-	
+
 	public String getOutputCollection() {
 		return this.outputCollection;
 	}
-	
+
 	public String getOutputDatabase() {
 		return this.outputDatabase;
 	}
-	
+
 	public Boolean getOutputSharded() {
 		return this.outputSharded;
 	}
-	
+
 	public MapReduceCommand.OutputType getOutputType() {
 		return this.outputType;
 	}
-	
+
 	public Map<String, Object> getScopeVariables() {
 		return this.scopeVariables;
 	}
-	
-	
+
 	public DBObject getOptionsObject() {
 		BasicDBObject cmd = new BasicDBObject();
 
@@ -253,7 +251,7 @@ public class MapReduceOptions {
 		if (scopeVariables != null) {
 			cmd.put("scope", scopeVariables);
 		}
-		
+
 		if (!extraOptions.keySet().isEmpty()) {
 			cmd.putAll(extraOptions);
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-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.
@@ -24,77 +24,126 @@ import com.mongodb.DBObject;
 
 /**
  * Collects the results of performing a MapReduce operations.
+ * 
  * @author Mark Pollack
- *
- * @param <T> The class in which the results are mapped onto, accessible via an interator.
+ * @author Oliver Gierke
+ * @param <T> The class in which the results are mapped onto, accessible via an iterator.
  */
 public class MapReduceResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
-	
-	private DBObject rawResults;
+	private final DBObject rawResults;
+	private final String outputCollection;
+	private final MapReduceTiming mapReduceTiming;
+	private final MapReduceCounts mapReduceCounts;
 
-	private MapReduceTiming mapReduceTiming;
-	
-	private MapReduceCounts mapReduceCounts;
-	
-	private String outputCollection;
-	
+	/**
+	 * Creates a new {@link MapReduceResults} from the given mapped results and the raw one.
+	 * 
+	 * @param mappedResults must not be {@literal null}.
+	 * @param rawResults must not be {@literal null}.
+	 */
 	public MapReduceResults(List<T> mappedResults, DBObject rawResults) {
+
 		Assert.notNull(mappedResults);
 		Assert.notNull(rawResults);
+
 		this.mappedResults = mappedResults;
 		this.rawResults = rawResults;
-		parseTiming(rawResults);
-		parseCounts(rawResults);		
-		if (rawResults.get("result") != null) {
-			this.outputCollection = (String) rawResults.get("result");
-		}
+		this.mapReduceTiming = parseTiming(rawResults);
+		this.mapReduceCounts = parseCounts(rawResults);
+		this.outputCollection = parseOutputCollection(rawResults);
 	}
-	
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
 	public Iterator<T> iterator() {
-			return mappedResults.iterator();
+		return mappedResults.iterator();
 	}
-		
+
 	public MapReduceTiming getTiming() {
 		return mapReduceTiming;
 	}
-	
+
 	public MapReduceCounts getCounts() {
 		return mapReduceCounts;
 	}
-	
+
 	public String getOutputCollection() {
 		return outputCollection;
 	}
-	
+
 	public DBObject getRawResults() {
 		return rawResults;
 	}
-	
-	protected void parseTiming(DBObject rawResults) {
+
+	private MapReduceTiming parseTiming(DBObject rawResults) {
+
 		DBObject timing = (DBObject) rawResults.get("timing");
-		if (timing != null) {
-			if (timing.get("mapTime") != null && timing.get("emitLoop") != null && timing.get("total") != null) {
-				mapReduceTiming =  new MapReduceTiming( (Long)timing.get("mapTime"), 
-																								(Integer)timing.get("emitLoop"), 
-																								(Integer)timing.get("total"));
-			}
-		} else {
-			mapReduceTiming = new MapReduceTiming(-1,-1,-1);
+
+		if (timing == null) {
+			return new MapReduceTiming(-1, -1, -1);
 		}
+
+		if (timing.get("mapTime") != null && timing.get("emitLoop") != null && timing.get("total") != null) {
+			return new MapReduceTiming(getAsLong(timing, "mapTime"), getAsLong(timing, "emitLoop"),
+					getAsLong(timing, "total"));
+		}
+
+		return new MapReduceTiming(-1, -1, -1);
 	}
-	
-	
-	protected void parseCounts(DBObject rawResults) {
+
+	/**
+	 * Returns the value of the source's field with the given key as {@link Long}.
+	 * 
+	 * @param source
+	 * @param key
+	 * @return
+	 */
+	private Long getAsLong(DBObject source, String key) {
+		Object raw = source.get(key);
+		return raw instanceof Long ? (Long) raw : (Integer) raw;
+	}
+
+	/**
+	 * Parses the raw {@link DBObject} result into a {@link MapReduceCounts} value object.
+	 * 
+	 * @param rawResults
+	 * @return
+	 */
+	private MapReduceCounts parseCounts(DBObject rawResults) {
+
 		DBObject counts = (DBObject) rawResults.get("counts");
-		if (counts != null) {
-			if (counts.get("input") != null && counts.get("emit") != null && counts.get("output") != null) {
-				mapReduceCounts =  new MapReduceCounts( (Integer)counts.get("input"), (Integer)counts.get("emit"), (Integer)counts.get("output"));
-			}
-		} else {
-			mapReduceCounts = new MapReduceCounts(-1,-1,-1);
+
+		if (counts == null) {
+			return new MapReduceCounts(-1, -1, -1);
 		}
+
+		if (counts.get("input") != null && counts.get("emit") != null && counts.get("output") != null) {
+			return new MapReduceCounts((Integer) counts.get("input"), (Integer) counts.get("emit"),
+					(Integer) counts.get("output"));
+		}
+
+		return new MapReduceCounts(-1, -1, -1);
+	}
+
+	/**
+	 * Parses the output collection from the raw {@link DBObject} result.
+	 * 
+	 * @param rawResults
+	 * @return
+	 */
+	private String parseOutputCollection(DBObject rawResults) {
+
+		Object resultField = rawResults.get("result");
+
+		if (resultField == null) {
+			return null;
+		}
+
+		return resultField instanceof DBObject ? ((DBObject) resultField).get("collection").toString() : resultField
+				.toString();
 	}
-	
 }

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

@@ -18,15 +18,15 @@ package org.springframework.data.mongodb.core.mapreduce;
 public class MapReduceTiming {
 
 	private long mapTime;
-	
+
 	private long emitLoopTime;
-	
+
 	private long totalTime;
-	
+
 	public MapReduceTiming(long mapTime, long emitLoopTime, long totalTime) {
 		this.mapTime = mapTime;
 		this.emitLoopTime = emitLoopTime;
-		this.totalTime = totalTime;		
+		this.totalTime = totalTime;
 	}
 
 	public long getMapTime() {
@@ -73,8 +73,5 @@ public class MapReduceTiming {
 			return false;
 		return true;
 	}
-	
-	
-	
-	
+
 }

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

@@ -20,14 +20,15 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.regex.Pattern;
 
+import org.bson.BSON;
 import org.bson.types.BasicBSONList;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.geo.Circle;
 import org.springframework.data.mongodb.core.geo.Point;
 import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -69,7 +70,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Static factory method to create a Criteria using the provided key
-	 *
+	 * 
 	 * @param key
 	 * @return
 	 */
@@ -79,7 +80,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Static factory method to create a Criteria using the provided key
-	 *
+	 * 
 	 * @return
 	 */
 	public Criteria and(String key) {
@@ -88,7 +89,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using equality
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -97,16 +98,20 @@ public class Criteria implements CriteriaDefinition {
 			throw new InvalidMongoDbApiUsageException(
 					"Multiple 'is' values declared. You need to use 'and' with multiple criteria");
 		}
-		if (this.criteria.size() > 0 && "$not".equals(this.criteria.keySet().toArray()[this.criteria.size() - 1])) {
+		if (lastOperatorWasNot()) {
 			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead.");
 		}
 		this.isValue = o;
 		return this;
 	}
 
+	private boolean lastOperatorWasNot() {
+		return this.criteria.size() > 0 && "$not".equals(this.criteria.keySet().toArray()[this.criteria.size() - 1]);
+	}
+
 	/**
 	 * Creates a criterion using the $ne operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -117,7 +122,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $lt operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -128,7 +133,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $lte operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -139,7 +144,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $gt operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -150,7 +155,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $gte operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -161,7 +166,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $in operator
-	 *
+	 * 
 	 * @param o the values to match against
 	 * @return
 	 */
@@ -176,7 +181,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $in operator
-	 *
+	 * 
 	 * @param c the collection containing the values to match against
 	 * @return
 	 */
@@ -187,7 +192,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $nin operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -202,7 +207,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $mod operator
-	 *
+	 * 
 	 * @param value
 	 * @param remainder
 	 * @return
@@ -217,7 +222,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $all operator
-	 *
+	 * 
 	 * @param o
 	 * @return
 	 */
@@ -232,7 +237,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $size operator
-	 *
+	 * 
 	 * @param s
 	 * @return
 	 */
@@ -243,7 +248,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $exists operator
-	 *
+	 * 
 	 * @param b
 	 * @return
 	 */
@@ -254,7 +259,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $type operator
-	 *
+	 * 
 	 * @param t
 	 * @return
 	 */
@@ -265,43 +270,65 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $not meta operator which affects the clause directly following
-	 *
+	 * 
 	 * @return
 	 */
 	public Criteria not() {
-		criteria.put("$not", null);
+		return not(null);
+	}
+
+	private Criteria not(Object value) {
+		criteria.put("$not", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using a $regex
-	 *
+	 * 
 	 * @param re
 	 * @return
 	 */
 	public Criteria regex(String re) {
-		criteria.put("$regex", re);
-		return this;
+		return regex(re, null);
 	}
 
 	/**
 	 * Creates a criterion using a $regex and $options
-	 *
+	 * 
 	 * @param re
 	 * @param options
 	 * @return
 	 */
 	public Criteria regex(String re, String options) {
-		criteria.put("$regex", re);
-		if (StringUtils.hasText(options)) {
-			criteria.put("$options", options);
+		return regex(toPattern(re, options));
+	}
+
+	/**
+	 * Syntactical sugar for {@link #is(Object)} making obvious that we create a regex predicate.
+	 * 
+	 * @param pattern
+	 * @return
+	 */
+	public Criteria regex(Pattern pattern) {
+
+		Assert.notNull(pattern);
+
+		if (lastOperatorWasNot()) {
+			return not(pattern);
 		}
+
+		this.isValue = pattern;
 		return this;
 	}
 
+	private Pattern toPattern(String regex, String options) {
+		Assert.notNull(regex);
+		return Pattern.compile(regex, options == null ? 0 : BSON.regexFlags(options));
+	}
+
 	/**
 	 * Creates a geospatial criterion using a $within $center operation. This is only available for Mongo 1.7 and higher.
-	 *
+	 * 
 	 * @param circle must not be {@literal null}
 	 * @return
 	 */
@@ -320,7 +347,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a geospatial criterion using a $near operation
-	 *
+	 * 
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
@@ -332,7 +359,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a geospatial criterion using a $nearSphere operation. This is only available for Mongo 1.7 and higher.
-	 *
+	 * 
 	 * @param point must not be {@literal null}
 	 * @return
 	 */
@@ -344,7 +371,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a geospatical criterion using a $maxDistance operation, for use with $near
-	 *
+	 * 
 	 * @param maxDistance
 	 * @return
 	 */
@@ -355,7 +382,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a criterion using the $elemMatch operator
-	 *
+	 * 
 	 * @param c
 	 * @return
 	 */
@@ -366,7 +393,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates an 'or' criteria using the $or operator for all of the provided criteria
-	 *
+	 * 
 	 * @param criteria
 	 */
 	public Criteria orOperator(Criteria... criteria) {
@@ -377,7 +404,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates a 'nor' criteria using the $nor operator for all of the provided criteria
-	 *
+	 * 
 	 * @param criteria
 	 */
 	public Criteria norOperator(Criteria... criteria) {
@@ -388,7 +415,7 @@ public class Criteria implements CriteriaDefinition {
 
 	/**
 	 * Creates an 'and' criteria using the $and operator for all of the provided criteria
-	 *
+	 * 
 	 * @param criteria
 	 */
 	public Criteria andOperator(Criteria... criteria) {
@@ -397,7 +424,6 @@ public class Criteria implements CriteriaDefinition {
 		return this;
 	}
 
-
 	public String getKey() {
 		return this.key;
 	}
@@ -427,16 +453,17 @@ public class Criteria implements CriteriaDefinition {
 		DBObject dbo = new BasicDBObject();
 		boolean not = false;
 		for (String k : this.criteria.keySet()) {
+			Object value = this.criteria.get(k);
 			if (not) {
 				DBObject notDbo = new BasicDBObject();
-				notDbo.put(k, this.criteria.get(k));
+				notDbo.put(k, value);
 				dbo.put("$not", notDbo);
 				not = false;
 			} else {
-				if ("$not".equals(k)) {
+				if ("$not".equals(k) && value == null) {
 					not = true;
 				} else {
-					dbo.put(k, this.criteria.get(k));
+					dbo.put(k, value);
 				}
 			}
 		}
@@ -462,11 +489,10 @@ public class Criteria implements CriteriaDefinition {
 		Object existing = dbo.get(key);
 		if (existing == null) {
 			dbo.put(key, value);
-		}
-		else {
-			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
-					"you can't add a second '" + key + "' expression specified as '" + key + " : " + value + "'. " +
-					"Criteria already contains '" + key + " : " + existing + "'.");
+		} else {
+			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, "
+					+ "you can't add a second '" + key + "' expression specified as '" + key + " : " + value + "'. "
+					+ "Criteria already contains '" + key + " : " + existing + "'.");
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2011-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.
@@ -18,6 +18,12 @@ package org.springframework.data.mongodb.core.query;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated use {@link Criteria#orOperator(Criteria...)} instead.
+ * @author Thomas Risberg
+ * @author Oliver Gierke
+ */
+@Deprecated
 public class OrQuery extends Query {
 
 	public OrQuery(Query... q) {
@@ -31,5 +37,4 @@ public class OrQuery extends Query {
 		}
 		return new Criteria(criteriaList, "$or");
 	}
-
 }

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

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.query;
 
+import static org.springframework.data.mongodb.core.SerializationUtils.*;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -36,7 +38,7 @@ public class Query {
 
 	/**
 	 * Static factory method to create a Query using the provided criteria
-	 *
+	 * 
 	 * @param critera
 	 * @return
 	 */
@@ -56,11 +58,10 @@ public class Query {
 		String key = criteria.getKey();
 		if (existing == null) {
 			this.criteria.put(key, criteria);
-		}
-		else {
-			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, " +
-					"you can't add a second '" + key + "' criteria. " +
-					"Query already contains '" + existing.getCriteriaObject() + "'.");
+		} else {
+			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDBObject, "
+					+ "you can't add a second '" + key + "' criteria. " + "Query already contains '"
+					+ existing.getCriteriaObject() + "'.");
 		}
 		return this;
 	}
@@ -93,12 +94,12 @@ public class Query {
 		this.hint = name;
 		return this;
 	}
-	
+
 	public Sort sort() {
 		if (this.sort == null) {
 			this.sort = new Sort();
 		}
-	
+
 		return this.sort;
 	}
 
@@ -137,8 +138,18 @@ public class Query {
 	public String getHint() {
 		return hint;
 	}
-	
+
 	protected List<Criteria> getCriteria() {
 		return new ArrayList<Criteria>(this.criteria.values());
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return String.format("Query: %s, Fields: %s, Sort: %s", serializeToJsonSafely(getQueryObject()),
+				serializeToJsonSafely(getFieldsObject()), serializeToJsonSafely(getSortObject()));
+	}
 }

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

@@ -48,7 +48,7 @@ public class MongoRepositoryConfigParser extends
 	protected void postProcessBeanDefinition(MongoRepositoryConfiguration context, BeanDefinitionBuilder builder,
 			BeanDefinitionRegistry registry, Object beanSource) {
 
-		builder.addPropertyReference("template", context.getMongoTemplateRef());
+		builder.addPropertyReference("mongoOperations", context.getMongoTemplateRef());
 		builder.addPropertyValue("createIndexesForQueryMethods", context.getCreateQueryIndexes());
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -15,15 +15,15 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.springframework.data.mongodb.repository.query.QueryUtils.applyPagination;
+import static org.springframework.data.mongodb.repository.query.QueryUtils.*;
 
 import java.util.List;
 
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.geo.Distance;
+import org.springframework.data.mongodb.core.geo.GeoPage;
 import org.springframework.data.mongodb.core.geo.GeoResult;
 import org.springframework.data.mongodb.core.geo.GeoResults;
 import org.springframework.data.mongodb.core.geo.Point;
@@ -34,10 +34,6 @@ import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-
 /**
  * Base class for {@link RepositoryQuery} implementations for Mongo.
  * 
@@ -46,45 +42,50 @@ import com.mongodb.DBObject;
 public abstract class AbstractMongoQuery implements RepositoryQuery {
 
 	private final MongoQueryMethod method;
-	private final MongoOperations mongoOperations;
+	private final MongoOperations operations;
 
 	/**
 	 * Creates a new {@link AbstractMongoQuery} from the given {@link MongoQueryMethod} and {@link MongoOperations}.
 	 * 
-	 * @param method
-	 * @param template
+	 * @param method must not be {@literal null}.
+	 * @param operations must not be {@literal null}.
 	 */
-	public AbstractMongoQuery(MongoQueryMethod method, MongoOperations template) {
+	public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations) {
 
-		Assert.notNull(template);
+		Assert.notNull(operations);
 		Assert.notNull(method);
 
 		this.method = method;
-		this.mongoOperations = template;
+		this.operations = operations;
 	}
 
-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod()
 	 */
 	public MongoQueryMethod getQueryMethod() {
-
 		return method;
 	}
 
 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see org.springframework.data.repository.query.RepositoryQuery#execute(java .lang.Object[])
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[])
+	 */
 	public Object execute(Object[] parameters) {
 
 		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(method, parameters);
-		Query query = createQuery(new ConvertingParameterAccessor(mongoOperations.getConverter(), accessor));
+		Query query = createQuery(new ConvertingParameterAccessor(operations.getConverter(), accessor));
 
-		if (method.isGeoNearQuery()) {
+		if (method.isGeoNearQuery() && method.isPageQuery()) {
+
+			MongoParameterAccessor countAccessor = new MongoParametersParameterAccessor(method, parameters);
+			Query countQuery = createCountQuery(new ConvertingParameterAccessor(operations.getConverter(), countAccessor));
+
+			return new GeoNearExecution(accessor).execute(query, countQuery);
+		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(accessor).execute(query);
 		} else if (method.isCollectionQuery()) {
-			return new CollectionExecution().execute(query);
+			return new CollectionExecution(accessor.getPageable()).execute(query);
 		} else if (method.isPageQuery()) {
 			return new PagedExecution(accessor.getPageable()).execute(query);
 		} else {
@@ -93,14 +94,25 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	}
 
 	/**
-	 * Create a {@link Query} instance using the given {@link ParameterAccessor}
+	 * Creates a {@link Query} instance using the given {@link ParameterAccessor}
 	 * 
-	 * @param accessor
-	 * @param converter
+	 * @param accessor must not be {@literal null}.
 	 * @return
 	 */
 	protected abstract Query createQuery(ConvertingParameterAccessor accessor);
 
+	/**
+	 * Creates a {@link Query} instance using the given {@link ConvertingParameterAccessor}. Will delegate to
+	 * {@link #createQuery(ConvertingParameterAccessor)} by default but allows customization of the count query to be
+	 * triggered.
+	 * 
+	 * @param accessor must not be {@literal null}.
+	 * @return
+	 */
+	protected Query createCountQuery(ConvertingParameterAccessor accessor) {
+		return createQuery(accessor);
+	}
+
 	private abstract class Execution {
 
 		abstract Object execute(Query query);
@@ -110,7 +122,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
 
 			String collectionName = metadata.getCollectionName();
-			return mongoOperations.find(query, metadata.getJavaType(), collectionName);
+			return operations.find(query, metadata.getJavaType(), collectionName);
 		}
 	}
 
@@ -121,14 +133,23 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 	 */
 	class CollectionExecution extends Execution {
 
+		private final Pageable pageable;
+
+		CollectionExecution(Pageable pageable) {
+			this.pageable = pageable;
+		}
+
 		/*
-		   * (non-Javadoc)
-		   *
-		   * @see org.springframework.data.mongodb.repository.MongoQuery.Execution #execute(com.mongodb.DBObject)
-		   */
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public Object execute(Query query) {
 
+			if (pageable != null) {
+				query = applyPagination(query, pageable);
+			}
+
 			return readCollection(query);
 		}
 	}
@@ -162,24 +183,13 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		Object execute(Query query) {
 
 			MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
-			int count = getCollectionCursor(metadata.getCollectionName(), query.getQueryObject()).count();
+			long count = operations.count(query, metadata.getCollectionName());
 
-			List<?> result = mongoOperations.find(applyPagination(query, pageable), metadata.getJavaType(),
+			List<?> result = operations.find(applyPagination(query, pageable), metadata.getJavaType(),
 					metadata.getCollectionName());
 
 			return new PageImpl(result, pageable, count);
 		}
-
-		private DBCursor getCollectionCursor(String collectionName, final DBObject query) {
-
-			return mongoOperations.execute(collectionName, new CollectionCallback<DBCursor>() {
-
-				public DBCursor doInCollection(DBCollection collection) {
-
-					return collection.find(query);
-				}
-			});
-		}
 	}
 
 	/**
@@ -197,19 +207,19 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		Object execute(Query query) {
 
 			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
-			return mongoOperations.findOne(query, entityInformation.getJavaType());
+			return operations.findOne(query, entityInformation.getJavaType());
 		}
 	}
 
 	/**
 	 * {@link Execution} to execute geo-near queries.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	class GeoNearExecution extends Execution {
-		
+
 		private final MongoParameterAccessor accessor;
-		
+
 		public GeoNearExecution(MongoParameterAccessor accessor) {
 			this.accessor = accessor;
 		}
@@ -220,27 +230,48 @@ public abstract class AbstractMongoQuery implements RepositoryQuery {
 		 */
 		@Override
 		Object execute(Query query) {
-			
+
+			GeoResults<?> results = doExecuteQuery(query);
+			return isListOfGeoResult() ? results.getContent() : results;
+		}
+
+		/**
+		 * Executes the given {@link Query} to return a page.
+		 * 
+		 * @param query must not be {@literal null}.
+		 * @param countQuery must not be {@literal null}.
+		 * @return
+		 */
+		Object execute(Query query, Query countQuery) {
+
+			MongoEntityInformation<?, ?> information = method.getEntityInformation();
+			long count = operations.count(countQuery, information.getCollectionName());
+
+			return new GeoPage<Object>(doExecuteQuery(query), accessor.getPageable(), count);
+		}
+
+		@SuppressWarnings("unchecked")
+		private GeoResults<Object> doExecuteQuery(Query query) {
+
 			Point nearLocation = accessor.getGeoNearLocation();
 			NearQuery nearQuery = NearQuery.near(nearLocation);
-			
+
 			if (query != null) {
 				nearQuery.query(query);
 			}
-			
+
 			Distance maxDistance = accessor.getMaxDistance();
 			if (maxDistance != null) {
 				nearQuery.maxDistance(maxDistance);
 			}
-			
-			MongoEntityInformation<?,?> entityInformation = method.getEntityInformation();
-			GeoResults<?> results = mongoOperations.geoNear(nearQuery, entityInformation.getJavaType(), entityInformation.getCollectionName());
-			
-			return isListOfGeoResult() ? results.getContent() : results;
+
+			MongoEntityInformation<?, ?> entityInformation = method.getEntityInformation();
+			return (GeoResults<Object>) operations.geoNear(nearQuery, entityInformation.getJavaType(),
+					entityInformation.getCollectionName());
 		}
-		
+
 		private boolean isListOfGeoResult() {
-			
+
 			TypeInformation<?> returnType = method.getReturnType();
 			return returnType.getType().equals(List.class) && GeoResult.class.equals(returnType.getComponentType());
 		}

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

@@ -42,10 +42,10 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 	 * @param delegate must not be {@literal null}.
 	 */
 	public ConvertingParameterAccessor(MongoWriter<?> writer, MongoParameterAccessor delegate) {
-		
+
 		Assert.notNull(writer);
 		Assert.notNull(delegate);
-		
+
 		this.writer = writer;
 		this.delegate = delegate;
 	}
@@ -92,7 +92,7 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 	public Distance getMaxDistance() {
 		return delegate.getMaxDistance();
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
 	 */

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

@@ -17,10 +17,9 @@ package org.springframework.data.mongodb.repository.query;
 
 import java.io.Serializable;
 
-
 /**
  * Interface for components being able to provide {@link EntityInformationCreator} for a given {@link Class}.
- *
+ * 
  * @author Oliver Gierke
  */
 public interface EntityInformationCreator {

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

@@ -33,7 +33,7 @@ public interface MongoParameterAccessor extends ParameterAccessor {
 	 *         at all or the given value for it was {@literal null}.
 	 */
 	Distance getMaxDistance();
-	
+
 	/**
 	 * Returns the {@link Point} to use for a geo-near query.
 	 * 

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

@@ -35,7 +35,7 @@ public class MongoParameters extends Parameters {
 
 	private final Integer distanceIndex;
 	private Integer nearIndex;
-	
+
 	/**
 	 * Creates a new {@link MongoParameters} instance from the given {@link Method} and {@link MongoQueryMethod}.
 	 * 
@@ -43,55 +43,56 @@ public class MongoParameters extends Parameters {
 	 * @param queryMethod must not be {@literal null}.
 	 */
 	public MongoParameters(Method method, boolean isGeoNearMethod) {
-		
+
 		super(method);
 		List<Class<?>> parameterTypes = Arrays.asList(method.getParameterTypes());
 		this.distanceIndex = parameterTypes.indexOf(Distance.class);
-		
+
 		if (this.nearIndex == null && isGeoNearMethod) {
 			this.nearIndex = getNearIndex(parameterTypes);
 		} else if (this.nearIndex == null) {
 			this.nearIndex = -1;
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	private final int getNearIndex(List<Class<?>> parameterTypes) {
-		
+
 		for (Class<?> reference : Arrays.asList(Point.class, double[].class)) {
-			
+
 			int nearIndex = parameterTypes.indexOf(reference);
-			
+
 			if (nearIndex == -1) {
 				continue;
 			}
-			
+
 			if (nearIndex == parameterTypes.lastIndexOf(reference)) {
 				return nearIndex;
 			} else {
 				throw new IllegalStateException("Multiple Point parameters found but none annotated with @Near!");
 			}
 		}
-		
+
 		return -1;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.Parameters#createParameter(org.springframework.core.MethodParameter)
 	 */
 	@Override
 	protected Parameter createParameter(MethodParameter parameter) {
-		
+
 		MongoParameter mongoParameter = new MongoParameter(parameter);
-		
+
 		// Detect manually annotated @Near Point and reject multiple annotated ones
 		if (this.nearIndex == null && mongoParameter.isManuallyAnnotatedNearParameter()) {
 			this.nearIndex = mongoParameter.getIndex();
 		} else if (mongoParameter.isManuallyAnnotatedNearParameter()) {
-			throw new IllegalStateException(String.format("Found multiple @Near annotations ond method %s! Only one allowed!", parameter.getMethod().toString()));
+			throw new IllegalStateException(String.format(
+					"Found multiple @Near annotations ond method %s! Only one allowed!", parameter.getMethod().toString()));
 		}
-		
+
 		return mongoParameter;
 	}
 
@@ -103,7 +104,7 @@ public class MongoParameters extends Parameters {
 	public int getDistanceIndex() {
 		return distanceIndex;
 	}
-	
+
 	/**
 	 * Returns the index of the parameter to be used to start a geo-near query from.
 	 * 
@@ -112,16 +113,16 @@ public class MongoParameters extends Parameters {
 	public int getNearIndex() {
 		return nearIndex;
 	}
-	
+
 	/**
 	 * Custom {@link Parameter} implementation adding parameters of type {@link Distance} to the special ones.
-	 *
+	 * 
 	 * @author Oliver Gierke
 	 */
 	class MongoParameter extends Parameter {
-		
+
 		private final MethodParameter parameter;
-		
+
 		/**
 		 * Creates a new {@link MongoParameter}.
 		 * 
@@ -130,7 +131,7 @@ public class MongoParameters extends Parameters {
 		MongoParameter(MethodParameter parameter) {
 			super(parameter);
 			this.parameter = parameter;
-			
+
 			if (!isPoint() && hasNearAnnotation()) {
 				throw new IllegalArgumentException("Near annotation is only allowed at Point parameter!");
 			}
@@ -142,23 +143,22 @@ public class MongoParameters extends Parameters {
 		 */
 		@Override
 		public boolean isSpecialParameter() {
-			return super.isSpecialParameter() || getType().equals(Distance.class)
-					|| isNearParameter();
+			return super.isSpecialParameter() || getType().equals(Distance.class) || isNearParameter();
 		}
-		
+
 		private boolean isNearParameter() {
 			Integer nearIndex = MongoParameters.this.nearIndex;
 			return nearIndex != null && nearIndex.equals(getIndex());
 		}
-		
+
 		private boolean isManuallyAnnotatedNearParameter() {
 			return isPoint() && hasNearAnnotation();
 		}
-		
+
 		private boolean isPoint() {
 			return getType().equals(Point.class) || getType().equals(double[].class);
 		}
-		
+
 		private boolean hasNearAnnotation() {
 			return parameter.getParameterAnnotation(Near.class) != null;
 		}

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

@@ -21,13 +21,13 @@ import org.springframework.data.repository.query.ParametersParameterAccessor;
 
 /**
  * Mongo-specific {@link ParametersParameterAccessor} to allow access to the {@link Distance} parameter.
- *
+ * 
  * @author Oliver Gierke
  */
 public class MongoParametersParameterAccessor extends ParametersParameterAccessor implements MongoParameterAccessor {
 
 	private final MongoQueryMethod method;
-	
+
 	/**
 	 * Creates a new {@link MongoParametersParameterAccessor}.
 	 * 
@@ -47,25 +47,25 @@ public class MongoParametersParameterAccessor extends ParametersParameterAccesso
 		int index = method.getParameters().getDistanceIndex();
 		return index == -1 ? null : (Distance) getValue(index);
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
 	 */
 	public Point getGeoNearLocation() {
-		
+
 		int nearIndex = method.getParameters().getNearIndex();
-		
+
 		if (nearIndex == -1) {
 			return null;
 		}
-		
+
 		Object value = getValue(nearIndex);
-		
+
 		if (value == null) {
 			return null;
 		}
-		
+
 		if (value instanceof double[]) {
 			double[] typedValue = (double[]) value;
 			if (typedValue.length != 2) {
@@ -74,7 +74,7 @@ public class MongoParametersParameterAccessor extends ParametersParameterAccesso
 				return new Point(typedValue[0], typedValue[1]);
 			}
 		}
-		
+
 		return (Point) value;
 	}
 }

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

@@ -31,7 +31,6 @@ import org.springframework.data.mongodb.core.geo.Shape;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.data.mongodb.core.query.OrQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
@@ -45,7 +44,7 @@ import org.springframework.util.Assert;
  * 
  * @author Oliver Gierke
  */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
+class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
 	private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
 	private final MongoParameterAccessor accessor;
@@ -92,7 +91,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
 	*/
 	@Override
-	protected Query create(Part part, Iterator<Object> iterator) {
+	protected Criteria create(Part part, Iterator<Object> iterator) {
 
 		if (isGeoNearQuery && part.getType().equals(Type.NEAR)) {
 			return null;
@@ -103,7 +102,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 				where(path.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
 
-		return new Query(criteria);
+		return criteria;
 	}
 
 	/*
@@ -111,7 +110,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 	* @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
 	*/
 	@Override
-	protected Query and(Part part, Query base, Iterator<Object> iterator) {
+	protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {
 
 		if (base == null) {
 			return create(part, iterator);
@@ -122,7 +121,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 		Criteria criteria = from(part.getType(),
 				where(path2.toDotPath(MongoPersistentProperty.PropertyToFieldNameConverter.INSTANCE)),
 				(PotentiallyConvertingIterator) iterator);
-		return base.addCriteria(criteria);
+
+		return criteria.andOperator(criteria);
 	}
 
 	/*
@@ -133,8 +133,10 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 	* #or(java.lang.Object, java.lang.Object)
 	*/
 	@Override
-	protected Query or(Query base, Query query) {
-		return new OrQuery(new Query[] { base, query });
+	protected Criteria or(Criteria base, Criteria criteria) {
+
+		Criteria result = new Criteria();
+		return result.orOperator(base, criteria);
 	}
 
 	/*
@@ -145,16 +147,17 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 	* #complete(java.lang.Object, org.springframework.data.domain.Sort)
 	*/
 	@Override
-	protected Query complete(Query query, Sort sort) {
+	protected Query complete(Criteria criteria, Sort sort) {
 
-		if (query == null) {
+		if (criteria == null) {
 			return null;
 		}
 
+		Query query = new Query(criteria);
 		QueryUtils.applySorting(query, sort);
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("Created query " + query.getQueryObject());
+			LOG.debug("Created query " + query);
 		}
 
 		return query;
@@ -203,7 +206,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
 		case NEAR:
 
 			Distance distance = accessor.getMaxDistance();
-			Point point = nextAs(parameters, Point.class);
+			Point point = accessor.getGeoNearLocation();
+			point = point == null ? nextAs(parameters, Point.class) : point;
 
 			if (distance == null) {
 				return criteria.near(point);

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

@@ -38,8 +38,8 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	/**
 	 * Creates a new {@link PartTreeMongoQuery} from the given {@link QueryMethod} and {@link MongoTemplate}.
 	 * 
-	 * @param method
-	 * @param template
+	 * @param method must not be {@literal null}.
+	 * @param template must not be {@literal null}.
 	 */
 	public PartTreeMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations) {
 
@@ -50,6 +50,8 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	}
 
 	/**
+	 * Return the {@link PartTree} backing the query.
+	 * 
 	 * @return the tree
 	 */
 	public PartTree getTree() {
@@ -57,16 +59,22 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	}
 
 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see
-	  * org.springframework.data.mongodb.repository.AbstractMongoQuery#createQuery(org.springframework.data.
-	  * document.mongodb.repository.ConvertingParameterAccessor)
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, boolean)
+	 */
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
 		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
 		return creator.createQuery();
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createCountQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
+	 */
+	@Override
+	protected Query createCountQuery(ConvertingParameterAccessor accessor) {
+		return new MongoQueryCreator(tree, accessor, context, false).createQuery();
+	}
 }

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

@@ -20,11 +20,12 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
 
+import com.mongodb.util.JSON;
+
 /**
  * Query to use a plain JSON String to create the {@link Query} to actually execute.
  * 
@@ -55,12 +56,9 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	}
 
 	/*
-	  * (non-Javadoc)
-	  *
-	  * @see
-	  * org.springframework.data.mongodb.repository.AbstractMongoQuery#createQuery(org.springframework.data.
-	  * repository.query.SimpleParameterAccessor, org.springframework.data.mongodb.core.core.support.convert.MongoConverter)
-	  */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
+	 */
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
@@ -74,7 +72,7 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 		} else {
 			query = new BasicQuery(queryString);
 		}
-		
+
 		QueryUtils.applySorting(query, accessor.getSort());
 
 		if (LOG.isDebugEnabled()) {
@@ -99,13 +97,6 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	}
 
 	private String getParameterWithIndex(ConvertingParameterAccessor accessor, int index) {
-		Object parameter = accessor.getBindableValue(index);
-		if (parameter instanceof String || parameter.getClass().isEnum()) {
-			return String.format("\"%s\"", parameter);
-		} else if (parameter instanceof ObjectId) {
-			return String.format("{ '$oid' : '%s' }", parameter);
-		}
-
-		return parameter.toString();
+		return JSON.serialize(accessor.getBindableValue(index));
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/DefaultEntityInformationCreator.java

@@ -25,7 +25,8 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.util.Assert;
 
 /**
- * Simple {@link EntityInformationCreator} to to create {@link MongoEntityInformation} instances based on a {@link MappingContext}.
+ * Simple {@link EntityInformationCreator} to to create {@link MongoEntityInformation} instances based on a
+ * {@link MappingContext}.
  * 
  * @author Oliver Gierke
  */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java

@@ -44,7 +44,7 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 
 	private static final Set<Type> GEOSPATIAL_TYPES = new HashSet<Type>(Arrays.asList(Type.NEAR, Type.WITHIN));
 	private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class);
-	
+
 	private final MongoOperations operations;
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java

@@ -17,7 +17,7 @@ package org.springframework.data.mongodb.repository.support;
 
 import java.io.Serializable;
 
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
@@ -32,17 +32,17 @@ import org.springframework.util.Assert;
 public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
 		RepositoryFactoryBeanSupport<T, S, ID> {
 
-	private MongoTemplate template;
+	private MongoOperations operations;
 	private boolean createIndexesForQueryMethods = false;
 
 	/**
-	 * Configures the {@link MongoTemplate} to be used.
+	 * Configures the {@link MongoOperations} to be used.
 	 * 
-	 * @param template the template to set
+	 * @param operations the operations to set
 	 */
-	public void setTemplate(MongoTemplate template) {
+	public void setMongoOperations(MongoOperations operations) {
 
-		this.template = template;
+		this.operations = operations;
 	}
 
 	/**
@@ -64,10 +64,10 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 	@Override
 	protected final RepositoryFactorySupport createRepositoryFactory() {
 
-		RepositoryFactorySupport factory = getFactoryInstance(template);
+		RepositoryFactorySupport factory = getFactoryInstance(operations);
 
 		if (createIndexesForQueryMethods) {
-			factory.addQueryCreationListener(new IndexEnsuringQueryCreationListener(template));
+			factory.addQueryCreationListener(new IndexEnsuringQueryCreationListener(operations));
 		}
 
 		return factory;
@@ -76,11 +76,11 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 	/**
 	 * Creates and initializes a {@link RepositoryFactorySupport} instance.
 	 * 
-	 * @param template
+	 * @param operations
 	 * @return
 	 */
-	protected RepositoryFactorySupport getFactoryInstance(MongoTemplate template) {
-		return new MongoRepositoryFactory(template);
+	protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) {
+		return new MongoRepositoryFactory(operations);
 	}
 
 	/*
@@ -94,6 +94,6 @@ public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID exten
 	public void afterPropertiesSet() {
 
 		super.afterPropertiesSet();
-		Assert.notNull(template, "MongoTemplate must not be null!");
+		Assert.notNull(operations, "MongoTemplate must not be null!");
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepository.java

@@ -252,7 +252,7 @@ public class QueryDslMongoRepository<T, ID extends Serializable> extends SimpleM
 			Path<?> parent = metadata.getParent();
 			MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
 			MongoPersistentProperty property = entity.getPersistentProperty(metadata.getExpression().toString());
-			return property.getFieldName();
+			return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
 		}
 
 		@Override

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java

@@ -61,12 +61,10 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#save(java.lang.Object)
+	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
 	 */
 	public T save(T entity) {
-		
+
 		Assert.notNull(entity, "Entity must not be null!");
 
 		mongoOperations.save(entity, entityInformation.getCollectionName());
@@ -75,14 +73,12 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#save(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
 	 */
 	public List<T> save(Iterable<? extends T> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
-		
+
 		List<T> result = new ArrayList<T>();
 
 		for (T entity : entities) {
@@ -95,10 +91,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#findById(java.io.Serializable
-	 * )
+	 * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable)
 	 */
 	public T findOne(ID id) {
 		Assert.notNull(id, "The given id must not be null!");
@@ -115,10 +108,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#exists(java.io.Serializable
-	 * )
+	 * @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable)
 	 */
 	public boolean exists(ID id) {
 
@@ -129,8 +119,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.data.repository.Repository#count()
+	 * @see org.springframework.data.repository.CrudRepository#count()
 	 */
 	public long count() {
 
@@ -139,7 +128,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.Repository#delete(java.io.Serializable)
+	 * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable)
 	 */
 	public void delete(ID id) {
 		Assert.notNull(id, "The given id must not be null!");
@@ -148,9 +137,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#delete(java.lang.Object)
+	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
 	 */
 	public void delete(T entity) {
 		Assert.notNull(entity, "The given entity must not be null!");
@@ -159,14 +146,12 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#delete(java.lang.Iterable)
+	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
 	 */
 	public void delete(Iterable<? extends T> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
-		
+
 		for (T entity : entities) {
 			delete(entity);
 		}
@@ -174,8 +159,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.data.repository.Repository#deleteAll()
+	 * @see org.springframework.data.repository.CrudRepository#deleteAll()
 	 */
 	public void deleteAll() {
 
@@ -184,8 +168,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.data.repository.Repository#findAll()
+	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
 	public List<T> findAll() {
 
@@ -194,10 +177,7 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.PagingAndSortingRepository#findAll
-	 * (org.springframework.data.domain.Pageable)
+	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
 	 */
 	public Page<T> findAll(final Pageable pageable) {
 
@@ -209,43 +189,13 @@ public class SimpleMongoRepository<T, ID extends Serializable> implements Paging
 
 	/*
 	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.PagingAndSortingRepository#findAll
-	 * (org.springframework.data.domain.Sort)
+	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
 	 */
 	public List<T> findAll(final Sort sort) {
 
 		return findAll(QueryUtils.applySorting(new Query(), sort));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.data.repository.Repository#findAll(java.lang.Iterable
-	 * )
-	 */
-	public List<T> findAll(Iterable<ID> ids) {
-
-		Query query = null;
-
-		//TODO: verify intent
-//		for (ID id : ids) {
-//			if (query == null) {
-//				query = getIdQuery(id);
-//			} else {
-//				query = new Query().or(getIdQuery(id));
-//			}
-//		}
-		List<ID> idList = new ArrayList<ID>();
-		for (ID id : ids) {
-			idList.add(id);
-		}
-		query = new Query(Criteria.where(entityInformation.getIdAttribute()).in(idList));
-		return findAll(query);
-	}
-
 	private List<T> findAll(Query query) {
 
 		if (query == null) {

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

@@ -7,16 +7,14 @@
 						xmlns:context="http://www.springframework.org/schema/context"
 						xmlns:repository="http://www.springframework.org/schema/data/repository"
 						targetNamespace="http://www.springframework.org/schema/data/mongo"
-						elementFormDefault="qualified" attributeFormDefault="unqualified"
-						xsi:schemaLocation="http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/context"
-							schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
-							schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />
 
 	<xsd:element name="mongo" type="mongoType">
 		<xsd:annotation>

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

@@ -42,10 +42,9 @@ import com.mongodb.DBObject;
  * @author Oliver Gierke
  */
 public class MappingMongoConverterParserIntegrationTests {
-	
+
 	DefaultListableBeanFactory factory;
-	
-	
+
 	@Before
 	public void setUp() {
 		factory = new DefaultListableBeanFactory();
@@ -55,26 +54,26 @@ public class MappingMongoConverterParserIntegrationTests {
 
 	@Test
 	public void allowsDbFactoryRefAttribute() {
-		
+
 		factory.getBeanDefinition("converter");
 		factory.getBean("converter");
 	}
-	
+
 	@Test
 	public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
-		
+
 		CustomConversions conversions = factory.getBean(CustomConversions.class);
 		assertThat(conversions.hasCustomWriteTarget(Person.class), is(true));
 		assertThat(conversions.hasCustomWriteTarget(Account.class), is(true));
 	}
-	
+
 	@Component
 	public static class SampleConverter implements Converter<Person, DBObject> {
 		public DBObject convert(Person source) {
 			return null;
 		}
 	}
-	
+
 	@Component
 	public static class SampleConverterFactory implements GenericConverter {
 

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

@@ -29,17 +29,17 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * Integration tests for {@link MongoDbFactory}.
- *
+ * 
  * @author Thomas Risbergf
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class MongoDbFactoryNoDatabaseRunningTests {
-	
+
 	@Autowired
 	MongoTemplate mongoTemplate;
-	
+
 	/**
 	 * @see DATADOC-139
 	 */
@@ -47,7 +47,7 @@ public class MongoDbFactoryNoDatabaseRunningTests {
 	public void startsUpWithoutADatabaseRunning() {
 		assertThat(mongoTemplate.getClass().getName(), is("org.springframework.data.mongodb.core.MongoTemplate"));
 	}
-	
+
 	@Test(expected = DataAccessResourceFailureException.class)
 	public void failsDataAccessWithoutADatabaseRunning() {
 		mongoTemplate.getCollectionNames();

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

@@ -32,6 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
@@ -40,14 +41,14 @@ import com.mongodb.WriteConcern;
 
 /**
  * Integration tests for {@link MongoDbFactoryParser}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class MongoDbFactoryParserIntegrationTests {
-	
+
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
-	
+
 	@Before
 	public void setUp() {
 		factory = new DefaultListableBeanFactory();
@@ -59,112 +60,112 @@ public class MongoDbFactoryParserIntegrationTests {
 		SimpleMongoDbFactory dbFactory = new SimpleMongoDbFactory(new Mongo("localhost"), "database");
 		dbFactory.setWriteConcern(WriteConcern.SAFE);
 		dbFactory.getDb();
-		assertThat(WriteConcern.SAFE, is(dbFactory.getWriteConcern()));
+		assertThat(ReflectionTestUtils.getField(dbFactory, "writeConcern"), is((Object) WriteConcern.SAFE));
 	}
-	
+
 	@Test
 	public void parsesWriteConcern() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
 		assertWriteConcern(ctx, WriteConcern.SAFE);
 	}
-	
+
 	@Test
 	public void parsesCustomWriteConcern() {
-		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean-custom-write-concern.xml");
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
+				"namespace/db-factory-bean-custom-write-concern.xml");
 		assertWriteConcern(ctx, new WriteConcern("rack1"));
 	}
-	
+
 	/**
 	 * @see DATAMONGO-331
 	 */
 	@Test
 	public void readsReplicasWriteConcernCorrectly() {
-		
+
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean-custom-write-concern.xml");
 		MongoDbFactory factory = ctx.getBean("second", MongoDbFactory.class);
 		DB db = factory.getDb();
-		
+
 		assertThat(db.getWriteConcern(), is(WriteConcern.REPLICAS_SAFE));
 	}
 
 	private void assertWriteConcern(ClassPathXmlApplicationContext ctx, WriteConcern expectedWriteConcern) {
 		SimpleMongoDbFactory dbFactory = ctx.getBean("first", SimpleMongoDbFactory.class);
 		DB db = dbFactory.getDb();
-		assertThat("db", is(db.getName()));
+		assertThat(db.getName(), is("db"));
 
-		MyWriteConcern myDbFactoryWriteConcern = new MyWriteConcern(dbFactory.getWriteConcern());
+		WriteConcern configuredConcern = (WriteConcern) ReflectionTestUtils.getField(dbFactory, "writeConcern");
+
+		MyWriteConcern myDbFactoryWriteConcern = new MyWriteConcern(configuredConcern);
 		MyWriteConcern myDbWriteConcern = new MyWriteConcern(db.getWriteConcern());
 		MyWriteConcern myExpectedWriteConcern = new MyWriteConcern(expectedWriteConcern);
 
-		
-		assertThat(myDbFactoryWriteConcern, equalTo(myExpectedWriteConcern));
-		assertThat(myDbWriteConcern, equalTo(myExpectedWriteConcern));
-		assertThat(myDbWriteConcern, equalTo(myDbFactoryWriteConcern));
+		assertThat(myDbFactoryWriteConcern, is(myExpectedWriteConcern));
+		assertThat(myDbWriteConcern, is(myExpectedWriteConcern));
+		assertThat(myDbWriteConcern, is(myDbFactoryWriteConcern));
 	}
-	
-	//This test will fail since equals in WriteConcern uses == for _w and not .equals
+
+	// This test will fail since equals in WriteConcern uses == for _w and not .equals
 	public void testWriteConcernEquality() {
-		String s1 =  new String("rack1");
-		String s2 =  new String("rack1");
+		String s1 = new String("rack1");
+		String s2 = new String("rack1");
 		WriteConcern wc1 = new WriteConcern(s1);
 		WriteConcern wc2 = new WriteConcern(s2);
-		assertThat(wc1, equalTo(wc2));
+		assertThat(wc1, is(wc2));
 	}
-	
-	
 
 	@Test
 	public void createsDbFactoryBean() {
-		
+
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/db-factory-bean.xml"));
 		factory.getBean("first");
 	}
-	
+
 	/**
 	 * @see DATADOC-280
 	 */
 	@Test
 	public void parsesMaxAutoConnectRetryTimeCorrectly() {
-		
+
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/db-factory-bean.xml"));
 		Mongo mongo = factory.getBean(Mongo.class);
 		assertThat(mongo.getMongoOptions().maxAutoConnectRetryTime, is(27L));
 	}
-	
+
 	/**
 	 * @see DATADOC-295
 	 */
 	@Test
 	public void setsUpMongoDbFactoryUsingAMongoUri() {
-		
+
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-uri.xml"));
 		BeanDefinition definition = factory.getBeanDefinition("mongoDbFactory");
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
-		
+
 		assertThat(constructorArguments.getArgumentCount(), is(1));
 		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoURI.class);
 		assertThat(argument, is(notNullValue()));
 	}
-	
+
 	/**
 	 * @see DATADOC-306
 	 */
 	@Test
 	public void setsUpMongoDbFactoryUsingAMongoUriWithoutCredentials() {
-		
+
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-uri-no-credentials.xml"));
 		BeanDefinition definition = factory.getBeanDefinition("mongoDbFactory");
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
-		
+
 		assertThat(constructorArguments.getArgumentCount(), is(1));
 		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoURI.class);
 		assertThat(argument, is(notNullValue()));
-	
+
 		MongoDbFactory dbFactory = factory.getBean("mongoDbFactory", MongoDbFactory.class);
 		DB db = dbFactory.getDb();
 		assertThat(db.getName(), is("database"));
 	}
-	
+
 	/**
 	 * @see DATADOC-295
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2011-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.
@@ -16,6 +16,7 @@
 
 package org.springframework.data.mongodb.config;
 
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.util.List;
@@ -29,6 +30,7 @@ import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.CommandResult;
 import com.mongodb.Mongo;
@@ -36,47 +38,45 @@ import com.mongodb.ServerAddress;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-public class MongoNamespaceReplicaSetTests extends NamespaceTestSupport {
+public class MongoNamespaceReplicaSetTests {
 
 	@Autowired
 	private ApplicationContext ctx;
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testParsingMongoWithReplicaSets() throws Exception {
+
 		assertTrue(ctx.containsBean("replicaSetMongo"));
 		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&replicaSetMongo");
 
-		List<ServerAddress> replicaSetSeeds = readField("replicaSetSeeds", mfb);
-		assertNotNull(replicaSetSeeds);
-
-		assertEquals("127.0.0.1", replicaSetSeeds.get(0).getHost());
-		assertEquals(10001, replicaSetSeeds.get(0).getPort());
-
-		assertEquals("localhost", replicaSetSeeds.get(1).getHost());
-		assertEquals(10002, replicaSetSeeds.get(1).getPort());
+		List<ServerAddress> replicaSetSeeds = (List<ServerAddress>) ReflectionTestUtils.getField(mfb, "replicaSetSeeds");
 
+		assertThat(replicaSetSeeds, is(notNullValue()));
+		assertThat(replicaSetSeeds, hasItems(new ServerAddress("127.0.0.1", 10001), new ServerAddress("localhost", 10002)));
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testParsingWithPropertyPlaceHolder() throws Exception {
+
 		assertTrue(ctx.containsBean("manyReplicaSetMongo"));
 		MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&manyReplicaSetMongo");
 
-		List<ServerAddress> replicaSetSeeds = readField("replicaSetSeeds", mfb);
-		assertNotNull(replicaSetSeeds);
-
-		assertEquals("192.168.174.130", replicaSetSeeds.get(0).getHost());
-		assertEquals(27017, replicaSetSeeds.get(0).getPort());
-		assertEquals("192.168.174.130", replicaSetSeeds.get(1).getHost());
-		assertEquals(27018, replicaSetSeeds.get(1).getPort());
-		assertEquals("192.168.174.130", replicaSetSeeds.get(2).getHost());
-		assertEquals(27019, replicaSetSeeds.get(2).getPort());
+		List<ServerAddress> replicaSetSeeds = (List<ServerAddress>) ReflectionTestUtils.getField(mfb, "replicaSetSeeds");
 
+		assertThat(replicaSetSeeds, is(notNullValue()));
+		assertThat(replicaSetSeeds, hasSize(3));
+		assertThat(
+				replicaSetSeeds,
+				hasItems(new ServerAddress("192.168.174.130", 27017), new ServerAddress("192.168.174.130", 27018),
+						new ServerAddress("192.168.174.130", 27019)));
 	}
 
 	@Test
 	@Ignore("CI infrastructure does not yet support replica sets")
 	public void testMongoWithReplicaSets() {
+
 		Mongo mongo = ctx.getBean(Mongo.class);
 		assertEquals(2, mongo.getAllAddress().size());
 		List<ServerAddress> servers = mongo.getAllAddress();
@@ -88,6 +88,5 @@ public class MongoNamespaceReplicaSetTests extends NamespaceTestSupport {
 		MongoTemplate template = new MongoTemplate(mongo, "admin");
 		CommandResult result = template.executeCommand("{replSetGetStatus : 1}");
 		assertEquals("blort", result.getString("set"));
-
 	}
 }

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

@@ -16,17 +16,19 @@
 
 package org.springframework.data.mongodb.config;
 
-import static org.springframework.test.util.ReflectionTestUtils.*;
 import static org.junit.Assert.*;
+import static org.springframework.test.util.ReflectionTestUtils.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoFactoryBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
 import com.mongodb.Mongo;
 import com.mongodb.MongoOptions;
 
@@ -62,8 +64,7 @@ public class MongoNamespaceTests {
 		Mongo mongo = (Mongo) getField(dbf, "mongo");
 		assertEquals("localhost", mongo.getAddress().getHost());
 		assertEquals(27017, mongo.getAddress().getPort());
-		assertEquals("joe", getField(dbf, "username"));
-		assertEquals("secret", getField(dbf, "password"));
+		assertEquals(new UserCredentials("joe", "secret"), getField(dbf, "credentials"));
 		assertEquals("database", getField(dbf, "databaseName"));
 	}
 

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

@@ -3,7 +3,7 @@ package org.springframework.data.mongodb.config;
 import com.mongodb.WriteConcern;
 
 public class MyWriteConcern {
-	
+
 	public MyWriteConcern(WriteConcern wc) {
 		this._w = wc.getWObject();
 		this._continueOnErrorForInsert = wc.getContinueOnErrorForInsert();
@@ -12,11 +12,12 @@ public class MyWriteConcern {
 		this._wtimeout = wc.getWtimeout();
 	}
 
-  Object _w = 0;
-  int _wtimeout = 0;
-  boolean _fsync = false;
-  boolean _j = false;
-  boolean _continueOnErrorForInsert = false;
+	Object _w = 0;
+	int _wtimeout = 0;
+	boolean _fsync = false;
+	boolean _j = false;
+	boolean _continueOnErrorForInsert = false;
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
@@ -28,6 +29,7 @@ public class MyWriteConcern {
 		result = prime * result + _wtimeout;
 		return result;
 	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
@@ -52,5 +54,5 @@ public class MyWriteConcern {
 			return false;
 		return true;
 	}
-  
+
 }

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

@@ -1,43 +0,0 @@
-/*
- * 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 java.lang.reflect.Field;
-
-public class NamespaceTestSupport {
-
-
-  @SuppressWarnings({ "unchecked" })
-  public static <T> T readField(String name, Object target) throws Exception {
-    Field field = null;
-    Class<?> clazz = target.getClass();
-    do {
-      try {
-        field = clazz.getDeclaredField(name);
-      } catch (Exception ex) {
-      }
-
-      clazz = clazz.getSuperclass();
-    } while (field == null && !clazz.equals(Object.class));
-
-    if (field == null)
-      throw new IllegalArgumentException("Cannot find field '" + name + "' in the class hierarchy of "
-          + target.getClass());
-    field.setAccessible(true);
-    return (T) field.get(target);
-  }
-}

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright 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.
+ * 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.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.ServerAddress;
+
+/**
+ * Unit tests for {@link ServerAddressPropertyEditor}.
+ * 
+ * @author Oliver Gierke
+ */
+public class ServerAddressPropertyEditorUnitTests {
+
+	ServerAddressPropertyEditor editor;
+
+	@Before
+	public void setUp() {
+		editor = new ServerAddressPropertyEditor();
+	}
+
+	/**
+	 * @see DATAMONGO-454
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsAddressConfigWithoutASingleParsableServerAddress() {
+
+		editor.setAsText("foo, bar");
+	}
+
+	/**
+	 * @see DATAMONGO-454
+	 */
+	@Test
+	public void skipsUnparsableAddressIfAtLeastOneIsParsable() throws UnknownHostException {
+
+		editor.setAsText("foo, localhost");
+		assertSingleAddressOfLocalhost(editor.getValue());
+	}
+
+	/**
+	 * @see DATAMONGO-454
+	 */
+	@Test
+	public void handlesEmptyAddressAsParseError() throws UnknownHostException {
+
+		editor.setAsText(", localhost");
+		assertSingleAddressOfLocalhost(editor.getValue());
+	}
+
+	private static void assertSingleAddressOfLocalhost(Object result) throws UnknownHostException {
+
+		assertThat(result, is(instanceOf(ServerAddress[].class)));
+		Collection<ServerAddress> addresses = Arrays.asList((ServerAddress[]) result);
+		assertThat(addresses, hasSize(1));
+		assertThat(addresses, hasItem(new ServerAddress("localhost")));
+	}
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 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.
+ * 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.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Unit tests for {@link StringToWriteConcernConverter}.
+ * 
+ * @author Oliver Gierke
+ */
+public class StringToWriteConcernConverterUnitTest {
+
+	StringToWriteConcernConverter converter = new StringToWriteConcernConverter();
+
+	@Test
+	public void createsWellKnownConstantsCorrectly() {
+		assertThat(converter.convert("SAFE"), is(WriteConcern.SAFE));
+	}
+
+	@Test
+	public void createsWriteConcernForUnknownValue() {
+		assertThat(converter.convert("-1"), is(new WriteConcern("-1")));
+	}
+}

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright 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.
+ * 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.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Unit tests for {@link WriteConcernPropertyEditor}.
+ * 
+ * @author Oliver Gierke
+ */
+public class WriteConcernPropertyEditorUnitTests {
+
+	WriteConcernPropertyEditor editor;
+
+	@Before
+	public void setUp() {
+		editor = new WriteConcernPropertyEditor();
+	}
+
+	@Test
+	public void createsWriteConcernForWellKnownConstants() {
+
+		editor.setAsText("SAFE");
+		assertThat(editor.getValue(), is((Object) WriteConcern.SAFE));
+	}
+
+	@Test
+	public void createsWriteConcernForUnknownConstants() {
+
+		editor.setAsText("-1");
+		assertThat(editor.getValue(), is((Object) new WriteConcern("-1")));
+	}
+}

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core;
 
-
 public class Friend {
 
 	private String id;

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright 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.
+ * 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.core;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.data.mongodb.config.WriteConcernPropertyEditor;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Integration tests for {@link MongoFactoryBean}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoFactoryBeanIntegrationTest {
+
+	/**
+	 * @see DATAMONGO-408
+	 */
+	@Test
+	public void convertsWriteConcernCorrectly() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("writeConcern", "SAFE");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerCustomEditor(WriteConcern.class, WriteConcernPropertyEditor.class);
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoFactoryBean bean = factory.getBean("&factory", MongoFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "writeConcern"), is((Object) WriteConcern.SAFE));
+	}
+}

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

@@ -23,7 +23,7 @@ import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link MongoOptionsFactoryBean}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class MongoOptionsFactoryBeanUnitTests {
@@ -33,11 +33,11 @@ public class MongoOptionsFactoryBeanUnitTests {
 	 */
 	@Test
 	public void setsMaxConnectRetryTime() {
-		
+
 		MongoOptionsFactoryBean bean = new MongoOptionsFactoryBean();
 		bean.setMaxAutoConnectRetryTime(27);
 		bean.afterPropertiesSet();
-		
+
 		MongoOptions options = bean.getObject();
 		assertThat(options.maxAutoConnectRetryTime, is(27L));
 	}

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

@@ -130,6 +130,7 @@ public class MongoTemplateTests {
 		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfTypeLong.class));
 		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfPrimitiveLong.class));
 		template.dropCollection(template.getCollectionName(TestClass.class));
+		template.dropCollection(Sample.class);
 	}
 
 	@Test
@@ -906,8 +907,6 @@ public class MongoTemplateTests {
 		assertThat(lastMongoAction.getEntityClass().toString(), is(PersonWithIdPropertyOfTypeObjectId.class.toString()));
 		assertThat(lastMongoAction.getMongoActionOperation(), is(MongoActionOperation.UPDATE));
 		assertThat(lastMongoAction.getQuery(), equalTo(q.getQueryObject()));
-		assertThat(lastMongoAction.getDocument(), equalTo(u.getUpdateObject()));
-
 	}
 
 	private class FsyncSafeWriteConcernResolver implements WriteConcernResolver {
@@ -1041,7 +1040,7 @@ public class MongoTemplateTests {
 		List<TestClass> testClassList = mappingTemplate.find(new Query(Criteria.where("myDate").is(dateTime.toDate())),
 				TestClass.class);
 		assertThat(testClassList.size(), is(1));
-		assertThat(testClassList.get(0).getMyDate(), is(testClass.getMyDate()));
+		assertThat(testClassList.get(0).myDate, is(testClass.myDate));
 	}
 
 	/**
@@ -1080,23 +1079,71 @@ public class MongoTemplateTests {
 		assertThat(template.findOne(query(where("id").is(id)), Sample.class), is(nullValue()));
 	}
 
-	public class Sample {
+	/**
+	 * @see DATAMONGO-423
+	 */
+	@Test
+	public void executesQueryWithNegatedRegexCorrectly() {
+
+		Sample first = new Sample();
+		first.field = "Matthews";
+
+		Sample second = new Sample();
+		second.field = "Beauford";
+
+		template.save(first);
+		template.save(second);
+
+		Query query = query(where("field").not().regex("Matthews"));
+		System.out.println(query.getQueryObject());
+		List<Sample> result = template.find(query, Sample.class);
+		assertThat(result.size(), is(1));
+		assertThat(result.get(0).field, is("Beauford"));
+	}
+
+	/**
+	 * @see DATAMONGO-447
+	 */
+	@Test
+	public void storesAndRemovesTypeWithComplexId() {
+
+		MyId id = new MyId();
+		id.first = "foo";
+		id.second = "bar";
+
+		TypeWithMyId source = new TypeWithMyId();
+		source.id = id;
+
+		template.save(source);
+		template.remove(query(where("id").is(id)), TypeWithMyId.class);
+	}
+
+	static class MyId {
+
+		String first;
+		String second;
+	}
+
+	static class TypeWithMyId {
+
+		@Id
+		MyId id;
+	}
+
+	public static class Sample {
 
 		@Id
 		String id;
+		String field;
 	}
 
-	public class TestClass {
+	static class TestClass {
 
-		private DateTime myDate;
+		DateTime myDate;
 
 		@PersistenceConstructor
-		public TestClass(DateTime date) {
-			this.myDate = date;
-		}
-
-		public DateTime getMyDate() {
-			return myDate;
+		TestClass(DateTime myDate) {
+			this.myDate = myDate;
 		}
 	}
 

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

@@ -31,7 +31,7 @@ import com.mongodb.DBCursor;
 
 /**
  * Unit tests for {@link QueryCursorPreparer}.
- *
+ * 
  * @author Oliver Gierke
  */
 @RunWith(MockitoJUnitRunner.class)
@@ -41,18 +41,18 @@ public class QueryCursorPreparerUnitTests {
 	MongoDbFactory factory;
 	@Mock
 	DBCursor cursor;
-	
+
 	/**
 	 * @see DATAMONGO-185
 	 */
 	@Test
 	public void appliesHintsCorrectly() {
-		
+
 		Query query = query(where("foo").is("bar")).withHint("hint");
-		
+
 		CursorPreparer preparer = new MongoTemplate(factory).new QueryCursorPreparer(query);
 		preparer.prepare(cursor);
-		
+
 		verify(cursor).hint("hint");
 	}
 }

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

@@ -0,0 +1,66 @@
+/*
+ * Copyright 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.
+ * 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.core;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.SerializationUtils.*;
+
+import java.util.Arrays;
+
+import org.hamcrest.Matcher;
+import org.junit.Test;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+
+/**
+ * Unit tests for {@link SerializationUtils}.
+ * 
+ * @author Oliver Gierke
+ */
+public class SerializationUtilsUnitTests {
+
+	@Test
+	public void writesSimpleDBObject() {
+
+		DBObject dbObject = new BasicDBObject("foo", "bar");
+		assertThat(serializeToJsonSafely(dbObject), is("{ \"foo\" : \"bar\"}"));
+	}
+
+	@Test
+	public void writesComplexObjectAsPlainToString() {
+
+		DBObject dbObject = new BasicDBObject("foo", new Complex());
+		assertThat(serializeToJsonSafely(dbObject),
+				startsWith("{ \"foo\" : { $java : org.springframework.data.mongodb.core.SerializationUtilsUnitTests$Complex"));
+	}
+
+	@Test
+	public void writesCollection() {
+
+		DBObject dbObject = new BasicDBObject("foo", Arrays.asList("bar", new Complex()));
+		Matcher<String> expectedOutput = allOf(
+				startsWith("{ \"foo\" : [ \"bar\", { $java : org.springframework.data.mongodb.core.SerializationUtilsUnitTests$Complex"),
+				endsWith(" } ] }"));
+		assertThat(serializeToJsonSafely(dbObject), is(expectedOutput));
+	}
+
+	static class Complex {
+
+	}
+
+}

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

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 import java.net.UnknownHostException;
 
@@ -24,6 +24,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -49,7 +50,7 @@ public class SimpleMongoDbFactoryUnitTests {
 		rejectsDatabaseName("foo.bar");
 		rejectsDatabaseName("foo!bar");
 	}
-	
+
 	/**
 	 * @see DATADOC-254
 	 */
@@ -66,16 +67,16 @@ public class SimpleMongoDbFactoryUnitTests {
 	 */
 	@Test
 	public void mongoUriConstructor() throws UnknownHostException {
-		
+
 		MongoURI mongoURI = new MongoURI("mongodb://myUsername:myPassword@localhost/myDatabase.myCollection");
 		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(mongoURI);
-		
-		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "username").toString(), is("myUsername"));
-		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "password").toString(), is("myPassword"));
+
+		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "credentials"), is((Object) new UserCredentials(
+				"myUsername", "myPassword")));
 		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "databaseName").toString(), is("myDatabase"));
 		assertThat(ReflectionTestUtils.getField(mongoDbFactory, "databaseName").toString(), is("myDatabase"));
 	}
-	
+
 	private void rejectsDatabaseName(String databaseName) {
 
 		try {

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

@@ -35,5 +35,4 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {
 		converter.setCustomConversions(new CustomConversions(converters));
 	}
 
-
 }

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

@@ -3,14 +3,18 @@ package org.springframework.data.mongodb.core.convert;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.Format;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.UUID;
 
+import org.bson.types.Binary;
 import org.bson.types.ObjectId;
 import org.junit.Test;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.support.ConversionServiceFactory;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
 
@@ -27,13 +31,13 @@ public class CustomConversionsUnitTests {
 	@SuppressWarnings("unchecked")
 	public void findsBasicReadAndWriteConversions() {
 
-		CustomConversions conversions = new CustomConversions(Arrays.asList(UuidToStringConverter.INSTANCE,
-				StringToUUIDConverter.INSTANCE));
+		CustomConversions conversions = new CustomConversions(Arrays.asList(FormatToStringConverter.INSTANCE,
+				StringToFormatConverter.INSTANCE));
 
-		assertThat(conversions.getCustomWriteTarget(UUID.class, null), is(typeCompatibleWith(String.class)));
+		assertThat(conversions.getCustomWriteTarget(Format.class, null), is(typeCompatibleWith(String.class)));
 		assertThat(conversions.getCustomWriteTarget(String.class, null), is(nullValue()));
 
-		assertThat(conversions.hasCustomReadTarget(String.class, UUID.class), is(true));
+		assertThat(conversions.hasCustomReadTarget(String.class, Format.class), is(true));
 		assertThat(conversions.hasCustomReadTarget(String.class, Locale.class), is(false));
 	}
 
@@ -51,7 +55,7 @@ public class CustomConversionsUnitTests {
 	@Test
 	public void considersTypesWeRegisteredConvertersForAsSimple() {
 
-		CustomConversions conversions = new CustomConversions(Arrays.asList(UuidToStringConverter.INSTANCE));
+		CustomConversions conversions = new CustomConversions(Arrays.asList(FormatToStringConverter.INSTANCE));
 		assertThat(conversions.isSimpleType(UUID.class), is(true));
 	}
 
@@ -95,14 +99,13 @@ public class CustomConversionsUnitTests {
 	@Test
 	public void populatesConversionServiceCorrectly() {
 
-		@SuppressWarnings("deprecation")
-		GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService();
+		GenericConversionService conversionService = new DefaultConversionService();
 		assertThat(conversionService.canConvert(String.class, UUID.class), is(false));
 
-		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToUUIDConverter.INSTANCE));
+		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE));
 		conversions.registerConvertersIn(conversionService);
 
-		assertThat(conversionService.canConvert(String.class, UUID.class), is(true));
+		assertThat(conversionService.canConvert(String.class, Format.class), is(true));
 	}
 
 	/**
@@ -110,8 +113,8 @@ public class CustomConversionsUnitTests {
 	 */
 	@Test
 	public void doesNotConsiderTypeSimpleIfOnlyReadConverterIsRegistered() {
-		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToUUIDConverter.INSTANCE));
-		assertThat(conversions.isSimpleType(UUID.class), is(false));
+		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToFormatConverter.INSTANCE));
+		assertThat(conversions.isSimpleType(Format.class), is(false));
 	}
 
 	/**
@@ -140,18 +143,47 @@ public class CustomConversionsUnitTests {
 		assertThat(conversions.getCustomWriteTarget(String.class), is(nullValue()));
 	}
 
-	enum UuidToStringConverter implements Converter<UUID, String> {
+	/**
+	 * @see DATAMONGO-390
+	 */
+	@Test
+	public void considersBinaryASimpleType() {
+
+		CustomConversions conversions = new CustomConversions();
+		assertThat(conversions.isSimpleType(Binary.class), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-462
+	 */
+	@Test
+	public void hasWriteConverterForURL() {
+
+		CustomConversions conversions = new CustomConversions();
+		assertThat(conversions.hasCustomWriteTarget(URL.class), is(true));
+	}
+
+	/**
+	 * @see DATAMONGO-462
+	 */
+	@Test
+	public void readTargetForURL() {
+		CustomConversions conversions = new CustomConversions();
+		assertThat(conversions.hasCustomReadTarget(String.class, URL.class), is(true));
+	}
+
+	enum FormatToStringConverter implements Converter<Format, String> {
 		INSTANCE;
 
-		public String convert(UUID source) {
+		public String convert(Format source) {
 			return source.toString();
 		}
 	}
 
-	enum StringToUUIDConverter implements Converter<String, UUID> {
+	enum StringToFormatConverter implements Converter<String, Format> {
 		INSTANCE;
-		public UUID convert(String source) {
-			return UUID.fromString(source);
+		public Format convert(String source) {
+			return DateFormat.getInstance();
 		}
 	}
 

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

@@ -39,7 +39,7 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 
 /**
  * Test case to verify correct usage of custom {@link Converter} implementations to be used.
- *
+ * 
  * @author Oliver Gierke
  * @see DATADOC-101
  */
@@ -65,9 +65,9 @@ public class CustomConvertersUnitTests {
 
 		when(barToDBObjectConverter.convert(any(Bar.class))).thenReturn(new BasicDBObject());
 		when(dbObjectToBarConverter.convert(any(DBObject.class))).thenReturn(new Bar());
-		
+
 		CustomConversions conversions = new CustomConversions(Arrays.asList(barToDBObjectConverter, dbObjectToBarConverter));
-		
+
 		context = new MongoMappingContext();
 		context.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(Foo.class, Bar.class)));
 		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -33,11 +33,12 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
- * Unit test to reproduce DATADOC-273.
+ * Unit test to reproduce DATAMONGO-273.
  * 
  * @author Harlan Iverson
+ * @author Oliver Gierke
  */
-public class DataDoc273Test {
+public class DataMongo273Tests {
 
 	MappingMongoConverter converter;
 
@@ -54,7 +55,7 @@ public class DataDoc273Test {
 	}
 
 	/**
-	 * @see DATADOC-273
+	 * @see DATAMONGO-273
 	 */
 	@Test
 	public void convertMapOfThings() {
@@ -80,7 +81,7 @@ public class DataDoc273Test {
 	}
 
 	/**
-	 * @see DATADOC-294
+	 * @see DATAMONGO-294
 	 */
 	@Test
 	@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -96,7 +97,6 @@ public class DataDoc273Test {
 
 		DBObject result = new BasicDBList();
 		converter.write(listOfThings, result);
-		System.out.println(result.toString());
 
 		List listOfThings2 = converter.read(List.class, result);
 
@@ -106,7 +106,7 @@ public class DataDoc273Test {
 	}
 
 	/**
-	 * @see DATADOC-294
+	 * @see DATAMONGO-294
 	 */
 	@Test
 	@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -121,7 +121,7 @@ public class DataDoc273Test {
 		listOfThings.add(train);
 		listOfThings.add(automobile);
 
-		Map box = new HashMap();
+		Map<String, Object> box = new HashMap<String, Object>();
 		box.put("one", listOfThings);
 
 		Shipment shipment = new Shipment(box);
@@ -138,7 +138,7 @@ public class DataDoc273Test {
 		assertTrue(listOfThings2.get(2) instanceof Automobile);
 	}
 
-	class Plane {
+	static class Plane {
 
 		String maker;
 		int numberOfPropellers;
@@ -149,7 +149,7 @@ public class DataDoc273Test {
 		}
 	}
 
-	class Train {
+	static class Train {
 
 		String railLine;
 		int numberOfCars;
@@ -160,7 +160,7 @@ public class DataDoc273Test {
 		}
 	}
 
-	class Automobile {
+	static class Automobile {
 
 		String make;
 		String model;
@@ -174,11 +174,11 @@ public class DataDoc273Test {
 	}
 
 	@SuppressWarnings("rawtypes")
-	public class Shipment {
-		
-		Map boxes = new HashMap();
+	static class Shipment {
 
-		public Shipment(Map boxes) {
+		Map<String, Object> boxes;
+
+		public Shipment(Map<String, Object> boxes) {
 			this.boxes = boxes;
 		}
 

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

@@ -38,27 +38,27 @@ public class DefaultMongoTypeMapperUnitTests {
 
 	ConfigurableTypeInformationMapper configurableTypeInformationMapper;
 	SimpleTypeInformationMapper simpleTypeInformationMapper;
-	
-	
+
 	DefaultMongoTypeMapper typeMapper;
 
 	@Before
 	public void setUp() {
-		
-		configurableTypeInformationMapper = new ConfigurableTypeInformationMapper(Collections.singletonMap(String.class, "1"));
+
+		configurableTypeInformationMapper = new ConfigurableTypeInformationMapper(Collections.singletonMap(String.class,
+				"1"));
 		simpleTypeInformationMapper = SimpleTypeInformationMapper.INSTANCE;
 
-		typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Arrays.asList(
-				configurableTypeInformationMapper));
+		typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY,
+				Arrays.asList(configurableTypeInformationMapper));
 	}
-	
+
 	@Test
 	public void defaultInstanceWritesClasses() {
-		
+
 		typeMapper = new DefaultMongoTypeMapper();
 		writesTypeToField(new BasicDBObject(), String.class, String.class.getName());
 	}
-	
+
 	@Test
 	public void defaultInstanceReadsClasses() {
 		typeMapper = new DefaultMongoTypeMapper();
@@ -74,10 +74,10 @@ public class DefaultMongoTypeMapperUnitTests {
 
 	@Test
 	public void writesClassNamesForUnmappedValuesIfConfigured() {
-		
+
 		typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Arrays.asList(
 				configurableTypeInformationMapper, simpleTypeInformationMapper));
-		
+
 		writesTypeToField(new BasicDBObject(), String.class, "1");
 		writesTypeToField(new BasicDBObject(), Object.class, Object.class.getName());
 	}
@@ -90,10 +90,10 @@ public class DefaultMongoTypeMapperUnitTests {
 
 	@Test
 	public void readsTypeLoadingClassesForUnmappedTypesIfConfigured() {
-		
+
 		typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Arrays.asList(
 				configurableTypeInformationMapper, simpleTypeInformationMapper));
-		
+
 		readsTypeFromField(new BasicDBObject(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, "1"), String.class);
 		readsTypeFromField(new BasicDBObject(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Object.class.getName()), Object.class);
 	}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright 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.
+ * 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.core.convert;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+
+/**
+ * Unit tests for {@link MappedConstructor}.
+ * 
+ * @author Oliver Gierke
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MappedConstructorUnitTests {
+
+	@Mock
+	MongoPersistentEntity<?> entity;
+	@Mock
+	MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+
+	@Test(expected = MappingException.class)
+	public void rejectsEntityWithoutPersistenceConstructor() {
+		new MappedConstructor(entity, mappingContext);
+	}
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright 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.
+ * 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.core.convert;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.UUID;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Integration tests for {@link MongoConverters}.
+ * 
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:infrastructure.xml")
+public class MongoConvertersIntegrationTests {
+
+	static final String COLLECTION = "_sample";
+
+	@Autowired
+	MongoOperations template;
+
+	@Before
+	public void setUp() {
+		template.dropCollection(COLLECTION);
+	}
+
+	@Test
+	public void writesUUIDBinaryCorrectly() {
+
+		Wrapper wrapper = new Wrapper();
+		wrapper.uuid = UUID.randomUUID();
+		template.save(wrapper);
+
+		assertThat(wrapper.id, is(notNullValue()));
+
+		Wrapper result = template.findOne(Query.query(Criteria.where("id").is(wrapper.id)), Wrapper.class);
+		assertThat(result.uuid, is(wrapper.uuid));
+	}
+
+	static class Wrapper {
+
+		String id;
+		UUID uuid;
+	}
+}

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

@@ -21,24 +21,23 @@ import static org.junit.Assert.*;
 import java.math.BigDecimal;
 
 import org.junit.Test;
-import org.springframework.data.mongodb.core.convert.MongoConverters;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
 
 /**
  * Unit tests for {@link MongoConverters}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class MongoConvertersUnitTests {
 
 	@Test
 	public void convertsBigDecimalToStringAndBackCorrectly() {
-		
+
 		BigDecimal bigDecimal = BigDecimal.valueOf(254, 1);
 		String value = BigDecimalToStringConverter.INSTANCE.convert(bigDecimal);
 		assertThat(value, is("25.4"));
-		
+
 		BigDecimal reference = StringToBigDecimalConverter.INSTANCE.convert(value);
 		assertThat(reference, is(bigDecimal));
 	}

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

@@ -24,26 +24,26 @@ import org.springframework.data.mongodb.core.geo.Point;
 
 /**
  * Unit tests for {@link Box}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class BoxUnitTests {
-	
+
 	Box first = new Box(new Point(1d, 1d), new Point(2d, 2d));
 	Box second = new Box(new Point(1d, 1d), new Point(2d, 2d));
 	Box third = new Box(new Point(3d, 3d), new Point(1d, 1d));
 
 	@Test
 	public void equalsWorksCorrectly() {
-		
+
 		assertThat(first.equals(second), is(true));
 		assertThat(second.equals(first), is(true));
 		assertThat(first.equals(third), is(false));
 	}
-	
+
 	@Test
 	public void hashCodeWorksCorrectly() {
-		
+
 		assertThat(first.hashCode(), is(second.hashCode()));
 		assertThat(first.hashCode(), is(not(third.hashCode())));
 	}

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

@@ -22,7 +22,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link Circle}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class CircleUnitTests {
@@ -31,23 +31,23 @@ public class CircleUnitTests {
 	public void rejectsNullOrigin() {
 		new Circle(null, 0);
 	}
-	
+
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNegativeRadius() {
 		new Circle(1, 1, -1);
 	}
-	
+
 	@Test
 	public void considersTwoCirclesEqualCorrectly() {
-		
+
 		Circle left = new Circle(1, 1, 1);
 		Circle right = new Circle(1, 1, 1);
-		
+
 		assertThat(left, is(right));
 		assertThat(right, is(left));
-		
-		right = new Circle(new Point(1,1), 1);
-		
+
+		right = new Circle(new Point(1, 1), 1);
+
 		assertThat(left, is(right));
 		assertThat(right, is(left));
 	}

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

@@ -27,7 +27,7 @@ import org.junit.Test;
  * @author Oliver Gierke
  */
 public class DistanceUnitTests {
-	
+
 	@Test
 	public void defaultsMetricToNeutralOne() {
 		assertThat(new Distance(2.5).getMetric(), is((Metric) Metrics.NEUTRAL));
@@ -40,7 +40,7 @@ public class DistanceUnitTests {
 		Distance right = new Distance(2.5, KILOMETERS);
 		assertThat(left.add(right), is(new Distance(5.0, KILOMETERS)));
 	}
-	
+
 	@Test
 	public void addsDistancesWithExplicitMetric() {
 		Distance left = new Distance(2.5, KILOMETERS);

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

@@ -21,11 +21,11 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link GeoResult}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class GeoResultUnitTests {
-	
+
 	GeoResult<String> first = new GeoResult<String>("Foo", new Distance(2.5));
 	GeoResult<String> second = new GeoResult<String>("Foo", new Distance(2.5));
 	GeoResult<String> third = new GeoResult<String>("Bar", new Distance(2.5));
@@ -33,10 +33,10 @@ public class GeoResultUnitTests {
 
 	@Test
 	public void considersSameInstanceEqual() {
-		
+
 		assertThat(first.equals(first), is(true));
 	}
-	
+
 	@Test
 	public void considersSameValuesAsEqual() {
 		assertThat(first.equals(second), is(true));
@@ -46,7 +46,7 @@ public class GeoResultUnitTests {
 		assertThat(first.equals(fourth), is(false));
 		assertThat(fourth.equals(first), is(false));
 	}
-	
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullContent() {

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

@@ -24,7 +24,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link GeoResults}.
- *
+ * 
  * @author Oliver Gierke
  */
 public class GeoResultsUnitTests {
@@ -32,11 +32,11 @@ public class GeoResultsUnitTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void calculatesAverageForGivenGeoResults() {
-		
+
 		GeoResult<Object> first = new GeoResult<Object>(new Object(), new Distance(2));
 		GeoResult<Object> second = new GeoResult<Object>(new Object(), new Distance(5));
 		GeoResults<Object> geoResults = new GeoResults<Object>(Arrays.asList(first, second));
-		
+
 		assertThat(geoResults.getAverageDistance(), is(new Distance(3.5)));
 	}
 }

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

@@ -34,10 +34,14 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.IndexOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.Venue;
 import org.springframework.data.mongodb.core.index.GeospatialIndex;
+import org.springframework.data.mongodb.core.index.IndexField;
+import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.mongodb.core.query.Order;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.monitor.ServerInfo;
 import org.springframework.expression.ExpressionParser;
@@ -54,7 +58,6 @@ import com.mongodb.WriteConcern;
  * Modified from https://github.com/deftlabs/mongo-java-geospatial-example
  * 
  * @author Mark Pollack
- * 
  */
 public class GeoSpatialTests {
 
@@ -193,6 +196,26 @@ public class GeoSpatialTests {
 		assertThat(indexInfo.get(1).get("ns").toString(), is("database.newyork"));
 	}
 
+	/**
+	 * @see DATAMONGO-360
+	 */
+	@Test
+	public void indexInfoIsCorrect() {
+
+		IndexOperations operations = template.indexOps(Venue.class);
+		List<IndexInfo> indexInfo = operations.getIndexInfo();
+
+		assertThat(indexInfo.size(), is(2));
+
+		List<IndexField> fields = indexInfo.get(0).getIndexFields();
+		assertThat(fields.size(), is(1));
+		assertThat(fields, hasItem(IndexField.create("_id", Order.ASCENDING)));
+
+		fields = indexInfo.get(1).getIndexFields();
+		assertThat(fields.size(), is(1));
+		assertThat(fields, hasItem(IndexField.geo("location")));
+	}
+
 	// TODO move to MongoAdmin
 	public List<DBObject> getIndexInfo(Class<?> clazz) {
 		return template.execute(clazz, new CollectionCallback<List<DBObject>>() {

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

@@ -17,14 +17,14 @@ public class PointUnitTests {
 	public void rejectsNullforCopyConstructor() {
 		new Point(null);
 	}
-	
+
 	@Test
 	public void equalsIsImplementedCorrectly() {
 		assertThat(new Point(1.5, 1.5), is(equalTo(new Point(1.5, 1.5))));
 		assertThat(new Point(1.5, 1.5), is(not(equalTo(new Point(2.0, 2.0)))));
 		assertThat(new Point(2.0, 2.0), is(not(equalTo(new Point(1.5, 1.5)))));
 	}
-	
+
 	@Test
 	public void invokingToStringWorksCorrectly() {
 		new Point(1.5, 1.5).toString();

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

@@ -35,19 +35,19 @@ public class PolygonUnitTests {
 	public void rejectsNullPoints() {
 		new Polygon(null, null, null);
 	}
-	
+
 	@Test
 	public void createsSimplePolygon() {
 		Polygon polygon = new Polygon(third, second, first);
 		assertThat(polygon, is(notNullValue()));
 	}
-	
+
 	@Test
 	public void isEqualForSamePoints() {
-		
+
 		Polygon left = new Polygon(third, second, first);
 		Polygon right = new Polygon(third, second, first);
-		
+
 		assertThat(left, is(right));
 		assertThat(right, is(left));
 	}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright 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.
+ * 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.core.index;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.data.mongodb.core.query.Order;
+
+/**
+ * Unit tests for {@link IndexField}.
+ * 
+ * @author Oliver Gierke
+ */
+public class IndexFieldUnitTests {
+
+	@Test
+	public void createsPlainIndexFieldCorrectly() {
+
+		IndexField field = IndexField.create("foo", Order.ASCENDING);
+
+		assertThat(field.getKey(), is("foo"));
+		assertThat(field.getOrder(), is(Order.ASCENDING));
+		assertThat(field.isGeo(), is(false));
+	}
+
+	@Test
+	public void createsGeoIndexFieldCorrectly() {
+
+		IndexField field = IndexField.geo("foo");
+
+		assertThat(field.getKey(), is("foo"));
+		assertThat(field.getOrder(), is(nullValue()));
+		assertThat(field.isGeo(), is(true));
+	}
+
+	@Test
+	public void correctEqualsForPlainFields() {
+
+		IndexField first = IndexField.create("foo", Order.ASCENDING);
+		IndexField second = IndexField.create("foo", Order.ASCENDING);
+
+		assertThat(first, is(second));
+		assertThat(second, is(first));
+	}
+
+	@Test
+	public void correctEqualsForGeoFields() {
+
+		IndexField first = IndexField.geo("bar");
+		IndexField second = IndexField.geo("bar");
+
+		assertThat(first, is(second));
+		assertThat(second, is(first));
+	}
+}

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

@@ -36,13 +36,13 @@ import com.mongodb.MongoException;
 
 /**
  * Integration tests for index handling.
- *
+ * 
  * @author Oliver Gierke
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class IndexingIntegrationTests {
-	
+
 	@Autowired
 	MongoOperations operations;
 
@@ -50,25 +50,24 @@ public class IndexingIntegrationTests {
 	public void tearDown() {
 		operations.dropCollection(IndexedPerson.class);
 	}
-	
-	
+
 	/**
 	 * @see DATADOC-237
 	 */
 	@Test
 	public void createsIndexWithFieldName() {
-		
+
 		operations.save(new IndexedPerson());
 		assertThat(hasIndex("_firstname", IndexedPerson.class), is(true));
 	}
-	
+
 	class IndexedPerson {
-		
+
 		@Field("_firstname")
 		@Indexed
 		String firstname;
 	}
-	
+
 	/**
 	 * Returns whether an index with the given name exists for the given entity type.
 	 * 
@@ -77,7 +76,7 @@ public class IndexingIntegrationTests {
 	 * @return
 	 */
 	private boolean hasIndex(final String indexName, Class<?> entityType) {
-		
+
 		return operations.execute(entityType, new CollectionCallback<Boolean>() {
 			public Boolean doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				for (DBObject indexInfo : collection.getIndexInfo()) {

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

@@ -28,7 +28,7 @@ import org.springframework.data.util.ClassTypeInformation;
 
 /**
  * Unit tests for {@link BasicMongoPersistentEntity}.
- *
+ * 
  * @author Oliver Gierke
  */
 @RunWith(MockitoJUnitRunner.class)
@@ -36,59 +36,61 @@ public class BasicMongoPersistentEntityUnitTests {
 
 	@Mock
 	ApplicationContext context;
-	
+
 	@Test
 	public void subclassInheritsAtDocumentAnnotation() {
-		
+
 		BasicMongoPersistentEntity<Person> entity = new BasicMongoPersistentEntity<Person>(
 				ClassTypeInformation.from(Person.class));
 		assertThat(entity.getCollection(), is("contacts"));
 	}
-	
+
 	@Test
 	public void evaluatesSpELExpression() {
-		
-		MongoPersistentEntity<Company> entity = new BasicMongoPersistentEntity<Company>(ClassTypeInformation.from(Company.class));
+
+		MongoPersistentEntity<Company> entity = new BasicMongoPersistentEntity<Company>(
+				ClassTypeInformation.from(Company.class));
 		assertThat(entity.getCollection(), is("35"));
 	}
-	
+
 	@Test
 	public void collectionAllowsReferencingSpringBean() {
-		
+
 		CollectionProvider provider = new CollectionProvider();
 		provider.collectionName = "reference";
-		
+
 		when(context.getBean("myBean")).thenReturn(provider);
 		when(context.containsBean("myBean")).thenReturn(true);
-		
-		BasicMongoPersistentEntity<DynamicallyMapped> entity = new BasicMongoPersistentEntity<DynamicallyMapped>(ClassTypeInformation.from(DynamicallyMapped.class));
+
+		BasicMongoPersistentEntity<DynamicallyMapped> entity = new BasicMongoPersistentEntity<DynamicallyMapped>(
+				ClassTypeInformation.from(DynamicallyMapped.class));
 		entity.setApplicationContext(context);
-		
+
 		assertThat(entity.getCollection(), is("reference"));
 	}
-	
+
 	@Document(collection = "contacts")
 	class Contact {
-		
+
 	}
-	
+
 	class Person extends Contact {
-		
+
 	}
-	
+
 	@Document(collection = "#{35}")
 	class Company {
-		
+
 	}
-	
+
 	@Document(collection = "#{myBean.collectionName}")
 	class DynamicallyMapped {
-		
+
 	}
-	
+
 	class CollectionProvider {
 		String collectionName;
-		
+
 		public String getCollectionName() {
 			return collectionName;
 		}