From 0b50e5802027a92c84cb2e90cfb96f19cca6aa71 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 12 May 2011 11:27:58 +0200
Subject: [PATCH] DATACMNS-29 - Adapted changes in Spring Data Commons.

User repository interfaces are not required to implement MongoRepository anymore. Added missing override for save(Iterable<? extends T> entities) to return a List<T>.
---
 .../mongodb/config/AbstractMongoConfiguration.java |  3 ---
 .../config/SimpleMongoRepositoryConfiguration.java | 14 --------------
 .../mongodb/repository/MongoRepository.java        |  7 +++++++
 .../repository/MongoRepositoryFactoryBean.java     |  3 ++-
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
index fa5d85176..4307c6f6b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
@@ -28,11 +28,8 @@ 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.MongoPersistentEntity;
 import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
-import org.springframework.data.mapping.model.MappingContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/SimpleMongoRepositoryConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/SimpleMongoRepositoryConfiguration.java
index 68468c753..89180dda1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/SimpleMongoRepositoryConfiguration.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/SimpleMongoRepositoryConfiguration.java
@@ -15,7 +15,6 @@
  */
 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;
@@ -85,19 +84,6 @@ public class SimpleMongoRepositoryConfiguration extends RepositoryConfig<SimpleM
   }
 
 
-  /*
-  * (non-Javadoc)
-  *
-  * @see
-  * org.springframework.data.repository.config.GlobalRepositoryConfigInformation
-  * #getRepositoryBaseInterface()
-  */
-  public Class<?> getRepositoryBaseInterface() {
-
-    return MongoRepository.class;
-  }
-
-
   /*
   * (non-Javadoc)
   *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepository.java
index 50f3bc3e5..c93fbf8f3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepository.java
@@ -28,6 +28,13 @@ import org.springframework.data.repository.PagingAndSortingRepository;
  */
 public interface MongoRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.data.repository.Repository#save(java.lang.Iterable)
+	 */
+	List<T> save(Iterable<? extends T> entites);
+	
   /*
     * (non-Javadoc)
     *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryBean.java
index ea82abe1f..34fb3d379 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryBean.java
@@ -34,6 +34,7 @@ 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.repository.Repository;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.query.RepositoryQuery;
@@ -52,7 +53,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Oliver Gierke
  */
-public class MongoRepositoryFactoryBean<T extends MongoRepository<S, ID>, S, ID extends Serializable> extends
+public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
     RepositoryFactoryBeanSupport<T, S, ID> {
 
   private MongoTemplate template;