preparing for 1.0.0.M4 MongoDB release

DATADOC-256 - Update to use MongoDB driver version 2.6.5
DATADOC-7 - Support for map-reduce operations in MongoTemplate

.gitignore

@@ -2,11 +2,16 @@
 *.iml
 *.ipr
 *.iws
+*.orig
 target
 .springBeans
+.sonar4clipse
+*.sonar4clipseExternals
 .ant-targets-build.xml
 .settings/
 .project
 .classpath
 src/ant/.ant-targets-upload-dist.xml
 atlassian-ide-plugin.xml
+/.gradle/
+/.idea/

pom.xml

@@ -5,11 +5,10 @@
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-document-dist</artifactId>
   <name>Spring Data Document Distribution</name>
-  <version>1.0.0.M2</version>
+  <version>1.0.0.M4</version>
   <packaging>pom</packaging>
   <modules>
     <module>spring-data-document-parent</module>
-    <module>spring-data-document-core</module>
     <module>spring-data-mongodb</module>
     <module>spring-data-mongodb-cross-store</module>
     <module>spring-data-mongodb-log4j</module>
@@ -92,8 +91,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dist.* properties are used by the antrun tasks below -->
     <dist.id>spring-data-document</dist.id>
-    <dist.name>Spring Data</dist.name>
-    <dist.key>DATADOC</dist.key>
+    <dist.name>Spring Data Mongo</dist.name>
+    <dist.key>SDMONGO</dist.key>
     <dist.version>${project.version}</dist.version>
     <dist.releaseType>snapshot</dist.releaseType>
     <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
@@ -264,6 +263,20 @@
     <finalName>${dist.finalName}</finalName>
   </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://maven.springframework.org/release</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <distributionManagement>
     <!-- see 'staging' profile for dry-run deployment settings -->
     <downloadUrl>http://www.springsource.com/spring-data</downloadUrl>

spring-data-couchdb/pom.xml

@@ -66,8 +66,31 @@
 
 	<!--  Spring Data -->
     <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-document-core</artifactId>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-commons-core</artifactId>
+    </dependency>
+
+    <!-- Dependencies for web analytics functionality - to me moved into spring framework  -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${org.springframework.version}</version>
     </dependency>
 
     <!-- Jackson JSON -->

spring-data-document-core/pom.xml

@@ -1,79 +0,0 @@
-<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-document-parent</artifactId>
-    <version>1.0.0.M2</version>
-    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>spring-data-document-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Data Document Support</name>
-  <dependencies>
-
-    <!--  Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <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>
-
-
-    <!-- Dependencies for web analytics functionality - to me moved into spring framework  -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Spring dependencies -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>

spring-data-document-core/src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java

@@ -1,43 +0,0 @@
-package org.springframework.data.document.analytics;
-
-import java.util.Map;
-
-public class ControllerCounter {
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public double getCount() {
-    return count;
-  }
-
-  public void setCount(double count) {
-    this.count = count;
-  }
-
-  public Map<String, Double> getMethods() {
-    return methods;
-  }
-
-
-  public void setMethods(Map<String, Double> methods) {
-    this.methods = methods;
-  }
-
-  private String name;
-
-  private double count;
-
-  private Map<String, Double> methods;
-
-  @Override
-  public String toString() {
-    return "ControllerCounter [name=" + name + ", count=" + count
-        + ", methods=" + methods + "]";
-  }
-}

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java

@@ -1,83 +0,0 @@
-package org.springframework.data.document.analytics;
-
-import java.util.Date;
-
-public class MvcEvent {
-
-  private String controller;
-
-  private String action;
-
-  private Parameters parameters;
-
-  private Date date;
-
-  private String requestUri;
-
-  private String requestAddress;
-
-  private String remoteUser;
-
-  private String view;
-
-  public String getController() {
-    return controller;
-  }
-
-  public void setController(String controller) {
-    this.controller = controller;
-  }
-
-  public String getAction() {
-    return action;
-  }
-
-  public void setAction(String action) {
-    this.action = action;
-  }
-
-  public Parameters getParameters() {
-    return parameters;
-  }
-
-  public void setParameters(Parameters parameters) {
-    this.parameters = parameters;
-  }
-
-  public Date getDate() {
-    return date;
-  }
-
-  public void setDate(Date date) {
-    this.date = date;
-  }
-
-  public String getRequestUri() {
-    return requestUri;
-  }
-
-  public void setRequestUri(String requestUri) {
-    this.requestUri = requestUri;
-  }
-
-  public String getRequestAddress() {
-    return requestAddress;
-  }
-
-  public void setRequestAddress(String requestAddress) {
-    this.requestAddress = requestAddress;
-  }
-
-  public String getRemoteUser() {
-    return remoteUser;
-  }
-
-  public void setRemoteUser(String remoteUser) {
-    this.remoteUser = remoteUser;
-  }
-
-  //TODO
-  //Map sessionAttributes
-
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java

@@ -1,35 +0,0 @@
-package org.springframework.data.document.analytics;
-
-public class Parameters {
-
-  private String p1;
-
-  private String p2;
-
-  private String p3;
-
-  public String getP1() {
-    return p1;
-  }
-
-  public void setP1(String p1) {
-    this.p1 = p1;
-  }
-
-  public String getP2() {
-    return p2;
-  }
-
-  public void setP2(String p2) {
-    this.p2 = p2;
-  }
-
-  public String getP3() {
-    return p3;
-  }
-
-  public void setP3(String p3) {
-    this.p3 = p3;
-  }
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java

@@ -1,821 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-
-
-package org.springframework.data.document.web.bind.annotation.support;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.*;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.http.*;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.ui.Model;
-import org.springframework.util.*;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.support.HandlerMethodInvocationException;
-import org.springframework.web.bind.annotation.support.HandlerMethodResolver;
-import org.springframework.web.bind.support.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-/**
- * Support class for invoking an annotated handler method. Operates on the introspection results of a {@link
- * HandlerMethodResolver} for a specific handler type.
- * <p/>
- * <p>Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter} and {@link
- * org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @see #invokeHandlerMethod
- * @since 2.5.2
- */
-public class HandlerMethodInvoker {
-
-  private static final String MODEL_KEY_PREFIX_STALE = SessionAttributeStore.class.getName() + ".STALE.";
-
-  /**
-   * We'll create a lot of these objects, so we don't want a new logger every time.
-   */
-  private static final Log logger = LogFactory.getLog(HandlerMethodInvoker.class);
-
-  private final HandlerMethodResolver methodResolver;
-
-  private final WebBindingInitializer bindingInitializer;
-
-  private final SessionAttributeStore sessionAttributeStore;
-
-  private final ParameterNameDiscoverer parameterNameDiscoverer;
-
-  private final WebArgumentResolver[] customArgumentResolvers;
-
-  private final HttpMessageConverter[] messageConverters;
-
-  private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus();
-
-
-  public HandlerMethodInvoker(HandlerMethodResolver methodResolver) {
-    this(methodResolver, null);
-  }
-
-  public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer) {
-    this(methodResolver, bindingInitializer, new DefaultSessionAttributeStore(), null, null, null);
-  }
-
-  public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer,
-                              SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer,
-                              WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters) {
-
-    this.methodResolver = methodResolver;
-    this.bindingInitializer = bindingInitializer;
-    this.sessionAttributeStore = sessionAttributeStore;
-    this.parameterNameDiscoverer = parameterNameDiscoverer;
-    this.customArgumentResolvers = customArgumentResolvers;
-    this.messageConverters = messageConverters;
-  }
-
-
-  public final Object invokeHandlerMethod(Method handlerMethod, Object handler,
-                                          NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-    Method handlerMethodToInvoke = BridgeMethodResolver.findBridgedMethod(handlerMethod);
-    try {
-      boolean debug = logger.isDebugEnabled();
-      for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-        Object attrValue = this.sessionAttributeStore.retrieveAttribute(webRequest, attrName);
-        if (attrValue != null) {
-          implicitModel.addAttribute(attrName, attrValue);
-        }
-      }
-      for (Method attributeMethod : this.methodResolver.getModelAttributeMethods()) {
-        Method attributeMethodToInvoke = BridgeMethodResolver.findBridgedMethod(attributeMethod);
-        Object[] args = resolveHandlerArguments(attributeMethodToInvoke, handler, webRequest, implicitModel);
-        if (debug) {
-          logger.debug("Invoking model attribute method: " + attributeMethodToInvoke);
-        }
-        String attrName = AnnotationUtils.findAnnotation(attributeMethod, ModelAttribute.class).value();
-        if (!"".equals(attrName) && implicitModel.containsAttribute(attrName)) {
-          continue;
-        }
-        ReflectionUtils.makeAccessible(attributeMethodToInvoke);
-        Object attrValue = attributeMethodToInvoke.invoke(handler, args);
-        if ("".equals(attrName)) {
-          Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass());
-          attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue);
-        }
-        if (!implicitModel.containsAttribute(attrName)) {
-          implicitModel.addAttribute(attrName, attrValue);
-        }
-      }
-      Object[] args = resolveHandlerArguments(handlerMethodToInvoke, handler, webRequest, implicitModel);
-      if (debug) {
-        logger.debug("Invoking request handler method: " + handlerMethodToInvoke);
-      }
-      ReflectionUtils.makeAccessible(handlerMethodToInvoke);
-      return handlerMethodToInvoke.invoke(handler, args);
-    } catch (IllegalStateException ex) {
-      // Internal assertion failed (e.g. invalid signature):
-      // throw exception with full handler method context...
-      throw new HandlerMethodInvocationException(handlerMethodToInvoke, ex);
-    } catch (InvocationTargetException ex) {
-      // User-defined @ModelAttribute/@InitBinder/@RequestMapping method threw an exception...
-      ReflectionUtils.rethrowException(ex.getTargetException());
-      return null;
-    }
-  }
-
-  public final void updateModelAttributes(Object handler, Map<String, Object> mavModel,
-                                          ExtendedModelMap implicitModel, NativeWebRequest webRequest) throws Exception {
-
-    if (this.methodResolver.hasSessionAttributes() && this.sessionStatus.isComplete()) {
-      for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-        this.sessionAttributeStore.cleanupAttribute(webRequest, attrName);
-      }
-    }
-
-    // Expose model attributes as session attributes, if required.
-    // Expose BindingResults for all attributes, making custom editors available.
-    Map<String, Object> model = (mavModel != null ? mavModel : implicitModel);
-    if (model != null) {
-      try {
-        String[] originalAttrNames = model.keySet().toArray(new String[model.size()]);
-        for (String attrName : originalAttrNames) {
-          Object attrValue = model.get(attrName);
-          boolean isSessionAttr = this.methodResolver.isSessionAttribute(
-              attrName, (attrValue != null ? attrValue.getClass() : null));
-          if (isSessionAttr) {
-            if (this.sessionStatus.isComplete()) {
-              implicitModel.put(MODEL_KEY_PREFIX_STALE + attrName, Boolean.TRUE);
-            } else if (!implicitModel.containsKey(MODEL_KEY_PREFIX_STALE + attrName)) {
-              this.sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
-            }
-          }
-          if (!attrName.startsWith(BindingResult.MODEL_KEY_PREFIX) &&
-              (isSessionAttr || isBindingCandidate(attrValue))) {
-            String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attrName;
-            if (mavModel != null && !model.containsKey(bindingResultKey)) {
-              WebDataBinder binder = createBinder(webRequest, attrValue, attrName);
-              initBinder(handler, attrName, binder, webRequest);
-              mavModel.put(bindingResultKey, binder.getBindingResult());
-            }
-          }
-        }
-      } catch (InvocationTargetException ex) {
-        // User-defined @InitBinder method threw an exception...
-        ReflectionUtils.rethrowException(ex.getTargetException());
-      }
-    }
-  }
-
-
-  private Object[] resolveHandlerArguments(Method handlerMethod, Object handler,
-                                           NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-    Class[] paramTypes = handlerMethod.getParameterTypes();
-    Object[] args = new Object[paramTypes.length];
-
-    for (int i = 0; i < args.length; i++) {
-      MethodParameter methodParam = new MethodParameter(handlerMethod, i);
-      methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-      GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-      String paramName = null;
-      String headerName = null;
-      boolean requestBodyFound = false;
-      String cookieName = null;
-      String pathVarName = null;
-      String attrName = null;
-      boolean required = false;
-      String defaultValue = null;
-      boolean validate = false;
-      int annotationsFound = 0;
-      Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-      for (Annotation paramAnn : paramAnns) {
-        if (RequestParam.class.isInstance(paramAnn)) {
-          RequestParam requestParam = (RequestParam) paramAnn;
-          paramName = requestParam.value();
-          required = requestParam.required();
-          defaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-          annotationsFound++;
-        } else if (RequestHeader.class.isInstance(paramAnn)) {
-          RequestHeader requestHeader = (RequestHeader) paramAnn;
-          headerName = requestHeader.value();
-          required = requestHeader.required();
-          defaultValue = parseDefaultValueAttribute(requestHeader.defaultValue());
-          annotationsFound++;
-        } else if (RequestBody.class.isInstance(paramAnn)) {
-          requestBodyFound = true;
-          annotationsFound++;
-        } else if (CookieValue.class.isInstance(paramAnn)) {
-          CookieValue cookieValue = (CookieValue) paramAnn;
-          cookieName = cookieValue.value();
-          required = cookieValue.required();
-          defaultValue = parseDefaultValueAttribute(cookieValue.defaultValue());
-          annotationsFound++;
-        } else if (PathVariable.class.isInstance(paramAnn)) {
-          PathVariable pathVar = (PathVariable) paramAnn;
-          pathVarName = pathVar.value();
-          annotationsFound++;
-        } else if (ModelAttribute.class.isInstance(paramAnn)) {
-          ModelAttribute attr = (ModelAttribute) paramAnn;
-          attrName = attr.value();
-          annotationsFound++;
-        } else if (Value.class.isInstance(paramAnn)) {
-          defaultValue = ((Value) paramAnn).value();
-        } else if ("Valid".equals(paramAnn.annotationType().getSimpleName())) {
-          validate = true;
-        }
-      }
-
-      if (annotationsFound > 1) {
-        throw new IllegalStateException("Handler parameter annotations are exclusive choices - " +
-            "do not specify more than one such annotation on the same parameter: " + handlerMethod);
-      }
-
-      if (annotationsFound == 0) {
-        Object argValue = resolveCommonArgument(methodParam, webRequest);
-        if (argValue != WebArgumentResolver.UNRESOLVED) {
-          args[i] = argValue;
-        } else if (defaultValue != null) {
-          args[i] = resolveDefaultValue(defaultValue);
-        } else {
-          Class paramType = methodParam.getParameterType();
-          if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
-            args[i] = implicitModel;
-          } else if (SessionStatus.class.isAssignableFrom(paramType)) {
-            args[i] = this.sessionStatus;
-          } else if (HttpEntity.class.isAssignableFrom(paramType)) {
-            args[i] = resolveHttpEntityRequest(methodParam, webRequest);
-          } else if (Errors.class.isAssignableFrom(paramType)) {
-            throw new IllegalStateException("Errors/BindingResult argument declared " +
-                "without preceding model attribute. Check your handler method signature!");
-          } else if (BeanUtils.isSimpleProperty(paramType)) {
-            paramName = "";
-          } else {
-            attrName = "";
-          }
-        }
-      }
-
-      if (paramName != null) {
-        args[i] = resolveRequestParam(paramName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (headerName != null) {
-        args[i] = resolveRequestHeader(headerName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (requestBodyFound) {
-        args[i] = resolveRequestBody(methodParam, webRequest, handler);
-      } else if (cookieName != null) {
-        args[i] = resolveCookieValue(cookieName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (pathVarName != null) {
-        args[i] = resolvePathVariable(pathVarName, methodParam, webRequest, handler);
-      } else if (attrName != null) {
-        WebDataBinder binder =
-            resolveModelAttribute(attrName, methodParam, implicitModel, webRequest, handler);
-        boolean assignBindingResult = (args.length > i + 1 && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-        if (binder.getTarget() != null) {
-          doBind(binder, webRequest, validate, !assignBindingResult);
-        }
-        args[i] = binder.getTarget();
-        if (assignBindingResult) {
-          args[i + 1] = binder.getBindingResult();
-          i++;
-        }
-        implicitModel.putAll(binder.getBindingResult().getModel());
-      }
-    }
-
-    return args;
-  }
-
-  protected void initBinder(Object handler, String attrName, WebDataBinder binder, NativeWebRequest webRequest)
-      throws Exception {
-
-    if (this.bindingInitializer != null) {
-      this.bindingInitializer.initBinder(binder, webRequest);
-    }
-    if (handler != null) {
-      Set<Method> initBinderMethods = this.methodResolver.getInitBinderMethods();
-      if (!initBinderMethods.isEmpty()) {
-        boolean debug = logger.isDebugEnabled();
-        for (Method initBinderMethod : initBinderMethods) {
-          Method methodToInvoke = BridgeMethodResolver.findBridgedMethod(initBinderMethod);
-          String[] targetNames = AnnotationUtils.findAnnotation(initBinderMethod, InitBinder.class).value();
-          if (targetNames.length == 0 || Arrays.asList(targetNames).contains(attrName)) {
-            Object[] initBinderArgs =
-                resolveInitBinderArguments(handler, methodToInvoke, binder, webRequest);
-            if (debug) {
-              logger.debug("Invoking init-binder method: " + methodToInvoke);
-            }
-            ReflectionUtils.makeAccessible(methodToInvoke);
-            Object returnValue = methodToInvoke.invoke(handler, initBinderArgs);
-            if (returnValue != null) {
-              throw new IllegalStateException(
-                  "InitBinder methods must not have a return value: " + methodToInvoke);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod,
-                                              WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-
-    Class[] initBinderParams = initBinderMethod.getParameterTypes();
-    Object[] initBinderArgs = new Object[initBinderParams.length];
-
-    for (int i = 0; i < initBinderArgs.length; i++) {
-      MethodParameter methodParam = new MethodParameter(initBinderMethod, i);
-      methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-      GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-      String paramName = null;
-      boolean paramRequired = false;
-      String paramDefaultValue = null;
-      String pathVarName = null;
-      Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-      for (Annotation paramAnn : paramAnns) {
-        if (RequestParam.class.isInstance(paramAnn)) {
-          RequestParam requestParam = (RequestParam) paramAnn;
-          paramName = requestParam.value();
-          paramRequired = requestParam.required();
-          paramDefaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-          break;
-        } else if (ModelAttribute.class.isInstance(paramAnn)) {
-          throw new IllegalStateException(
-              "@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
-        } else if (PathVariable.class.isInstance(paramAnn)) {
-          PathVariable pathVar = (PathVariable) paramAnn;
-          pathVarName = pathVar.value();
-        }
-      }
-
-      if (paramName == null && pathVarName == null) {
-        Object argValue = resolveCommonArgument(methodParam, webRequest);
-        if (argValue != WebArgumentResolver.UNRESOLVED) {
-          initBinderArgs[i] = argValue;
-        } else {
-          Class paramType = initBinderParams[i];
-          if (paramType.isInstance(binder)) {
-            initBinderArgs[i] = binder;
-          } else if (BeanUtils.isSimpleProperty(paramType)) {
-            paramName = "";
-          } else {
-            throw new IllegalStateException("Unsupported argument [" + paramType.getName() +
-                "] for @InitBinder method: " + initBinderMethod);
-          }
-        }
-      }
-
-      if (paramName != null) {
-        initBinderArgs[i] =
-            resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
-      } else if (pathVarName != null) {
-        initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
-      }
-    }
-
-    return initBinderArgs;
-  }
-
-  @SuppressWarnings("unchecked")
-  private Object resolveRequestParam(String paramName, boolean required, String defaultValue,
-                                     MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) {
-      return resolveRequestParamMap((Class<? extends Map>) paramType, webRequest);
-    }
-    if (paramName.length() == 0) {
-      paramName = getRequiredParameterName(methodParam);
-    }
-    Object paramValue = null;
-    MultipartRequest multipartRequest = webRequest.getNativeRequest(MultipartRequest.class);
-    if (multipartRequest != null) {
-      List<MultipartFile> files = multipartRequest.getFiles(paramName);
-      if (!files.isEmpty()) {
-        if (files.size() == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-          paramValue = files.get(0);
-        } else {
-          paramValue = files;
-        }
-      }
-    }
-    if (paramValue == null) {
-      String[] paramValues = webRequest.getParameterValues(paramName);
-      if (paramValues != null) {
-        if (paramValues.length == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-          paramValue = paramValues[0];
-        } else {
-          paramValue = paramValues;
-        }
-      }
-    }
-    if (paramValue == null) {
-      if (defaultValue != null) {
-        paramValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingParameterException(paramName, paramType);
-      }
-      paramValue = checkValue(paramName, paramValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, paramName);
-    initBinder(handlerForInitBinderCall, paramName, binder, webRequest);
-    return binder.convertIfNecessary(paramValue, paramType, methodParam);
-  }
-
-  private Map resolveRequestParamMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-    Map<String, String[]> parameterMap = webRequest.getParameterMap();
-    if (MultiValueMap.class.isAssignableFrom(mapType)) {
-      MultiValueMap<String, String> result = new LinkedMultiValueMap<String, String>(parameterMap.size());
-      for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-        for (String value : entry.getValue()) {
-          result.add(entry.getKey(), value);
-        }
-      }
-      return result;
-    } else {
-      Map<String, String> result = new LinkedHashMap<String, String>(parameterMap.size());
-      for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-        if (entry.getValue().length > 0) {
-          result.put(entry.getKey(), entry.getValue()[0]);
-        }
-      }
-      return result;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private Object resolveRequestHeader(String headerName, boolean required, String defaultValue,
-                                      MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (Map.class.isAssignableFrom(paramType)) {
-      return resolveRequestHeaderMap((Class<? extends Map>) paramType, webRequest);
-    }
-    if (headerName.length() == 0) {
-      headerName = getRequiredParameterName(methodParam);
-    }
-    Object headerValue = null;
-    String[] headerValues = webRequest.getHeaderValues(headerName);
-    if (headerValues != null) {
-      headerValue = (headerValues.length == 1 ? headerValues[0] : headerValues);
-    }
-    if (headerValue == null) {
-      if (defaultValue != null) {
-        headerValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingHeaderException(headerName, paramType);
-      }
-      headerValue = checkValue(headerName, headerValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, headerName);
-    initBinder(handlerForInitBinderCall, headerName, binder, webRequest);
-    return binder.convertIfNecessary(headerValue, paramType, methodParam);
-  }
-
-  private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-    if (MultiValueMap.class.isAssignableFrom(mapType)) {
-      MultiValueMap<String, String> result;
-      if (HttpHeaders.class.isAssignableFrom(mapType)) {
-        result = new HttpHeaders();
-      } else {
-        result = new LinkedMultiValueMap<String, String>();
-      }
-      for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-        String headerName = iterator.next();
-        for (String headerValue : webRequest.getHeaderValues(headerName)) {
-          result.add(headerName, headerValue);
-        }
-      }
-      return result;
-    } else {
-      Map<String, String> result = new LinkedHashMap<String, String>();
-      for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-        String headerName = iterator.next();
-        String headerValue = webRequest.getHeader(headerName);
-        result.put(headerName, headerValue);
-      }
-      return result;
-    }
-  }
-
-  /**
-   * Resolves the given {@link RequestBody @RequestBody} annotation.
-   */
-  protected Object resolveRequestBody(MethodParameter methodParam, NativeWebRequest webRequest, Object handler)
-      throws Exception {
-
-    return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType());
-  }
-
-  private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest)
-      throws Exception {
-
-    HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
-    Class<?> paramType = getHttpEntityType(methodParam);
-    Object body = readWithMessageConverters(methodParam, inputMessage, paramType);
-    return new HttpEntity<Object>(body, inputMessage.getHeaders());
-  }
-
-  private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType)
-      throws Exception {
-
-    MediaType contentType = inputMessage.getHeaders().getContentType();
-    if (contentType == null) {
-      StringBuilder builder = new StringBuilder(ClassUtils.getShortName(methodParam.getParameterType()));
-      String paramName = methodParam.getParameterName();
-      if (paramName != null) {
-        builder.append(' ');
-        builder.append(paramName);
-      }
-      throw new HttpMediaTypeNotSupportedException(
-          "Cannot extract parameter (" + builder.toString() + "): no Content-Type found");
-    }
-
-    List<MediaType> allSupportedMediaTypes = new ArrayList<MediaType>();
-    if (this.messageConverters != null) {
-      for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
-        allSupportedMediaTypes.addAll(messageConverter.getSupportedMediaTypes());
-        if (messageConverter.canRead(paramType, contentType)) {
-          if (logger.isDebugEnabled()) {
-            logger.debug("Reading [" + paramType.getName() + "] as \"" + contentType
-                + "\" using [" + messageConverter + "]");
-          }
-          return messageConverter.read(paramType, inputMessage);
-        }
-      }
-    }
-    throw new HttpMediaTypeNotSupportedException(contentType, allSupportedMediaTypes);
-  }
-
-  private Class<?> getHttpEntityType(MethodParameter methodParam) {
-    Assert.isAssignable(HttpEntity.class, methodParam.getParameterType());
-    ParameterizedType type = (ParameterizedType) methodParam.getGenericParameterType();
-    if (type.getActualTypeArguments().length == 1) {
-      Type typeArgument = type.getActualTypeArguments()[0];
-      if (typeArgument instanceof Class) {
-        return (Class<?>) typeArgument;
-      } else if (typeArgument instanceof GenericArrayType) {
-        Type componentType = ((GenericArrayType) typeArgument).getGenericComponentType();
-        if (componentType instanceof Class) {
-          // Surely, there should be a nicer way to do this
-          Object array = Array.newInstance((Class<?>) componentType, 0);
-          return array.getClass();
-        }
-      }
-    }
-    throw new IllegalArgumentException(
-        "HttpEntity parameter (" + methodParam.getParameterName() + ") is not parameterized");
-
-  }
-
-  private Object resolveCookieValue(String cookieName, boolean required, String defaultValue,
-                                    MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (cookieName.length() == 0) {
-      cookieName = getRequiredParameterName(methodParam);
-    }
-    Object cookieValue = resolveCookieValue(cookieName, paramType, webRequest);
-    if (cookieValue == null) {
-      if (defaultValue != null) {
-        cookieValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingCookieException(cookieName, paramType);
-      }
-      cookieValue = checkValue(cookieName, cookieValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, cookieName);
-    initBinder(handlerForInitBinderCall, cookieName, binder, webRequest);
-    return binder.convertIfNecessary(cookieValue, paramType, methodParam);
-  }
-
-  /**
-   * Resolves the given {@link CookieValue @CookieValue} annotation.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest)
-      throws Exception {
-
-    throw new UnsupportedOperationException("@CookieValue not supported");
-  }
-
-  private Object resolvePathVariable(String pathVarName, MethodParameter methodParam,
-                                     NativeWebRequest webRequest, Object handlerForInitBinderCall) throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (pathVarName.length() == 0) {
-      pathVarName = getRequiredParameterName(methodParam);
-    }
-    String pathVarValue = resolvePathVariable(pathVarName, paramType, webRequest);
-    WebDataBinder binder = createBinder(webRequest, null, pathVarName);
-    initBinder(handlerForInitBinderCall, pathVarName, binder, webRequest);
-    return binder.convertIfNecessary(pathVarValue, paramType, methodParam);
-  }
-
-  /**
-   * Resolves the given {@link PathVariable @PathVariable} annotation.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest)
-      throws Exception {
-
-    throw new UnsupportedOperationException("@PathVariable not supported");
-  }
-
-  private String getRequiredParameterName(MethodParameter methodParam) {
-    String name = methodParam.getParameterName();
-    if (name == null) {
-      throw new IllegalStateException(
-          "No parameter name specified for argument of type [" + methodParam.getParameterType().getName() +
-              "], and no parameter name information found in class file either.");
-    }
-    return name;
-  }
-
-  private Object checkValue(String name, Object value, Class paramType) {
-    if (value == null) {
-      if (boolean.class.equals(paramType)) {
-        return Boolean.FALSE;
-      } else if (paramType.isPrimitive()) {
-        throw new IllegalStateException("Optional " + paramType + " parameter '" + name +
-            "' is not present but cannot be translated into a null value due to being declared as a " +
-            "primitive type. Consider declaring it as object wrapper for the corresponding primitive type.");
-      }
-    }
-    return value;
-  }
-
-  private WebDataBinder resolveModelAttribute(String attrName, MethodParameter methodParam,
-                                              ExtendedModelMap implicitModel, NativeWebRequest webRequest, Object handler) throws Exception {
-
-    // Bind request parameter onto object...
-    String name = attrName;
-    if ("".equals(name)) {
-      name = Conventions.getVariableNameForParameter(methodParam);
-    }
-    Class<?> paramType = methodParam.getParameterType();
-    Object bindObject;
-    if (implicitModel.containsKey(name)) {
-      bindObject = implicitModel.get(name);
-    } else if (this.methodResolver.isSessionAttribute(name, paramType)) {
-      bindObject = this.sessionAttributeStore.retrieveAttribute(webRequest, name);
-      if (bindObject == null) {
-        raiseSessionRequiredException("Session attribute '" + name + "' required - not found in session");
-      }
-    } else {
-      bindObject = BeanUtils.instantiateClass(paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, bindObject, name);
-    initBinder(handler, name, binder, webRequest);
-    return binder;
-  }
-
-
-  /**
-   * Determine whether the given value qualifies as a "binding candidate", i.e. might potentially be subject to
-   * bean-style data binding later on.
-   */
-  protected boolean isBindingCandidate(Object value) {
-    return (value != null && !value.getClass().isArray() && !(value instanceof Collection) &&
-        !(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass()));
-  }
-
-  protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception {
-    throw new IllegalStateException("Missing parameter '" + paramName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception {
-    throw new IllegalStateException("Missing header '" + headerName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception {
-    throw new IllegalStateException(
-        "Missing cookie value '" + cookieName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseSessionRequiredException(String message) throws Exception {
-    throw new IllegalStateException(message);
-  }
-
-  protected WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
-      throws Exception {
-
-    return new WebRequestDataBinder(target, objectName);
-  }
-
-  private void doBind(WebDataBinder binder, NativeWebRequest webRequest, boolean validate, boolean failOnErrors)
-      throws Exception {
-
-    doBind(binder, webRequest);
-    if (validate) {
-      binder.validate();
-    }
-    if (failOnErrors && binder.getBindingResult().hasErrors()) {
-      throw new BindException(binder.getBindingResult());
-    }
-  }
-
-  protected void doBind(WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-    ((WebRequestDataBinder) binder).bind(webRequest);
-  }
-
-  /**
-   * Return a {@link HttpInputMessage} for the given {@link NativeWebRequest}.
-   * <p>Throws an UnsupportedOperation1Exception by default.
-   */
-  protected HttpInputMessage createHttpInputMessage(NativeWebRequest webRequest) throws Exception {
-    throw new UnsupportedOperationException("@RequestBody not supported");
-  }
-
-  /**
-   * Return a {@link HttpOutputMessage} for the given {@link NativeWebRequest}.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception {
-    throw new UnsupportedOperationException("@ResponseBody not supported");
-  }
-
-  protected String parseDefaultValueAttribute(String value) {
-    return (ValueConstants.DEFAULT_NONE.equals(value) ? null : value);
-  }
-
-  protected Object resolveDefaultValue(String value) {
-    return value;
-  }
-
-  protected Object resolveCommonArgument(MethodParameter methodParameter, NativeWebRequest webRequest)
-      throws Exception {
-
-    // Invoke custom argument resolvers if present...
-    if (this.customArgumentResolvers != null) {
-      for (WebArgumentResolver argumentResolver : this.customArgumentResolvers) {
-        Object value = argumentResolver.resolveArgument(methodParameter, webRequest);
-        if (value != WebArgumentResolver.UNRESOLVED) {
-          return value;
-        }
-      }
-    }
-
-    // Resolution of standard parameter types...
-    Class paramType = methodParameter.getParameterType();
-    Object value = resolveStandardArgument(paramType, webRequest);
-    if (value != WebArgumentResolver.UNRESOLVED && !ClassUtils.isAssignableValue(paramType, value)) {
-      throw new IllegalStateException("Standard argument type [" + paramType.getName() +
-          "] resolved to incompatible value of type [" + (value != null ? value.getClass() : null) +
-          "]. Consider declaring the argument type in a less specific fashion.");
-    }
-    return value;
-  }
-
-  protected Object resolveStandardArgument(Class<?> parameterType, NativeWebRequest webRequest) throws Exception {
-    if (WebRequest.class.isAssignableFrom(parameterType)) {
-      return webRequest;
-    }
-    return WebArgumentResolver.UNRESOLVED;
-  }
-
-  protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType,
-                                                      Object returnValue, ExtendedModelMap implicitModel) {
-
-    ModelAttribute attr = AnnotationUtils.findAnnotation(handlerMethod, ModelAttribute.class);
-    String attrName = (attr != null ? attr.value() : "");
-    if ("".equals(attrName)) {
-      Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType);
-      attrName = Conventions.getVariableNameForReturnType(handlerMethod, resolvedType, returnValue);
-    }
-    implicitModel.addAttribute(attrName, returnValue);
-  }
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java

@@ -1,58 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.web.servlet;
-
-import java.util.Arrays;
-
-import org.springframework.web.servlet.ModelAndView;
-
-public class ActionExecutedContext extends ActionExecutingContext {
-
-
-  private ModelAndView modelAndView;
-
-  private Exception exception;
-
-  public ActionExecutedContext(ActionExecutingContext actionExecutingContext, ModelAndView modelAndView, Exception exception) {
-    super(actionExecutingContext.getServletWebRequest(), actionExecutingContext.getHandler(),
-        actionExecutingContext.getHandlerMethod(), actionExecutingContext.getHandlerParameters(),
-        actionExecutingContext.getImplicitModel());
-    this.modelAndView = modelAndView;
-    this.exception = exception;
-  }
-
-  @Override
-  public String toString() {
-    return "ActionExecutedContext [handler=" + getHandler()
-        + ", servletWebRequest=" + getServletWebRequest()
-        + ", implicitModel=" + getImplicitModel() + ", handlerMethod="
-        + getHandlerMethod() + ", handlerParameters="
-        + Arrays.toString(getHandlerParameters()) + ",modelAndView=" + modelAndView
-        + ", exception=" + exception + "]";
-  }
-
-
-  public ModelAndView getModelAndView() {
-    return modelAndView;
-  }
-
-
-  public Exception getException() {
-    return exception;
-  }
-
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java

@@ -1,89 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.web.servlet;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.web.context.request.ServletWebRequest;
-
-public class ActionExecutingContext {
-
-
-  private Object handler;
-
-  private ServletWebRequest servletWebRequest;
-
-  private ExtendedModelMap implicitModel;
-
-  private Method handlerMethod;
-
-  private Object[] handlerParameters;
-
-
-  public ActionExecutingContext(ServletWebRequest servletWebRequest,
-                                Object handler, Method handlerMethod, Object[] handlerParameters,
-                                ExtendedModelMap implicitModel) {
-    super();
-    this.servletWebRequest = servletWebRequest;
-    this.handler = handler;
-    this.handlerMethod = handlerMethod;
-    this.handlerParameters = handlerParameters;
-    this.implicitModel = implicitModel;
-  }
-
-  public HttpServletRequest getHttpServletRequest() {
-    return servletWebRequest.getRequest();
-  }
-
-  public HttpServletResponse getHttpServletResponse() {
-    return servletWebRequest.getResponse();
-  }
-
-  public Object getHandler() {
-    return handler;
-  }
-
-  public ServletWebRequest getServletWebRequest() {
-    return servletWebRequest;
-  }
-
-  public ExtendedModelMap getImplicitModel() {
-    return implicitModel;
-  }
-
-  public Method getHandlerMethod() {
-    return handlerMethod;
-  }
-
-  public Object[] getHandlerParameters() {
-    return handlerParameters;
-  }
-
-  @Override
-  public String toString() {
-    return "ActionExecutingContext [handler=" + handler
-        + ", servletWebRequest=" + servletWebRequest
-        + ", implicitModel=" + implicitModel + ", handlerMethod="
-        + handlerMethod + ", handlerParameters="
-        + Arrays.toString(handlerParameters) + "]";
-  }
-
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionInterceptor.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.web.servlet;
-
-public interface ActionInterceptor {
-
-  boolean preHandle(ActionExecutingContext actionExecutingContext);
-
-  void postHandle(ActionExecutedContext actionExecutedContext);
-
-  void afterCompletion(ActionExecutedContext actionExecutedContext);
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java

@@ -1,141 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-
-package org.springframework.data.document.web.servlet.mvc.annotation;
-
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.MediaType;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Helper class for annotation-based request mapping.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 2.5.2
- */
-abstract class ServletAnnotationMappingUtils {
-
-  /**
-   * Check whether the given request matches the specified request methods.
-   *
-   * @param methods the HTTP request methods to check against
-   * @param request the current HTTP request to check
-   */
-  public static boolean checkRequestMethod(RequestMethod[] methods, HttpServletRequest request) {
-    if (ObjectUtils.isEmpty(methods)) {
-      return true;
-    }
-    for (RequestMethod method : methods) {
-      if (method.name().equals(request.getMethod())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Check whether the given request matches the specified parameter conditions.
-   *
-   * @param params  the parameter conditions, following
-   *                {@link org.springframework.web.bind.annotation.RequestMapping#params() RequestMapping.#params()}
-   * @param request the current HTTP request to check
-   */
-  public static boolean checkParameters(String[] params, HttpServletRequest request) {
-    if (!ObjectUtils.isEmpty(params)) {
-      for (String param : params) {
-        int separator = param.indexOf('=');
-        if (separator == -1) {
-          if (param.startsWith("!")) {
-            if (WebUtils.hasSubmitParameter(request, param.substring(1))) {
-              return false;
-            }
-          } else if (!WebUtils.hasSubmitParameter(request, param)) {
-            return false;
-          }
-        } else {
-          boolean negated = separator > 0 && param.charAt(separator - 1) == '!';
-          String key = !negated ? param.substring(0, separator) : param.substring(0, separator - 1);
-          String value = param.substring(separator + 1);
-          if (!value.equals(request.getParameter(key))) {
-            return negated;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Check whether the given request matches the specified header conditions.
-   *
-   * @param headers the header conditions, following
-   *                {@link org.springframework.web.bind.annotation.RequestMapping#headers() RequestMapping.headers()}
-   * @param request the current HTTP request to check
-   */
-  public static boolean checkHeaders(String[] headers, HttpServletRequest request) {
-    if (!ObjectUtils.isEmpty(headers)) {
-      for (String header : headers) {
-        int separator = header.indexOf('=');
-        if (separator == -1) {
-          if (header.startsWith("!")) {
-            if (request.getHeader(header.substring(1)) != null) {
-              return false;
-            }
-          } else if (request.getHeader(header) == null) {
-            return false;
-          }
-        } else {
-          boolean negated = separator > 0 && header.charAt(separator - 1) == '!';
-          String key = !negated ? header.substring(0, separator) : header.substring(0, separator - 1);
-          String value = header.substring(separator + 1);
-          if (isMediaTypeHeader(key)) {
-            List<MediaType> requestMediaTypes = MediaType.parseMediaTypes(request.getHeader(key));
-            List<MediaType> valueMediaTypes = MediaType.parseMediaTypes(value);
-            boolean found = false;
-            for (Iterator<MediaType> valIter = valueMediaTypes.iterator(); valIter.hasNext() && !found;) {
-              MediaType valueMediaType = valIter.next();
-              for (Iterator<MediaType> reqIter = requestMediaTypes.iterator();
-                   reqIter.hasNext() && !found;) {
-                MediaType requestMediaType = reqIter.next();
-                if (valueMediaType.includes(requestMediaType)) {
-                  found = true;
-                }
-              }
-
-            }
-            if (!found) {
-              return negated;
-            }
-          } else if (!value.equals(request.getHeader(key))) {
-            return negated;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  private static boolean isMediaTypeHeader(String headerName) {
-    return "Accept".equalsIgnoreCase(headerName) || "Content-Type".equalsIgnoreCase(headerName);
-  }
-
-}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/support/InterceptingHandlerMethodInvoker.java

@@ -1,828 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-
-package org.springframework.data.document.web.servlet.mvc.annotation.support;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.*;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.document.web.servlet.ActionInterceptor;
-import org.springframework.http.*;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.ui.ExtendedModelMap;
-import org.springframework.ui.Model;
-import org.springframework.util.*;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.support.HandlerMethodInvocationException;
-import org.springframework.web.bind.annotation.support.HandlerMethodResolver;
-import org.springframework.web.bind.support.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-/**
- * Support class for invoking an annotated handler method. Operates on the introspection results of a {@link
- * HandlerMethodResolver} for a specific handler type.
- * <p/>
- * <p>Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter} and {@link
- * org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @see #invokeHandlerMethod
- * @since 2.5.2
- */
-public class InterceptingHandlerMethodInvoker {
-
-  private static final String MODEL_KEY_PREFIX_STALE = SessionAttributeStore.class.getName() + ".STALE.";
-
-  /**
-   * We'll create a lot of these objects, so we don't want a new logger every time.
-   */
-  private static final Log logger = LogFactory.getLog(InterceptingHandlerMethodInvoker.class);
-
-  protected final HandlerMethodResolver methodResolver;
-
-  private final WebBindingInitializer bindingInitializer;
-
-  protected final SessionAttributeStore sessionAttributeStore;
-
-  private final ParameterNameDiscoverer parameterNameDiscoverer;
-
-  private final WebArgumentResolver[] customArgumentResolvers;
-
-  private final HttpMessageConverter[] messageConverters;
-
-  private final ActionInterceptor[] actionInterceptors;
-
-  private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus();
-
-
-  public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver) {
-    this(methodResolver, null);
-  }
-
-  public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer) {
-    this(methodResolver, bindingInitializer, new DefaultSessionAttributeStore(), null, null, null, null);
-  }
-
-  public InterceptingHandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer,
-                                          SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer,
-                                          WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters, ActionInterceptor[] actionInterceptors) {
-
-    this.methodResolver = methodResolver;
-    this.bindingInitializer = bindingInitializer;
-    this.sessionAttributeStore = sessionAttributeStore;
-    this.parameterNameDiscoverer = parameterNameDiscoverer;
-    this.customArgumentResolvers = customArgumentResolvers;
-    this.messageConverters = messageConverters;
-    this.actionInterceptors = actionInterceptors;
-  }
-
-  protected ActionInterceptor[] getActionInterceptors() {
-    return actionInterceptors;
-  }
-
-
-  public final Object invokeHandlerMethod(Method handlerMethod, Object handler,
-                                          NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-    Method handlerMethodToInvoke = BridgeMethodResolver.findBridgedMethod(handlerMethod);
-    try {
-      boolean debug = logger.isDebugEnabled();
-      for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-        Object attrValue = this.sessionAttributeStore.retrieveAttribute(webRequest, attrName);
-        if (attrValue != null) {
-          implicitModel.addAttribute(attrName, attrValue);
-        }
-      }
-      for (Method attributeMethod : this.methodResolver.getModelAttributeMethods()) {
-        Method attributeMethodToInvoke = BridgeMethodResolver.findBridgedMethod(attributeMethod);
-        Object[] args = resolveHandlerArguments(attributeMethodToInvoke, handler, webRequest, implicitModel);
-        if (debug) {
-          logger.debug("Invoking model attribute method: " + attributeMethodToInvoke);
-        }
-        String attrName = AnnotationUtils.findAnnotation(attributeMethod, ModelAttribute.class).value();
-        if (!"".equals(attrName) && implicitModel.containsAttribute(attrName)) {
-          continue;
-        }
-        ReflectionUtils.makeAccessible(attributeMethodToInvoke);
-        Object attrValue = attributeMethodToInvoke.invoke(handler, args);
-        if ("".equals(attrName)) {
-          Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass());
-          attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue);
-        }
-        if (!implicitModel.containsAttribute(attrName)) {
-          implicitModel.addAttribute(attrName, attrValue);
-        }
-      }
-      Object[] args = resolveHandlerArguments(handlerMethodToInvoke, handler, webRequest, implicitModel);
-      if (debug) {
-        logger.debug("Invoking request handler method: " + handlerMethodToInvoke);
-      }
-      ReflectionUtils.makeAccessible(handlerMethodToInvoke);
-      return handlerMethodToInvoke.invoke(handler, args);
-    } catch (IllegalStateException ex) {
-      // Internal assertion failed (e.g. invalid signature):
-      // throw exception with full handler method context...
-      throw new HandlerMethodInvocationException(handlerMethodToInvoke, ex);
-    } catch (InvocationTargetException ex) {
-      // User-defined @ModelAttribute/@InitBinder/@RequestMapping method threw an exception...
-      ReflectionUtils.rethrowException(ex.getTargetException());
-      return null;
-    }
-  }
-
-  public final void updateModelAttributes(Object handler, Map<String, Object> mavModel,
-                                          ExtendedModelMap implicitModel, NativeWebRequest webRequest) throws Exception {
-
-    if (this.methodResolver.hasSessionAttributes() && this.sessionStatus.isComplete()) {
-      for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
-        this.sessionAttributeStore.cleanupAttribute(webRequest, attrName);
-      }
-    }
-
-    // Expose model attributes as session attributes, if required.
-    // Expose BindingResults for all attributes, making custom editors available.
-    Map<String, Object> model = (mavModel != null ? mavModel : implicitModel);
-    if (model != null) {
-      try {
-        String[] originalAttrNames = model.keySet().toArray(new String[model.size()]);
-        for (String attrName : originalAttrNames) {
-          Object attrValue = model.get(attrName);
-          boolean isSessionAttr = this.methodResolver.isSessionAttribute(
-              attrName, (attrValue != null ? attrValue.getClass() : null));
-          if (isSessionAttr) {
-            if (this.sessionStatus.isComplete()) {
-              implicitModel.put(MODEL_KEY_PREFIX_STALE + attrName, Boolean.TRUE);
-            } else if (!implicitModel.containsKey(MODEL_KEY_PREFIX_STALE + attrName)) {
-              this.sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
-            }
-          }
-          if (!attrName.startsWith(BindingResult.MODEL_KEY_PREFIX) &&
-              (isSessionAttr || isBindingCandidate(attrValue))) {
-            String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attrName;
-            if (mavModel != null && !model.containsKey(bindingResultKey)) {
-              WebDataBinder binder = createBinder(webRequest, attrValue, attrName);
-              initBinder(handler, attrName, binder, webRequest);
-              mavModel.put(bindingResultKey, binder.getBindingResult());
-            }
-          }
-        }
-      } catch (InvocationTargetException ex) {
-        // User-defined @InitBinder method threw an exception...
-        ReflectionUtils.rethrowException(ex.getTargetException());
-      }
-    }
-  }
-
-
-  protected Object[] resolveHandlerArguments(Method handlerMethod, Object handler,
-                                             NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
-    Class[] paramTypes = handlerMethod.getParameterTypes();
-    Object[] args = new Object[paramTypes.length];
-
-    for (int i = 0; i < args.length; i++) {
-      MethodParameter methodParam = new MethodParameter(handlerMethod, i);
-      methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-      GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-      String paramName = null;
-      String headerName = null;
-      boolean requestBodyFound = false;
-      String cookieName = null;
-      String pathVarName = null;
-      String attrName = null;
-      boolean required = false;
-      String defaultValue = null;
-      boolean validate = false;
-      int annotationsFound = 0;
-      Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-      for (Annotation paramAnn : paramAnns) {
-        if (RequestParam.class.isInstance(paramAnn)) {
-          RequestParam requestParam = (RequestParam) paramAnn;
-          paramName = requestParam.value();
-          required = requestParam.required();
-          defaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-          annotationsFound++;
-        } else if (RequestHeader.class.isInstance(paramAnn)) {
-          RequestHeader requestHeader = (RequestHeader) paramAnn;
-          headerName = requestHeader.value();
-          required = requestHeader.required();
-          defaultValue = parseDefaultValueAttribute(requestHeader.defaultValue());
-          annotationsFound++;
-        } else if (RequestBody.class.isInstance(paramAnn)) {
-          requestBodyFound = true;
-          annotationsFound++;
-        } else if (CookieValue.class.isInstance(paramAnn)) {
-          CookieValue cookieValue = (CookieValue) paramAnn;
-          cookieName = cookieValue.value();
-          required = cookieValue.required();
-          defaultValue = parseDefaultValueAttribute(cookieValue.defaultValue());
-          annotationsFound++;
-        } else if (PathVariable.class.isInstance(paramAnn)) {
-          PathVariable pathVar = (PathVariable) paramAnn;
-          pathVarName = pathVar.value();
-          annotationsFound++;
-        } else if (ModelAttribute.class.isInstance(paramAnn)) {
-          ModelAttribute attr = (ModelAttribute) paramAnn;
-          attrName = attr.value();
-          annotationsFound++;
-        } else if (Value.class.isInstance(paramAnn)) {
-          defaultValue = ((Value) paramAnn).value();
-        } else if ("Valid".equals(paramAnn.annotationType().getSimpleName())) {
-          validate = true;
-        }
-      }
-
-      if (annotationsFound > 1) {
-        throw new IllegalStateException("Handler parameter annotations are exclusive choices - " +
-            "do not specify more than one such annotation on the same parameter: " + handlerMethod);
-      }
-
-      if (annotationsFound == 0) {
-        Object argValue = resolveCommonArgument(methodParam, webRequest);
-        if (argValue != WebArgumentResolver.UNRESOLVED) {
-          args[i] = argValue;
-        } else if (defaultValue != null) {
-          args[i] = resolveDefaultValue(defaultValue);
-        } else {
-          Class paramType = methodParam.getParameterType();
-          if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
-            args[i] = implicitModel;
-          } else if (SessionStatus.class.isAssignableFrom(paramType)) {
-            args[i] = this.sessionStatus;
-          } else if (HttpEntity.class.isAssignableFrom(paramType)) {
-            args[i] = resolveHttpEntityRequest(methodParam, webRequest);
-          } else if (Errors.class.isAssignableFrom(paramType)) {
-            throw new IllegalStateException("Errors/BindingResult argument declared " +
-                "without preceding model attribute. Check your handler method signature!");
-          } else if (BeanUtils.isSimpleProperty(paramType)) {
-            paramName = "";
-          } else {
-            attrName = "";
-          }
-        }
-      }
-
-      if (paramName != null) {
-        args[i] = resolveRequestParam(paramName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (headerName != null) {
-        args[i] = resolveRequestHeader(headerName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (requestBodyFound) {
-        args[i] = resolveRequestBody(methodParam, webRequest, handler);
-      } else if (cookieName != null) {
-        args[i] = resolveCookieValue(cookieName, required, defaultValue, methodParam, webRequest, handler);
-      } else if (pathVarName != null) {
-        args[i] = resolvePathVariable(pathVarName, methodParam, webRequest, handler);
-      } else if (attrName != null) {
-        WebDataBinder binder =
-            resolveModelAttribute(attrName, methodParam, implicitModel, webRequest, handler);
-        boolean assignBindingResult = (args.length > i + 1 && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-        if (binder.getTarget() != null) {
-          doBind(binder, webRequest, validate, !assignBindingResult);
-        }
-        args[i] = binder.getTarget();
-        if (assignBindingResult) {
-          args[i + 1] = binder.getBindingResult();
-          i++;
-        }
-        implicitModel.putAll(binder.getBindingResult().getModel());
-      }
-    }
-
-    return args;
-  }
-
-  protected void initBinder(Object handler, String attrName, WebDataBinder binder, NativeWebRequest webRequest)
-      throws Exception {
-
-    if (this.bindingInitializer != null) {
-      this.bindingInitializer.initBinder(binder, webRequest);
-    }
-    if (handler != null) {
-      Set<Method> initBinderMethods = this.methodResolver.getInitBinderMethods();
-      if (!initBinderMethods.isEmpty()) {
-        boolean debug = logger.isDebugEnabled();
-        for (Method initBinderMethod : initBinderMethods) {
-          Method methodToInvoke = BridgeMethodResolver.findBridgedMethod(initBinderMethod);
-          String[] targetNames = AnnotationUtils.findAnnotation(initBinderMethod, InitBinder.class).value();
-          if (targetNames.length == 0 || Arrays.asList(targetNames).contains(attrName)) {
-            Object[] initBinderArgs =
-                resolveInitBinderArguments(handler, methodToInvoke, binder, webRequest);
-            if (debug) {
-              logger.debug("Invoking init-binder method: " + methodToInvoke);
-            }
-            ReflectionUtils.makeAccessible(methodToInvoke);
-            Object returnValue = methodToInvoke.invoke(handler, initBinderArgs);
-            if (returnValue != null) {
-              throw new IllegalStateException(
-                  "InitBinder methods must not have a return value: " + methodToInvoke);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod,
-                                              WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-
-    Class[] initBinderParams = initBinderMethod.getParameterTypes();
-    Object[] initBinderArgs = new Object[initBinderParams.length];
-
-    for (int i = 0; i < initBinderArgs.length; i++) {
-      MethodParameter methodParam = new MethodParameter(initBinderMethod, i);
-      methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
-      GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
-      String paramName = null;
-      boolean paramRequired = false;
-      String paramDefaultValue = null;
-      String pathVarName = null;
-      Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
-      for (Annotation paramAnn : paramAnns) {
-        if (RequestParam.class.isInstance(paramAnn)) {
-          RequestParam requestParam = (RequestParam) paramAnn;
-          paramName = requestParam.value();
-          paramRequired = requestParam.required();
-          paramDefaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
-          break;
-        } else if (ModelAttribute.class.isInstance(paramAnn)) {
-          throw new IllegalStateException(
-              "@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
-        } else if (PathVariable.class.isInstance(paramAnn)) {
-          PathVariable pathVar = (PathVariable) paramAnn;
-          pathVarName = pathVar.value();
-        }
-      }
-
-      if (paramName == null && pathVarName == null) {
-        Object argValue = resolveCommonArgument(methodParam, webRequest);
-        if (argValue != WebArgumentResolver.UNRESOLVED) {
-          initBinderArgs[i] = argValue;
-        } else {
-          Class paramType = initBinderParams[i];
-          if (paramType.isInstance(binder)) {
-            initBinderArgs[i] = binder;
-          } else if (BeanUtils.isSimpleProperty(paramType)) {
-            paramName = "";
-          } else {
-            throw new IllegalStateException("Unsupported argument [" + paramType.getName() +
-                "] for @InitBinder method: " + initBinderMethod);
-          }
-        }
-      }
-
-      if (paramName != null) {
-        initBinderArgs[i] =
-            resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
-      } else if (pathVarName != null) {
-        initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
-      }
-    }
-
-    return initBinderArgs;
-  }
-
-  @SuppressWarnings("unchecked")
-  private Object resolveRequestParam(String paramName, boolean required, String defaultValue,
-                                     MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) {
-      return resolveRequestParamMap((Class<? extends Map>) paramType, webRequest);
-    }
-    if (paramName.length() == 0) {
-      paramName = getRequiredParameterName(methodParam);
-    }
-    Object paramValue = null;
-    MultipartRequest multipartRequest = webRequest.getNativeRequest(MultipartRequest.class);
-    if (multipartRequest != null) {
-      List<MultipartFile> files = multipartRequest.getFiles(paramName);
-      if (!files.isEmpty()) {
-        if (files.size() == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-          paramValue = files.get(0);
-        } else {
-          paramValue = files;
-        }
-      }
-    }
-    if (paramValue == null) {
-      String[] paramValues = webRequest.getParameterValues(paramName);
-      if (paramValues != null) {
-        if (paramValues.length == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
-          paramValue = paramValues[0];
-        } else {
-          paramValue = paramValues;
-        }
-      }
-    }
-    if (paramValue == null) {
-      if (defaultValue != null) {
-        paramValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingParameterException(paramName, paramType);
-      }
-      paramValue = checkValue(paramName, paramValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, paramName);
-    initBinder(handlerForInitBinderCall, paramName, binder, webRequest);
-    return binder.convertIfNecessary(paramValue, paramType, methodParam);
-  }
-
-  private Map resolveRequestParamMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-    Map<String, String[]> parameterMap = webRequest.getParameterMap();
-    if (MultiValueMap.class.isAssignableFrom(mapType)) {
-      MultiValueMap<String, String> result = new LinkedMultiValueMap<String, String>(parameterMap.size());
-      for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-        for (String value : entry.getValue()) {
-          result.add(entry.getKey(), value);
-        }
-      }
-      return result;
-    } else {
-      Map<String, String> result = new LinkedHashMap<String, String>(parameterMap.size());
-      for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
-        if (entry.getValue().length > 0) {
-          result.put(entry.getKey(), entry.getValue()[0]);
-        }
-      }
-      return result;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private Object resolveRequestHeader(String headerName, boolean required, String defaultValue,
-                                      MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (Map.class.isAssignableFrom(paramType)) {
-      return resolveRequestHeaderMap((Class<? extends Map>) paramType, webRequest);
-    }
-    if (headerName.length() == 0) {
-      headerName = getRequiredParameterName(methodParam);
-    }
-    Object headerValue = null;
-    String[] headerValues = webRequest.getHeaderValues(headerName);
-    if (headerValues != null) {
-      headerValue = (headerValues.length == 1 ? headerValues[0] : headerValues);
-    }
-    if (headerValue == null) {
-      if (defaultValue != null) {
-        headerValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingHeaderException(headerName, paramType);
-      }
-      headerValue = checkValue(headerName, headerValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, headerName);
-    initBinder(handlerForInitBinderCall, headerName, binder, webRequest);
-    return binder.convertIfNecessary(headerValue, paramType, methodParam);
-  }
-
-  private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-    if (MultiValueMap.class.isAssignableFrom(mapType)) {
-      MultiValueMap<String, String> result;
-      if (HttpHeaders.class.isAssignableFrom(mapType)) {
-        result = new HttpHeaders();
-      } else {
-        result = new LinkedMultiValueMap<String, String>();
-      }
-      for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-        String headerName = iterator.next();
-        for (String headerValue : webRequest.getHeaderValues(headerName)) {
-          result.add(headerName, headerValue);
-        }
-      }
-      return result;
-    } else {
-      Map<String, String> result = new LinkedHashMap<String, String>();
-      for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
-        String headerName = iterator.next();
-        String headerValue = webRequest.getHeader(headerName);
-        result.put(headerName, headerValue);
-      }
-      return result;
-    }
-  }
-
-  /**
-   * Resolves the given {@link RequestBody @RequestBody} annotation.
-   */
-  protected Object resolveRequestBody(MethodParameter methodParam, NativeWebRequest webRequest, Object handler)
-      throws Exception {
-
-    return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType());
-  }
-
-  private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest)
-      throws Exception {
-
-    HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
-    Class<?> paramType = getHttpEntityType(methodParam);
-    Object body = readWithMessageConverters(methodParam, inputMessage, paramType);
-    return new HttpEntity<Object>(body, inputMessage.getHeaders());
-  }
-
-  private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType)
-      throws Exception {
-
-    MediaType contentType = inputMessage.getHeaders().getContentType();
-    if (contentType == null) {
-      StringBuilder builder = new StringBuilder(ClassUtils.getShortName(methodParam.getParameterType()));
-      String paramName = methodParam.getParameterName();
-      if (paramName != null) {
-        builder.append(' ');
-        builder.append(paramName);
-      }
-      throw new HttpMediaTypeNotSupportedException(
-          "Cannot extract parameter (" + builder.toString() + "): no Content-Type found");
-    }
-
-    List<MediaType> allSupportedMediaTypes = new ArrayList<MediaType>();
-    if (this.messageConverters != null) {
-      for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
-        allSupportedMediaTypes.addAll(messageConverter.getSupportedMediaTypes());
-        if (messageConverter.canRead(paramType, contentType)) {
-          if (logger.isDebugEnabled()) {
-            logger.debug("Reading [" + paramType.getName() + "] as \"" + contentType
-                + "\" using [" + messageConverter + "]");
-          }
-          return messageConverter.read(paramType, inputMessage);
-        }
-      }
-    }
-    throw new HttpMediaTypeNotSupportedException(contentType, allSupportedMediaTypes);
-  }
-
-  private Class<?> getHttpEntityType(MethodParameter methodParam) {
-    Assert.isAssignable(HttpEntity.class, methodParam.getParameterType());
-    ParameterizedType type = (ParameterizedType) methodParam.getGenericParameterType();
-    if (type.getActualTypeArguments().length == 1) {
-      Type typeArgument = type.getActualTypeArguments()[0];
-      if (typeArgument instanceof Class) {
-        return (Class<?>) typeArgument;
-      } else if (typeArgument instanceof GenericArrayType) {
-        Type componentType = ((GenericArrayType) typeArgument).getGenericComponentType();
-        if (componentType instanceof Class) {
-          // Surely, there should be a nicer way to do this
-          Object array = Array.newInstance((Class<?>) componentType, 0);
-          return array.getClass();
-        }
-      }
-    }
-    throw new IllegalArgumentException(
-        "HttpEntity parameter (" + methodParam.getParameterName() + ") is not parameterized");
-
-  }
-
-  private Object resolveCookieValue(String cookieName, boolean required, String defaultValue,
-                                    MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
-      throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (cookieName.length() == 0) {
-      cookieName = getRequiredParameterName(methodParam);
-    }
-    Object cookieValue = resolveCookieValue(cookieName, paramType, webRequest);
-    if (cookieValue == null) {
-      if (defaultValue != null) {
-        cookieValue = resolveDefaultValue(defaultValue);
-      } else if (required) {
-        raiseMissingCookieException(cookieName, paramType);
-      }
-      cookieValue = checkValue(cookieName, cookieValue, paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, null, cookieName);
-    initBinder(handlerForInitBinderCall, cookieName, binder, webRequest);
-    return binder.convertIfNecessary(cookieValue, paramType, methodParam);
-  }
-
-  /**
-   * Resolves the given {@link CookieValue @CookieValue} annotation.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest)
-      throws Exception {
-
-    throw new UnsupportedOperationException("@CookieValue not supported");
-  }
-
-  private Object resolvePathVariable(String pathVarName, MethodParameter methodParam,
-                                     NativeWebRequest webRequest, Object handlerForInitBinderCall) throws Exception {
-
-    Class<?> paramType = methodParam.getParameterType();
-    if (pathVarName.length() == 0) {
-      pathVarName = getRequiredParameterName(methodParam);
-    }
-    String pathVarValue = resolvePathVariable(pathVarName, paramType, webRequest);
-    WebDataBinder binder = createBinder(webRequest, null, pathVarName);
-    initBinder(handlerForInitBinderCall, pathVarName, binder, webRequest);
-    return binder.convertIfNecessary(pathVarValue, paramType, methodParam);
-  }
-
-  /**
-   * Resolves the given {@link PathVariable @PathVariable} annotation.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest)
-      throws Exception {
-
-    throw new UnsupportedOperationException("@PathVariable not supported");
-  }
-
-  private String getRequiredParameterName(MethodParameter methodParam) {
-    String name = methodParam.getParameterName();
-    if (name == null) {
-      throw new IllegalStateException(
-          "No parameter name specified for argument of type [" + methodParam.getParameterType().getName() +
-              "], and no parameter name information found in class file either.");
-    }
-    return name;
-  }
-
-  private Object checkValue(String name, Object value, Class paramType) {
-    if (value == null) {
-      if (boolean.class.equals(paramType)) {
-        return Boolean.FALSE;
-      } else if (paramType.isPrimitive()) {
-        throw new IllegalStateException("Optional " + paramType + " parameter '" + name +
-            "' is not present but cannot be translated into a null value due to being declared as a " +
-            "primitive type. Consider declaring it as object wrapper for the corresponding primitive type.");
-      }
-    }
-    return value;
-  }
-
-  private WebDataBinder resolveModelAttribute(String attrName, MethodParameter methodParam,
-                                              ExtendedModelMap implicitModel, NativeWebRequest webRequest, Object handler) throws Exception {
-
-    // Bind request parameter onto object...
-    String name = attrName;
-    if ("".equals(name)) {
-      name = Conventions.getVariableNameForParameter(methodParam);
-    }
-    Class<?> paramType = methodParam.getParameterType();
-    Object bindObject;
-    if (implicitModel.containsKey(name)) {
-      bindObject = implicitModel.get(name);
-    } else if (this.methodResolver.isSessionAttribute(name, paramType)) {
-      bindObject = this.sessionAttributeStore.retrieveAttribute(webRequest, name);
-      if (bindObject == null) {
-        raiseSessionRequiredException("Session attribute '" + name + "' required - not found in session");
-      }
-    } else {
-      bindObject = BeanUtils.instantiateClass(paramType);
-    }
-    WebDataBinder binder = createBinder(webRequest, bindObject, name);
-    initBinder(handler, name, binder, webRequest);
-    return binder;
-  }
-
-
-  /**
-   * Determine whether the given value qualifies as a "binding candidate", i.e. might potentially be subject to
-   * bean-style data binding later on.
-   */
-  protected boolean isBindingCandidate(Object value) {
-    return (value != null && !value.getClass().isArray() && !(value instanceof Collection) &&
-        !(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass()));
-  }
-
-  protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception {
-    throw new IllegalStateException("Missing parameter '" + paramName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception {
-    throw new IllegalStateException("Missing header '" + headerName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception {
-    throw new IllegalStateException(
-        "Missing cookie value '" + cookieName + "' of type [" + paramType.getName() + "]");
-  }
-
-  protected void raiseSessionRequiredException(String message) throws Exception {
-    throw new IllegalStateException(message);
-  }
-
-  protected WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
-      throws Exception {
-
-    return new WebRequestDataBinder(target, objectName);
-  }
-
-  private void doBind(WebDataBinder binder, NativeWebRequest webRequest, boolean validate, boolean failOnErrors)
-      throws Exception {
-
-    doBind(binder, webRequest);
-    if (validate) {
-      binder.validate();
-    }
-    if (failOnErrors && binder.getBindingResult().hasErrors()) {
-      throw new BindException(binder.getBindingResult());
-    }
-  }
-
-  protected void doBind(WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-    ((WebRequestDataBinder) binder).bind(webRequest);
-  }
-
-  /**
-   * Return a {@link HttpInputMessage} for the given {@link NativeWebRequest}.
-   * <p>Throws an UnsupportedOperation1Exception by default.
-   */
-  protected HttpInputMessage createHttpInputMessage(NativeWebRequest webRequest) throws Exception {
-    throw new UnsupportedOperationException("@RequestBody not supported");
-  }
-
-  /**
-   * Return a {@link HttpOutputMessage} for the given {@link NativeWebRequest}.
-   * <p>Throws an UnsupportedOperationException by default.
-   */
-  protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception {
-    throw new UnsupportedOperationException("@ResponseBody not supported");
-  }
-
-  protected String parseDefaultValueAttribute(String value) {
-    return (ValueConstants.DEFAULT_NONE.equals(value) ? null : value);
-  }
-
-  protected Object resolveDefaultValue(String value) {
-    return value;
-  }
-
-  protected Object resolveCommonArgument(MethodParameter methodParameter, NativeWebRequest webRequest)
-      throws Exception {
-
-    // Invoke custom argument resolvers if present...
-    if (this.customArgumentResolvers != null) {
-      for (WebArgumentResolver argumentResolver : this.customArgumentResolvers) {
-        Object value = argumentResolver.resolveArgument(methodParameter, webRequest);
-        if (value != WebArgumentResolver.UNRESOLVED) {
-          return value;
-        }
-      }
-    }
-
-    // Resolution of standard parameter types...
-    Class paramType = methodParameter.getParameterType();
-    Object value = resolveStandardArgument(paramType, webRequest);
-    if (value != WebArgumentResolver.UNRESOLVED && !ClassUtils.isAssignableValue(paramType, value)) {
-      throw new IllegalStateException("Standard argument type [" + paramType.getName() +
-          "] resolved to incompatible value of type [" + (value != null ? value.getClass() : null) +
-          "]. Consider declaring the argument type in a less specific fashion.");
-    }
-    return value;
-  }
-
-  protected Object resolveStandardArgument(Class<?> parameterType, NativeWebRequest webRequest) throws Exception {
-    if (WebRequest.class.isAssignableFrom(parameterType)) {
-      return webRequest;
-    }
-    return WebArgumentResolver.UNRESOLVED;
-  }
-
-  protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType,
-                                                      Object returnValue, ExtendedModelMap implicitModel) {
-
-    ModelAttribute attr = AnnotationUtils.findAnnotation(handlerMethod, ModelAttribute.class);
-    String attrName = (attr != null ? attr.value() : "");
-    if ("".equals(attrName)) {
-      Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType);
-      attrName = Conventions.getVariableNameForReturnType(handlerMethod, resolvedType, returnValue);
-    }
-    implicitModel.addAttribute(attrName, returnValue);
-  }
-
-}

spring-data-document-core/template.mf

@@ -1,38 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.document
-Bundle-Name: Spring Data Document
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
-Import-Template: 
- javax.servlet;version="[2.4.0, 4.0.0)",
- javax.servlet.http;version="[2.4.0, 4.0.0)",
- org.springframework.http.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.converter.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.server*;version="[3.0.0, 4.0.0)",
- org.springframework.ui.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.context.request.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.common.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.spel.standard.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.spel.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.w3c.dom.*;version="0",
- javax.persistence.*;version="[1.0, 2.0)"
-
-

spring-data-document-parent/pom.xml

@@ -6,7 +6,7 @@
   <artifactId>spring-data-document-parent</artifactId>
   <name>Spring Data Document Parent</name>
   <url>http://www.springsource.org/spring-data/data-document</url>
-  <version>1.0.0.M2</version>
+  <version>1.0.0.M4</version>
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,8 +16,8 @@
     <org.mockito.version>1.8.4</org.mockito.version>
     <org.slf4j.version>1.5.10</org.slf4j.version>
     <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
-    <data.commons.version>1.0.0.RC1</data.commons.version>
+    <org.springframework.version>3.0.6.RELEASE</org.springframework.version>
+    <data.commons.version>1.2.0.M1</data.commons.version>
     <aspectj.version>1.6.11.RELEASE</aspectj.version>
   </properties>
   <profiles>
@@ -142,11 +142,6 @@
         <artifactId>spring-data-commons-aspects</artifactId>
         <version>${data.commons.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-document-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-couchdb</artifactId>
@@ -297,7 +292,7 @@
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
-          <compilerArgument>-Xlint:all</compilerArgument>
+          <compilerArgument>-Xlint:-path</compilerArgument>
           <showWarnings>true</showWarnings>
           <showDeprecation>false</showDeprecation>
         </configuration>
@@ -377,6 +372,11 @@
       <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://maven.springframework.org/release</url>
+    </pluginRepository>
   </pluginRepositories>
   <repositories>
     <repository>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-document-parent</artifactId>
-    <version>1.0.0.M2</version>
+    <version>1.0.0.M4</version>
     <relativePath>../spring-data-document-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-cross-store</artifactId>
@@ -158,14 +158,6 @@
       <name>JBoss Public Repository</name>
       <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
     </repository>
-    <repository>
-      <id>spring-maven-snapshot</id>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <name>Springframework Maven SNAPSHOT Repository</name>
-      <url>http://maven.springframework.org/snapshot</url>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -173,6 +165,11 @@
       <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>

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/RelatedDocument.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.annotation;
+package org.springframework.data.persistence.document;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -29,7 +29,4 @@ import java.lang.annotation.Target;
     ElementType.FIELD
 })
 public @interface RelatedDocument {
-
-  String collection() default "";
-
 }

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java

@@ -1,4 +1,4 @@
-package org.springframework.data.persistence.document.mongo;
+package org.springframework.data.persistence.document.mongodb;
 
 import javax.persistence.EntityManagerFactory;
 
@@ -11,8 +11,8 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.document.mongodb.CollectionCallback;
-import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.persistence.ChangeSet;
 import org.springframework.data.persistence.ChangeSetBacked;
 import org.springframework.data.persistence.ChangeSetPersister;

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj

@@ -1,7 +1,6 @@
-package org.springframework.data.persistence.document.mongo;
+package org.springframework.data.persistence.document.mongodb;
 
 import java.lang.reflect.Field;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Transient;
@@ -13,12 +12,11 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.reflect.FieldSignature;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.annotation.RelatedDocument;
+import org.springframework.data.persistence.document.RelatedDocument;
 
 import org.springframework.data.persistence.document.DocumentBacked;
 import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
 import org.springframework.data.persistence.ChangeSet;
-import org.springframework.data.persistence.ChangeSetBacked;
 import org.springframework.data.persistence.ChangeSetPersister;
 import org.springframework.data.persistence.ChangeSetPersister.NotFoundException;
 import org.springframework.data.persistence.HashMapChangeSet;

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java

@@ -7,10 +7,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.document.mongodb.MongoTemplate;
 import org.springframework.data.document.persistence.test.Address;
 import org.springframework.data.document.persistence.test.Person;
 import org.springframework.data.document.persistence.test.Resume;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java

@@ -3,7 +3,7 @@ package org.springframework.data.document.persistence.test;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.springframework.data.document.annotation.RelatedDocument;
+import org.springframework.data.persistence.document.RelatedDocument;
 
 @Entity
 public class Person {

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java

@@ -4,7 +4,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.document.mongodb.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Document
 public class Resume {

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -20,27 +20,30 @@
   <mongo:mapping-converter/>
   
   <!--  Mongo config -->
-  <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
+  <bean id="mongo" class="org.springframework.data.mongodb.core.MongoFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>
 
-  <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg name="mongo" ref="mongo"/>
-    <constructor-arg name="databaseName" value="test"/>
-    <constructor-arg name="defaultCollectionName" value="cross-store"/>
+  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
-  <bean class="org.springframework.data.document.mongodb.MongoExceptionTranslator"/>
+  <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
 
   <!--  Mongo aspect config -->
-  <bean class="org.springframework.data.persistence.document.mongo.MongoDocumentBacking"
+  <bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"
         factory-method="aspectOf">
     <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
   </bean>
   <bean id="mongoChangeSetPersister" 
-      class="org.springframework.data.persistence.document.mongo.MongoChangeSetPersister">
+      class="org.springframework.data.persistence.document.mongodb.MongoChangeSetPersister">
     <property name="mongoTemplate" ref="mongoTemplate"/>
     <property name="entityManagerFactory" ref="entityManagerFactory"/>
   </bean>

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-document-parent</artifactId>
-    <version>1.0.0.M2</version>
+    <version>1.0.0.M4</version>
     <relativePath>../spring-data-document-parent/pom.xml</relativePath>
   </parent>
   <artifactId>spring-data-mongodb-log4j</artifactId>

spring-data-mongodb/Spring Data MongoDB.sonargraph

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<context version="7.0.3.1152">
+    <scope name="spring-data-mongodb" type="Project">
+        <element name="Filter" type="TypeFilterReferenceOverridden">
+            <element name="org.springframework.data.mongodb.**" type="IncludeTypePattern"/>
+        </element>
+        <architecture>
+            <element name="Config" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.config.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Monitoring"/>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Repositories"/>
+            </element>
+            <element name="Repositories" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.repository.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
+            <element name="Monitoring" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.monitor.**" type="IncludeTypePattern"/>
+                </element>
+                <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core"/>
+            </element>
+            <element name="Core" type="Layer">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="**.core.**" type="IncludeTypePattern"/>
+                </element>
+                <element name="Mapping" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.mapping.**" type="IncludeTypePattern"/>
+                    </element>
+                </element>
+                <element name="Geospatial" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.geo.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                </element>
+                <element name="Query" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.query.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                </element>
+                <element name="Index" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.index.**" type="IncludeTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                </element>
+                <element name="Core" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.core.**" type="WeakTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Geospatial"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Index"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Mapping"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-mongodb::Layer|Core::Subsystem|Query"/>
+                </element>
+            </element>
+        </architecture>
+        <workspace>
+            <element name="src/main/java" type="JavaRootDirectory">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+            <element name="target/classes" type="JavaRootDirectory">
+                <reference name="Project|spring-data-mongodb::BuildUnit|spring-data-mongodb"/>
+            </element>
+        </workspace>
+        <physical>
+            <element name="spring-data-mongodb" type="BuildUnit"/>
+        </physical>
+    </scope>
+    <scope name="External" type="External">
+        <element name="Filter" type="TypeFilter">
+            <element name="**" type="IncludeTypePattern"/>
+            <element name="java.**" type="ExcludeTypePattern"/>
+            <element name="javax.**" type="ExcludeTypePattern"/>
+        </element>
+        <architecture>
+            <element name="Spring" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.springframework.**" type="IncludeTypePattern"/>
+                    <element name="org.springframework.data.**" type="ExcludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Spring Data Core" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="org.springframework.data.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Mongo Java Driver" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="com.mongodb.**" type="IncludeTypePattern"/>
+                    <element name="org.bson.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+            <element name="Querydsl" type="Subsystem">
+                <element name="Assignment" type="TypeFilter">
+                    <element name="com.mysema.query.**" type="IncludeTypePattern"/>
+                </element>
+            </element>
+        </architecture>
+    </scope>
+    <scope name="Global" type="Global">
+        <element name="Configuration" type="Configuration"/>
+        <element name="Filter" type="TypeFilter">
+            <element name="**" type="IncludeTypePattern"/>
+        </element>
+    </scope>
+</context>

spring-data-mongodb/etc/eclipse-formatter.xml

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="Spring Data" version="12">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>

spring-data-mongodb/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-document-parent</artifactId>
-		<version>1.0.0.M2</version>
+		<version>1.0.0.M4</version>
 		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
@@ -13,7 +13,8 @@
 	<name>Spring Data MongoDB Support</name>
 
 	<properties>
-		<mongo.version>2.4</mongo.version>
+		<mongo.version>2.6.5</mongo.version>
+		<querydsl.version>2.2.0</querydsl.version>
 	</properties>
 
 	<dependencies>
@@ -23,10 +24,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
@@ -38,11 +35,6 @@
 		</dependency>
 
 		<!--  Spring Data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-document-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons-core</artifactId>
@@ -65,7 +57,7 @@
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>2.1.1</version>
+			<version>${querydsl.version}</version>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
@@ -78,7 +70,7 @@
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>2.1.1</version>
+			<version>${querydsl.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -88,20 +80,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<!--
-				<dependency>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-					<version>1.0</version>
-				</dependency>
-				-->
-
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -161,7 +139,7 @@
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0</version>
+				<version>1.0.2</version>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>
@@ -169,8 +147,8 @@
 							<goal>test-process</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>target/generated-sources/test-annotations</outputDirectory>
-							<processor>org.springframework.data.document.mongodb.repository.MongoAnnotationProcessor</processor>
+							<outputDirectory>target/generated-test-sources</outputDirectory>
+							<processor>org.springframework.data.mongodb.repository.MongoAnnotationProcessor</processor>
 						</configuration>
 					</execution>
 				</executions>

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-/**
- * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
- *
- * @author Thomas Risberg
- */
-public class CollectionOptions {
-
-  private Integer maxDocuments;
-
-  private Integer size;
-
-  private Boolean capped;
-
-  /**
-   * Constructs a new <code>CollectionOptions</code> instance.
-   *
-   * @param size         the collection size in bytes, this data space is preallocated
-   * @param maxDocuments the maximum number of documents in the collection.
-   * @param capped       true to created a "capped" collection (fixed size with auto-FIFO behavior
-   *                     based on insertion order), false otherwise.
-   */
-  public CollectionOptions(Integer size, Integer maxDocuments, Boolean capped) {
-    super();
-    this.maxDocuments = maxDocuments;
-    this.size = size;
-    this.capped = capped;
-  }
-
-  public Integer getMaxDocuments() {
-    return maxDocuments;
-  }
-
-  public void setMaxDocuments(Integer maxDocuments) {
-    this.maxDocuments = maxDocuments;
-  }
-
-  public Integer getSize() {
-    return size;
-  }
-
-  public void setSize(Integer size) {
-    this.size = size;
-  }
-
-  public Boolean getCapped() {
-    return capped;
-  }
-
-  public void setCapped(Boolean capped) {
-    this.capped = capped;
-  }
-
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbHolder.java

@@ -1,70 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.mongodb.DB;
-import org.springframework.transaction.support.ResourceHolderSupport;
-import org.springframework.util.Assert;
-
-class DbHolder extends ResourceHolderSupport {
-  private static final Object DEFAULT_KEY = new Object();
-
-  private final Map<Object, DB> dbMap = new ConcurrentHashMap<Object, DB>();
-
-
-  public DbHolder(DB db) {
-    addDB(db);
-  }
-
-  public DbHolder(Object key, DB db) {
-    addDB(key, db);
-  }
-
-
-  public DB getDB() {
-    return getDB(DEFAULT_KEY);
-  }
-
-  public DB getDB(Object key) {
-    return this.dbMap.get(key);
-  }
-
-
-  public DB getAnyDB() {
-    if (!this.dbMap.isEmpty()) {
-      return this.dbMap.values().iterator().next();
-    }
-    return null;
-  }
-
-  public void addDB(DB session) {
-    addDB(DEFAULT_KEY, session);
-  }
-
-  public void addDB(Object key, DB session) {
-    Assert.notNull(key, "Key must not be null");
-    Assert.notNull(session, "DB must not be null");
-    this.dbMap.put(key, session);
-  }
-
-  public DB removeDB(Object key) {
-    return this.dbMap.remove(key);
-  }
-
-  public boolean containsDB(DB session) {
-    return this.dbMap.containsValue(session);
-  }
-
-  public boolean isEmpty() {
-    return this.dbMap.isEmpty();
-  }
-
-  public boolean doesNotHoldNonDefaultDB() {
-    synchronized (this.dbMap) {
-      return this.dbMap.isEmpty() ||
-          (this.dbMap.size() == 1 && this.dbMap.containsKey(DEFAULT_KEY));
-    }
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdmin.java

@@ -1,94 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb;
-
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-
-/**
- * Mongo server administration exposed via JMX annotations
- *
- * @author Mark Pollack
- */
-
-@ManagedResource(description = "Mongo Admin Operations")
-public class MongoAdmin implements MongoAdminOperations {
-
-  /**
-   * Logger available to subclasses
-   */
-  protected final Log logger = LogFactory.getLog(getClass());
-
-  private Mongo mongo;
-  private String username;
-  private String password;
-
-  public MongoAdmin(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.document.mongodb.MongoAdminOperations#dropDatabase(java.lang.String)
-    */
-  @ManagedOperation
-  public void dropDatabase(String databaseName) {
-    getDB(databaseName).dropDatabase();
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.document.mongodb.MongoAdminOperations#createDatabase(java.lang.String)
-    */
-  @ManagedOperation
-  public void createDatabase(String databaseName) {
-    getDB(databaseName);
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.document.mongodb.MongoAdminOperations#getDatabaseStats(java.lang.String)
-    */
-  @ManagedOperation
-  public String getDatabaseStats(String databaseName) {
-    return getDB(databaseName).getStats().toString();
-  }
-
-  /**
-   * Sets the username to use to connect to the Mongo database
-   *
-   * @param username The username to use
-   */
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  /**
-   * Sets the password to use to authenticate with the Mongo database.
-   *
-   * @param password The password to use
-   */
-  public void setPassword(String password) {
-
-    this.password = password;
-  }
-
-
-  DB getDB(String databaseName) {
-    return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdminOperations.java

@@ -1,16 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-import org.springframework.jmx.export.annotation.ManagedOperation;
-
-public interface MongoAdminOperations {
-
-  @ManagedOperation
-  public abstract void dropDatabase(String databaseName);
-
-  @ManagedOperation
-  public abstract void createDatabase(String databaseName);
-
-  @ManagedOperation
-  public abstract String getDatabaseStats(String databaseName);
-
-}

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

@@ -1,168 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-import com.mongodb.CommandResult;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes.
- * <p/>
- * <p>Mainly intended for internal use within the framework.
- *
- * @author Thomas Risberg
- * @author Graeme Rocher
- * @author Oliver Gierke
- * @since 1.0
- */
-public abstract class MongoDbUtils {
-
-  private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
-
-  /**
-   * Private constructor to prevent instantiation.
-   */
-  private MongoDbUtils() {
-
-  }
-
-  /**
-   * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
-   *
-   * @param mongo        The {@link Mongo} instance
-   * @param databaseName The database name
-   * @return The {@link DB} connection
-   */
-  public static DB getDB(Mongo mongo, String databaseName) {
-    return doGetDB(mongo, databaseName, null, null, true);
-  }
-
-  /**
-   * Obtains a {@link DB} connection for the given {@link Mongo} instance and database name
-   *
-   * @param mongo        The {@link Mongo} instance
-   * @param databaseName The database name
-   * @param username     The username to authenticate with
-   * @param password     The password to authenticate with
-   * @return The {@link DB} connection
-   */
-  public static DB getDB(Mongo mongo, String databaseName, String username, char[] password) {
-    return doGetDB(mongo, databaseName, username, password, true);
-  }
-
-  public static DB doGetDB(Mongo mongo, String databaseName, String username, char[] password, boolean allowCreate) {
-    Assert.notNull(mongo, "No Mongo instance specified");
-
-    DbHolder dbHolder = (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-    if (dbHolder != null && !dbHolder.isEmpty()) {
-      // pre-bound Mongo DB
-      DB db = null;
-      if (TransactionSynchronizationManager.isSynchronizationActive() &&
-          dbHolder.doesNotHoldNonDefaultDB()) {
-        // Spring transaction management is active ->
-        db = dbHolder.getDB();
-        if (db != null && !dbHolder.isSynchronizedWithTransaction()) {
-          LOGGER.debug("Registering Spring transaction synchronization for existing Mongo DB");
-          TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
-          dbHolder.setSynchronizedWithTransaction(true);
-        }
-      }
-      if (db != null) {
-        return db;
-      }
-    }
-
-    LOGGER.trace("Getting Mongo Database name=["+databaseName+"]");
-    DB db = mongo.getDB(databaseName);
-    
-    boolean credentialsGiven = username != null && password != null;
-    if (credentialsGiven && !db.isAuthenticated()) {
-      //Note, can only authenticate once against the same com.mongodb.DB object.
-      if (!db.authenticate(username, password)) {            
-        throw new CannotGetMongoDbConnectionException("Failed to authenticate to database [" + databaseName + 
-            "], username = [" + username + "], password = [" + new String(password) + "]", databaseName, username, password );
-      }
-    }
-
-    // Use same Session for further Mongo actions within the transaction.
-    // Thread object will get removed by synchronization at transaction completion.
-    if (TransactionSynchronizationManager.isSynchronizationActive()) {
-      // We're within a Spring-managed transaction, possibly from JtaTransactionManager.
-      LOGGER.debug("Registering Spring transaction synchronization for new Hibernate Session");
-      DbHolder holderToUse = dbHolder;
-      if (holderToUse == null) {
-        holderToUse = new DbHolder(db);
-      } else {
-        holderToUse.addDB(db);
-      }
-      TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(holderToUse, mongo));
-      holderToUse.setSynchronizedWithTransaction(true);
-      if (holderToUse != dbHolder) {
-        TransactionSynchronizationManager.bindResource(mongo, holderToUse);
-      }
-    }
-
-    // Check whether we are allowed to return the DB.
-    if (!allowCreate && !isDBTransactional(db, mongo)) {
-      throw new IllegalStateException("No Mongo DB bound to thread, " +
-          "and configuration does not allow creation of non-transactional one here");
-    }
-
-    return db;
-  }
-
-
-  /**
-   * Return whether the given DB instance is transactional, that is,
-   * bound to the current thread by Spring's transaction facilities.
-   *
-   * @param db    the DB to check
-   * @param mongo the Mongo instance that the DB was created with
-   *              (may be <code>null</code>)
-   * @return whether the DB is transactional
-   */
-  public static boolean isDBTransactional(DB db, Mongo mongo) {
-    if (mongo == null) {
-      return false;
-    }
-    DbHolder dbHolder =
-        (DbHolder) TransactionSynchronizationManager.getResource(mongo);
-    return (dbHolder != null && dbHolder.containsDB(db));
-  }
-
-  /**
-   * Perform actual closing of the Mongo DB object,
-   * catching and logging any cleanup exceptions thrown.
-   *
-   * @param db the DB to close (may be <code>null</code>)
-   */
-  public static void closeDB(DB db) {
-    if (db != null) {
-      LOGGER.debug("Closing Mongo DB object");
-      try {
-        db.requestDone();
-      } catch (Throwable ex) {
-        LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
-      }
-    }
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java

@@ -1,84 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-import com.mongodb.MongoException;
-import com.mongodb.MongoException.CursorNotFound;
-import com.mongodb.MongoException.DuplicateKey;
-import com.mongodb.MongoException.Network;
-import com.mongodb.MongoInternalException;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.document.UncategorizedDocumentStoreException;
-
-/**
- * Simple {@link PersistenceExceptionTranslator} for Mongo. Convert the given runtime exception to an appropriate
- * exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
- * appropriate: any other exception may have resulted from user code, and should not be translated.
- *
- * @param ex runtime exception that occurred
- * @author Oliver Gierke
- * @return the corresponding DataAccessException instance, or {@literal null} if the exception should not be translated
- */
-public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.dao.support.PersistenceExceptionTranslator#
-    * translateExceptionIfPossible(java.lang.RuntimeException)
-    */
-  public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-
-    // Check for well-known MongoException subclasses.
-
-    // All other MongoExceptions
-    if (ex instanceof DuplicateKey) {
-      return new DuplicateKeyException(ex.getMessage(), ex);
-    }
-    if (ex instanceof Network) {
-      return new DataAccessResourceFailureException(ex.getMessage(), ex);
-    }
-    if (ex instanceof CursorNotFound) {
-      return new DataAccessResourceFailureException(ex.getMessage(), ex);
-    }
-    if (ex instanceof MongoException) {
-      int code = ((MongoException)ex).getCode();
-      if (code == 11000 || code == 11001) {
-        throw new DuplicateKeyException(ex.getMessage(), ex);
-      } else if (code == 12000 || code == 13440) {
-        throw new DataAccessResourceFailureException(ex.getMessage(), ex);
-      } else if (code == 10003 || code == 12001 || code == 12010 || code == 12011 || code == 12012 ) {
-        throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-      } 
-      return new UncategorizedDocumentStoreException(ex.getMessage(), ex);
-    }
-    if (ex instanceof MongoInternalException) {
-      return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex);
-    }
-
-    // If we get here, we have an exception that resulted from user code,
-    // rather than the persistence provider, so we return null to indicate
-    // that translation should not occur.
-    return null;
-  }
-}

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

@@ -1,131 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-import java.util.List;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoOptions;
-import com.mongodb.ServerAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.util.Assert;
-
-/**
- * Convenient factory for configuring MongoDB.
- *
- * @author Thomas Risberg
- * @author Graeme Rocher
- * @since 1.0
- */
-public class MongoFactoryBean implements FactoryBean<Mongo>, InitializingBean, PersistenceExceptionTranslator {
-
-
-  /**
-   * Logger, available to subclasses.
-   */
-  protected final Log logger = LogFactory.getLog(getClass());
-
-  private Mongo mongo;
-  private MongoOptions mongoOptions;
-  private String host;
-  private Integer port;
-  private List<ServerAddress> replicaSetSeeds;
-  private List<ServerAddress> replicaPair;
-
-  private PersistenceExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-
-  public void setMongoOptions(MongoOptions mongoOptions) {
-    this.mongoOptions = mongoOptions;
-  }
-
-  public void setReplicaSetSeeds(List<ServerAddress> replicaSetSeeds) {
-    this.replicaSetSeeds = replicaSetSeeds;
-  }
-
-  public void setReplicaPair(List<ServerAddress> replicaPair) {
-    this.replicaPair = replicaPair;
-  }
-
-  public void setHost(String host) {
-    this.host = host;
-  }
-
-  public void setPort(int port) {
-    this.port = port;
-  }
-
-  public PersistenceExceptionTranslator getExceptionTranslator() {
-    return exceptionTranslator;
-  }
-
-  public void setExceptionTranslator(
-      PersistenceExceptionTranslator exceptionTranslator) {
-    this.exceptionTranslator = exceptionTranslator;
-  }
-
-  public Mongo getObject() throws Exception {
-    Assert.notNull(mongo, "Mongo must not be null");
-    return mongo;
-  }
-
-  public Class<? extends Mongo> getObjectType() {
-    return Mongo.class;
-  }
-
-  public boolean isSingleton() {
-    return false;
-  }
-
-  public void afterPropertiesSet() throws Exception {
-    // apply defaults - convenient when used to configure for tests
-    // in an application context
-    if (mongo == null) {
-
-      if (host == null) {
-        logger.warn("Property host not specified. Using default configuration");
-        mongo = new Mongo();
-      } else {
-        ServerAddress defaultOptions = new ServerAddress();
-        if (mongoOptions == null) mongoOptions = new MongoOptions();
-        if (replicaPair != null) {
-          if (replicaPair.size() < 2) {
-            throw new CannotGetMongoDbConnectionException("A replica pair must have two server entries");
-          }
-          mongo = new Mongo(replicaPair.get(0), replicaPair.get(1), mongoOptions);
-        } else if (replicaSetSeeds != null) {
-          mongo = new Mongo(replicaSetSeeds, mongoOptions);
-        } else {
-          String mongoHost = host != null ? host : defaultOptions.getHost();
-          if (port != null) {
-            mongo = new Mongo(new ServerAddress(mongoHost, port), mongoOptions);
-          } else {
-            mongo = new Mongo(mongoHost, mongoOptions);
-          }
-        }
-      }
-    }
-  }
-
-  public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-    return exceptionTranslator.translateExceptionIfPossible(ex);
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java

@@ -1,735 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-import java.util.List;
-import java.util.Set;
-
-import com.mongodb.CommandResult;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.WriteResult;
-
-import org.bson.types.ObjectId;
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.Update;
-
-/**
- * Interface that specifies a basic set of MongoDB operations.  Implemented by {@link MongoTemplate}.
- * Not often used but a useful option for extensibility and testability (as it can be easily mocked, stubbed, or be
- * the target of a JDK proxy).
- *
- * @author Thomas Risberg
- * @author Mark Pollack
- * @author Oliver Gierke
- */
-public interface MongoOperations {
-
-  /**
-   * The default collection name used by this template.
-   *
-   * @return
-   */
-  String getDefaultCollectionName();
-
-  /**
-   * The default collection used by this template.
-   *
-   * @return The default collection used by this template
-   */
-  DBCollection getDefaultCollection();
-
-  /**
-   * Execute the a MongoDB command expressed as a JSON string.  This will call the method
-   * JSON.parse that is part of the MongoDB driver to convert the JSON string to a DBObject.
-   * Any errors that result from executing this command will be converted into Spring's DAO
-   * exception hierarchy.
-   *
-   * @param jsonCommand a MongoDB command expressed as a JSON string.
-   */
-  CommandResult executeCommand(String jsonCommand);
-
-  /**
-   * Execute a MongoDB command.  Any errors that result from executing this command will be converted
-   * into Spring's DAO exception hierarchy.
-   *
-   * @param command a MongoDB command
-   */
-  CommandResult executeCommand(DBObject command);
-
-  /**
-   * Executes a {@link DbCallback} translating any exceptions as necessary.
-   * <p/>
-   * Allows for returning a result object, that is a domain object or a collection of domain objects.
-   *
-   * @param <T>    return type
-   * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance.
-   * @return a result object returned by the action or <tt>null</tt>
-   */
-  <T> T execute(DbCallback<T> action);
-
-  /**
-   * Executes the given {@link CollectionCallback} on the default collection.
-   * <p/>
-   * Allows for returning a result object, that is a domain object or a collection of domain objects.
-   *
-   * @param <T>    return type
-   * @param action callback object that specifies the MongoDB action
-   * @return a result object returned by the action or <tt>null</tt>
-   */
-  <T> T execute(CollectionCallback<T> action);
-
-  /**
-   * Executes the given {@link CollectionCallback} on the collection of the given name.
-   * <p/>
-   * Allows for returning a result object, that is a domain object or a collection of domain objects.
-   *
-   * @param <T>            return type
-   * @param collectionName the name of the collection that specifies which DBCollection instance will be passed into
-   * @param action         callback object that specifies the MongoDB action
-   *                       the callback action.
-   * @return a result object returned by the action or <tt>null</tt>
-   */
-  <T> T execute(String collectionName, CollectionCallback<T> action);
-
-  /**
-   * Executes the given {@link DbCallback} within the same connection to the database so as to ensure
-   * consistency in a write heavy environment where you may read the data that you wrote.  See the
-   * comments on {@see <a href=http://www.mongodb.org/display/DOCS/Java+Driver+Concurrency>Java Driver Concurrency</a>}
-   * <p/>
-   * Allows for returning a result object, that is a domain object or a collection of domain objects.
-   *
-   * @param <T>    return type
-   * @param action callback that specified the MongoDB actions to perform on the DB instance
-   * @return a result object returned by the action or <tt>null</tt>
-   */
-  <T> T executeInSession(DbCallback<T> action);
-
-  /**
-   * Create an uncapped collection with the provided name.
-   *
-   * @param collectionName name of the collection
-   * @return the created collection
-   */
-  DBCollection createCollection(String collectionName);
-
-  /**
-   * Create a collect with the provided name and options.
-   *
-   * @param collectionName    name of the collection
-   * @param collectionOptions options to use when creating the collection.
-   * @return the created collection
-   */
-  DBCollection createCollection(String collectionName, CollectionOptions collectionOptions);
-
-  /**
-   * A set of collection names.
-   *
-   * @return list of collection names
-   */
-  Set<String> getCollectionNames();
-
-  /**
-   * Get a collection by name, creating it if it doesn't exist.
-   * <p/>
-   * Translate any exceptions as necessary.
-   *
-   * @param collectionName name of the collection
-   * @return an existing collection or a newly created one.
-   */
-  DBCollection getCollection(String collectionName);
-
-  /**
-   * Check to see if a collection with a given name exists.
-   * <p/>
-   * Translate any exceptions as necessary.
-   *
-   * @param collectionName name of the collection
-   * @return true if a collection with the given name is found, false otherwise.
-   */
-  boolean collectionExists(String collectionName);
-
-  /**
-   * Drop the collection with the given name.
-   * <p/>
-   * Translate any exceptions as necessary.
-   *
-   * @param collectionName name of the collection to drop/delete.
-   */
-  void dropCollection(String collectionName);
-
-  /**
-   * Query for a list of objects of type T from the default collection.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient
-   * way to map objects since the test for class type is done in the client and not on the server.
-   *
-   * @param targetClass the parameterized type of the returned list
-   * @return the converted collection
-   */
-  <T> List<T> getCollection(Class<T> targetClass);
-
-  /**
-   * Query for a list of objects of type T from the specified collection.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient
-   * way to map objects since the test for class type is done in the client and not on the server.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param targetClass    the parameterized type of the returned list.
-   * @return the converted collection
-   */
-  <T> List<T> getCollection(String collectionName, Class<T> targetClass);
-
-  /**
-   * Query for a list of objects of type T from the specified collection, mapping the DBObject using
-   * the provided MongoReader.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param targetClass    the parameterized type of the returned list.
-   * @param reader         the MongoReader to convert from DBObject to an object.
-   * @return the converted collection
-   */
-  <T> List<T> getCollection(String collectionName, Class<T> targetClass,
-                            MongoReader<T> reader);
-
-  /**
-   * Ensure that an index for the provided {@link IndexDefinition} exists for the default collection.
-   * If not it will be created.
-   *
-   * @param index
-   */
-  void ensureIndex(IndexDefinition indexDefinition);
-
-  /**
-   * Ensure that an index for the provided {@link IndexDefinition} exists. If not it will be
-   * created.
-   *
-   * @param collectionName
-   * @param index
-   */
-  void ensureIndex(String collectionName, IndexDefinition indexDefinition);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object
-   * of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @return the converted object
-   */
-  <T> T findOne(Query query, Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object
-   * of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @param reader      the MongoReader to convert from DBObject to an object.
-   * @return the converted object
-   */
-  <T> T findOne(Query query, Class<T> targetClass,
-                MongoReader<T> reader);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a single instance of an object
-   * of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @return the converted object
-   */
-  <T> T findOne(String collectionName, Query query,
-                Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a single instance of an object
-   * of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @param reader         the MongoReader to convert from DBObject to an object.
-   * @return the converted object
-   */
-  <T> T findOne(String collectionName, Query query,
-                Class<T> targetClass, MongoReader<T> reader);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @return the List of converted objects
-   */
-  <T> List<T> find(Query query, Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @param reader      the MongoReader to convert from DBObject to an object.
-   * @return the List of converted objects
-   */
-  <T> List<T> find(Query query, Class<T> targetClass,
-                   MongoReader<T> reader);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @return the List of converted objects
-   */
-  <T> List<T> find(String collectionName, Query query,
-                   Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @param reader         the MongoReader to convert from DBObject to an object.
-   * @return the List of converted objects
-   */
-  <T> List<T> find(String collectionName, Query query,
-                   Class<T> targetClass, MongoReader<T> reader);
-
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @param preparer       allows for customization of the DBCursor used when iterating over the result set,
-   *                       (apply limits, skips and so on).
-   * @return the List of converted objects.
-   */
-  <T> List<T> find(String collectionName, Query query, Class<T> targetClass, CursorPreparer preparer);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object
-   * of the specified type. The first document that matches the query is returned and also removed from the
-   * collection in the database.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @return the converted object
-   */
-  <T> T findAndRemove(Query query, Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the default MongoDB collection to a single instance of an object
-   * of the specified type. The first document that matches the query is returned and also removed from the
-   * collection in the database.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param query       the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass the parameterized type of the returned list.
-   * @param reader      the MongoReader to convert from DBObject to an object.
-   * @return the converted object
-   */
-  <T> T findAndRemove(Query query, Class<T> targetClass,
-                MongoReader<T> reader);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a single instance of an object
-   * of the specified type. The first document that matches the query is returned and also removed from the
-   * collection in the database.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @return the converted object
-   */
-  <T> T findAndRemove(String collectionName, Query query,
-                Class<T> targetClass);
-
-  /**
-   * Map the results of an ad-hoc query on the specified collection to a single instance of an object
-   * of the specified type. The first document that matches the query is returned and also removed from the
-   * collection in the database.
-   * <p/>
-   * The object is converted from the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
-   * feature rich {@link Query}.
-   *
-   * @param collectionName name of the collection to retrieve the objects from
-   * @param query          the query class that specifies the criteria used to find a record and also an optional fields specification
-   * @param targetClass    the parameterized type of the returned list.
-   * @param reader         the MongoReader to convert from DBObject to an object.
-   * @return the converted object
-   */
-  <T> T findAndRemove(String collectionName, Query query,
-                Class<T> targetClass, MongoReader<T> reader);
-
-  /**
-   * Insert the object into the default collection.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * If you object has an "Id' property, it will be set with the generated Id from MongoDB.  If your Id property
-   * is a String then MongoDB ObjectId will be used to populate that string.  Otherwise, the conversion from
-   * ObjectId to your property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's
-   * new Type Conversion API.
-   * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type Conversion"</a>
-   * for more details.
-   * <p/>
-   * <p/>
-   * Insert is used to initially store the object into the database.
-   * To update an existing object use the save method.
-   *
-   * @param objectToSave the object to store in the collection.
-   */
-  void insert(Object objectToSave);
-
-  /**
-   * Insert the object into the specified collection.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * Insert is used to initially store the object into the
-   * database.  To update an existing object use the save method.
-   *
-   * @param collectionName name of the collection to store the object in
-   * @param objectToSave   the object to store in the collection
-   */
-  void insert(String collectionName, Object objectToSave);
-
-  /**
-   * Insert the object into the default collection.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoWriter}
-   * <p/>
-   * Insert is used to initially store the object into the
-   * database.  To update an existing object use the save method.
-   *
-   * @param <T>          the type of the object to insert
-   * @param objectToSave the object to store in the collection
-   * @param writer       the writer to convert the object to save into a DBObject
-   */
-  <T> void insert(T objectToSave, MongoWriter<T> writer);
-
-  /**
-   * Insert the object into the specified collection.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoWriter}
-   * <p/>
-   * Insert is used to initially store the object into the
-   * database.  To update an existing object use the save method.
-   *
-   * @param <T>            the type of the object to insert
-   * @param collectionName name of the collection to store the object in
-   * @param objectToSave   the object to store in the collection
-   * @param writer         the writer to convert the object to save into a DBObject
-   */
-  <T> void insert(String collectionName, T objectToSave, MongoWriter<T> writer);
-
-  /**
-   * Insert a list of objects into the default collection in a single batch write to the database.
-   *
-   * @param listToSave the list of objects to save.
-   */
-  void insertList(List<? extends Object> listToSave);
-
-  /**
-   * Insert a list of objects into the specified collection in a single batch write to the database.
-   *
-   * @param collectionName name of the collection to store the object in
-   * @param listToSave     the list of objects to save.
-   */
-  void insertList(String collectionName, List<? extends Object> listToSave);
-
-  /**
-   * Insert a list of objects into the default collection using the provided MongoWriter instance
-   *
-   * @param <T>        the type of object being saved
-   * @param listToSave the list of objects to save.
-   * @param writer     the writer to convert the object to save into a DBObject
-   */
-  <T> void insertList(List<? extends T> listToSave, MongoWriter<T> writer);
-
-  /**
-   * Insert a list of objects into the specified collection using the provided MongoWriter instance
-   *
-   * @param <T>            the type of object being saved
-   * @param collectionName name of the collection to store the object in
-   * @param listToSave     the list of objects to save.
-   * @param writer         the writer to convert the object to save into a DBObject
-   */
-  <T> void insertList(String collectionName, List<? extends T> listToSave, MongoWriter<T> writer);
-
-  /**
-   * Save the object to the default collection.  This will perform an insert if the object is not already
-   * present, that is an 'upsert'.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * If you object has an "Id' property, it will be set with the generated Id from MongoDB.  If your Id property
-   * is a String then MongoDB ObjectId will be used to populate that string.  Otherwise, the conversion from
-   * ObjectId to your property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's
-   * new Type Conversion API.
-   * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type Conversion"</a>
-   * for more details.
-   *
-   * @param objectToSave the object to store in the collection
-   */
-  void save(Object objectToSave);
-
-  /**
-   * Save the object to the specified collection.  This will perform an insert if the object is not already
-   * present, that is an 'upsert'.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoConverter}.  Unless configured otherwise, an
-   * instance of SimpleMongoConverter will be used.
-   * <p/>
-   * If you object has an "Id' property, it will be set with the generated Id from MongoDB.  If your Id property
-   * is a String then MongoDB ObjectId will be used to populate that string.  Otherwise, the conversion from
-   * ObjectId to your property type will be handled by Spring's BeanWrapper class that leverages Spring 3.0's
-   * new Type Cobnversion API.
-   * See <a href="http://static.springsource.org/spring/docs/3.0.x/reference/validation.html#core-convert">Spring 3 Type Conversion"</a>
-   * for more details.
-   *
-   * @param collectionName name of the collection to store the object in
-   * @param objectToSave   the object to store in the collection
-   */
-  void save(String collectionName, Object objectToSave);
-
-  /**
-   * Save the object into the default collection using the provided writer.
-   * This will perform an insert if the object is not already
-   * present, that is an 'upsert'.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoWriter}
-   *
-   * @param <T>          the type of the object to insert
-   * @param objectToSave the object to store in the collection
-   * @param writer       the writer to convert the object to save into a DBObject
-   */
-  <T> void save(T objectToSave, MongoWriter<T> writer);
-
-  /**
-   * Save the object into the specified collection using the provided writer.
-   * This will perform an insert if the object is not already
-   * present, that is an 'upsert'.
-   * <p/>
-   * The object is converted to the MongoDB native representation using an instance of
-   * {@see MongoWriter}
-   *
-   * @param <T>            the type of the object to insert
-   * @param collectionName name of the collection to store the object in
-   * @param objectToSave   the object to store in the collection
-   * @param writer         the writer to convert the object to save into a DBObject
-   */
-  <T> void save(String collectionName, T objectToSave, MongoWriter<T> writer);
-
-  /**
-   * Updates the first object that is found in the default collection that matches the query document
-   * with the provided updated document.
-   *
-   * @param queryDoc  the query document that specifies the criteria used to select a record to be updated
-   * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-   *                  existing object.
-   */
-  WriteResult updateFirst(Query query, Update update);
-
-  /**
-   * Updates the first object that is found in the specified collection that matches the query document criteria
-   * with the provided updated document.
-   *
-   * @param collectionName name of the collection to update the object in
-   * @param queryDoc       the query document that specifies the criteria used to select a record to be updated
-   * @param updateDoc      the update document that contains the updated object or $ operators to manipulate the
-   *                       existing object.
-   */
-  WriteResult updateFirst(String collectionName, Query query,
-                          Update update);
-
-  /**
-   * Updates all objects that are found in the default collection that matches the query document criteria
-   * with the provided updated document.
-   *
-   * @param queryDoc  the query document that specifies the criteria used to select a record to be updated
-   * @param updateDoc the update document that contains the updated object or $ operators to manipulate the
-   *                  existing object.
-   */
-  WriteResult updateMulti(Query query, Update update);
-
-  /**
-   * Updates all objects that are found in the specified collection that matches the query document criteria
-   * with the provided updated document.
-   *
-   * @param collectionName name of the collection to update the object in
-   * @param queryDoc       the query document that specifies the criteria used to select a record to be updated
-   * @param updateDoc      the update document that contains the updated object or $ operators to manipulate the
-   *                       existing object.
-   */
-  WriteResult updateMulti(String collectionName, Query query,
-                          Update update);
-
-  /**
-   * Remove the given object from the collection by Id
-   * @param object
-   */
-  void remove(Object object);
-  
- 
-  
-  /**
-   * Remove all documents from the default collection that match the provided query document criteria.
-   *
-   * @param queryDoc the query document that specifies the criteria used to remove a record
-   */
-  void remove(Query query);
-  
-  /**
-   * Remove all documents from the default collection that match the provided query document criteria.  The
-   * Class parameter is used to help convert the Id of the object if it is present in the query.
-   * @param <T>
-   * @param query
-   * @param targetClass
-   */
-  <T> void remove(Query query, Class<T> targetClass);
-  
-  /**
-   * Remove all documents from the specified collection that match the provided query document criteria.
-   *
-   * @param collectionName name of the collection where the objects will removed
-   * @param queryDoc       the query document that specifies the criteria used to remove a record
-   */
-  void remove(String collectionName, Query query);
-  
-  /**
-   * Remove all documents from the specified collection that match the provided query document criteria.
-   * The Class parameter is used to help convert the Id of the object if it is present in the query.
-   * @param collectionName
-   * @param query
-   * @param targetClass
-   */
-  <T> void remove(String collectionName, Query query, Class<T> targetClass);
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOptionsFactoryBean.java

@@ -1,134 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb;
-
-import com.mongodb.MongoOptions;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * A factory bean for consruction a MongoOptions instance
- *
- * @author Graeme Rocher
- */
-public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
-
-  private static final MongoOptions MONGO_OPTIONS = new MongoOptions();
-  /**
-   * number of connections allowed per host
-   * will block if run out
-   */
-  private int connectionsPerHost = MONGO_OPTIONS.connectionsPerHost;
-
-  /**
-   * multiplier for connectionsPerHost for # of threads that can block
-   * if connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
-   * then 50 threads can block
-   * more than that and an exception will be throw
-   */
-  private int threadsAllowedToBlockForConnectionMultiplier = MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier;
-
-  /**
-   * max wait time of a blocking thread for a connection
-   */
-  private int maxWaitTime = MONGO_OPTIONS.maxWaitTime;
-
-  /**
-   * connect timeout in milliseconds. 0 is default and infinite
-   */
-  private int connectTimeout = MONGO_OPTIONS.connectTimeout;
-
-  /**
-   * socket timeout.  0 is default and infinite
-   */
-  private int socketTimeout = MONGO_OPTIONS.socketTimeout;
-
-  /**
-   * this controls whether or not on a connect, the system retries automatically
-   */
-  private boolean autoConnectRetry = MONGO_OPTIONS.autoConnectRetry;
-
-
-  /**
-   * number of connections allowed per host
-   * will block if run out
-   */
-  public void setConnectionsPerHost(int connectionsPerHost) {
-    this.connectionsPerHost = connectionsPerHost;
-  }
-
-  /**
-   * multiplier for connectionsPerHost for # of threads that can block
-   * if connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
-   * then 50 threads can block
-   * more than that and an exception will be throw
-   */
-  public void setThreadsAllowedToBlockForConnectionMultiplier(
-      int threadsAllowedToBlockForConnectionMultiplier) {
-    this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-  }
-
-  /**
-   * max wait time of a blocking thread for a connection
-   */
-  public void setMaxWaitTime(int maxWaitTime) {
-    this.maxWaitTime = maxWaitTime;
-  }
-
-  /**
-   * connect timeout in milliseconds. 0 is default and infinite
-   */
-  public void setConnectTimeout(int connectTimeout) {
-    this.connectTimeout = connectTimeout;
-  }
-
-  /**
-   * socket timeout.  0 is default and infinite
-   */
-  public void setSocketTimeout(int socketTimeout) {
-    this.socketTimeout = socketTimeout;
-  }
-
-  /**
-   * this controls whether or not on a connect, the system retries automatically
-   */
-  public void setAutoConnectRetry(boolean autoConnectRetry) {
-    this.autoConnectRetry = autoConnectRetry;
-  }
-
-  public void afterPropertiesSet() {
-    MONGO_OPTIONS.connectionsPerHost = connectionsPerHost;
-    MONGO_OPTIONS.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-    MONGO_OPTIONS.maxWaitTime = maxWaitTime;
-    MONGO_OPTIONS.connectTimeout = connectTimeout;
-    MONGO_OPTIONS.socketTimeout = socketTimeout;
-    MONGO_OPTIONS.autoConnectRetry = autoConnectRetry;
-
-  }
-
-  public MongoOptions getObject() {
-    return MONGO_OPTIONS;
-  }
-
-  public Class<?> getObjectType() {
-    return MongoOptions.class;
-  }
-
-  public boolean isSingleton() {
-    return true;
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java

@@ -1,245 +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.document.mongodb;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.math.BigInteger;
-import java.util.*;
-
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * An iterable of {@link MongoPropertyDescriptor}s that allows dedicated access to the {@link MongoPropertyDescriptor}
- * that captures the id-property.
- *
- * @author Oliver Gierke
- */
-public class MongoPropertyDescriptors implements Iterable<MongoPropertyDescriptors.MongoPropertyDescriptor> {
-
-  private final Collection<MongoPropertyDescriptors.MongoPropertyDescriptor> descriptors;
-  private final MongoPropertyDescriptors.MongoPropertyDescriptor idDescriptor;
-
-  /**
-   * Creates the {@link MongoPropertyDescriptors} for the given type.
-   *
-   * @param type
-   */
-  public MongoPropertyDescriptors(Class<?> type) {
-
-    Assert.notNull(type);
-    Set<MongoPropertyDescriptors.MongoPropertyDescriptor> descriptors = new HashSet<MongoPropertyDescriptors.MongoPropertyDescriptor>();
-    MongoPropertyDescriptors.MongoPropertyDescriptor idDesciptor = null;
-
-    for (PropertyDescriptor candidates : BeanUtils.getPropertyDescriptors(type)) {
-      MongoPropertyDescriptor descriptor = new MongoPropertyDescriptors.MongoPropertyDescriptor(candidates, type);
-      descriptors.add(descriptor);
-      if (descriptor.isIdProperty()) {
-        idDesciptor = descriptor;
-      }
-    }
-
-    this.descriptors = Collections.unmodifiableSet(descriptors);
-    this.idDescriptor = idDesciptor;
-  }
-
-  /**
-   * Returns the {@link MongoPropertyDescriptor} for the id property.
-   *
-   * @return the idDescriptor
-   */
-  public MongoPropertyDescriptors.MongoPropertyDescriptor getIdDescriptor() {
-    return idDescriptor;
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see java.lang.Iterable#iterator()
-    */
-  public Iterator<MongoPropertyDescriptors.MongoPropertyDescriptor> iterator() {
-    return descriptors.iterator();
-  }
-
-  /**
-   * Simple value object to have a more suitable abstraction for MongoDB specific property handling.
-   *
-   * @author Oliver Gierke
-   */
-  public static class MongoPropertyDescriptor {
-
-    public static Collection<Class<?>> SUPPORTED_ID_CLASSES;
-
-    static {
-      Set<Class<?>> classes = new HashSet<Class<?>>();
-      classes.add(ObjectId.class);
-      classes.add(String.class);
-      classes.add(BigInteger.class);
-      SUPPORTED_ID_CLASSES = Collections.unmodifiableCollection(classes);
-    }
-
-    private static final String ID_PROPERTY = "id";
-    static final String ID_KEY = "_id";
-
-    private final PropertyDescriptor delegate;
-    private final Class<?> owningType;
-
-    /**
-     * Creates a new {@link MongoPropertyDescriptor} for the given {@link PropertyDescriptor}.
-     *
-     * @param descriptor
-     * @param owningType
-     */
-    public MongoPropertyDescriptor(PropertyDescriptor descriptor, Class<?> owningType) {
-      Assert.notNull(descriptor);
-      this.delegate = descriptor;
-      this.owningType = owningType;
-    }
-
-    /**
-     * Returns whether the property is the id-property. Will be identified by name for now ({@value #ID_PROPERTY}).
-     *
-     * @return
-     */
-    public boolean isIdProperty() {
-      return ID_PROPERTY.equals(delegate.getName()) || ID_KEY.equals(delegate.getName());
-    }
-
-    /**
-     * Returns whether the property is of one of the supported id types. Currently we support {@link String},
-     * {@link ObjectId} and {@link BigInteger}.
-     *
-     * @return
-     */
-    public boolean isOfIdType() {
-      return SUPPORTED_ID_CLASSES.contains(delegate.getPropertyType());
-    }
-
-    /**
-     * Returns the key that shall be used for mapping. Will return {@value #ID_KEY} for the id property and the
-     * plain name for all other ones.
-     *
-     * @return
-     */
-    public String getKeyToMap() {
-      return isIdProperty() ? ID_KEY : delegate.getName();
-    }
-
-    /**
-     * Returns the name of the property.
-     *
-     * @return
-     */
-    public String getName() {
-      return delegate.getName();
-    }
-
-    /**
-     * Returns whether the underlying property is actually mappable. By default this will exclude the
-     * {@literal class} property and only include properties with a getter.
-     *
-     * @return
-     */
-    public boolean isMappable() {
-      
-      boolean isNotClassAttribute = !delegate.getName().equals("class");
-      boolean hasGetter = delegate.getReadMethod() != null;
-      boolean hasField = ReflectionUtils.findField(owningType, delegate.getName()) != null;
-      
-      return isNotClassAttribute && hasGetter && hasField;
-    }
-
-    /**
-     * Returns the plain property type.
-     *
-     * @return
-     */
-    public Class<?> getPropertyType() {
-      return delegate.getPropertyType();
-    }
-
-    /**
-     * Returns the type type to be set. Will return the setter method's type and fall back to the getter method's
-     * return type in case no setter is available. Useful for further (generics) inspection.
-     *
-     * @return
-     */
-    public Type getTypeToSet() {
-
-      Method method = delegate.getWriteMethod();
-      return method == null ? delegate.getReadMethod().getGenericReturnType()
-          : method.getGenericParameterTypes()[0];
-    }
-
-    /**
-     * Returns whther we describe a {@link Map}.
-     *
-     * @return
-     */
-    public boolean isMap() {
-      return Map.class.isAssignableFrom(getPropertyType());
-    }
-
-    /**
-     * Returns whether the descriptor is for a collection.
-     *
-     * @return
-     */
-    public boolean isCollection() {
-      return Collection.class.isAssignableFrom(getPropertyType());
-    }
-
-    /**
-     * Returns whether the descriptor is for an {@link Enum}.
-     *
-     * @return
-     */
-    public boolean isEnum() {
-      return Enum.class.isAssignableFrom(getPropertyType());
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see java.lang.Object#equals(java.lang.Object)
-       */
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == this) {
-        return true;
-      }
-      if (obj == null || !getClass().equals(obj.getClass())) {
-        return false;
-      }
-      MongoPropertyDescriptor that = (MongoPropertyDescriptor) obj;
-      return that.delegate.equals(this.delegate);
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see java.lang.Object#hashCode()
-       */
-    @Override
-    public int hashCode() {
-      return delegate.hashCode();
-    }
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/WriteResultChecking.java

@@ -1,5 +0,0 @@
-package org.springframework.data.document.mongodb;
-
-public enum WriteResultChecking {
-  NONE, LOG, EXCEPTION
-}

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

@@ -1,100 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.config;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.data.annotation.Persistent;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.mapping.Document;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.document.mongodb.mapping.event.LoggingEventListener;
-import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
-import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-import com.mongodb.Mongo;
-
-@Configuration
-public abstract class AbstractMongoConfiguration {
-
-
-  @Bean
-  public abstract Mongo mongo() throws Exception;
-  
-  @Bean
-  public abstract MongoTemplate mongoTemplate() throws Exception;
-  
-  public String getMappingBasePackage() { 
-    return "";
-  }
- 
-  
-  @Bean
-  public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
-    MongoMappingContext mappingContext = new MongoMappingContext();
-    String basePackage = getMappingBasePackage();
-    if (StringUtils.hasText(basePackage)) {
-      ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(false);
-      componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-      componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
-      
-      Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
-      for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
-        initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass().getClassLoader()));
-      }      
-      mappingContext.setInitialEntitySet(initialEntitySet);
-    }
-    return mappingContext;
-  }
-  
-  @Bean
-  public MappingMongoConverter mappingMongoConverter() throws Exception {
-    MappingMongoConverter converter = new MappingMongoConverter(mongoMappingContext());
-    converter.setMongo(mongo());
-    afterMappingMongoConverterCreation(converter);
-    return converter;
-  }
-  
-  /**
-   * Hook that allows post-processing after the MappingMongoConverter has been
-   * successfully created. 
-   * @param converter
-   */
-  protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
-  }
-
-  @Bean
-  public MappingContextAwareBeanPostProcessor mappingContextAwareBeanPostProcessor() {
-    MappingContextAwareBeanPostProcessor bpp = new MappingContextAwareBeanPostProcessor();
-    bpp.setMappingContextBeanName("mongoMappingContext");
-    return bpp;
-  }
-  
-  @Bean MongoPersistentEntityIndexCreator mongoPersistentEntityIndexCreator() throws Exception {
-    MongoPersistentEntityIndexCreator indexCreator = new MongoPersistentEntityIndexCreator(mongoMappingContext(), mongoTemplate() );    
-    return indexCreator;
-  }
-}

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

@@ -1,69 +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.document.mongodb.config;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoAdmin;
-import org.springframework.data.document.mongodb.monitor.*;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-public class MongoJmxParser implements BeanDefinitionParser {
-
-  public BeanDefinition parse(Element element, ParserContext parserContext) {
-    String name = element.getAttribute("mongo-ref");
-    if (!StringUtils.hasText(name)) {
-      name = "mongo";
-    }
-    registerJmxComponents(name, element, parserContext);
-    return null;
-  }
-
-  protected void registerJmxComponents(String mongoRefName, Element element, ParserContext parserContext) {
-    Object eleSource = parserContext.extractSource(element);
-
-    CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
-
-    createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(ServerInfo.class, compositeDef, mongoRefName, eleSource, parserContext);
-    createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
-
-
-    parserContext.registerComponent(compositeDef);
-
-  }
-
-  protected void createBeanDefEntry(Class<?> clazz, CompositeComponentDefinition compositeDef, String mongoRefName, Object eleSource, ParserContext parserContext) {
-    BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
-    builder.getRawBeanDefinition().setSource(eleSource);
-    builder.addConstructorArgReference(mongoRefName);
-    BeanDefinition assertDef = builder.getBeanDefinition();
-    String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
-    compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
-  }
-
-}

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

@@ -1,94 +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.document.mongodb.config;
-
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.MongoOptionsFactoryBean;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-/**
- * Parser for <mongo;gt; definitions.  If no name
- *
- * @author Mark Pollack
- */
-public class MongoParser extends AbstractSingleBeanDefinitionParser {
-
-  protected Class<?> getBeanClass(Element element) {
-    return MongoFactoryBean.class;
-  }
-
-  @Override
-  protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-    super.doParse(element, builder);
-
-    setPropertyValue(element, builder, "port", "port");
-    setPropertyValue(element, builder, "host", "host");
-
-    parseOptions(parserContext, element, builder);
-
-  }
-
-  /**
-   * Parses the options sub-element. Populates the given attribute factory with the proper attributes.
-   *
-   * @param element
-   * @param attrBuilder
-   * @return true if parsing actually occured, false otherwise
-   */
-  private boolean parseOptions(ParserContext parserContext, Element element,
-                               BeanDefinitionBuilder mongoBuilder) {
-    Element optionsElement = DomUtils.getChildElementByTagName(element, "options");
-    if (optionsElement == null)
-      return false;
-
-    BeanDefinitionBuilder optionsDefBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoOptionsFactoryBean.class);
-
-    setPropertyValue(optionsElement, optionsDefBuilder, "connectionsPerHost", "connectionsPerHost");
-    setPropertyValue(optionsElement, optionsDefBuilder, "threadsAllowedToBlockForConnectionMultiplier", "threadsAllowedToBlockForConnectionMultiplier");
-    setPropertyValue(optionsElement, optionsDefBuilder, "maxWaitTime", "maxWaitTime");
-    setPropertyValue(optionsElement, optionsDefBuilder, "connectTimeout", "connectTimeout");
-    setPropertyValue(optionsElement, optionsDefBuilder, "socketTimeout", "socketTimeout");
-    setPropertyValue(optionsElement, optionsDefBuilder, "autoConnectRetry", "autoConnectRetry");
-
-    mongoBuilder.addPropertyValue("mongoOptions", optionsDefBuilder.getBeanDefinition());
-    return true;
-  }
-
-  @Override
-  protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
-      throws BeanDefinitionStoreException {
-    String name = super.resolveId(element, definition, parserContext);
-    if (!StringUtils.hasText(name)) {
-      name = "mongo";
-    }
-    return name;
-  }
-
-  private void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attrName, String propertyName) {
-    String attr = element.getAttribute(attrName);
-    if (StringUtils.hasText(attr)) {
-      builder.addPropertyValue(propertyName, attr);
-    }
-  }
-}

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

@@ -1,95 +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.document.mongodb.config;
-
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
-import org.w3c.dom.Element;
-
-
-/**
- * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} to create
- * Mongo DB repositories from classpath scanning or manual definition.
- *
- * @author Oliver Gierke
- */
-public class MongoRepositoryConfigParser
-    extends
-    AbstractRepositoryConfigDefinitionParser<SimpleMongoRepositoryConfiguration, MongoRepositoryConfiguration> {
-  
-  private static final String MAPPING_CONTEXT_DEFAULT = MappingMongoConverterParser.MAPPING_CONTEXT;
-  
-  /*
-  * (non-Javadoc)
-  *
-  * @see org.springframework.data.repository.config.
-  * AbstractRepositoryConfigDefinitionParser
-  * #getGlobalRepositoryConfigInformation(org.w3c.dom.Element)
-  */
-  @Override
-  protected SimpleMongoRepositoryConfiguration getGlobalRepositoryConfigInformation(
-      Element element) {
-
-    return new SimpleMongoRepositoryConfiguration(element);
-  }
-
-
-  /*
-   * (non-Javadoc)
-   * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#postProcessBeanDefinition(org.springframework.data.repository.config.SingleRepositoryConfigInformation, org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.beans.factory.support.BeanDefinitionRegistry, java.lang.Object)
-   */
-  @Override
-  protected void postProcessBeanDefinition(
-      MongoRepositoryConfiguration context,
-      BeanDefinitionBuilder builder, BeanDefinitionRegistry registry, Object beanSource) {
-
-    builder.addPropertyReference("template", context.getMongoTemplateRef());
-    
-    String mappingContextRef = getMappingContextReference(context, registry);
-    if (mappingContextRef != null) {
-      builder.addPropertyReference("mappingContext", mappingContextRef);
-    }
-  }
-
-  /**
-   * Returns the bean name of a {@link MappingContext} to be wired. Will inspect the namespace attribute first and if no
-   * config is found in that place it will try to lookup the default one. Will return {@literal null} if neither one is
-   * available.
-   * 
-   * @param config
-   * @param registry
-   * @return
-   */
-  private String getMappingContextReference(MongoRepositoryConfiguration config, BeanDefinitionRegistry registry) {
-    
-    String contextRef = config.getMappingContextRef();
-    
-    if (contextRef != null) {
-      return contextRef;
-    }
-    
-    try {
-      registry.getBeanDefinition(MAPPING_CONTEXT_DEFAULT);
-      return MAPPING_CONTEXT_DEFAULT;
-    } catch(NoSuchBeanDefinitionException e) {
-      return null;
-    }
-  }
-}

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

@@ -1,216 +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.document.mongodb.config;
-
-import org.springframework.data.document.mongodb.repository.MongoRepository;
-import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean;
-import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
-import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
-import org.springframework.data.repository.config.RepositoryConfig;
-import org.springframework.data.repository.config.SingleRepositoryConfigInformation;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-
-/**
- * {@link RepositoryConfig} implementation to create
- * {@link MongoRepositoryConfiguration} instances for both automatic and manual
- * configuration.
- *
- * @author Oliver Gierke
- */
-public class SimpleMongoRepositoryConfiguration extends RepositoryConfig<SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration, SimpleMongoRepositoryConfiguration> {
-
-  private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
-  private static final String DEFAULT_MONGO_TEMPLATE_REF = "mongoTemplate";
-  
-  private static final String MAPPING_CONTEXT_REF = "mongo-mapping-context-ref";
-
-
-  /**
-   * Creates a new {@link SimpleMongoRepositoryConfiguration} for the given
-   * {@link Element}.
-   *
-   * @param repositoriesElement
-   */
-  protected SimpleMongoRepositoryConfiguration(Element repositoriesElement) {
-
-    super(repositoriesElement, MongoRepositoryFactoryBean.class.getName());
-  }
-
-
-  /**
-   * Returns the bean name of the {@link org.springframework.data.document.mongodb.MongoTemplate} to be referenced.
-   *
-   * @return
-   */
-  public String getMongoTemplateRef() {
-
-    String templateRef = getSource().getAttribute(MONGO_TEMPLATE_REF);
-    return StringUtils.hasText(templateRef) ? templateRef
-        : DEFAULT_MONGO_TEMPLATE_REF;
-  }
-  
-  public String getMappingContextRef() {
-    
-    String attribute = getSource().getAttribute(MAPPING_CONTEXT_REF);
-    return StringUtils.hasText(attribute) ? attribute : null;
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.config.GlobalRepositoryConfigInformation
-  * #getAutoconfigRepositoryInformation(java.lang.String)
-  */
-  public MongoRepositoryConfiguration getAutoconfigRepositoryInformation(
-      String interfaceName) {
-
-    return new AutomaticMongoRepositoryConfiguration(interfaceName, this);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.config.GlobalRepositoryConfigInformation
-  * #getRepositoryBaseInterface()
-  */
-  public Class<?> getRepositoryBaseInterface() {
-
-    return MongoRepository.class;
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see org.springframework.data.repository.config.RepositoryConfig#
-  * createSingleRepositoryConfigInformationFor(org.w3c.dom.Element)
-  */
-  @Override
-  protected MongoRepositoryConfiguration createSingleRepositoryConfigInformationFor(
-      Element element) {
-
-    return new ManualMongoRepositoryConfiguration(element, this);
-  }
-
-  /**
-   * Simple interface for configuration values specific to Mongo repositories.
-   *
-   * @author Oliver Gierke
-   */
-  public interface MongoRepositoryConfiguration
-      extends
-      SingleRepositoryConfigInformation<SimpleMongoRepositoryConfiguration> {
-
-    String getMongoTemplateRef();
-    
-    String getMappingContextRef();
-  }
-
-  /**
-   * Implements manual lookup of the additional attributes.
-   *
-   * @author Oliver Gierke
-   */
-  private static class ManualMongoRepositoryConfiguration
-      extends
-      ManualRepositoryConfigInformation<SimpleMongoRepositoryConfiguration>
-      implements MongoRepositoryConfiguration {
-
-    /**
-     * Creates a new {@link ManualMongoRepositoryConfiguration} for the
-     * given {@link Element} and parent.
-     *
-     * @param element
-     * @param parent
-     */
-    public ManualMongoRepositoryConfiguration(Element element,
-                                              SimpleMongoRepositoryConfiguration parent) {
-
-      super(element, parent);
-    }
-
-
-    /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.document.mongodb.repository.config.
-    * SimpleMongoRepositoryConfiguration
-    * .MongoRepositoryConfiguration#getMongoTemplateRef()
-    */
-    public String getMongoTemplateRef() {
-
-      return getAttribute(MONGO_TEMPLATE_REF);
-    }
-    
-    /* (non-Javadoc)
-     * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getMappingContextRef()
-     */
-    public String getMappingContextRef() {
-      return getAttribute(MAPPING_CONTEXT_REF);
-    }
-  }
-
-  /**
-   * Implements the lookup of the additional attributes during automatic
-   * configuration.
-   *
-   * @author Oliver Gierke
-   */
-  private static class AutomaticMongoRepositoryConfiguration
-      extends
-      AutomaticRepositoryConfigInformation<SimpleMongoRepositoryConfiguration>
-      implements MongoRepositoryConfiguration {
-
-    /**
-     * Creates a new {@link AutomaticMongoRepositoryConfiguration} for the
-     * given interface and parent.
-     *
-     * @param interfaceName
-     * @param parent
-     */
-    public AutomaticMongoRepositoryConfiguration(String interfaceName,
-                                                 SimpleMongoRepositoryConfiguration parent) {
-
-      super(interfaceName, parent);
-    }
-
-
-    /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.document.mongodb.repository.config.
-    * SimpleMongoRepositoryConfiguration
-    * .MongoRepositoryConfiguration#getMongoTemplateRef()
-    */
-    public String getMongoTemplateRef() {
-
-      return getParent().getMongoTemplateRef();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getMappingContextRef()
-     */
-    public String getMappingContextRef() {
-      return getParent().getMappingContextRef();
-    }
-  }
-}

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

@@ -1,636 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.convert;
-
-import static org.springframework.data.document.mongodb.convert.ObjectIdConverters.*;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-import com.mongodb.Mongo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.converter.ConverterFactory;
-import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.mapping.AssociationHandler;
-import org.springframework.data.mapping.MappingBeanHelper;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.mapping.model.MappingException;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.mapping.model.PersistentProperty;
-import org.springframework.data.mapping.model.PreferredConstructor;
-import org.springframework.expression.Expression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-
-/**
- * {@link MongoConverter} that uses a {@link MappingContext} to do sophisticated mapping of domain objects to
- * {@link DBObject}.
- *
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke
- */
-public class MappingMongoConverter implements MongoConverter, ApplicationContextAware, InitializingBean {
-
-	private static final String CUSTOM_TYPE_KEY = "_class";
-	@SuppressWarnings({"unchecked"})
-	private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, String.class, DBObject.class);
-	private static final List<Class<?>> VALID_ID_TYPES = Arrays.asList(new Class<?>[]{ObjectId.class, String.class, BigInteger.class, byte[].class});
-	protected static final Log log = LogFactory.getLog(MappingMongoConverter.class);
-
-	protected final GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService();
-	protected final Map<Class<?>, Class<?>> customTypeMapping = new HashMap<Class<?>, Class<?>>();
-	protected final MappingContext mappingContext;
-	protected SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
-	protected ApplicationContext applicationContext;
-	protected boolean useFieldAccessOnly = true;
-	protected Mongo mongo;
-	protected String defaultDatabase;
-
-	/**
-	 * Creates a new {@link MappingMongoConverter} with the given {@link MappingContext}.
-	 *
-	 * @param mappingContext
-	 */
-	public MappingMongoConverter(MappingContext mappingContext) {
-		this.mappingContext = mappingContext;
-		this.conversionService.removeConvertible(Object.class, String.class);
-	}
-
-	/**
-	 * Add custom {@link Converter} or {@link ConverterFactory} instances to be used that will take presidence over
-	 * metadata driven conversion between of objects to/from DBObject
-	 *
-	 * @param converters
-	 */
-	public void setConverters(List<Converter<?, ?>> converters) {
-		if (null != converters) {
-			for (Converter<?, ?> c : converters) {
-				registerConverter(c);
-				conversionService.addConverter(c);
-			}
-		}
-	}
-
-	/**
-	 * Inspects the given {@link Converter} for the types it can convert and registers the pair for custom type conversion
-	 * in case the target type is a Mongo basic type.
-	 *
-	 * @param converter
-	 */
-	private void registerConverter(Converter<?, ?> converter) {
-		Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(converter.getClass(), Converter.class);
-		if (MONGO_TYPES.contains(arguments[1])) {
-			customTypeMapping.put(arguments[0], arguments[1]);
-		}
-	}
-
-	public MappingContext getMappingContext() {
-		return mappingContext;
-	}
-
-	public Mongo getMongo() {
-		return mongo;
-	}
-
-	public void setMongo(Mongo mongo) {
-		this.mongo = mongo;
-	}
-
-	public String getDefaultDatabase() {
-		return defaultDatabase;
-	}
-
-	public void setDefaultDatabase(String defaultDatabase) {
-		this.defaultDatabase = defaultDatabase;
-	}
-
-	public boolean isUseFieldAccessOnly() {
-		return useFieldAccessOnly;
-	}
-
-	public void setUseFieldAccessOnly(boolean useFieldAccessOnly) {
-		this.useFieldAccessOnly = useFieldAccessOnly;
-	}
-
-	public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
-		return conversionService.convert(id, targetType);
-	}
-
-	public ObjectId convertObjectId(Object id) {
-		return conversionService.convert(id, ObjectId.class);
-	}
-
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public <S extends Object> S read(Class<S> clazz, final DBObject dbo) {
-		if (null == dbo) {
-			return null;
-		}
-
-		if ((clazz.isArray()
-				|| (clazz.isAssignableFrom(Collection.class)
-				|| clazz.isAssignableFrom(List.class)))
-				&& dbo instanceof BasicDBList) {
-			List l = new ArrayList<S>();
-			BasicDBList dbList = (BasicDBList) dbo;
-			for (Object o : dbList) {
-				if (o instanceof DBObject) {
-					Object newObj = read(clazz.getComponentType(), (DBObject) o);
-					if (newObj.getClass().isAssignableFrom(clazz.getComponentType())) {
-						l.add(newObj);
-					} else {
-						l.add(conversionService.convert(newObj, clazz.getComponentType()));
-					}
-				} else {
-					l.add(o);
-				}
-			}
-			return conversionService.convert(l, clazz);
-		}
-
-		// Retrieve persistent entity info
-		PersistentEntity<S> persistentEntity = mappingContext.getPersistentEntity(clazz);
-		if (persistentEntity == null) {
-			persistentEntity = mappingContext.addPersistentEntity(clazz);
-		}
-
-		return read(persistentEntity, dbo);
-	}
-
-	private <S extends Object> S read(PersistentEntity<S> entity, final DBObject dbo) {
-
-		final StandardEvaluationContext spelCtx = new StandardEvaluationContext();
-		if (null != applicationContext) {
-			spelCtx.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		}
-		String[] keySet = dbo.keySet().toArray(new String[]{});
-		for (String key : keySet) {
-			spelCtx.setVariable(key, dbo.get(key));
-		}
-
-		final List<String> ctorParamNames = new ArrayList<String>();
-		final S instance = MappingBeanHelper.constructInstance(entity, new PreferredConstructor.ParameterValueProvider() {
-			public Object getParameterValue(PreferredConstructor.Parameter parameter) {
-				String name = parameter.getName();
-				Class<?> type = parameter.getType();
-				Object obj = dbo.get(name);
-				if (obj instanceof DBRef) {
-					ctorParamNames.add(name);
-					return read(type, ((DBRef) obj).fetch());
-				} else if (obj instanceof DBObject) {
-					ctorParamNames.add(name);
-					return read(type, ((DBObject) obj));
-				} else if (null != obj && obj.getClass().isAssignableFrom(type)) {
-					ctorParamNames.add(name);
-					return obj;
-				} else if (null != obj) {
-					ctorParamNames.add(name);
-					return conversionService.convert(obj, type);
-				}
-
-				return null;
-			}
-		}, spelCtx);
-
-		// Set the ID
-		PersistentProperty idProperty = entity.getIdProperty();
-		if (dbo.containsField("_id") && null != idProperty) {
-			Object idObj = dbo.get("_id");
-			try {
-				MappingBeanHelper.setProperty(instance, idProperty, idObj, useFieldAccessOnly);
-			} catch (IllegalAccessException e) {
-				throw new MappingException(e.getMessage(), e);
-			} catch (InvocationTargetException e) {
-				throw new MappingException(e.getMessage(), e);
-			}
-		}
-
-		// Set properties not already set in the constructor
-		entity.doWithProperties(new PropertyHandler() {
-			public void doWithPersistentProperty(PersistentProperty prop) {
-				if (ctorParamNames.contains(prop.getName())) {
-					return;
-				}
-
-				Object obj = getValueInternal(prop, dbo, spelCtx, prop.getValueAnnotation());
-				try {
-					MappingBeanHelper.setProperty(instance, prop, obj, useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-			}
-		});
-
-		// Handle associations
-		entity.doWithAssociations(new AssociationHandler() {
-			public void doWithAssociation(Association association) {
-				PersistentProperty inverseProp = association.getInverse();
-				Object obj = getValueInternal(inverseProp, dbo, spelCtx, inverseProp.getValueAnnotation());
-				try {
-					MappingBeanHelper.setProperty(instance, inverseProp, obj);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-			}
-		});
-
-		return instance;
-	}
-
-	public void write(final Object obj, final DBObject dbo) {
-		if (null == obj) {
-			return;
-		}
-
-		PersistentEntity<?> entity = mappingContext.getPersistentEntity(obj.getClass());
-		write(obj, dbo, entity);
-	}
-
-	protected void write(final Object obj, final DBObject dbo, PersistentEntity<?> entity) {
-
-		if (obj == null) {
-			return;
-		}
-
-		if (null == entity) {
-			// Must not have explictly added this entity yet		
-		    entity = mappingContext.addPersistentEntity(obj.getClass());		  
-			if (null == entity) {
-				// We can't map this entity for some reason
-				throw new MappingException("Unable to map entity " + obj);
-			}
-		}
-
-		// Write the ID
-		final PersistentProperty idProperty = entity.getIdProperty();
-		if (!dbo.containsField("_id") && null != idProperty) {
-			Object idObj = null;
-			try {
-				idObj = MappingBeanHelper.getProperty(obj, idProperty, Object.class, useFieldAccessOnly);
-			} catch (IllegalAccessException e) {
-				throw new MappingException(e.getMessage(), e);
-			} catch (InvocationTargetException e) {
-				throw new MappingException(e.getMessage(), e);
-			}
-
-			if (null != idObj) {
-				dbo.put("_id", idObj);
-			} else {
-				if (!VALID_ID_TYPES.contains(idProperty.getType())) {
-					throw new MappingException("Invalid data type " + idProperty.getType().getName() + " for Id property. Should be one of " + VALID_ID_TYPES);
-				}
-			}
-		}
-    
-		// Write the properties
-		entity.doWithProperties(new PropertyHandler() {
-			public void doWithPersistentProperty(PersistentProperty prop) {
-				String name = prop.getName();
-				Class<?> type = prop.getType();
-				Object propertyObj = null;
-				try {
-					propertyObj = MappingBeanHelper.getProperty(obj, prop, type, useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-				if (null != propertyObj) {
-					if (!MappingBeanHelper.isSimpleType(propertyObj.getClass())) {
-						writePropertyInternal(prop, propertyObj, dbo);
-					} else {
-						dbo.put(name, propertyObj);
-					}
-				}
-			}
-		});
-
-		entity.doWithAssociations(new AssociationHandler() {
-			public void doWithAssociation(Association association) {
-				PersistentProperty inverseProp = association.getInverse();
-				Class<?> type = inverseProp.getType();
-				Object propertyObj = null;
-				try {
-					propertyObj = MappingBeanHelper.getProperty(obj, inverseProp, type, useFieldAccessOnly);
-				} catch (IllegalAccessException e) {
-					throw new MappingException(e.getMessage(), e);
-				} catch (InvocationTargetException e) {
-					throw new MappingException(e.getMessage(), e);
-				}
-				if (null != propertyObj) {
-					writePropertyInternal(inverseProp, propertyObj, dbo);
-				}
-			}
-		});
-	}
-
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-	}
-
-	/**
-	 * Registers converters for {@link ObjectId} handling, removes plain {@link #toString()} converter and promotes the
-	 * configured {@link ConversionService} to {@link MappingBeanHelper}.
-	 */
-	private void initializeConverters() {
-
-		if (!conversionService.canConvert(ObjectId.class, String.class)) {
-			conversionService.addConverter(ObjectIdToStringConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(String.class, ObjectId.class)) {
-			conversionService.addConverter(StringToObjectIdConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(ObjectId.class, BigInteger.class)) {
-			conversionService.addConverter(ObjectIdToBigIntegerConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(BigInteger.class, ObjectId.class)) {
-			conversionService.addConverter(BigIntegerToObjectIdConverter.INSTANCE);
-		}
-
-		MappingBeanHelper.setConversionService(conversionService);
-	}
-
-	@SuppressWarnings({"unchecked"})
-	protected void writePropertyInternal(PersistentProperty prop, Object obj, DBObject dbo) {
-		org.springframework.data.document.mongodb.mapping.DBRef dbref = prop.getField()
-				.getAnnotation(org.springframework.data.document.mongodb.mapping.DBRef.class);
-
-		String name = prop.getName();
-		Class<?> type = prop.getType();
-		if (prop.isCollection()) {
-			BasicDBList dbList = new BasicDBList();
-			Collection<?> coll;
-			if (type.isArray()) {
-				coll = new ArrayList<Object>();
-				for (Object o : (Object[]) obj) {
-					((List) coll).add(o);
-				}
-			} else {
-				coll = (Collection<?>) obj;
-			}
-			for (Object propObjItem : coll) {
-				if (null != dbref) {
-					DBRef dbRef = createDBRef(propObjItem, dbref);
-					dbList.add(dbRef);
-				} else if (type.isArray() && MappingBeanHelper.isSimpleType(type.getComponentType())) {
-				  dbList.add(propObjItem);
-				} else if (MappingBeanHelper.isSimpleType(propObjItem.getClass())) {				  
-					dbList.add(propObjItem);
-				} else {
-					BasicDBObject propDbObj = new BasicDBObject();
-					write(propObjItem, propDbObj, mappingContext.getPersistentEntity(prop.getTypeInformation()));
-					dbList.add(propDbObj);
-				}
-			}
-			dbo.put(name, dbList);
-			return;
-		}
-
-		if (null != obj && obj instanceof Map) {
-			BasicDBObject mapDbObj = new BasicDBObject();
-			writeMapInternal((Map<Object, Object>) obj, mapDbObj);
-			dbo.put(name, mapDbObj);
-			return;
-		}
-
-		if (null != dbref) {
-			DBRef dbRefObj = createDBRef(obj, dbref);
-			if (null != dbRefObj) {
-				dbo.put(name, dbRefObj);
-				return;
-			}
-		}
-
-		// Lookup potential custom target type
-		Class<?> basicTargetType = customTypeMapping.get(obj.getClass());
-
-		if (basicTargetType != null) {
-			dbo.put(name, conversionService.convert(obj, basicTargetType));
-			return;
-		}
-
-		BasicDBObject propDbObj = new BasicDBObject();
-		write(obj, propDbObj, mappingContext.getPersistentEntity(prop.getTypeInformation()));
-		dbo.put(name, propDbObj);
-
-	}
-
-	protected void writeMapInternal(Map<Object, Object> obj, DBObject dbo) {
-		for (Map.Entry<Object, Object> entry : obj.entrySet()) {
-			Object key = entry.getKey();
-			Object val = entry.getValue();
-			if (MappingBeanHelper.isSimpleType(key.getClass())) {
-				String simpleKey = conversionService.convert(key, String.class);
-				if (MappingBeanHelper.isSimpleType(val.getClass())) {
-					dbo.put(simpleKey, val);
-				} else {
-					DBObject newDbo = new BasicDBObject();
-					Class<?> componentType = val.getClass();
-					if (componentType.isArray()
-							|| componentType.isAssignableFrom(Collection.class)
-							|| componentType.isAssignableFrom(List.class)) {
-						Class<?> ctype = val.getClass().getComponentType();
-						dbo.put("_class", (null != ctype ? ctype.getName() : componentType.getName()));
-					} else {
-						dbo.put("_class", componentType.getName());
-					}
-					write(val, newDbo);
-					dbo.put(simpleKey, newDbo);
-				}
-			} else {
-				throw new MappingException("Cannot use a complex object as a key value.");
-			}
-		}
-	}
-
-	protected DBRef createDBRef(Object target, org.springframework.data.document.mongodb.mapping.DBRef dbref) {
-		PersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
-		if (null == targetEntity || null == targetEntity.getIdProperty()) {
-			return null;
-		}
-
-		PersistentProperty idProperty = targetEntity.getIdProperty();
-		ObjectId id = null;
-		try {
-			id = MappingBeanHelper.getProperty(target, idProperty, ObjectId.class, useFieldAccessOnly);
-			if (null == id) {
-				throw new MappingException("Cannot create a reference to an object with a NULL id.");
-			}
-		} catch (IllegalAccessException e) {
-			throw new MappingException(e.getMessage(), e);
-		} catch (InvocationTargetException e) {
-			throw new MappingException(e.getMessage(), e);
-		}
-
-		String collection = dbref.collection();
-		if ("".equals(collection)) {
-			collection = targetEntity.getType().getSimpleName().toLowerCase();
-		}
-
-		String dbname = dbref.db();
-		if ("".equals(dbname)) {
-			dbname = defaultDatabase;
-		}
-
-		DB db = mongo.getDB(dbname);
-		return new DBRef(db, collection, id);
-	}
-
-	@SuppressWarnings({"unchecked"})
-	protected Object getValueInternal(PersistentProperty prop, DBObject dbo, StandardEvaluationContext ctx, Value spelExpr) {
-		String name = prop.getName();
-		Object o;
-		if (null != spelExpr) {
-			Expression x = spelExpressionParser.parseExpression(spelExpr.value());
-			o = x.getValue(ctx);
-		} else {
-			DBObject from = dbo;
-			if (dbo instanceof DBRef) {
-				from = ((DBRef) dbo).fetch();
-			}
-			Object dbObj = from.get(name);
-			if (dbObj instanceof DBObject) {
-				if (prop.isMap() && dbObj instanceof DBObject) {
-
-					// We have to find a potentially stored class to be used first.
-					Class<?> toType = findTypeToBeUsed((DBObject) dbObj);
-					Map<String, Object> m = new LinkedHashMap<String, Object>();
-
-					for (Map.Entry<String, Object> entry : ((Map<String, Object>) ((DBObject) dbObj).toMap()).entrySet()) {
-						if (entry.getKey().equals(CUSTOM_TYPE_KEY)) {
-							continue;
-						}
-						if (null != entry.getValue() && entry.getValue() instanceof DBObject) {
-							m.put(entry.getKey(), read((null != toType ? toType : prop.getMapValueType()), (DBObject) entry.getValue()));
-						} else {
-							m.put(entry.getKey(), entry.getValue());
-						}
-					}
-					return m;
-				} else if (prop.isArray() && dbObj instanceof BasicDBObject && ((DBObject) dbObj).keySet().size() == 0) {
-					// It's empty
-					return Array.newInstance(prop.getComponentType(), 0);
-				} else if (prop.isCollection() && dbObj instanceof BasicDBList) {
-					BasicDBList dbObjList = (BasicDBList) dbObj;
-					Object[] items = (Object[]) Array.newInstance(prop.getComponentType(), dbObjList.size());
-					for (int i = 0; i < dbObjList.size(); i++) {
-						Object dbObjItem = dbObjList.get(i);
-						if (dbObjItem instanceof DBRef) {
-							items[i] = read(prop.getComponentType(), ((DBRef) dbObjItem).fetch());
-						} else if (dbObjItem instanceof DBObject) {
-							items[i] = read(prop.getComponentType(), (DBObject) dbObjItem);
-						} else {
-							items[i] = dbObjItem;
-						}
-					}
-					List<Object> itemsToReturn = new LinkedList<Object>();
-					for (Object obj : items) {
-						itemsToReturn.add(obj);
-					}
-					return itemsToReturn;
-				}
-
-				Class<?> toType = findTypeToBeUsed((DBObject) dbObj);
-
-				// It's a complex object, have to read it in
-				if (toType != null) {
-					dbo.removeField(CUSTOM_TYPE_KEY);
-					o = read(toType, (DBObject) dbObj);
-				} else {
-					o = read(mappingContext.getPersistentEntity(prop.getTypeInformation()), (DBObject) dbObj);
-				}
-			} else {
-				o = dbObj;
-			}
-		}
-		return o;
-	}
-
-	/**
-	 * Returns the type to be used to convert the DBObject given to.
-	 *
-	 * @param dbObject
-	 * @return
-	 */
-	protected Class<?> findTypeToBeUsed(DBObject dbObject) {
-		Object classToBeUsed = dbObject.get(CUSTOM_TYPE_KEY);
-
-		if (classToBeUsed == null) {
-			return null;
-		}
-
-		try {
-			return Class.forName(classToBeUsed.toString());
-		} catch (ClassNotFoundException e) {
-			throw new MappingException(e.getMessage(), e);
-		}
-	}
-
-	public void afterPropertiesSet() {
-		initializeConverters();
-	}
-
-	protected class PersistentPropertyWrapper {
-		private final PersistentProperty property;
-		private final DBObject target;
-
-		public PersistentPropertyWrapper(PersistentProperty property, DBObject target) {
-			this.property = property;
-			this.target = target;
-		}
-
-		public PersistentProperty getProperty() {
-			return property;
-		}
-
-		public DBObject getTarget() {
-			return target;
-		}
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoBeanWrapper.java

@@ -1,94 +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.document.mongodb.convert;
-
-import static org.springframework.beans.PropertyAccessorFactory.forBeanPropertyAccess;
-import static org.springframework.beans.PropertyAccessorFactory.forDirectFieldAccess;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.ConfigurablePropertyAccessor;
-import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.util.Assert;
-
-/**
- * Custom Mongo specific {@link BeanWrapper} to allow access to bean properties via {@link MongoPropertyDescriptor}s.
- *
- * @author Oliver Gierke
- */
-class MongoBeanWrapper {
-
-  private final ConfigurablePropertyAccessor accessor;
-  private final MongoPropertyDescriptors descriptors;
-  private final boolean fieldAccess;
-
-  /**
-   * Creates a new {@link MongoBeanWrapper} for the given target object and {@link ConversionService}.
-   *
-   * @param target
-   * @param conversionService
-   * @param fieldAccess
-   */
-  public MongoBeanWrapper(Object target, ConversionService conversionService, boolean fieldAccess) {
-
-    Assert.notNull(target);
-    Assert.notNull(conversionService);
-
-    this.fieldAccess = fieldAccess;
-    this.accessor = fieldAccess ? forDirectFieldAccess(target) : forBeanPropertyAccess(target);
-    this.accessor.setConversionService(conversionService);
-    this.descriptors = new MongoPropertyDescriptors(target.getClass());
-  }
-
-  /**
-   * Returns all {@link MongoPropertyDescriptors.MongoPropertyDescriptor}s for the underlying target object.
-   *
-   * @return
-   */
-  public MongoPropertyDescriptors getDescriptors() {
-    return this.descriptors;
-  }
-
-  /**
-   * Returns the value of the underlying object for the given property.
-   *
-   * @param descriptor
-   * @return
-   */
-  public Object getValue(MongoPropertyDescriptors.MongoPropertyDescriptor descriptor) {
-    Assert.notNull(descriptor);
-    return accessor.getPropertyValue(descriptor.getName());
-  }
-
-  /**
-   * Sets the property of the underlying object to the given value.
-   *
-   * @param descriptor
-   * @param value
-   */
-  public void setValue(MongoPropertyDescriptors.MongoPropertyDescriptor descriptor, Object value) {
-    Assert.notNull(descriptor);
-    try {
-      accessor.setPropertyValue(descriptor.getName(), value);
-    } catch (NotWritablePropertyException e) {
-      if (!fieldAccess) {
-        throw e;
-      }
-    }
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoConverter.java

@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.convert;
-
-import org.bson.types.ObjectId;
-import org.springframework.data.document.mongodb.MongoReader;
-import org.springframework.data.document.mongodb.MongoWriter;
-
-
-public interface MongoConverter extends MongoWriter<Object>, MongoReader<Object> {
-
-  /**
-   * Converts the given {@link ObjectId} to the given target type.
-   *
-   * @param <T>        the actual type to create
-   * @param id         the source {@link ObjectId}
-   * @param targetType the target type to convert the {@link ObjectId} to
-   * @return
-   */
-  public <T> T convertObjectId(ObjectId id, Class<T> targetType);
-
-
-  /**
-   * Returns the {@link ObjectId} instance for the given id.
-   *
-   * @param id
-   * @return
-   */
-  public ObjectId convertObjectId(Object id);
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/ObjectIdConverters.java

@@ -1,88 +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.document.mongodb.convert;
-
-import java.math.BigInteger;
-
-import org.bson.types.ObjectId;
-import org.springframework.core.convert.converter.Converter;
-
-/**
- * Wrapper class to contain useful {@link ObjectId}-to-something-and-back converters.
- *
- * @author Oliver Gierke
- */
-abstract class ObjectIdConverters {
-  
-  /**
-   * Private constructor to prevent instantiation.
-   */
-  private ObjectIdConverters() {
-    
-  }
-
-  /**
-   * Simple singleton to convert {@link ObjectId}s to their {@link String} representation.
-   *
-   * @author Oliver Gierke
-   */
-  public static enum ObjectIdToStringConverter implements Converter<ObjectId, String> {
-    INSTANCE;
-
-    public String convert(ObjectId id) {
-      return id.toString();
-    }
-  }
-  
-  /**
-   * Simple singleton to convert {@link String}s to their {@link ObjectId} representation.
-   *
-   * @author Oliver Gierke
-   */
-  public static enum StringToObjectIdConverter implements Converter<String, ObjectId> {
-    INSTANCE;
-
-    public ObjectId convert(String source) {
-      return new ObjectId(source);
-    }
-  }
-  
-  /**
-   * Simple singleton to convert {@link ObjectId}s to their {@link java.math.BigInteger} representation.
-   *
-   * @author Oliver Gierke
-   */
-  public static enum ObjectIdToBigIntegerConverter implements Converter<ObjectId, BigInteger> {
-    INSTANCE;
-
-    public BigInteger convert(ObjectId source) {
-      return new BigInteger(source.toString(), 16);
-    }
-  }
-  
-  /**
-   * Simple singleton to convert {@link BigInteger}s to their {@link ObjectId} representation.
-   *
-   * @author Oliver Gierke
-   */
-  public static enum BigIntegerToObjectIdConverter implements Converter<BigInteger, ObjectId> {
-    INSTANCE;
-
-    public ObjectId convert(BigInteger source) {
-      return new ObjectId(source.toString(16));
-    }
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java

@@ -1,541 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.convert;
-
-import static org.springframework.data.document.mongodb.convert.ObjectIdConverters.*;
-import java.lang.reflect.*;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.bson.types.CodeWScope;
-import org.bson.types.ObjectId;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.CollectionFactory;
-import org.springframework.core.convert.ConversionFailedException;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.converter.ConverterFactory;
-import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.util.Assert;
-import org.springframework.util.comparator.CompoundComparator;
-
-/**
- * Basic {@link MongoConverter} implementation to convert between domain classes and {@link DBObject}s.
- * 
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author Oliver Gierke
- */
-public class SimpleMongoConverter implements MongoConverter, InitializingBean {
-
-  private static final Log LOG = LogFactory.getLog(SimpleMongoConverter.class);
-  @SuppressWarnings("unchecked")
-  private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, String.class, DBObject.class);
-  private static final Set<String> SIMPLE_TYPES;
-
-  static {
-    Set<String> basics = new HashSet<String>();
-    basics.add(boolean.class.getName());
-    basics.add(long.class.getName());
-    basics.add(short.class.getName());
-    basics.add(int.class.getName());
-    basics.add(byte.class.getName());
-    basics.add(float.class.getName());
-    basics.add(double.class.getName());
-    basics.add(char.class.getName());
-    basics.add(Boolean.class.getName());
-    basics.add(Long.class.getName());
-    basics.add(Short.class.getName());
-    basics.add(Integer.class.getName());
-    basics.add(Byte.class.getName());
-    basics.add(Float.class.getName());
-    basics.add(Double.class.getName());
-    basics.add(Character.class.getName());
-    basics.add(String.class.getName());
-    basics.add(java.util.Date.class.getName());
-    // basics.add(Time.class.getName());
-    // basics.add(Timestamp.class.getName());
-    // basics.add(java.sql.Date.class.getName());
-    // basics.add(BigDecimal.class.getName());
-    // basics.add(BigInteger.class.getName());
-    basics.add(Locale.class.getName());
-    // basics.add(Calendar.class.getName());
-    // basics.add(GregorianCalendar.class.getName());
-    // basics.add(java.util.Currency.class.getName());
-    // basics.add(TimeZone.class.getName());
-    // basics.add(Object.class.getName());
-    basics.add(Class.class.getName());
-    // basics.add(byte[].class.getName());
-    // basics.add(Byte[].class.getName());
-    // basics.add(char[].class.getName());
-    // basics.add(Character[].class.getName());
-    // basics.add(Blob.class.getName());
-    // basics.add(Clob.class.getName());
-    // basics.add(Serializable.class.getName());
-    // basics.add(URI.class.getName());
-    // basics.add(URL.class.getName());
-    basics.add(DBRef.class.getName());
-    basics.add(Pattern.class.getName());
-    basics.add(CodeWScope.class.getName());
-    basics.add(ObjectId.class.getName());
-    basics.add(Enum.class.getName());
-    SIMPLE_TYPES = Collections.unmodifiableSet(basics);
-  }
-
-  private final GenericConversionService conversionService;
-
-  /**
-   * Creates a {@link SimpleMongoConverter}.
-   */
-  public SimpleMongoConverter() {
-    this.conversionService = ConversionServiceFactory.createDefaultConversionService();
-    this.conversionService.removeConvertible(Object.class, String.class);
-  }
-
-  /**
-   * Initializes additional converters that handle {@link ObjectId} conversion. Will register converters for supported
-   * id types if none are registered for those conversion already. {@link GenericConversionService} is configured.
-   */
-  private void initializeConverters() {
-
-    if (!conversionService.canConvert(ObjectId.class, String.class)) {
-      conversionService.addConverter(ObjectIdToStringConverter.INSTANCE);
-    }
-    if (!conversionService.canConvert(String.class, ObjectId.class)) {
-      conversionService.addConverter(StringToObjectIdConverter.INSTANCE);
-    }
-    if (!conversionService.canConvert(ObjectId.class, BigInteger.class)) {
-      conversionService.addConverter(ObjectIdToBigIntegerConverter.INSTANCE);
-    }
-    if (!conversionService.canConvert(BigInteger.class, ObjectId.class)) {
-      conversionService.addConverter(BigIntegerToObjectIdConverter.INSTANCE);
-    }
-  }
-
-  /**
-   * Add custom {@link Converter} or {@link ConverterFactory} instances to be used that will take presidence over
-   * using object traversal to convert and object to/from DBObject
-   * 
-   * @param converters
-   */
-  public void setConverters(Set<?> converters) {
-    for (Object converter : converters) {
-      boolean added = false;
-      if (converter instanceof Converter) {
-        this.conversionService.addConverter((Converter<?, ?>) converter);
-        added = true;
-      }
-      if (converter instanceof ConverterFactory) {
-        this.conversionService.addConverterFactory((ConverterFactory<?, ?>) converter);
-        added = true;
-      }
-      if (!added) {
-        throw new IllegalArgumentException("Given set contains element that is neither Converter nor ConverterFactory!");
-      }
-    }
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
-    */
-  @SuppressWarnings("rawtypes")
-  public void write(Object obj, DBObject dbo) {
-
-    MongoBeanWrapper beanWrapper = createWrapper(obj, false);
-    for (MongoPropertyDescriptor descriptor : beanWrapper.getDescriptors()) {
-      if (descriptor.isMappable()) {
-        Object value = beanWrapper.getValue(descriptor);
-
-        if (value == null) {
-          continue;
-        }
-
-        String keyToUse = descriptor.getKeyToMap();
-        if (descriptor.isEnum()) {
-          writeValue(dbo, keyToUse, ((Enum) value).name());
-        } else if (descriptor.isIdProperty() && descriptor.isOfIdType()) {
-          if (value instanceof String && ObjectId.isValid((String) value)) {
-            try {
-              writeValue(dbo, keyToUse, conversionService.convert(value, ObjectId.class));
-            } catch (ConversionFailedException iae) {
-              LOG.warn("Unable to convert the String " + value + " to an ObjectId");
-              writeValue(dbo, keyToUse, value);
-            }
-          } else {
-            // we can't convert this id - use as is
-            writeValue(dbo, keyToUse, value);
-          }
-        } else {
-          writeValue(dbo, keyToUse, value);
-        }
-      } else {
-        if (!"class".equals(descriptor.getName())) {
-          LOG.debug("Skipping property " + descriptor.getName() + " as it's not a mappable one.");
-        }
-      }
-    }
-  }
-
-  /**
-   * Writes the given value to the given {@link DBObject}. Will skip {@literal null} values.
-   * 
-   * @param dbo
-   * @param keyToUse
-   * @param value
-   */
-  private void writeValue(DBObject dbo, String keyToUse, Object value) {
-
-    if (!isSimpleType(value.getClass())) {
-      writeCompoundValue(dbo, keyToUse, value);
-    } else {
-      dbo.put(keyToUse, value);
-    }
-  }
-
-  /**
-   * Writes the given {@link CompoundComparator} value to the given {@link DBObject}.
-   *
-   * @param dbo
-   * @param keyToUse
-   * @param value
-   */
-  @SuppressWarnings("unchecked")
-  private void writeCompoundValue(DBObject dbo, String keyToUse, Object value) {
-    if (value instanceof Map) {
-      writeMap(dbo, keyToUse, (Map<String, Object>) value);
-      return;
-    }
-    if (value instanceof Collection) {
-      // Should write a collection!
-      writeArray(dbo, keyToUse, ((Collection<Object>) value).toArray());
-      return;
-    }
-    if (value instanceof Object[]) {
-      // Should write an array!
-      writeArray(dbo, keyToUse, (Object[]) value);
-      return;
-    }
-    
-    Class<?> customTargetType = getCustomTargetType(value);
-    if (customTargetType != null) {
-      dbo.put(keyToUse, conversionService.convert(value, customTargetType));
-      return;
-    }
-    
-    DBObject nestedDbo = new BasicDBObject();
-    write(value, nestedDbo);
-    dbo.put(keyToUse, nestedDbo);
-  }
-  
-  /**
-   * Returns whether the {@link ConversionService} has a custom {@link Converter} registered that can convert the given
-   * object into one of the types supported by MongoDB.
-   * 
-   * @param obj
-   * @return
-   */
-  private Class<?> getCustomTargetType(Object obj) {
-    
-    for (Class<?> mongoType : MONGO_TYPES) {
-      if (conversionService.canConvert(obj.getClass(), mongoType)) {
-        return mongoType;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Writes the given {@link Map} to the given {@link DBObject}.
-   * 
-   * @param dbo
-   * @param mapKey
-   * @param map
-   */
-  protected void writeMap(DBObject dbo, String mapKey, Map<String, Object> map) {
-    // TODO support non-string based keys as long as there is a Spring Converter obj->string and (optionally)
-    // string->obj
-    DBObject dboToPopulate = null;
-
-    // TODO - Does that make sense? If we create a new object here it's content will never make it out of this
-    // method
-    if (mapKey != null) {
-      dboToPopulate = new BasicDBObject();
-    } else {
-      dboToPopulate = dbo;
-    }
-    if (map != null) {
-      for (Entry<String, Object> entry : map.entrySet()) {
-
-        Object entryValue = entry.getValue();
-        String entryKey = entry.getKey();
-
-        if (!isSimpleType(entryValue.getClass())) {
-          writeCompoundValue(dboToPopulate, entryKey, entryValue);
-        } else {
-          dboToPopulate.put(entryKey, entryValue);
-        }
-      }
-      dbo.put(mapKey, dboToPopulate);
-    }
-  }
-
-  /**
-   * Writes the given array to the given {@link DBObject}.
-   *
-   * @param dbo
-   * @param keyToUse
-   * @param array
-   */
-  protected void writeArray(DBObject dbo, String keyToUse, Object[] array) {
-    Object[] dboValues;
-    if (array != null) {
-      dboValues = new Object[array.length];
-      int i = 0;
-      for (Object o : array) {
-        if (!isSimpleType(o.getClass())) {
-          DBObject dboValue = new BasicDBObject();
-          write(o, dboValue);
-          dboValues[i] = dboValue;
-        } else {
-          dboValues[i] = o;
-        }
-        i++;
-      }
-      dbo.put(keyToUse, dboValues);
-    }
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.document.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
-    */
-  public <S> S read(Class<S> clazz, DBObject source) {
-
-    if (source == null) {
-      return null;
-    }
-
-    Assert.notNull(clazz, "Mapped class was not specified");
-    S target = BeanUtils.instantiateClass(clazz);
-    MongoBeanWrapper bw = new MongoBeanWrapper(target, conversionService, true);
-
-    for (MongoPropertyDescriptor descriptor : bw.getDescriptors()) {
-      String keyToUse = descriptor.getKeyToMap();
-      if (source.containsField(keyToUse)) {
-        if (descriptor.isMappable()) {
-          Object value = source.get(keyToUse);
-          if (!isSimpleType(value.getClass())) {
-            if (value instanceof Object[]) {
-              bw.setValue(descriptor, readCollection(descriptor, Arrays.asList((Object[]) value))
-                  .toArray());
-            } else if (value instanceof BasicDBList) {
-              bw.setValue(descriptor, readCollection(descriptor, (BasicDBList) value));
-            } else if (value instanceof DBObject) {
-              bw.setValue(descriptor, readCompoundValue(descriptor, (DBObject) value));
-            } else {
-              LOG.warn("Unable to map compound DBObject field " + keyToUse + " to property "
-                  + descriptor.getName()
-                  + ".  The field value should have been a 'DBObject.class' but was "
-                  + value.getClass().getName());
-            }
-          } else {
-            bw.setValue(descriptor, value);
-          }
-        } else {
-          LOG.warn("Unable to map DBObject field " + keyToUse + " to property " + descriptor.getName()
-              + ".  Skipping.");
-        }
-      }
-    }
-
-    return target;
-  }
-
-  /**
-   * Reads the given collection values (that are {@link DBObject}s potentially) into a {@link Collection} of domain
-   * objects.
-   *
-   * @param descriptor
-   * @param values
-   * @return
-   */
-  private Collection<Object> readCollection(MongoPropertyDescriptor descriptor, Collection<?> values) {
-
-    Class<?> targetCollectionType = descriptor.getPropertyType();
-    boolean targetIsArray = targetCollectionType.isArray();
-
-    @SuppressWarnings("unchecked")
-    Collection<Object> result = targetIsArray ? new ArrayList<Object>(values.size()) : CollectionFactory
-        .createCollection(targetCollectionType, values.size());
-
-    for (Object o : values) {
-      if (o instanceof DBObject) {
-        Class<?> type;
-        if (targetIsArray) {
-          type = targetCollectionType.getComponentType();
-        } else {
-          type = getGenericParameters(descriptor.getTypeToSet()).get(0);
-        }
-        result.add(read(type, (DBObject) o));
-      } else {
-        result.add(o);
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Reads a compound value from the given {@link DBObject} for the given property.
-   *
-   * @param pd
-   * @param dbo
-   * @return
-   */
-  private Object readCompoundValue(MongoPropertyDescriptor pd, DBObject dbo) {
-
-    Assert.isTrue(!pd.isCollection(), "Collections not supported!");
-
-    if (pd.isMap()) {
-      return readMap(pd, dbo, getGenericParameters(pd.getTypeToSet()).get(1));
-    } else {
-      return read(pd.getPropertyType(), dbo);
-    }
-  }
-
-  /**
-   * Create a {@link Map} instance. Will return a {@link HashMap} by default. Subclasses might want to override this
-   * method to use a custom {@link Map} implementation.
-   *
-   * @return
-   */
-  protected Map<String, Object> createMap() {
-    return new HashMap<String, Object>();
-  }
-
-  /**
-   * Reads every key/value pair from the {@link DBObject} into a {@link Map} instance.
-   *
-   * @param pd
-   * @param dbo
-   * @param targetType
-   * @return
-   */
-  protected Map<?, ?> readMap(MongoPropertyDescriptor pd, DBObject dbo, Class<?> targetType) {
-    Map<String, Object> map = createMap();
-    for (String key : dbo.keySet()) {
-      Object value = dbo.get(key);
-      if (!isSimpleType(value.getClass())) {
-        map.put(key, read(targetType, (DBObject) value));
-        // Can do some reflection tricks here -
-        // throw new RuntimeException("User types not supported yet as values for Maps");
-      } else {
-        map.put(key, conversionService.convert(value, targetType));
-      }
-    }
-    return map;
-  }
-
-  protected static boolean isSimpleType(Class<?> propertyType) {
-    if (propertyType == null) {
-      return false;
-    }
-    if (propertyType.isArray()) {
-      return isSimpleType(propertyType.getComponentType());
-    }
-    return SIMPLE_TYPES.contains(propertyType.getName());
-  }
-
-  /**
-   * Callback to allow customizing creation of a {@link MongoBeanWrapper}.
-   *
-   * @param target      the target object to wrap
-   * @param fieldAccess whether to use field access or property access
-   * @return
-   */
-  protected MongoBeanWrapper createWrapper(Object target, boolean fieldAccess) {
-
-    return new MongoBeanWrapper(target, conversionService, fieldAccess);
-  }
-
-  public List<Class<?>> getGenericParameters(Type genericParameterType) {
-
-    List<Class<?>> actualGenericParameterTypes = new ArrayList<Class<?>>();
-
-    if (genericParameterType instanceof ParameterizedType) {
-      ParameterizedType aType = (ParameterizedType) genericParameterType;
-      Type[] parameterArgTypes = aType.getActualTypeArguments();
-      for (Type parameterArgType : parameterArgTypes) {
-        if (parameterArgType instanceof GenericArrayType) {
-          Class<?> arrayType = (Class<?>) ((GenericArrayType) parameterArgType).getGenericComponentType();
-          actualGenericParameterTypes.add(Array.newInstance(arrayType, 0).getClass());
-        } else {
-          if (parameterArgType instanceof ParameterizedType) {
-            ParameterizedType paramTypeArgs = (ParameterizedType) parameterArgType;
-            actualGenericParameterTypes.add((Class<?>) paramTypeArgs.getRawType());
-          } else {
-            if (parameterArgType instanceof TypeVariable) {
-              throw new RuntimeException("Can not map " + ((TypeVariable<?>) parameterArgType).getName());
-            } else {
-              if (parameterArgType instanceof Class) {
-                actualGenericParameterTypes.add((Class<?>) parameterArgType);
-              } else {
-                throw new RuntimeException("Can not map " + parameterArgType);
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return actualGenericParameterTypes;
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
-    */
-  public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
-    return conversionService.convert(id, targetType);
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
-    */
-  public ObjectId convertObjectId(Object id) {
-    return conversionService.convert(id, ObjectId.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-   */
-  public void afterPropertiesSet() {
-    initializeConverters();
-  }
-}

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

@@ -1,97 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.geo;
-
-/**
- * Represents a geospatial box value
- * @author Mark Pollack
- *
- */
-public class Box {
-
-  
-    private double xmin;
-    
-    private double ymin;
-    
-    private double xmax;
-    
-    private double ymax;
-           
-    public Box(Point lowerLeft, Point upperRight) {
-      xmin = lowerLeft.getX();
-      ymin = lowerLeft.getY();
-      xmax = upperRight.getX();
-      ymax = upperRight.getY();
-    }
-    
-    public Box(double[] lowerLeft, double[] upperRight) {
-      xmin = lowerLeft[0];
-      ymin = lowerLeft[1];
-      xmax = upperRight[0];
-      ymax = upperRight[1];
-    }
-    
-    public Point getLowerLeft() {
-      return new Point(xmin, ymin);
-    }
-    
-    public Point getUpperRight() {
-      return new Point(xmax, ymax);
-    }
-    @Override
-    public String toString() {
-      return "Box [xmin=" + xmin + ", ymin=" + ymin + ", xmax=" + xmax
-          + ", ymax=" + ymax + "]";
-    }
-
-    @Override
-    public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      long temp;
-      temp = Double.doubleToLongBits(xmax);
-      result = prime * result + (int) (temp ^ (temp >>> 32));
-      temp = Double.doubleToLongBits(xmin);
-      result = prime * result + (int) (temp ^ (temp >>> 32));
-      temp = Double.doubleToLongBits(ymax);
-      result = prime * result + (int) (temp ^ (temp >>> 32));
-      temp = Double.doubleToLongBits(ymin);
-      result = prime * result + (int) (temp ^ (temp >>> 32));
-      return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj)
-        return true;
-      if (obj == null)
-        return false;
-      if (getClass() != obj.getClass())
-        return false;
-      Box other = (Box) obj;
-      if (Double.doubleToLongBits(xmax) != Double.doubleToLongBits(other.xmax))
-        return false;
-      if (Double.doubleToLongBits(xmin) != Double.doubleToLongBits(other.xmin))
-        return false;
-      if (Double.doubleToLongBits(ymax) != Double.doubleToLongBits(other.ymax))
-        return false;
-      if (Double.doubleToLongBits(ymin) != Double.doubleToLongBits(other.ymin))
-        return false;
-      return true;
-    }
-
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.geo;
-
-import java.util.Arrays;
-
-/**
- * Represents a geospatial circle value
- * @author Mark Pollack
- *
- */
-public class Circle {
-
-  private double[] center;
-  private double radius;
-  
-  public Circle(double centerX, double centerY, double radius) {
-    this.center = new double[] { centerX, centerY };
-    this.radius = radius;
-  }
-
-  public double[] getCenter() {
-    return center;
-  }
-
-  public double getRadius() {
-    return radius;
-  }
-
-  @Override
-  public String toString() {
-    return "Circle [center=" + Arrays.toString(center) + ", radius=" + radius
-        + "]";
-  }
-  
-  
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/geo/Point.java

@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.geo;
-
-/**
- * Represents a geospatial point value
- * @author Mark Pollack
- *
- */
-public class Point {
-
-  private double x;
-  
-  private double y;
-
-  public Point(double x, double y) {
-    this.x = x;
-    this.y = y;
-  }
-  
-  public Point(Point point) {
-    this.x = point.x;
-    this.y = point.y;
-  }
-
-  public double getX() {
-    return x;
-  }
-
-  public double getY() {
-    return y;
-  }
-  
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    long temp;
-    temp = Double.doubleToLongBits(x);
-    result = prime * result + (int) (temp ^ (temp >>> 32));
-    temp = Double.doubleToLongBits(y);
-    result = prime * result + (int) (temp ^ (temp >>> 32));
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
-    Point other = (Point) obj;
-    if (Double.doubleToLongBits(x) != Double
-        .doubleToLongBits(other.x))
-      return false;
-    if (Double.doubleToLongBits(y) != Double
-        .doubleToLongBits(other.y))
-      return false;
-    return true;
-  }
-
-  @Override
-  public String toString() {
-    return "Point [latitude=" + x + ", longitude=" + y + "]";
-  }
-  
-  
-  
-  
-}

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

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.Set;
-
-import org.bson.types.CodeWScope;
-import org.bson.types.ObjectId;
-import org.springframework.data.mapping.BasicMappingContext;
-import org.springframework.data.mapping.BasicPersistentEntity;
-import org.springframework.data.mapping.BasicPersistentProperty;
-import org.springframework.data.mapping.MappingBeanHelper;
-import org.springframework.data.mapping.model.MappingConfigurationException;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class MongoMappingContext extends BasicMappingContext {
-
-  public MongoMappingContext() {
-    augmentSimpleTypes();
-  }
-
-  protected void augmentSimpleTypes() {
-    // Augment simpleTypes with MongoDB-specific classes
-    Set<Class<?>> simpleTypes = MappingBeanHelper.getSimpleTypes();
-    simpleTypes.add(com.mongodb.DBRef.class);
-    simpleTypes.add(ObjectId.class);
-    simpleTypes.add(CodeWScope.class);
-    simpleTypes.add(Character.class);
-  }
-
-  @Override
-  public boolean isAssociation(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException {
-    if (field.isAnnotationPresent(DBRef.class)) {
-      return true;
-    }
-    return super.isAssociation(field, descriptor);
-  }
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.mapping.BasicMappingContext#getPersistentEntities()
-   */
-  @Override
-  @SuppressWarnings("unchecked")
-  public Collection<MongoPersistentEntity<?>> getPersistentEntities() {
-    return (Collection<MongoPersistentEntity<?>>) super.getPersistentEntities();
-  }
-
-  @Override
-  public BasicPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
-                                                          TypeInformation information) throws MappingConfigurationException {
-    return new MongoPersistentProperty(field, descriptor, information);
-  }
-
-  @Override
-  public <T> BasicPersistentEntity<T> createPersistentEntity(TypeInformation typeInformation, MappingContext mappingContext)
-      throws MappingConfigurationException {
-    return new MongoPersistentEntity<T>(mappingContext, typeInformation);
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntity.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping;
-
-import org.springframework.data.mapping.BasicPersistentEntity;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * Mongo specific {@link PersistentEntity} implementation that adds Mongo specific meta-data such as the collection name
- * and the like.
- *
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke
- */
-public class MongoPersistentEntity<T> extends BasicPersistentEntity<T> {
-
-  protected String collection;
-
-  /**
-   * Creates a new {@link MongoPersistentEntity} with the given {@link MappingContext} and {@link TypeInformation}. Will
-   * default the collection name to the entities simple type name.
-   *
-   * @param mappingContext
-   * @param typeInformation
-   */
-  public MongoPersistentEntity(MappingContext mappingContext, TypeInformation typeInformation) {
-    super(mappingContext, typeInformation);
-    this.collection = typeInformation.getType().getSimpleName().toLowerCase();
-    if (typeInformation.getType().isAnnotationPresent(Document.class)) {
-      Document d = typeInformation.getType().getAnnotation(Document.class);
-      if (!"".equals(d.collection())) {
-        this.collection = d.collection();
-      }
-    }
-  }
-
-  /**
-   * Returns the collection the entity should be stored in.
-   *
-   * @return
-   */
-  public String getCollection() {
-    if (null == collection) {
-      this.collection = type.getSimpleName().toLowerCase();
-    }
-    return collection;
-  }
-
-
-  public void setCollection(String collection) {
-    this.collection = collection;
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntityIndexCreator.java

@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping;
-
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
-import com.mongodb.MongoException;
-import com.mongodb.util.JSON;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationListener;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.mongodb.CollectionCallback;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.index.CompoundIndex;
-import org.springframework.data.document.mongodb.index.CompoundIndexes;
-import org.springframework.data.document.mongodb.index.GeoSpatialIndexed;
-import org.springframework.data.document.mongodb.index.IndexDirection;
-import org.springframework.data.document.mongodb.index.Indexed;
-import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.mapping.event.MappingContextEvent;
-import org.springframework.data.mapping.model.PersistentProperty;
-import org.springframework.util.Assert;
-
-/**
- * Component that inspects {@link MongoPersistentEntity} instances contained in the given {@link MongoMappingContext}
- * for indexing metadata and ensures the indexes to be available.
- *
- * @author Jon Brisbin <jbrisbin@vmware.com>
- * @author Oliver Gierke
- */
-public class MongoPersistentEntityIndexCreator implements ApplicationListener<MappingContextEvent> {
-
-	private static final Log log = LogFactory.getLog(MongoPersistentEntityIndexCreator.class);
-
-	private Set<Class<?>> classesSeen = Collections.newSetFromMap(new ConcurrentHashMap<Class<?>, Boolean>());
-
-	private final MongoTemplate mongoTemplate;
-
-	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoTemplate mongoTemplate) {
-
-		Assert.notNull(mongoTemplate);
-		Assert.notNull(mappingContext);
-		this.mongoTemplate = mongoTemplate;
-
-		for (MongoPersistentEntity<?> entity : mappingContext.getPersistentEntities()) {
-			checkForIndexes(entity);
-		}
-	}
-
-	/* (non-Javadoc)
-		* @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-		*/
-	public void onApplicationEvent(MappingContextEvent event) {
-		checkForIndexes((MongoPersistentEntity<?>) event.getPersistentEntity());
-	}
-
-	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
-		final Class<?> type = entity.getType();
-		if (!classesSeen.contains(type)) {
-			if (log.isDebugEnabled()) {
-				log.debug("Analyzing class " + type + " for index information.");
-			}
-			// Check for special collection setting
-			if (type.isAnnotationPresent(Document.class)) {
-				Document doc = type.getAnnotation(Document.class);
-				String collection = doc.collection();
-				if ("".equals(collection)) {
-					collection = type.getSimpleName().toLowerCase();
-				}
-				entity.setCollection(collection);
-			}
-
-			// Make sure indexes get created
-			if (type.isAnnotationPresent(CompoundIndexes.class)) {
-				CompoundIndexes indexes = type.getAnnotation(CompoundIndexes.class);
-				for (CompoundIndex index : indexes.value()) {
-					String indexColl = index.collection();
-					if ("".equals(indexColl)) {
-						indexColl = entity.getCollection();
-					}
-					ensureIndex(indexColl, index.name(), index.def(), index.direction(), index.unique(), index.dropDups(), index.sparse());
-					if (log.isDebugEnabled()) {
-						log.debug("Created compound index " + index);
-					}
-				}
-			}
-
-			entity.doWithProperties(new PropertyHandler() {
-				public void doWithPersistentProperty(PersistentProperty persistentProperty) {
-					Field field = persistentProperty.getField();
-					if (field.isAnnotationPresent(Indexed.class)) {
-						Indexed index = field.getAnnotation(Indexed.class);
-						String name = index.name();
-						if ("".equals(name)) {
-							name = field.getName();
-						} else {
-							if (!name.equals(field.getName()) && index.unique() && !index.sparse()) {
-								// Names don't match, and sparse is not true. This situation will generate an error on the server.
-								if (log.isWarnEnabled()) {
-									log.warn("The index name " + name + " doesn't match this property name: " + field.getName()
-											+ ". Setting sparse=true on this index will prevent errors when inserting documents.");
-								}
-							}
-						}
-						String collection = index.collection();
-						if ("".equals(collection)) {
-							collection = entity.getCollection();
-						}
-						ensureIndex(collection, name, null, index.direction(), index.unique(), index.dropDups(), index.sparse());
-						if (log.isDebugEnabled()) {
-							log.debug("Created property index " + index);
-						}
-					} else if (field.isAnnotationPresent(GeoSpatialIndexed.class)) {
-						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
-						String name = index.name();
-						if ("".equals(name)) {
-							name = field.getName();
-						}
-						String collection = index.collection();
-						if ("".equals(collection)) {
-							collection = entity.getCollection();
-						}
-						ensureGeoIndex(collection, name, index.min(), index.max(), index.bits());
-						if (log.isDebugEnabled()) {
-							log.debug("Created geo index " + index);
-						}
-					}
-				}
-			});
-
-			classesSeen.add(type);
-		}
-
-
-	}
-
-	protected void ensureIndex(String collection,
-														 final String name,
-														 final String def,
-														 final IndexDirection direction,
-														 final boolean unique,
-														 final boolean dropDups,
-														 final boolean sparse) {
-		mongoTemplate.execute(collection, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				DBObject defObj;
-				if (null != def) {
-					defObj = (DBObject) JSON.parse(def);
-				} else {
-					defObj = new BasicDBObject();
-					defObj.put(name, (direction == IndexDirection.ASCENDING ? 1 : -1));
-				}
-				DBObject opts = new BasicDBObject();
-				//opts.put("name", name + "_idx");
-				opts.put("dropDups", dropDups);
-				opts.put("sparse", sparse);
-				opts.put("unique", unique);
-				collection.ensureIndex(defObj, opts);
-				return null;
-			}
-		});
-	}
-
-	protected void ensureGeoIndex(String collection,
-																final String name,
-																final int min,
-																final int max,
-																final int bits) {
-		mongoTemplate.execute(collection, new CollectionCallback<Object>() {
-			public Object doInCollection(DBCollection collection) throws MongoException, DataAccessException {
-				DBObject defObj = new BasicDBObject();
-				defObj.put(name, "2d");
-
-				DBObject opts = new BasicDBObject();
-				// Min
-				if (min != 0) {
-					opts.put("min", min);
-				}
-				// Max
-				if (max != 0) {
-					opts.put("max", max);
-				}
-				// Bits
-				opts.put("bits", bits);
-				collection.ensureIndex(defObj, opts);
-				return null;
-			}
-		});
-	}
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentProperty.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bson.types.ObjectId;
-import org.springframework.data.mapping.BasicPersistentProperty;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * Mongo specific
- * {@link org.springframework.data.mapping.model.PersistentProperty}
- * implementation.
- *
- * @author Oliver Gierke
- */
-public class MongoPersistentProperty extends BasicPersistentProperty {
-
-  private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
-  private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
-
-  static {
-    SUPPORTED_ID_TYPES.add(ObjectId.class);
-    SUPPORTED_ID_TYPES.add(String.class);
-    SUPPORTED_ID_TYPES.add(BigInteger.class);
-
-    SUPPORTED_ID_PROPERTY_NAMES.add("id");
-    SUPPORTED_ID_PROPERTY_NAMES.add("_id");
-  }
-
-  /**
-   * Creates a new {@link MongoPersistentProperty}.
-   *
-   * @param field
-   * @param propertyDescriptor
-   * @param owningTypeInformation
-   */
-  public MongoPersistentProperty(Field field,
-                                 PropertyDescriptor propertyDescriptor, TypeInformation owningTypeInformation) {
-    super(field, propertyDescriptor, owningTypeInformation);
-  }
-
-  /**
-   * Also considers fields as id that are of supported id type and name.
-   *
-   * @see #SUPPORTED_ID_PROPERTY_NAMES
-   * @see #SUPPORTED_ID_TYPES
-   */
-  @Override
-  public boolean isIdProperty() {
-    if (super.isIdProperty()) {
-      return true;
-    }
-
-    return SUPPORTED_ID_TYPES.contains(field.getType())
-        && SUPPORTED_ID_PROPERTY_NAMES.contains(field.getName());
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/AbstractMappingEventListener.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping.event;
-
-import com.mongodb.DBObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public abstract class AbstractMappingEventListener<T extends ApplicationEvent, E> implements ApplicationListener<T> {
-
-  protected final Log log = LogFactory.getLog(getClass());
-
-  @SuppressWarnings({"unchecked"})
-  public void onApplicationEvent(T appEvent) {
-    if (appEvent instanceof MongoMappingEvent) {
-      try {
-        MongoMappingEvent<E> event = (MongoMappingEvent<E>) appEvent;
-        if (event instanceof BeforeConvertEvent) {
-          onBeforeConvert(event.getSource());
-        } else if (event instanceof BeforeSaveEvent) {
-          onBeforeSave(event.getSource(), event.getDBObject());
-        } else if (event instanceof AfterSaveEvent) {
-          onAfterSave(event.getSource(), event.getDBObject());
-        } else if (event instanceof AfterLoadEvent) {
-          onAfterLoad((DBObject) event.getSource());
-        } else if (event instanceof AfterConvertEvent) {
-          onAfterConvert(event.getDBObject(), event.getSource());
-        }
-      } catch (ClassCastException e) {
-        // Not a mapping event for this entity, apparently.
-        // Just ignore it for now.
-      }
-    }
-  }
-
-  public void onBeforeConvert(E source) {
-    if (log.isDebugEnabled()) {
-      log.debug("onBeforeConvert(" + source + ")");
-    }
-  }
-
-  public void onBeforeSave(E source, DBObject dbo) {
-    if (log.isDebugEnabled()) {
-      log.debug("onBeforeSave(" + source + ", " + dbo + ")");
-    }
-  }
-
-  public void onAfterSave(E source, DBObject dbo) {
-    if (log.isDebugEnabled()) {
-      log.debug("onAfterSave(" + source + ", " + dbo + ")");
-    }
-  }
-
-  public void onAfterLoad(DBObject dbo) {
-    if (log.isDebugEnabled()) {
-      log.debug("onAfterLoad(" + dbo + ")");
-    }
-  }
-
-  public void onAfterConvert(DBObject dbo, E source) {
-    if (log.isDebugEnabled()) {
-      log.debug("onAfterConvert(" + dbo + "," + source + ")");
-    }
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/LoggingEventListener.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.mapping.event;
-
-import com.mongodb.DBObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class LoggingEventListener<MongoMappingEvent> extends AbstractMappingEventListener {
-
-  private Log log = LogFactory.getLog(getClass());
-
-  @Override
-  public void onBeforeConvert(Object source) {
-    log.info("onBeforeConvert: " + source);
-  }
-
-  @Override
-  public void onBeforeSave(Object source, DBObject dbo) {
-    log.info("onBeforeSave: " + source + ", " + dbo);
-  }
-
-  @Override
-  public void onAfterSave(Object source, DBObject dbo) {
-    log.info("onAfterSave: " + source + ", " + dbo);
-  }
-
-  @Override
-  public void onAfterLoad(DBObject dbo) {
-    log.info("onAfterLoad: " + dbo);
-  }
-
-  @Override
-  public void onAfterConvert(DBObject dbo, Object source) {
-    log.info("onAfterConvert: " + dbo + ", " + source);
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/AbstractMonitor.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.CommandResult;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.mongodb.MongoDbUtils;
-
-/**
- * Base class to encapsulate common configuration settings when connecting to a database
- *
- * @author Mark Pollack
- */
-public abstract class AbstractMonitor {
-
-  private final Log logger = LogFactory.getLog(getClass());
-
-  protected Mongo mongo;
-  private String username;
-  private String password;
-
-
-  /**
-   * Sets the username to use to connect to the Mongo database
-   *
-   * @param username The username to use
-   */
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  /**
-   * Sets the password to use to authenticate with the Mongo database.
-   *
-   * @param password The password to use
-   */
-  public void setPassword(String password) {
-
-    this.password = password;
-  }
-
-  public CommandResult getServerStatus() {
-    CommandResult result = getDb("admin").command("serverStatus");
-    if (!result.ok()) {
-      logger.error("Could not query for server status.  Command Result = " + result);
-      throw new MongoException("could not query for server status.  Command Result = " + result);
-    }
-    return result;
-  }
-
-  public DB getDb(String databaseName) {
-    return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/AssertMetrics.java

@@ -1,67 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for assertions
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Assertion Metrics")
-public class AssertMetrics extends AbstractMonitor {
-
-  public AssertMetrics(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Regular")
-  public int getRegular() {
-    return getBtree("regular");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Warning")
-  public int getWarning() {
-    return getBtree("warning");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Msg")
-  public int getMsg() {
-    return getBtree("msg");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "User")
-  public int getUser() {
-    return getBtree("user");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Rollovers")
-  public int getRollovers() {
-    return getBtree("rollovers");
-  }
-
-  private int getBtree(String key) {
-    DBObject asserts = (DBObject) getServerStatus().get("asserts");
-    //Class c = btree.get(key).getClass();
-    return (Integer) asserts.get(key);
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/BackgroundFlushingMetrics.java

@@ -1,78 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import java.util.Date;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for Background Flushing
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Background Flushing Metrics")
-public class BackgroundFlushingMetrics extends AbstractMonitor {
-
-
-  public BackgroundFlushingMetrics(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Flushes")
-  public int getFlushes() {
-    return getFlushingData("flushes", java.lang.Integer.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Total ms", unit = "ms")
-  public int getTotalMs() {
-    return getFlushingData("total_ms", java.lang.Integer.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Average ms", unit = "ms")
-  public double getAverageMs() {
-    return getFlushingData("average_ms", java.lang.Double.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Last Ms", unit = "ms")
-  public int getLastMs() {
-    return getFlushingData("last_ms", java.lang.Integer.class);
-  }
-
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Last finished")
-  public Date getLastFinished() {
-    return getLast();
-  }
-
-  @SuppressWarnings("unchecked")
-  private <T> T getFlushingData(String key, Class<T> targetClass) {
-    DBObject mem = (DBObject) getServerStatus().get("backgroundFlushing");
-    return (T) mem.get(key);
-  }
-
-  private Date getLast() {
-    DBObject bgFlush = (DBObject) getServerStatus().get("backgroundFlushing");
-    Date lastFinished = (Date) bgFlush.get("last_finished");
-    return lastFinished;
-  }
-
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/BtreeIndexCounters.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for B-tree index counters
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Btree Metrics")
-public class BtreeIndexCounters extends AbstractMonitor {
-
-  public BtreeIndexCounters(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Accesses")
-  public int getAccesses() {
-    return getBtree("accesses");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Hits")
-  public int getHits() {
-    return getBtree("hits");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Misses")
-  public int getMisses() {
-    return getBtree("misses");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Resets")
-  public int getResets() {
-    return getBtree("resets");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Miss Ratio")
-  public int getMissRatio() {
-    return getBtree("missRatio");
-  }
-
-  private int getBtree(String key) {
-    DBObject indexCounters = (DBObject) getServerStatus().get("indexCounters");
-    if (indexCounters.get("note") != null) {
-      String message = (String) indexCounters.get("note");
-      if (message.contains("not supported")) {
-        return -1;
-      }
-    }
-    DBObject btree = (DBObject) indexCounters.get("btree");
-    //Class c = btree.get(key).getClass();
-    return (Integer) btree.get(key);
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/GlobalLockMetrics.java

@@ -1,79 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for Global Locks
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Global Lock Metrics")
-public class GlobalLockMetrics extends AbstractMonitor {
-
-
-  public GlobalLockMetrics(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Total time")
-  public double getTotalTime() {
-    return getGlobalLockData("totalTime", java.lang.Double.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Lock time", unit = "s")
-  public double getLockTime() {
-    return getGlobalLockData("lockTime", java.lang.Double.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Lock time")
-  public double getLockTimeRatio() {
-    return getGlobalLockData("ratio", java.lang.Double.class);
-  }
-
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Current Queue")
-  public int getCurrentQueueTotal() {
-    return getCurrentQueue("total");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Reader Queue")
-  public int getCurrentQueueReaders() {
-    return getCurrentQueue("readers");
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Writer Queue")
-  public int getCurrentQueueWriters() {
-    return getCurrentQueue("writers");
-  }
-
-  @SuppressWarnings("unchecked")
-  private <T> T getGlobalLockData(String key, Class<T> targetClass) {
-    DBObject globalLock = (DBObject) getServerStatus().get("globalLock");
-    return (T) globalLock.get(key);
-  }
-
-  private int getCurrentQueue(String key) {
-    DBObject globalLock = (DBObject) getServerStatus().get("globalLock");
-    DBObject currentQueue = (DBObject) globalLock.get("currentQueue");
-    return (Integer) currentQueue.get(key);
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/MemoryMetrics.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for Memory
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Memory Metrics")
-public class MemoryMetrics extends AbstractMonitor {
-
-
-  public MemoryMetrics(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Memory address size")
-  public int getBits() {
-    return getMemData("bits", java.lang.Integer.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Resident in Physical Memory", unit = "MB")
-  public int getResidentSpace() {
-    return getMemData("resident", java.lang.Integer.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Virtual Address Space", unit = "MB")
-  public int getVirtualAddressSpace() {
-    return getMemData("virtual", java.lang.Integer.class);
-  }
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Is memory info supported on this platform")
-  public boolean getMemoryInfoSupported() {
-    return getMemData("supported", java.lang.Boolean.class);
-  }
-
-
-  @ManagedMetric(metricType = MetricType.GAUGE, displayName = "Memory Mapped Space", unit = "MB")
-  public int getMemoryMappedSpace() {
-    return getMemData("mapped", java.lang.Integer.class);
-  }
-
-
-  @SuppressWarnings("unchecked")
-  private <T> T getMemData(String key, Class<T> targetClass) {
-    DBObject mem = (DBObject) getServerStatus().get("mem");
-    //Class c = mem.get(key).getClass();
-    return (T) mem.get(key);
-  }
-
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/OperationCounters.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.monitor;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-/**
- * JMX Metrics for Operation counters
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Operation Counters")
-public class OperationCounters extends AbstractMonitor {
-
-
-  public OperationCounters(Mongo mongo) {
-    this.mongo = mongo;
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Insert operation count")
-  public int getInsertCount() {
-    return getOpCounter("insert");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Query operation count")
-  public int getQueryCount() {
-    return getOpCounter("query");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Update operation count")
-  public int getUpdateCount() {
-    return getOpCounter("update");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Delete operation count")
-  public int getDeleteCount() {
-    return getOpCounter("delete");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "GetMore operation count")
-  public int getGetMoreCount() {
-    return getOpCounter("getmore");
-  }
-
-  @ManagedMetric(metricType = MetricType.COUNTER, displayName = "Command operation count")
-  public int getCommandCount() {
-    return getOpCounter("command");
-  }
-
-  private int getOpCounter(String key) {
-    DBObject opCounters = (DBObject) getServerStatus().get("opcounters");
-    return (Integer) opCounters.get(key);
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB specific JMX monitoring support.
- */
-package org.springframework.data.document.mongodb.monitor;

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB core support.
- */
-package org.springframework.data.document.mongodb;

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java

@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-public class BasicQuery extends Query {
-
-  private DBObject queryObject = null;
-
-  private DBObject fieldsObject = null;
-
-  private DBObject sortObject = null;
-
-  private int skip;
-
-  private int limit;
-
-  public BasicQuery(String query) {
-    super();
-    this.queryObject = (DBObject) JSON.parse(query);
-  }
-
-  public BasicQuery(DBObject queryObject) {
-    super();
-    this.queryObject = queryObject;
-  }
-
-  public BasicQuery(String query, String fields) {
-    this.queryObject = (DBObject) JSON.parse(query);
-    this.fieldsObject = (DBObject) JSON.parse(fields);
-  }
-
-  public BasicQuery(DBObject queryObject, DBObject fieldsObject) {
-    this.queryObject = queryObject;
-    this.fieldsObject = fieldsObject;
-  }
-
-  @Override
-  public Query addCriteria(Criteria criteria) {
-    this.queryObject.putAll(criteria.getCriteriaObject());
-    return this;
-  }
-
-  public DBObject getQueryObject() {
-    return this.queryObject;
-  }
-
-  public DBObject getFieldsObject() {
-    return fieldsObject;
-  }
-
-  public DBObject getSortObject() {
-    return sortObject;
-  }
-
-  public void setSortObject(DBObject sortObject) {
-    this.sortObject = sortObject;
-  }
-
-  public int getSkip() {
-    return skip;
-  }
-
-  public void setSkip(int skip) {
-    this.skip = skip;
-  }
-
-  public int getLimit() {
-    return this.limit;
-  }
-
-  public void setLimit(int limit) {
-    this.limit = limit;
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicUpdate.java

@@ -1,115 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.Collections;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.util.JSON;
-
-public class BasicUpdate extends Update {
-
-  private DBObject updateObject = null;
-
-  public BasicUpdate(String updateString) {
-    super();
-    this.updateObject = (DBObject) JSON.parse(updateString);
-  }
-
-  public BasicUpdate(DBObject updateObject) {
-    super();
-    this.updateObject = updateObject;
-  }
-
-  @Override
-  public Update set(String key, Object value) {
-    updateObject.put("$set", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  @Override
-  public Update unset(String key) {
-    updateObject.put("$unset", Collections.singletonMap(key, 1));
-    return this;
-  }
-
-  @Override
-  public Update inc(String key, Number inc) {
-    updateObject.put("$inc", Collections.singletonMap(key, inc));
-    return this;
-  }
-
-  @Override
-  public Update push(String key, Object value) {
-    updateObject.put("$push", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  @Override
-  public Update pushAll(String key, Object[] values) {
-    Object[] convertedValues = new Object[values.length];
-    for (int i = 0; i < values.length; i++) {
-      convertedValues[i] = convertValueIfNecessary(values[i]);
-    }
-    DBObject keyValue = new BasicDBObject();
-    keyValue.put(key, convertedValues);
-    updateObject.put("$pushAll", keyValue);
-    return this;
-  }
-
-  @Override
-  public Update addToSet(String key, Object value) {
-    updateObject.put("$addToSet", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  @Override
-  public Update pop(String key, Position pos) {
-    updateObject.put("$pop", Collections.singletonMap(key, (pos == Position.FIRST ? -1 : 1)));
-    return this;
-  }
-
-  @Override
-  public Update pull(String key, Object value) {
-    updateObject.put("$pull", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  @Override
-  public Update pullAll(String key, Object[] values) {
-    Object[] convertedValues = new Object[values.length];
-    for (int i = 0; i < values.length; i++) {
-      convertedValues[i] = convertValueIfNecessary(values[i]);
-    }
-    DBObject keyValue = new BasicDBObject();
-    keyValue.put(key, convertedValues);
-    updateObject.put("$pullAll", keyValue);
-    return this;
-  }
-
-  @Override
-  public Update rename(String oldName, String newName) {
-    updateObject.put("$rename", Collections.singletonMap(oldName, newName));
-    return this;
-  }
-
-  @Override
-  public DBObject getUpdateObject() {
-    return updateObject;
-  }
-
-}

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

@@ -1,382 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import org.springframework.data.document.InvalidDocumentStoreApiUsageException;
-import org.springframework.data.document.mongodb.geo.Box;
-import org.springframework.data.document.mongodb.geo.Circle;
-import org.springframework.data.document.mongodb.geo.Point;
-
-public class Criteria implements CriteriaDefinition {
-
-  private String key;
-  
-  private List<Criteria> criteriaChain;
-
-  private LinkedHashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
-
-  private Object isValue = null;
-
-
-  public Criteria(String key) {
-    this.criteriaChain = new ArrayList<Criteria>();
-    this.criteriaChain.add(this);
-    this.key = key;
-  }
-
-  protected Criteria(List<Criteria> criteriaChain, String key) {
-    this.criteriaChain = criteriaChain;
-    this.criteriaChain.add(this);
-    this.key = key;
-  }
-
-  /**
-   * Static factory method to create a Criteria using the provided key
-   *
-   * @param key
-   * @return
-   */
-  public static Criteria where(String key) {
-    return new Criteria(key);
-  }
-  
-  public static Criteria whereId() {
-    return new Criteria("id");
-  }
-
-  /**
-   * Static factory method to create a Criteria using the provided key
-   *
-   * @param key
-   * @return
-   */
-  public Criteria and(String key) {
-    return new Criteria(this.criteriaChain, key);
-  }
-
-  /**
-   * Creates a criterion using the $is operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria is(Object o) {
-    if (isValue != null) {
-      throw new InvalidDocumentStoreApiUsageException("Multiple 'is' values declared.");
-    }
-    this.isValue = o;
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $lt operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria lt(Object o) {
-    criteria.put("$lt", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $lte operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria lte(Object o) {
-    criteria.put("$lte", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $gt operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria gt(Object o) {
-    criteria.put("$gt", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $gte operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria gte(Object o) {
-    criteria.put("$gte", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $in operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria in(Object... o) {
-    criteria.put("$in", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $nin operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria nin(Object... o) {
-    criteria.put("$nin", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $mod operator
-   *
-   * @param value
-   * @param remainder
-   * @return
-   */
-  public Criteria mod(Number value, Number remainder) {
-    List<Object> l = new ArrayList<Object>();
-    l.add(value);
-    l.add(remainder);
-    criteria.put("$mod", l);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $all operator
-   *
-   * @param o
-   * @return
-   */
-  public Criteria all(Object o) {
-    criteria.put("$is", o);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $size operator
-   *
-   * @param s
-   * @return
-   */
-  public Criteria size(int s) {
-    criteria.put("$size", s);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $exists operator
-   *
-   * @param b
-   * @return
-   */
-  public Criteria exists(boolean b) {
-    criteria.put("$exists", b);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $type operator
-   *
-   * @param t
-   * @return
-   */
-  public Criteria type(int t) {
-    criteria.put("$type", t);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $not meta operator which affects the clause directly following
-   *
-   * @return
-   */
-  public Criteria not() {
-    criteria.put("$not", null);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using a $regex
-   *
-   * @param re
-   * @return
-   */
-  public Criteria regex(String re) {
-    criteria.put("$regex", re);
-    return this;
-  }
-  
-  
-  /**
-   * Creates a geospatial criterion using a $within $center operation
-   * @param circle
-   * @return
-   */
-  public Criteria withinCenter(Circle circle) {
-    LinkedList list = new LinkedList();
-    list.addLast(circle.getCenter());
-    list.add(circle.getRadius());   
-    criteria.put("$within", new BasicDBObject("$center", list));
-    return this;
-  }  
-  
-  /**
-   * Creates a geospatial criterion using a $within $center operation.  This is only available for Mongo 1.7 and higher. 
-   * @param circle
-   * @return
-   */
-  public Criteria withinCenterSphere(Circle circle) {
-    LinkedList list = new LinkedList();
-    list.addLast(circle.getCenter());
-    list.add(circle.getRadius());   
-    criteria.put("$within", new BasicDBObject("$centerSphere", list));
-    return this;
-  } 
-  
-  /**
-   * Creates a geospatial criterion using a $within $box operation
-   * @param circle
-   * @return
-   */
-  public Criteria withinBox(Box box) {
-    LinkedList<double[]> list = new LinkedList<double[]>();    
-    list.addLast(new double[]{ box.getLowerLeft().getX(), box.getLowerLeft().getY()} );
-    list.addLast(new double[]{ box.getUpperRight().getX(), box.getUpperRight().getY()} );         
-    criteria.put("$within", new BasicDBObject("$box", list));
-    return this;
-  }  
-  
-  /**
-   * Creates a geospatial criterion using a $near operation
-   * @param point
-   * @return
-   */
-  public Criteria near(Point point) {
-    criteria.put("$near", new double[]{point.getX(), point.getY()});
-    return this;
-  }
-  
-  /**
-   * Creates a geospatial criterion using a $nearSphere operation.  This is only available for Mongo 1.7 and higher.
-   * @param point
-   * @return
-   */
-  public Criteria nearSphere(Point point) {
-    criteria.put("$nearSphere", new double[]{point.getX(), point.getY()});
-    return this;
-  }
-  
-  /**
-   * Creates a geospatical criterion using a $maxDistance operation, for use with $near
-   * @param maxDistance
-   * @return
-   */
-  public Criteria maxDistance(double maxDistance) {
-    criteria.put("$maxDistance", maxDistance);
-    return this;
-  }
-
-  /**
-   * Creates a criterion using the $elemMatch operator
-   *
-   * @param t
-   * @return
-   */
-  public Criteria elemMatch(Criteria c) {
-    criteria.put("$elemMatch", c.getCriteriaObject());
-    return this;
-  }
-  /**
-   * Creates an or query using the $or operator for all of the provided queries
-   *
-   * @param queries
-   */
-  public void or(List<Query> queries) {
-    criteria.put("$or", queries);
-  }
-  
-
-
-  public String getKey() {
-    return this.key;
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.datastore.document.mongodb.query.Criteria#getCriteriaObject(java.lang.String)
-    */
-  public DBObject getCriteriaObject() {
-    if (this.criteriaChain.size() == 1) {
-      return criteriaChain.get(0).getSingleCriteriaObject();
-    }
-    else {
-      DBObject criteriaObject = new BasicDBObject();
-      for (Criteria c : this.criteriaChain) {
-        criteriaObject.putAll(c.getSingleCriteriaObject());
-      }
-      return criteriaObject;
-    }    
-  }
-  
-  protected DBObject getSingleCriteriaObject() {
-    DBObject dbo = new BasicDBObject();
-    boolean not = false;
-    for (String k : this.criteria.keySet()) {
-      if (not) {
-        DBObject notDbo = new BasicDBObject();
-        notDbo.put(k, convertValueIfNecessary(this.criteria.get(k)));
-        dbo.put("$not", notDbo);
-        not = false;
-      } else {
-        if ("$not".equals(k)) {
-          not = true;
-        } else {
-          dbo.put(k, convertValueIfNecessary(this.criteria.get(k)));
-        }
-      }
-    }
-    DBObject queryCriteria = new BasicDBObject();
-    if (isValue != null) {
-      queryCriteria.put(this.key, convertValueIfNecessary(this.isValue));
-      queryCriteria.putAll(dbo);
-    } else {
-      queryCriteria.put(this.key, dbo);
-    }
-    return queryCriteria;
-  }
-
-  private Object convertValueIfNecessary(Object value) {
-    if (value instanceof Enum) {
-      return ((Enum<?>) value).name();
-    }
-    return value;
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Field.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-
-public class Field {
-
-  private Map<String, Integer> criteria = new HashMap<String, Integer>();
-
-  private Map<String, Object> slices = new HashMap<String, Object>();
-
-  public Field include(String key) {
-    criteria.put(key, Integer.valueOf(1));
-    return this;
-  }
-
-  public Field exclude(String key) {
-    criteria.put(key, Integer.valueOf(0));
-    return this;
-  }
-
-  public Field slice(String key, int size) {
-    slices.put(key, Integer.valueOf(size));
-    return this;
-  }
-
-  public Field slice(String key, int offset, int size) {
-    slices.put(key, new Integer[]{Integer.valueOf(offset), Integer.valueOf(size)});
-    return this;
-  }
-
-  public DBObject getFieldsObject() {
-    DBObject dbo = new BasicDBObject();
-    for (String k : criteria.keySet()) {
-      dbo.put(k, (criteria.get(k)));
-    }
-    for (String k : slices.keySet()) {
-      dbo.put(k, new BasicDBObject("$slice", (slices.get(k))));
-    }
-    return dbo;
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/GeospatialIndex.java

@@ -1,79 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-
-public class GeospatialIndex implements IndexDefinition {
-
-  private String keyField;
-
-  private String name;
-
-  private Integer min = null;
-
-  private Integer max = null;
-
-  public GeospatialIndex() {
-  }
-
-  public GeospatialIndex(String key) {
-    keyField = key;
-  }
-
-  public GeospatialIndex named(String name) {
-    this.name = name;
-    return this;
-  }
-
-  public GeospatialIndex withMin(int min) {
-    this.min = Integer.valueOf(min);
-    return this;
-  }
-
-  public GeospatialIndex withMax(int max) {
-    this.max = Integer.valueOf(max);
-    return this;
-  }
-
-  public DBObject getIndexKeys() {
-    DBObject dbo = new BasicDBObject();
-    dbo.put(keyField, "2d");
-    return dbo;
-  }
-
-  public DBObject getIndexOptions() {
-    if (name == null && min == null && max == null) {
-      return null;
-    }
-    DBObject dbo = new BasicDBObject();
-    if (name != null) {
-      dbo.put("name", name);
-    }
-    if (min != null) {
-      dbo.put("min", min);
-    }
-    if (max != null) {
-      dbo.put("max", max);
-    }
-    return dbo;
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Index.java

@@ -1,110 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-
-public class Index implements IndexDefinition {
-
-  public enum Duplicates {
-    RETAIN,
-    DROP
-  }
-
-  private Map<String, Order> fieldSpec = new HashMap<String, Order>();
-
-  private String name;
-
-  private boolean unique = false;
-
-  private boolean dropDuplicates = false;
-  
-  private boolean sparse = false;
-
-  public Index() {
-  }
-
-  public Index(String key, Order order) {
-    fieldSpec.put(key, order);
-  }
-
-  public Index on(String key, Order order) {
-    fieldSpec.put(key, order);
-    return this;
-  }
-
-  public Index named(String name) {
-    this.name = name;
-    return this;
-  }
-
-  public Index unique() {
-    this.unique = true;
-    return this;
-  }
-  
-  public Index sparse() {
-    this.sparse = true;
-    return this;
-  }
-
-  public Index unique(Duplicates duplicates) {
-    if (duplicates == Duplicates.DROP) {
-      this.dropDuplicates = true;
-    }
-    return unique();
-  }
-
-  public DBObject getIndexKeys() {
-    DBObject dbo = new BasicDBObject();
-    for (String k : fieldSpec.keySet()) {
-      dbo.put(k, (fieldSpec.get(k).equals(Order.ASCENDING) ? 1 : -1));
-    }
-    return dbo;
-  }
-
-  public DBObject getIndexOptions() {
-    if (name == null && !unique) {
-      return null;
-    }
-    DBObject dbo = new BasicDBObject();
-    if (name != null) {
-      dbo.put("name", name);
-    }
-    if (unique) {
-      dbo.put("unique", true);
-    }
-    if (dropDuplicates) {
-      dbo.put("dropDups", true);
-    }
-    if (sparse) {
-      dbo.put("sparse", true);
-    }
-    return dbo;
-  }
-  
-  @Override
-  public String toString() {
-    return String.format("Index: %s - Options: %s", getIndexKeys(), getIndexOptions());
-  }
-}

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

@@ -1,9 +0,0 @@
-package org.springframework.data.document.mongodb.query;
-
-public class OrQuery extends Query {
-
-  public OrQuery(Query... q) {
-    super.or(q);
-  }
-
-}

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

@@ -1,122 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.LinkedHashMap;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-public class Query {
-
-  private LinkedHashMap<String, CriteriaDefinition> criteria = new LinkedHashMap<String, CriteriaDefinition>();
-
-  private Field fieldSpec;
-
-  private Sort sort;
-
-  private int skip;
-
-  private int limit;
-
-
-  /**
-   * Static factory method to create a Query using the provided criteria
-   *
-   * @param key
-   * @return
-   */
-  public static Query query(Criteria critera) {
-    return new Query(critera);
-  }
-  
-  public Query() {
-  }
-
-  public Query(Criteria criteria) {
-    addCriteria(criteria);
-  }
-
-  public Query addCriteria(Criteria criteria) {
-    this.criteria.put(criteria.getKey(), criteria);
-    return this;
-  }
-
-  public Query or(Query... queries) {
-    this.criteria.put("$or", new OrCriteria(queries));
-    return this;
-  }
-
-  public Field fields() {
-    synchronized (this) {
-      if (fieldSpec == null) {
-        this.fieldSpec = new Field();
-      }
-    }
-    return this.fieldSpec;
-  }
-
-  public Query skip(int skip) {
-    this.skip = skip;
-    return this;
-  }
-
-  public Query limit(int limit) {
-    this.limit = limit;
-    return this;
-  }
-
-  public Sort sort() {
-    synchronized (this) {
-      if (this.sort == null) {
-        this.sort = new Sort();
-      }
-    }
-    return this.sort;
-  }
-
-  public DBObject getQueryObject() {
-    DBObject dbo = new BasicDBObject();
-    for (String k : criteria.keySet()) {
-      CriteriaDefinition c = criteria.get(k);
-      DBObject cl = c.getCriteriaObject();
-      dbo.putAll(cl);
-    }
-    return dbo;
-  }
-
-  public DBObject getFieldsObject() {
-    if (this.fieldSpec == null) {
-      return null;
-    }
-    return fieldSpec.getFieldsObject();
-  }
-
-  public DBObject getSortObject() {
-    if (this.sort == null) {
-      return null;
-    }
-    return this.sort.getSortObject();
-  }
-
-  public int getSkip() {
-    return this.skip;
-  }
-
-  public int getLimit() {
-    return this.limit;
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Update.java

@@ -1,189 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.query;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-
-public class Update {
-
-  public enum Position {
-    LAST, FIRST
-  }
-
-  private HashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
-
-  /**
-   * Static factory method to create an Update using the provided key
-   *
-   * @param key
-   * @return
-   */
-  public static Update update(String key, Object value) {
-    return new Update().set(key, value);
-  }
-  
-  /**
-   * Update using the $set update modifier
-   *
-   * @param key
-   * @param value
-   * @return
-   */
-  public Update set(String key, Object value) {
-    criteria.put("$set", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
- 
-  /**
-   * Update using the $unset update modifier
-   *
-   * @param key
-   * @return
-   */
-  public Update unset(String key) {
-    criteria.put("$unset", Collections.singletonMap(key, 1));
-    return this;
-  }
-
-  /**
-   * Update using the $inc update modifier
-   *
-   * @param key
-   * @param inc
-   * @return
-   */
-  public Update inc(String key, Number inc) {
-    criteria.put("$inc", Collections.singletonMap(key, inc));
-    return this;
-  }
-
-  /**
-   * Update using the $push update modifier
-   *
-   * @param key
-   * @param value
-   * @return
-   */
-  public Update push(String key, Object value) {
-    criteria.put("$push", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  /**
-   * Update using the $pushAll update modifier
-   *
-   * @param key
-   * @param values
-   * @return
-   */
-  public Update pushAll(String key, Object[] values) {
-    Object[] convertedValues = new Object[values.length];
-    for (int i = 0; i < values.length; i++) {
-      convertedValues[i] = convertValueIfNecessary(values[i]);
-    }
-    DBObject keyValue = new BasicDBObject();
-    keyValue.put(key, convertedValues);
-    criteria.put("$pushAll", keyValue);
-    return this;
-  }
-
-  /**
-   * Update using the $addToSet update modifier
-   *
-   * @param key
-   * @param value
-   * @return
-   */
-  public Update addToSet(String key, Object value) {
-    criteria.put("$addToSet", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  /**
-   * Update using the $pop update modifier
-   *
-   * @param key
-   * @param pos
-   * @return
-   */
-  public Update pop(String key, Position pos) {
-    criteria.put("$pop", Collections.singletonMap(key, (pos == Position.FIRST ? -1 : 1)));
-    return this;
-  }
-
-  /**
-   * Update using the $pull update modifier
-   *
-   * @param key
-   * @param value
-   * @return
-   */
-  public Update pull(String key, Object value) {
-    criteria.put("$pull", Collections.singletonMap(key, convertValueIfNecessary(value)));
-    return this;
-  }
-
-  /**
-   * Update using the $pullAll update modifier
-   *
-   * @param key
-   * @param values
-   * @return
-   */
-  public Update pullAll(String key, Object[] values) {
-    Object[] convertedValues = new Object[values.length];
-    for (int i = 0; i < values.length; i++) {
-      convertedValues[i] = convertValueIfNecessary(values[i]);
-    }
-    DBObject keyValue = new BasicDBObject();
-    keyValue.put(key, convertedValues);
-    criteria.put("$pullAll", keyValue);
-    return this;
-  }
-
-  /**
-   * Update using the $rename update modifier
-   *
-   * @param oldName
-   * @param newName
-   * @return
-   */
-  public Update rename(String oldName, String newName) {
-    criteria.put("$rename", Collections.singletonMap(oldName, newName));
-    return this;
-  }
-
-  public DBObject getUpdateObject() {
-    DBObject dbo = new BasicDBObject();
-    for (String k : criteria.keySet()) {
-      dbo.put(k, criteria.get(k));
-    }
-    return dbo;
-  }
-
-  protected Object convertValueIfNecessary(Object value) {
-    if (value instanceof Enum) {
-      return ((Enum<?>) value).name();
-    }
-    return value;
-  }
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB specific query and update support.
- */
-package org.springframework.data.document.mongodb.query;

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

@@ -1,198 +0,0 @@
-/*
- * Copyright 2002-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.document.mongodb.repository;
-
-import static org.springframework.data.document.mongodb.repository.QueryUtils.applyPagination;
-
-import java.util.List;
-
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import org.springframework.data.document.mongodb.CollectionCallback;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.util.Assert;
-
-/**
- * Base class for {@link RepositoryQuery} implementations for Mongo.
- *
- * @author Oliver Gierke
- */
-public abstract class AbstractMongoQuery implements RepositoryQuery {
-
-  private final MongoQueryMethod method;
-  private final MongoTemplate template;
-
-  /**
-   * Creates a new {@link AbstractMongoQuery} from the given {@link MongoQueryMethod} and {@link MongoTemplate}.
-   *
-   * @param method
-   * @param template
-   */
-  public AbstractMongoQuery(MongoQueryMethod method, MongoTemplate template) {
-
-    Assert.notNull(template);
-    Assert.notNull(method);
-
-    this.method = method;
-    this.template = template;
-  }
-
-  /* (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[])
-    */
-  public Object execute(Object[] parameters) {
-
-    ParameterAccessor accessor = new ParametersParameterAccessor(method.getParameters(), parameters);
-    Query query = createQuery(new ConvertingParameterAccessor(template.getConverter(), accessor));
-
-    switch (method.getType()) {
-      case COLLECTION:
-        return new CollectionExecution().execute(query);
-      case PAGING:
-        return new PagedExecution(accessor.getPageable()).execute(query);
-      default:
-        return new SingleEntityExecution().execute(query);
-    }
-  }
-
-  /**
-   * Create a {@link Query} instance using the given {@link ParameterAccessor}
-   *
-   * @param accessor
-   * @param converter
-   * @return
-   */
-  protected abstract Query createQuery(ConvertingParameterAccessor accessor);
-
-  private abstract class Execution {
-
-    abstract Object execute(Query query);
-
-    protected List<?> readCollection(Query query) {
-
-      MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
-
-      String collectionName = metadata.getCollectionName();
-      return template.find(collectionName, query, metadata.getJavaType());
-    }
-  }
-
-  /**
-   * {@link Execution} for collection returning queries.
-   *
-   * @author Oliver Gierke
-   */
-  class CollectionExecution extends Execution {
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see org.springframework.data.document.mongodb.repository.MongoQuery.Execution #execute(com.mongodb.DBObject)
-       */
-    @Override
-    public Object execute(Query query) {
-
-      return readCollection(query);
-    }
-  }
-
-  /**
-   * {@link Execution} for pagination queries.
-   *
-   * @author Oliver Gierke
-   */
-  class PagedExecution extends Execution {
-
-    private final Pageable pageable;
-
-    /**
-     * Creates a new {@link PagedExecution}.
-     *
-     * @param pageable
-     */
-    public PagedExecution(Pageable pageable) {
-
-      Assert.notNull(pageable);
-      this.pageable = pageable;
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see org.springframework.data.document.mongodb.repository.MongoQuery.Execution #execute(com.mongodb.DBObject)
-       */
-    @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    Object execute(Query query) {
-
-      MongoEntityInformation<?, ?> metadata = method.getEntityInformation();
-      int count = getCollectionCursor(metadata.getCollectionName(), query.getQueryObject()).count();
-
-      List<?> result = template.find(metadata.getCollectionName(), applyPagination(query, pageable),
-          metadata.getJavaType());
-
-      return new PageImpl(result, pageable, count);
-    }
-
-    private DBCursor getCollectionCursor(String collectionName, final DBObject query) {
-
-      return template.execute(collectionName, new CollectionCallback<DBCursor>() {
-
-        public DBCursor doInCollection(DBCollection collection) {
-
-          return collection.find(query);
-        }
-      });
-    }
-  }
-
-  /**
-   * {@link Execution} to return a single entity.
-   *
-   * @author Oliver Gierke
-   */
-  class SingleEntityExecution extends Execution {
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see org.springframework.data.document.mongodb.repository.MongoQuery.Execution #execute(com.mongodb.DBObject)
-       */
-    @Override
-    Object execute(Query query) {
-
-      List<?> result = readCollection(query);
-      return result.isEmpty() ? null : result.get(0);
-    }
-  }
-}

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

@@ -1,179 +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.document.mongodb.repository;
-
-import java.util.Iterator;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import org.springframework.data.document.mongodb.MongoWriter;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.query.ParameterAccessor;
-
-/**
- * Custom {@link ParameterAccessor} that uses a {@link MongoWriter} to serialize parameters into Mongo format.
- *
- * @author Oliver Gierke
- */
-public class ConvertingParameterAccessor implements ParameterAccessor {
-
-  private final MongoWriter<Object> writer;
-  private final ParameterAccessor delegate;
-
-  /**
-   * Creates a new {@link ConvertingParameterAccessor} with the given {@link MongoWriter} and delegate.
-   *
-   * @param writer
-   */
-  public ConvertingParameterAccessor(MongoWriter<Object> writer, ParameterAccessor delegate) {
-    this.writer = writer;
-    this.delegate = delegate;
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see java.lang.Iterable#iterator()
-    */
-  public Iterator<Object> iterator() {
-    return new ConvertingIterator(delegate.iterator());
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.repository.query.ParameterAccessor#getPageable()
-    */
-  public Pageable getPageable() {
-    return delegate.getPageable();
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see org.springframework.data.repository.query.ParameterAccessor#getSort()
-    */
-  public Sort getSort() {
-    return delegate.getSort();
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.repository.query.ParameterAccessor#getBindableParameter(int)
-    */
-  public Object getBindableValue(int index) {
-
-    return getConvertedValue(delegate.getBindableValue(index));
-  }
-
-  /**
-   * Converts the given value with the underlying {@link MongoWriter}.
-   *
-   * @param value
-   * @return
-   */
-  private Object getConvertedValue(Object value) {
-
-    DBObject result = new BasicDBObject();
-    writer.write(value.getClass().isEnum() ? new EnumValueHolder((Enum<?>) value) : new ValueHolder(value), result);
-    return result.get("value");
-  }
-
-  /**
-   * Custom {@link Iterator} to convert items before returning them.
-   *
-   * @author Oliver Gierke
-   */
-  private class ConvertingIterator implements Iterator<Object> {
-
-    private final Iterator<Object> delegate;
-
-    /**
-     * Creates a new {@link ConvertingIterator} for the given delegate.
-     *
-     * @param delegate
-     */
-    public ConvertingIterator(Iterator<Object> delegate) {
-      this.delegate = delegate;
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see java.util.Iterator#hasNext()
-       */
-    public boolean hasNext() {
-      return delegate.hasNext();
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see java.util.Iterator#next()
-       */
-    public Object next() {
-
-      return getConvertedValue(delegate.next());
-    }
-
-    /*
-       * (non-Javadoc)
-       *
-       * @see java.util.Iterator#remove()
-       */
-    public void remove() {
-      delegate.remove();
-    }
-  }
-
-  /**
-   * Simple value holder class to allow conversion and accessing the converted value in a deterministic way.
-   *
-   * @author Oliver Gierke
-   */
-  private static class ValueHolder {
-
-    private Object value;
-
-    public ValueHolder(Object value) {
-
-      this.value = value;
-    }
-
-    @SuppressWarnings("unused")
-    public Object getValue() {
-
-      return value;
-    }
-  }
-
-  private static class EnumValueHolder {
-
-    private Enum<?> value;
-
-    public EnumValueHolder(Enum<?> value) {
-      this.value = value;
-    }
-
-    /**
-     * @return the value
-     */
-    @SuppressWarnings("unused")
-    public Enum<?> getValue() {
-      return value;
-    }
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.repository;
-
-import java.io.Serializable;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.mapping.MappingBeanHelper;
-import org.springframework.data.mapping.model.PersistentProperty;
-import org.springframework.data.repository.support.AbstractEntityInformation;
-
-/**
- * {@link MongoEntityInformation} implementation using a {@link MongoPersistentEntity} instance to lookup the necessary
- * information.
- * 
- * @author Oliver Gierke
- */
-public class MappingMongoEntityInformation<T, ID extends Serializable> extends AbstractEntityInformation<T, ID>
-    implements MongoEntityInformation<T, ID> {
-
-  private final MongoPersistentEntity<T> entityMetadata;
-
-  /**
-   * Creates a new {@link MappingMongoEntityInformation} for the given {@link MongoPersistentEntity}.
-   * 
-   * @param domainClass
-   * @param entity
-   */
-  public MappingMongoEntityInformation(MongoPersistentEntity<T> entity) {
-    super(entity.getType());
-    this.entityMetadata = entity;
-  }
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.repository.support.EntityInformation#getId(java.lang.Object)
-   */
-  @SuppressWarnings("unchecked")
-  public ID getId(T entity) {
-
-    PersistentProperty idProperty = entityMetadata.getIdProperty();
-
-    try {
-      return (ID) MappingBeanHelper.getProperty(entity, idProperty, idProperty.getType(), false);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.repository.support.EntityInformation#getIdType()
-   */
-  @SuppressWarnings("unchecked")
-  public Class<ID> getIdType() {
-    return (Class<ID>) entityMetadata.getIdProperty().getType();
-  }
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.document.mongodb.repository.MongoEntityInformation#getCollectionName()
-   */
-  public String getCollectionName() {
-    return entityMetadata.getCollection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.document.mongodb.repository.MongoEntityInformation#getIdAttribute()
-   */
-  public String getIdAttribute() {
-    return "_id";
-  }
-}

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

@@ -1,180 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.mongodb.repository;
-
-import static org.springframework.data.document.mongodb.query.Criteria.where;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.regex.Pattern;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.mongodb.query.Criteria;
-import org.springframework.data.document.mongodb.query.CriteriaDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.AbstractQueryCreator;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.data.repository.query.parser.PartTree;
-
-
-/**
- * Custom query creator to create Mongo criterias.
- *
- * @author Oliver Gierke
- */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
-
-  private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
-
-
-  /**
-   * Creates a new {@link MongoQueryCreator} from the given {@link PartTree}
-   * and {@link ParametersParameterAccessor}.
-   *
-   * @param tree
-   * @param accessor
-   */
-  public MongoQueryCreator(PartTree tree, ParameterAccessor accessor) {
-
-    super(tree, accessor);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  * @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) {
-
-    Criteria criteria = from(part.getType(),
-        where(part.getProperty().toDotPath()), iterator);
-
-    return new Query(criteria);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  * @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) {
-
-    Criteria criteria = from(part.getType(), where(part.getProperty().toDotPath()),
-        iterator);
-    return base.addCriteria(criteria);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.query.parser.AbstractQueryCreator
-  * #or(java.lang.Object, java.lang.Object)
-  */
-  @Override
-  protected Query or(Query base, Query query) {
-
-    return new Query().or(base, query);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.query.parser.AbstractQueryCreator
-  * #complete(java.lang.Object, org.springframework.data.domain.Sort)
-  */
-  @Override
-  protected Query complete(Query query, Sort sort) {
-
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Created query " + query.getQueryObject());
-    }
-
-    return query;
-  }
-
-
-  /**
-   * Populates the given {@link CriteriaDefinition} depending on the {@link Type} given.
-   *
-   * @param type
-   * @param criteria
-   * @param parameters
-   * @return
-   */
-  private Criteria from(Type type, Criteria criteria,
-                        Iterator<Object> parameters) {
-
-    switch (type) {
-      case GREATER_THAN:
-        return criteria.gt(parameters.next());
-      case LESS_THAN:
-        return criteria.lt(parameters.next());
-      case BETWEEN:
-        return criteria.gt(parameters.next()).lt(
-            parameters.next());
-      case IS_NOT_NULL:
-        return criteria.not().is(null);
-      case IS_NULL:
-        return criteria.is(null);
-      case NOT_IN:
-        return criteria.nin(nextAsArray(parameters));
-      case IN:
-        return criteria.in(nextAsArray(parameters));
-      case LIKE:
-        String value = parameters.next().toString();
-        return criteria.is(toLikeRegex(value));
-      case SIMPLE_PROPERTY:
-        return criteria.is(parameters.next());
-      case NEGATING_SIMPLE_PROPERTY:
-        return criteria.not().is(parameters.next());
-    }
-
-    throw new IllegalArgumentException("Unsupported keyword!");
-  }
-
-
-  private Object[] nextAsArray(Iterator<Object> iterator) {
-    Object next = iterator.next();
-
-    if (next instanceof Collection) {
-      return ((Collection<?>) next).toArray();
-    } else if (next.getClass().isArray()) {
-      return (Object[]) next;
-    }
-
-    return new Object[]{next};
-  }
-
-  private Pattern toLikeRegex(String source) {
-
-    String regex = source.replaceAll("\\*", ".*");
-    return Pattern.compile(regex);
-  }
-
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java

@@ -1,99 +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.document.mongodb.repository;
-
-import java.lang.reflect.Method;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean.EntityInformationCreator;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.support.RepositoryMetadata;
-import org.springframework.data.repository.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * TODO - Extract methods for {@link #getAnnotatedQuery()} into superclass as it is currently copied from Spring Data
- * JPA
- * 
- * @author Oliver Gierke
- */
-class MongoQueryMethod extends QueryMethod {
-
-  private final Method method;
-  private final MongoEntityInformation<?, ?> entityInformation;
-
-  /**
-   * Creates a new {@link MongoQueryMethod} from the given {@link Method}.
-   * 
-   * @param method
-   */
-  public MongoQueryMethod(Method method, RepositoryMetadata metadata, EntityInformationCreator entityInformationCreator) {
-    super(method, metadata);
-    this.method = method;
-    this.entityInformation = entityInformationCreator.getEntityInformation(ClassUtils.getReturnedDomainClass(method));
-  }
-
-  /**
-   * Returns whether the method has an annotated query.
-   * 
-   * @return
-   */
-  boolean hasAnnotatedQuery() {
-    return getAnnotatedQuery() != null;
-  }
-
-  /**
-   * Returns the query string declared in a {@link Query} annotation or {@literal null} if neither the annotation found
-   * nor the attribute was specified.
-   * 
-   * @return
-   */
-  String getAnnotatedQuery() {
-
-    String query = (String) AnnotationUtils.getValue(getQueryAnnotation());
-    return StringUtils.hasText(query) ? query : null;
-  }
-
-  /**
-   * Returns the field specification to be used for the query.
-   * 
-   * @return
-   */
-  String getFieldSpecification() {
-
-    String value = (String) AnnotationUtils.getValue(getQueryAnnotation(), "fields");
-    return StringUtils.hasText(value) ? value : null;
-  }
-
-  /* (non-Javadoc)
-    * @see org.springframework.data.repository.query.QueryMethod#getEntityMetadata()
-    */
-  @Override
-  public MongoEntityInformation<?, ?> getEntityInformation() {
-
-    return entityInformation;
-  }
-
-  /**
-   * Returns the {@link Query} annotation that is applied to the method or {@code null} if none available.
-   * 
-   * @return
-   */
-  private Query getQueryAnnotation() {
-
-    return method.getAnnotation(Query.class);
-  }
-}

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

@@ -1,316 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.mongodb.repository;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.mongodb.MongoOperations;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.query.Index;
-import org.springframework.data.document.mongodb.query.Order;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mapping.model.MappingContext;
-import org.springframework.data.mapping.model.PersistentEntity;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.data.repository.support.QueryCreationListener;
-import org.springframework.data.repository.support.RepositoryFactoryBeanSupport;
-import org.springframework.data.repository.support.RepositoryFactorySupport;
-import org.springframework.data.repository.support.RepositoryMetadata;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} to create {@link MongoRepository} instances.
- *
- * @author Oliver Gierke
- */
-public class MongoRepositoryFactoryBean<T extends MongoRepository<S, ID>, S, ID extends Serializable> extends
-    RepositoryFactoryBeanSupport<T, S, ID> {
-
-  private MongoTemplate template;
-  private MappingContext mappingContext;
-
-  /**
-   * Configures the {@link MongoTemplate} to be used.
-   *
-   * @param template the template to set
-   */
-  public void setTemplate(MongoTemplate template) {
-
-    this.template = template;
-  }
-
-  /**
-   * Sets the {@link MappingContext} used with the underlying {@link MongoTemplate}.
-   *
-   * @param mappingContext the mappingContext to set
-   */
-  public void setMappingContext(MappingContext mappingContext) {
-    this.mappingContext = mappingContext;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-   * #createRepositoryFactory()
-   */
-  @Override
-  protected RepositoryFactorySupport createRepositoryFactory() {
-
-    MongoRepositoryFactory factory = new MongoRepositoryFactory(template, mappingContext);
-    factory.addQueryCreationListener(new IndexEnsuringQueryCreationListener(template));
-    return factory;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-   * #afterPropertiesSet()
-   */
-  @Override
-  public void afterPropertiesSet() {
-
-    super.afterPropertiesSet();
-    Assert.notNull(template, "MongoTemplate must not be null!");
-  }
-
-  /**
-   * Repository to create {@link MongoRepository} instances.
-   *
-   * @author Oliver Gierke
-   */
-  public static class MongoRepositoryFactory extends RepositoryFactorySupport {
-
-    private static final boolean QUERY_DSL_PRESENT = org.springframework.util.ClassUtils.isPresent(
-        "com.mysema.query.types.Predicate", MongoRepositoryFactory.class.getClassLoader());
-
-    private final MongoTemplate template;
-    private final EntityInformationCreator entityInformationCreator;
-
-    /**
-     * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoTemplate} and {@link MappingContext}.
-     *
-     * @param template       must not be {@literal null}
-     * @param mappingContext
-     */
-    public MongoRepositoryFactory(MongoTemplate template, MappingContext mappingContext) {
-
-      Assert.notNull(template);
-      this.template = template;
-      this.entityInformationCreator = new EntityInformationCreator(mappingContext);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactorySupport
-     * #getRepositoryBaseClass()
-     */
-    @Override
-    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-
-      return isQueryDslRepository(metadata.getRepositoryInterface()) ? QueryDslMongoRepository.class
-          : SimpleMongoRepository.class;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactorySupport
-     * #getTargetRepository
-     * (org.springframework.data.repository.support.RepositoryMetadata)
-     */
-    @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected Object getTargetRepository(RepositoryMetadata metadata) {
-
-      Class<?> repositoryInterface = metadata.getRepositoryInterface();
-      MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainClass());
-
-      if (isQueryDslRepository(repositoryInterface)) {
-        return new QueryDslMongoRepository(entityInformation, template);
-      } else {
-        return new SimpleMongoRepository(entityInformation, template);
-      }
-    }
-
-    private static boolean isQueryDslRepository(Class<?> repositoryInterface) {
-
-      return QUERY_DSL_PRESENT && QueryDslPredicateExecutor.class.isAssignableFrom(repositoryInterface);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactorySupport
-     * #getQueryLookupStrategy
-     * (org.springframework.data.repository.query.QueryLookupStrategy.Key)
-     */
-    @Override
-    protected QueryLookupStrategy getQueryLookupStrategy(Key key) {
-
-      return new MongoQueryLookupStrategy();
-    }
-
-    /**
-     * {@link QueryLookupStrategy} to create {@link PartTreeMongoQuery} instances.
-     *
-     * @author Oliver Gierke
-     */
-    private class MongoQueryLookupStrategy implements QueryLookupStrategy {
-
-      /*
-       * (non-Javadoc)
-       * 
-       * @see
-       * org.springframework.data.repository.query.QueryLookupStrategy
-       * #resolveQuery(java.lang.reflect.Method, java.lang.Class)
-       */
-      public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata) {
-
-        MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, entityInformationCreator);
-
-        if (queryMethod.hasAnnotatedQuery()) {
-          return new StringBasedMongoQuery(queryMethod, template);
-        } else {
-          return new PartTreeMongoQuery(queryMethod, template);
-        }
-      }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.repository.support.RepositoryFactorySupport#validate(org.springframework.data.repository.support.RepositoryMetadata)
-     */
-    @Override
-    protected void validate(RepositoryMetadata metadata) {
-
-      Class<?> idClass = metadata.getIdClass();
-      if (!MongoPropertyDescriptor.SUPPORTED_ID_CLASSES.contains(idClass)) {
-        throw new IllegalArgumentException(String.format("Unsupported id class! Only %s are supported!",
-            StringUtils.collectionToCommaDelimitedString(MongoPropertyDescriptor.SUPPORTED_ID_CLASSES)));
-      }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactorySupport
-     * #getEntityInformation(java.lang.Class)
-     */
-    @Override
-    public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-
-      return entityInformationCreator.getEntityInformation(domainClass);
-    }
-  }
-
-  /**
-   * Simple wrapper to to create {@link MongoEntityInformation} instances based on a {@link MappingContext}.
-   *
-   * @author Oliver Gierke
-   */
-  static class EntityInformationCreator {
-
-    private final MappingContext mappingContext;
-
-    public EntityInformationCreator(MappingContext mappingContext) {
-      this.mappingContext = mappingContext;
-    }
-
-    public <T, ID extends Serializable> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-      if (null == mappingContext) {
-        return new SimpleMongoEntityInformation<T, ID>(domainClass);
-      }
-
-      PersistentEntity<T> persistentEntity = mappingContext.getPersistentEntity(domainClass);
-      if (persistentEntity == null) {
-        persistentEntity = mappingContext.addPersistentEntity(domainClass);
-      }
-      return new MappingMongoEntityInformation<T, ID>((MongoPersistentEntity<T>) persistentEntity);
-    }
-  }
-
-  /**
-   * {@link QueryCreationListener} inspecting {@link PartTreeMongoQuery}s and creating an index for the properties it
-   * refers to.
-   *
-   * @author Oliver Gierke
-   */
-  private static class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTreeMongoQuery> {
-
-    private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class);
-    private final MongoOperations operations;
-
-    public IndexEnsuringQueryCreationListener(MongoOperations operations) {
-
-      this.operations = operations;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.repository.support.QueryCreationListener
-     * #onCreation(org.springframework.data.repository
-     * .query.RepositoryQuery)
-     */
-    public void onCreation(PartTreeMongoQuery query) {
-
-      PartTree tree = query.getTree();
-      Index index = new Index();
-      index.named(query.getQueryMethod().getName());
-      Sort sort = tree.getSort();
-
-      for (Part part : tree.getParts()) {
-        String property = part.getProperty().toDotPath();
-        Order order = toOrder(sort, property);
-        index.on(property, order);
-      }
-
-      MongoEntityInformation<?, ?> metadata = query.getQueryMethod().getEntityInformation();
-      operations.ensureIndex(metadata.getCollectionName(), index);
-      LOG.debug(String.format("Created index %s!", index.toString()));
-    }
-
-    private static Order toOrder(Sort sort, String property) {
-
-      if (sort == null) {
-        return Order.DESCENDING;
-      }
-
-      org.springframework.data.domain.Sort.Order order = sort.getOrderFor(property);
-      return order == null ? Order.DESCENDING : order.isAscending() ? Order.ASCENDING : Order.DESCENDING;
-    }
-  }
-}

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

@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-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.
- */
-package org.springframework.data.document.mongodb.repository;
-
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.query.parser.PartTree;
-
-/**
- * {@link RepositoryQuery} implementation for Mongo.
- *
- * @author Oliver Gierke
- */
-public class PartTreeMongoQuery extends AbstractMongoQuery {
-
-  private final PartTree tree;
-
-  /**
-   * Creates a new {@link PartTreeMongoQuery} from the given {@link QueryMethod} and {@link MongoTemplate}.
-   *
-   * @param method
-   * @param template
-   */
-  public PartTreeMongoQuery(MongoQueryMethod method, MongoTemplate template) {
-
-    super(method, template);
-    this.tree = new PartTree(method.getName(), method.getEntityInformation().getJavaType());
-  }
-
-  /**
-   * @return the tree
-   */
-  public PartTree getTree() {
-    return tree;
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see
-    * org.springframework.data.document.mongodb.repository.AbstractMongoQuery#createQuery(org.springframework.data.
-    * document.mongodb.repository.ConvertingParameterAccessor)
-    */
-  @Override
-  protected Query createQuery(ConvertingParameterAccessor accessor) {
-
-    MongoQueryCreator creator = new MongoQueryCreator(tree, accessor);
-    return creator.createQuery();
-  }
-}

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

@@ -1,413 +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.document.mongodb.repository;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import org.apache.commons.collections15.Transformer;
-import org.springframework.data.document.mongodb.MongoOperations;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.convert.MongoConverter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.repository.support.EntityMetadata;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-import com.mongodb.DBObject;
-import com.mysema.query.mongodb.MongodbQuery;
-import com.mysema.query.mongodb.MongodbSerializer;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.PathBuilder;
-
-
-/**
- * Special QueryDsl based repository implementation that allows execution
- * {@link Predicate}s in various forms. TODO: Extract {@link EntityPathResolver}
- * into Spring Data Commons TODO: Refactor Spring Data JPA to use this common
- * infrastructure
- * 
- * @author Oliver Gierke
- */
-public class QueryDslMongoRepository<T, ID extends Serializable> extends
-        SimpleMongoRepository<T, ID> implements QueryDslPredicateExecutor<T> {
-
-    private final MongoConverterTransformer transformer;
-    private final MongodbSerializer serializer;
-    private final PathBuilder<T> builder;
-
-
-    /**
-     * Creates a new {@link QueryDslMongoRepository} for the given
-     * {@link EntityMetadata} and {@link MongoTemplate}. Uses the
-     * {@link SimpleEntityPathResolver} to create an {@link EntityPath} for the
-     * given domain class.
-     * 
-     * @param entityInformation
-     * @param template
-     */
-    public QueryDslMongoRepository(
-            MongoEntityInformation<T, ID> entityInformation, MongoTemplate template) {
-
-        this(entityInformation, template, SimpleEntityPathResolver.INSTANCE);
-    }
-
-
-    /**
-     * Creates a new {@link QueryDslMongoRepository} for the given {@link MongoEntityInformation},
-     * {@link MongoTemplate} and {@link EntityPathResolver}.
-     * 
-     * @param entityInformation
-     * @param template
-     * @param resolver
-     */
-    public QueryDslMongoRepository(
-            MongoEntityInformation<T, ID> entityInformation,
-            MongoTemplate template, EntityPathResolver resolver) {
-
-        super(entityInformation, template);
-        this.transformer = new MongoConverterTransformer(template.getConverter());
-        this.serializer = new MongodbSerializer();
-        
-        EntityPath<T> path = resolver.createPath(entityInformation.getJavaType());
-        this.builder = new PathBuilder<T>(path.getType(), path.getMetadata());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.QueryDslExecutor
-     * #findOne(com.mysema.query.types.Predicate)
-     */
-    public T findOne(Predicate predicate) {
-
-        return createQueryFor(predicate).uniqueResult();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.QueryDslExecutor
-     * #findAll(com.mysema.query.types.Predicate)
-     */
-    public List<T> findAll(Predicate predicate) {
-
-        return createQueryFor(predicate).list();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.QueryDslExecutor
-     * #findAll(com.mysema.query.types.Predicate,
-     * com.mysema.query.types.OrderSpecifier<?>[])
-     */
-    public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
-
-        return createQueryFor(predicate).orderBy(orders).list();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.QueryDslExecutor
-     * #findAll(com.mysema.query.types.Predicate,
-     * org.springframework.data.domain.Pageable)
-     */
-    public Page<T> findAll(Predicate predicate, Pageable pageable) {
-
-        MongodbQuery<T> countQuery = createQueryFor(predicate);
-        MongodbQuery<T> query = createQueryFor(predicate);
-
-        return new PageImpl<T>(applyPagination(query, pageable).list(),
-                pageable, countQuery.count());
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.springframework.data.document.mongodb.repository.QueryDslExecutor
-     * #count(com.mysema.query.types.Predicate)
-     */
-    public Long count(Predicate predicate) {
-
-        return createQueryFor(predicate).count();
-    }
-
-
-    /**
-     * Creates a {@link MongodbQuery} for the given {@link Predicate}.
-     * 
-     * @param predicate
-     * @return
-     */
-    private MongodbQuery<T> createQueryFor(Predicate predicate) {
-
-        MongodbQuery<T> query = new MongoTemplateQuery(getMongoOperations());
-        return query.where(predicate);
-    }
-
-
-    /**
-     * Applies the given {@link Pageable} to the given {@link MongodbQuery}.
-     * 
-     * @param query
-     * @param pageable
-     * @return
-     */
-    private MongodbQuery<T> applyPagination(MongodbQuery<T> query,
-            Pageable pageable) {
-
-        if (pageable == null) {
-            return query;
-        }
-
-        query =
-                query.offset(pageable.getOffset())
-                        .limit(pageable.getPageSize());
-        return applySorting(query, pageable.getSort());
-    }
-
-
-    /**
-     * Applies the given {@link Sort} to the given {@link MongodbQuery}.
-     * 
-     * @param query
-     * @param sort
-     * @return
-     */
-    private MongodbQuery<T> applySorting(MongodbQuery<T> query, Sort sort) {
-
-        if (sort == null) {
-            return query;
-        }
-
-        for (Order order : sort) {
-            query.orderBy(toOrder(order));
-        }
-
-        return query;
-    }
-
-
-    /**
-     * Transforms a plain {@link Order} into a QueryDsl specific
-     * {@link OrderSpecifier}.
-     * 
-     * @param order
-     * @return
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private OrderSpecifier<?> toOrder(Order order) {
-
-        Expression<Object> property = builder.get(order.getProperty());
-
-        return new OrderSpecifier(
-                order.isAscending() ? com.mysema.query.types.Order.ASC
-                        : com.mysema.query.types.Order.DESC, property);
-    }
-
-    /**
-     * Special {@link MongodbQuery} implementation to use our
-     * {@link MongoOperations} for actually accessing Mongo.
-     * 
-     * @author Oliver Gierke
-     */
-    private class MongoTemplateQuery extends MongodbQuery<T> {
-
-        public MongoTemplateQuery(MongoOperations operations) {
-            super(operations.getCollection(getEntityInformation()
-                    .getCollectionName()), transformer, serializer);
-        }
-    }
-
-    /**
-     * {@link Transformer} implementation to delegate to a
-     * {@link MongoConverter}.
-     * 
-     * @author Oliver Gierke
-     */
-    private class MongoConverterTransformer implements Transformer<DBObject, T> {
-
-        private final MongoConverter converter;
-
-
-        /**
-         * Creates a new {@link MongoConverterTransformer} with the given
-         * {@link MongoConverter}.
-         * 
-         * @param converter
-         */
-        public MongoConverterTransformer(MongoConverter converter) {
-
-            this.converter = converter;
-        }
-
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.apache.commons.collections15.Transformer#transform(java.lang.
-         * Object)
-         */
-        public T transform(DBObject input) {
-
-            return converter.read(getEntityInformation().getJavaType(), input);
-        }
-    }
-
-    /**
-     * Strategy interface to abstract the ways to translate an plain domain
-     * class into a {@link EntityPath}.
-     * 
-     * @author Oliver Gierke
-     */
-    public static interface EntityPathResolver {
-
-        <T> EntityPath<T> createPath(Class<T> domainClass);
-    }
-
-    /**
-     * Simple implementation of {@link EntityPathResolver} to lookup a query
-     * class by reflection and using the static field of the same type.
-     * 
-     * @author Oliver Gierke
-     */
-    static enum SimpleEntityPathResolver implements EntityPathResolver {
-
-        INSTANCE;
-
-        private static final String NO_CLASS_FOUND_TEMPLATE =
-                "Did not find a query class %s for domain class %s!";
-        private static final String NO_FIELD_FOUND_TEMPLATE =
-                "Did not find a static field of the same type in %s!";
-
-
-        /**
-         * Creates an {@link EntityPath} instance for the given domain class.
-         * Tries to lookup a class matching the naming convention (prepend Q to
-         * the simple name of the class, same package) and find a static field
-         * of the same type in it.
-         * 
-         * @param domainClass
-         * @return
-         */
-        @SuppressWarnings("unchecked")
-        public <T> EntityPath<T> createPath(Class<T> domainClass) {
-
-            String pathClassName = getQueryClassName(domainClass);
-
-            try {
-                Class<?> pathClass =
-                        ClassUtils.forName(pathClassName,
-                                QueryDslMongoRepository.class.getClassLoader());
-                Field field = getStaticFieldOfType(pathClass);
-
-                if (field == null) {
-                    throw new IllegalStateException(String.format(
-                            NO_FIELD_FOUND_TEMPLATE, pathClass));
-                } else {
-                    return (EntityPath<T>) ReflectionUtils
-                            .getField(field, null);
-                }
-
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(String.format(
-                        NO_CLASS_FOUND_TEMPLATE, pathClassName,
-                        domainClass.getName()), e);
-            }
-        }
-
-
-        /**
-         * Returns the first static field of the given type inside the given
-         * type.
-         * 
-         * @param type
-         * @return
-         */
-        private Field getStaticFieldOfType(Class<?> type) {
-
-            for (Field field : type.getDeclaredFields()) {
-
-                boolean isStatic = Modifier.isStatic(field.getModifiers());
-                boolean hasSameType = type.equals(field.getType());
-
-                if (isStatic && hasSameType) {
-                    return field;
-                }
-            }
-
-            Class<?> superclass = type.getSuperclass();
-            return Object.class.equals(superclass) ? null
-                    : getStaticFieldOfType(superclass);
-        }
-
-
-        /**
-         * Returns the name of the query class for the given domain class.
-         * 
-         * @param domainClass
-         * @return
-         */
-        private String getQueryClassName(Class<?> domainClass) {
-
-            String simpleClassName = ClassUtils.getShortName(domainClass);
-            return String.format("%s.Q%s%s",
-                    domainClass.getPackage().getName(),
-                    getClassBase(simpleClassName), domainClass.getSimpleName());
-        }
-
-
-        /**
-         * Analyzes the short class name and potentially returns the outer
-         * class.
-         * 
-         * @param shortName
-         * @return
-         */
-        private String getClassBase(String shortName) {
-
-            String[] parts = shortName.split("\\.");
-
-            if (parts.length < 2) {
-                return "";
-            }
-
-            return parts[0] + "_";
-        }
-    }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryDslPredicateExecutor.java

@@ -1,74 +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.document.mongodb.repository;
-
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Predicate;
-
-/**
- * Interface for query methods taking a QueryDsl {@link Predicate}.
- * 
- * @author Oliver Gierke
- */
-public interface QueryDslPredicateExecutor<T> {
-
-	/**
-	 * Returns a single entity matching the given {@link Predicate}.
-	 * 
-	 * @param spec
-	 * @return
-	 */
-	T findOne(Predicate predicate);
-
-	/**
-	 * Returns all entities matching the given {@link Predicate}.
-	 * 
-	 * @param spec
-	 * @return
-	 */
-	List<T> findAll(Predicate predicate);
-
-	/**
-	 * Returns all entities matching the given {@link Predicate} applying the given {@link OrderSpecifier}s.
-	 * 
-	 * @param predicate
-	 * @param orders
-	 * @return
-	 */
-	List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);
-
-	/**
-	 * Returns a {@link Page} of entities matching the given {@link Predicate}.
-	 * 
-	 * @param predicate
-	 * @param pageable
-	 * @return
-	 */
-	Page<T> findAll(Predicate predicate, Pageable pageable);
-
-	/**
-	 * Returns the number of instances that the given {@link Predicate} will return.
-	 * 
-	 * @param predicate the {@link Predicate} to count instances for
-	 * @return the number of instances
-	 */
-	Long count(Predicate predicate);
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryUtils.java

@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.repository;
-
-import com.mongodb.DBCursor;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Order;
-
-
-/**
- * Collection of utility methods to apply sorting and pagination to a
- * {@link DBCursor}.
- *
- * @author Oliver Gierke
- */
-abstract class QueryUtils {
-
-  private QueryUtils() {
-
-  }
-
-
-  /**
-   * Applies the given {@link Pageable} to the given {@link Query}. Will do
-   * nothing if {@link Pageable} is {@literal null}.
-   *
-   * @param query
-   * @param pageable
-   * @return
-   */
-  public static Query applyPagination(Query query, Pageable pageable) {
-
-    if (pageable == null) {
-      return query;
-    }
-
-    query.limit(pageable.getPageSize());
-    query.skip(pageable.getOffset());
-
-    return applySorting(query, pageable.getSort());
-  }
-
-
-  /**
-   * Applies the given {@link Sort} to the {@link Query}. Will do nothing if
-   * {@link Sort} is {@literal null}.
-   *
-   * @param query
-   * @param sort
-   * @return
-   */
-  public static Query applySorting(Query query, Sort sort) {
-
-    if (sort == null) {
-      return query;
-    }
-
-    org.springframework.data.document.mongodb.query.Sort bSort =
-        query.sort();
-
-    for (Order order : sort) {
-      bSort.on(
-          order.getProperty(),
-          order.isAscending() ? org.springframework.data.document.mongodb.query.Order.ASCENDING
-              : org.springframework.data.document.mongodb.query.Order.DESCENDING);
-    }
-
-    return query;
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/SimpleMongoEntityInformation.java

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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.document.mongodb.repository;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.data.repository.support.AbstractEntityInformation;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-
-/**
- * Expects the domain class to contain a field with a name out of the following
- * {@value #FIELD_NAMES}.
- *
- * @author Oliver Gierke
- */
-class SimpleMongoEntityInformation<T extends Object, ID extends Serializable> extends AbstractEntityInformation<T, ID> implements MongoEntityInformation<T, ID> {
-
-  private static final List<String> FIELD_NAMES = Arrays.asList("ID", "id", "_id");
-  private Field field;
-
-
-  /**
-   * Creates a new {@link SimpleMongoEntityInformation}.
-   *
-   * @param domainClass
-   */
-  public SimpleMongoEntityInformation(Class<T> domainClass) {
-
-    super(domainClass);
-
-    for (String name : FIELD_NAMES) {
-
-      Field candidate = ReflectionUtils.findField(domainClass, name);
-
-      if (candidate != null) {
-        ReflectionUtils.makeAccessible(candidate);
-        this.field = candidate;
-        break;
-      }
-    }
-
-    if (this.field == null) {
-      throw new IllegalArgumentException(String.format(
-          "Given domain class %s does not contain an id property!",
-          domainClass.getName()));
-    }
-  }
-
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.document.mongodb.repository.MongoEntityInformation#getCollectionName()
-   */
-  public String getCollectionName() {
-
-    return StringUtils.uncapitalize(getJavaType().getSimpleName());
-  }
-
-
-  /* (non-Javadoc)
-   * @see org.springframework.data.document.mongodb.repository.MongoEntityInformation#getIdAttribute()
-   */
-  public String getIdAttribute() {
-
-    return "_id";
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.support.IdAware#getId(java.lang.Object
-  * )
-  */
-  @SuppressWarnings("unchecked")
-  public ID getId(Object entity) {
-
-    return (ID) ReflectionUtils.getField(field, entity);
-  }
-
-
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.support.EntityInformation#getIdType()
-  */
-  @SuppressWarnings("unchecked")
-  public Class<ID> getIdType() {
-
-    return (Class<ID>) field.getType();
-  }
-}

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

@@ -1,251 +0,0 @@
-/*
- * Copyright 2010-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.document.mongodb.repository;
-
-import static org.springframework.data.document.mongodb.query.Criteria.*;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.data.document.mongodb.MongoOperations;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.Criteria;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.util.Assert;
-
-/**
- * Repository base implementation for Mongo.
- * 
- * @author Oliver Gierke
- */
-public class SimpleMongoRepository<T, ID extends Serializable> implements PagingAndSortingRepository<T, ID> {
-
-  private final MongoTemplate template;
-  private final MongoEntityInformation<T, ID> entityInformation;
-
-  /**
-   * Creates a ew {@link SimpleMongoRepository} for the given {@link MongoEntityInformation} and {@link MongoTemplate}.
-   * 
-   * @param metadata
-   * @param template
-   */
-  public SimpleMongoRepository(MongoEntityInformation<T, ID> metadata, MongoTemplate template) {
-
-    Assert.notNull(template);
-    Assert.notNull(metadata);
-    this.entityInformation = metadata;
-    this.template = template;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#save(java.lang.Object)
-   */
-  public T save(T entity) {
-
-    template.save(entityInformation.getCollectionName(), entity);
-    return entity;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#save(java.lang.Iterable)
-   */
-  public List<T> save(Iterable<? extends T> entities) {
-
-    List<T> result = new ArrayList<T>();
-
-    for (T entity : entities) {
-      save(entity);
-      result.add(entity);
-    }
-
-    return result;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#findById(java.io.Serializable
-   * )
-   */
-  public T findOne(ID id) {
-
-    return template.findOne(entityInformation.getCollectionName(), getIdQuery(id), entityInformation.getJavaType());
-  }
-
-  private Query getIdQuery(Object id) {
-    return new Query(getIdCriteria(id));
-  }
-
-  private Criteria getIdCriteria(Object id) {
-    return where(entityInformation.getIdAttribute()).is(id);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#exists(java.io.Serializable
-   * )
-   */
-  public boolean exists(ID id) {
-
-    return findOne(id) != null;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.springframework.data.repository.Repository#count()
-   */
-  public Long count() {
-
-    return template.getCollection(entityInformation.getCollectionName()).count();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#delete(java.lang.Object)
-   */
-  public void delete(T entity) {
-
-    template.remove(entityInformation.getCollectionName(), getIdQuery(entityInformation.getId(entity)), entity.getClass());
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.Repository#delete(java.lang.Iterable)
-   */
-  public void delete(Iterable<? extends T> entities) {
-
-    for (T entity : entities) {
-      delete(entity);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.springframework.data.repository.Repository#deleteAll()
-   */
-  public void deleteAll() {
-
-    template.dropCollection(entityInformation.getCollectionName());
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.springframework.data.repository.Repository#findAll()
-   */
-  public List<T> findAll() {
-
-    return findAll(new Query());
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.springframework.data.repository.PagingAndSortingRepository#findAll
-   * (org.springframework.data.domain.Pageable)
-   */
-  public Page<T> findAll(final Pageable pageable) {
-
-    Long count = count();
-    List<T> list = findAll(QueryUtils.applyPagination(new Query(), pageable));
-
-    return new PageImpl<T>(list, pageable, count);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @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;
-
-    for (ID id : ids) {
-      if (query == null) {
-        query = getIdQuery(id);
-      } else {
-        query = new Query().or(getIdQuery(id));
-      }
-    }
-
-    return findAll(query);
-  }
-
-  private List<T> findAll(Query query) {
-
-    if (query == null) {
-      return Collections.emptyList();
-    }
-
-    return template.find(entityInformation.getCollectionName(), query, entityInformation.getJavaType());
-  }
-
-  /**
-   * Returns the underlying {@link MongoOperations} instance.
-   * 
-   * @return
-   */
-  protected MongoOperations getMongoOperations() {
-
-    return this.template;
-  }
-
-  /**
-   * @return the entityInformation
-   */
-  protected MongoEntityInformation<T, ID> getEntityInformation() {
-
-    return entityInformation;
-  }
-}

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

@@ -1,105 +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.document.mongodb.repository;
-
-import java.util.regex.Matcher;
-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.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.query.BasicQuery;
-import org.springframework.data.document.mongodb.query.Query;
-
-/**
- * Query to use a plain JSON String to create the {@link Query} to actually execute.
- *
- * @author Oliver Gierke
- */
-public class StringBasedMongoQuery extends AbstractMongoQuery {
-
-  private static final Pattern PLACEHOLDER = Pattern.compile("\\?(\\d+)");
-  private static final Log LOG = LogFactory.getLog(StringBasedMongoQuery.class);
-
-  private final String query;
-  private final String fieldSpec;
-
-  /**
-   * Creates a new {@link StringBasedMongoQuery}.
-   *
-   * @param method
-   * @param template
-   */
-  public StringBasedMongoQuery(MongoQueryMethod method, MongoTemplate template) {
-    super(method, template);
-    this.query = method.getAnnotatedQuery();
-    this.fieldSpec = method.getFieldSpecification();
-  }
-
-  /*
-    * (non-Javadoc)
-    *
-    * @see
-    * org.springframework.data.document.mongodb.repository.AbstractMongoQuery#createQuery(org.springframework.data.
-    * repository.query.SimpleParameterAccessor, org.springframework.data.document.mongodb.support.convert.MongoConverter)
-    */
-  @Override
-  protected Query createQuery(ConvertingParameterAccessor accessor) {
-
-    String queryString = replacePlaceholders(query, accessor);
-
-    Query query = null;
-
-    if (fieldSpec != null) {
-      String fieldString = replacePlaceholders(fieldSpec, accessor);
-      query = new BasicQuery(queryString, fieldString);
-    } else {
-      query = new BasicQuery(queryString);
-    }
-
-    if (LOG.isDebugEnabled()) {
-      LOG.debug(String.format("Created query {}", query.getQueryObject()));
-    }
-
-    return query;
-  }
-
-  private String replacePlaceholders(String input, ConvertingParameterAccessor accessor) {
-
-    Matcher matcher = PLACEHOLDER.matcher(input);
-    String result = input;
-
-    while (matcher.find()) {
-      String group = matcher.group();
-      int index = Integer.parseInt(matcher.group(1));
-      result = input.replace(group, getParameterWithIndex(accessor, index));
-    }
-
-    return result;
-  }
-
-  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();
-  }
-}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MongoDB specific repository implementation.
- */
-package org.springframework.data.document.mongodb.repository;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java

@@ -13,45 +13,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
 
-  private String username;
-  
-  private char[] password;
-  
-  private String database;
-  
-  private static final long serialVersionUID = 1172099106475265589L;
+	private String username;
 
-  public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
-    super(msg, cause);
-  }
-  
-  public CannotGetMongoDbConnectionException(String msg) {
-    super(msg);
-  }
+	private char[] password;
 
-  public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password2) {
-    super(msg);
-    this.username = username;
-    this.password = password2;
-    this.database = database;
-  }
+	private String database;
 
-  public String getUsername() {
-    return username;
-  }
+	private static final long serialVersionUID = 1172099106475265589L;
 
-  public char[] getPassword() {
-    return password;
-  }
+	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
+	public CannotGetMongoDbConnectionException(String msg) {
+		super(msg);
+	}
+
+	public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password2) {
+		super(msg);
+		this.username = username;
+		this.password = password2;
+		this.database = database;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public char[] getPassword() {
+		return password;
+	}
+
+	public String getDatabase() {
+		return database;
+	}
 
-  public String getDatabase() {
-    return database;
-  }
- 
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-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.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.document;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
-public class InvalidDocumentStoreApiUsageException extends InvalidDataAccessApiUsageException {
+public class InvalidMongoDbApiUsageException extends InvalidDataAccessApiUsageException {
 
-  public InvalidDocumentStoreApiUsageException(String msg) {
-    super(msg);
-  }
+	private static final long serialVersionUID = 2034770973290508041L;
 
-  public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
-    super(msg, cause);
-  }
+	public InvalidMongoDbApiUsageException(String msg) {
+		super(msg);
+	}
 
+	public InvalidMongoDbApiUsageException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java

@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Helper class featuring helper methods for working with MongoDb collections.
+ * <p/>
+ * <p/>
+ * Mainly intended for internal use within the framework.
+ * 
+ * @author Thomas Risberg
+ * @since 1.0
+ */
+public abstract class MongoCollectionUtils {
+
+	/**
+	 * Private constructor to prevent instantiation.
+	 */
+	private MongoCollectionUtils() {
+
+	}
+
+	/**
+	 * Obtains the collection name to use for the provided class
+	 * 
+	 * @param entityClass The class to determine the preferred collection name for
+	 * @return The preferred collection name
+	 */
+	public static String getPreferredCollectionName(Class<?> entityClass) {
+		return StringUtils.uncapitalize(entityClass.getSimpleName());
+	}
+
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java

@@ -0,0 +1,30 @@
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataAccessException;
+
+import com.mongodb.DB;
+
+/**
+ * Interface for factories creating {@link DB} instances.
+ * 
+ * @author Mark Pollack
+ */
+public interface MongoDbFactory {
+
+	/**
+	 * Creates a default {@link DB} instance.
+	 * 
+	 * @return
+	 * @throws DataAccessException
+	 */
+	DB getDb() throws DataAccessException;
+
+	/**
+	 * Creates a {@link DB} instance to access the database with the given name.
+	 * 
+	 * @param dbName must not be {@literal null} or empty.
+	 * @return
+	 * @throws DataAccessException
+	 */
+	DB getDb(String dbName) throws DataAccessException;
+}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-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.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.springframework.data.document;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.UncategorizedDataAccessException;
 
-public class UncategorizedDocumentStoreException extends UncategorizedDataAccessException {
+public class UncategorizedMongoDbException extends UncategorizedDataAccessException {
 
-  public UncategorizedDocumentStoreException(String msg, Throwable cause) {
-    super(msg, cause);
-  }
+	private static final long serialVersionUID = -2336595514062364929L;
 
+	public UncategorizedMongoDbException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 }

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

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2010-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.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;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.data.annotation.Persistent;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+
+@Configuration
+public abstract class AbstractMongoConfiguration {
+
+	public abstract String getDatabaseName();
+
+	@Bean
+	public abstract Mongo mongo() throws Exception;
+
+	@Bean
+	public MongoTemplate mongoTemplate() throws Exception {
+		return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
+	}
+
+	@Bean
+	public MongoDbFactory mongoDbFactory() throws Exception {
+		if (getUserCredentials() == null) {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName());
+		} else {
+			return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
+		}
+	}
+
+	public String getMappingBasePackage() {
+		return "";
+	}
+
+	public UserCredentials getUserCredentials() {
+		return null;
+	}
+
+	@Bean
+	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		String basePackage = getMappingBasePackage();
+		if (StringUtils.hasText(basePackage)) {
+			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
+					false);
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
+
+			Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass()
+						.getClassLoader()));
+			}
+			mappingContext.setInitialEntitySet(initialEntitySet);
+		}
+		return mappingContext;
+	}
+
+	@Bean
+	public MappingMongoConverter mappingMongoConverter() throws Exception {
+		MappingMongoConverter converter = new MappingMongoConverter(mongoDbFactory(), mongoMappingContext());
+		afterMappingMongoConverterCreation(converter);
+		return converter;
+	}
+
+	/**
+	 * Hook that allows post-processing after the MappingMongoConverter has been successfully created.
+	 * 
+	 * @param converter
+	 */
+	protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {
+	}
+
+	@Bean
+	public MappingContextAwareBeanPostProcessor mappingContextAwareBeanPostProcessor() {
+		MappingContextAwareBeanPostProcessor bpp = new MappingContextAwareBeanPostProcessor();
+		bpp.setMappingContextBeanName("mongoMappingContext");
+		return bpp;
+	}
+
+}

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * 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;
+
+/**
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ */
+public abstract class BeanNames {
+
+	static final String MAPPING_CONTEXT = "mappingContext";
+	static final String INDEX_HELPER = "indexCreationHelper";
+	static final String MONGO = "mongo";
+	static final String DB_FACTORY = "mongoDbFactory";
+	static final String POST_PROCESSOR = "mappingContextAwareBeanPostProcessor";
+
+}