Merge remote branch 'origin/master'

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDocumentSource.java

@@ -1,8 +0,0 @@
-package org.springframework.data.document.couchdb;
-
-import org.jcouchdb.document.BaseDocument;
-import org.springframework.data.document.DocumentSource;
-
-public interface CouchDocumentSource extends DocumentSource<BaseDocument> {
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchTemplate.java

@@ -20,7 +20,6 @@ package org.springframework.data.document.couchdb;
 import org.jcouchdb.db.Database;
 import org.jcouchdb.document.BaseDocument;
 import org.springframework.data.document.AbstractDocumentStoreTemplate;
-import org.springframework.data.document.DocumentSource;
 
 	public class CouchTemplate extends AbstractDocumentStoreTemplate<Database> {
 
@@ -40,9 +39,8 @@ import org.springframework.data.document.DocumentSource;
 		this.database = database;
 	}
 	
-	public void save(DocumentSource<BaseDocument> documentSource) {
+	public void save(BaseDocument document) {
-		BaseDocument d = documentSource.getDocument();
+		getConnection().createDocument(document);
-		getConnection().createDocument(d);
 	}
 
 	@Override

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

@@ -1,29 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.document;
-
-/**
- * Class used to map a business object to an object providing the source data for a Document.
- *
- * @author Thomas Risberg
- * @since 1.0
- */
-public interface DocumentSource<D> {
-	
-	D getDocument();
-
-}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.document.mongodb;
-
-import org.springframework.data.document.DocumentSource;
-
-import com.mongodb.DBObject;
-
-public interface MongoDocumentSource extends DocumentSource<DBObject> {
-	
-}