DATADOC-117 removed defaultCollection on MongoTemplate/Operations; changed getDefaultCollectionName to getCollectionName(Class clazz) to determine collection name used for specific class; added a class parameter where necessary

Author: Thomas Risberg

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

@@ -28,7 +28,6 @@
   <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"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 

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

@@ -23,7 +23,6 @@
 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;
@@ -40,18 +39,11 @@
 public interface MongoOperations {
 
   /**
-   * The default collection name used by this template.
+   * The collection name used for the specified class by this template.
    *
    * @return
    */
-  String getDefaultCollectionName();
-
-  /**
-   * The default collection used by this template.
-   *
-   * @return The default collection used by this template
-   */
-  DBCollection getDefaultCollection();
+  String getCollectionName(Class<?> clazz);
 
   /**
    * Execute the a MongoDB command expressed as a JSON string.  This will call the method
@@ -83,15 +75,16 @@ public interface MongoOperations {
   <T> T execute(DbCallback<T> action);
 
   /**
-   * Executes the given {@link CollectionCallback} on the default collection.
+   * Executes the given {@link CollectionCallback} on the entity collection of the specified class.
    * <p/>
    * Allows for returning a result object, that is a domain object or a collection of domain objects.
    *
+   * @param entityClass class that determines the collection to use
    * @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);
+  <T> T execute(Class<?> entityClass, CollectionCallback<T> action);
 
   /**
    * Executes the given {@link CollectionCallback} on the collection of the given name.
@@ -219,9 +212,10 @@ <T> List<T> getCollection(String collectionName, Class<T> targetClass,
    * Ensure that an index for the provided {@link IndexDefinition} exists for the default collection.
    * If not it will be created.
    *
-   * @param index
+   * @param entityClass class that determines the collection to use
+   * @param indexDefinition
    */
-  void ensureIndex(IndexDefinition indexDefinition);
+  void ensureIndex(Class<?> entityClass, IndexDefinition indexDefinition);
 
   /**
    * Ensure that an index for the provided {@link IndexDefinition} exists. If not it will be
@@ -651,11 +645,12 @@ <T> T findAndRemove(String collectionName, Query query,
    * Updates the first object that is found in the default collection that matches the query document
    * with the provided updated document.
    *
+   * @param entityClass class that determines the collection to use
    * @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);
+  WriteResult updateFirst(Class<?> entityClass, Query query, Update update);
 
   /**
    * Updates the first object that is found in the specified collection that matches the query document criteria
@@ -673,11 +668,12 @@ WriteResult updateFirst(String collectionName, Query query,
    * Updates all objects that are found in the default collection that matches the query document criteria
    * with the provided updated document.
    *
+   * @param entityClass class that determines the collection to use
    * @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);
+  WriteResult updateMulti(Class<?> entityClass, Query query, Update update);
 
   /**
    * Updates all objects that are found in the specified collection that matches the query document criteria