diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java
index 4b12566dc..8c763c02f 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java
@@ -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.CollectionCallback;
+import org.springframework.data.mongodb.MongoTemplate;
import org.springframework.data.persistence.ChangeSet;
import org.springframework.data.persistence.ChangeSetBacked;
import org.springframework.data.persistence.ChangeSetPersister;
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java
index aafae19ad..3ab26edef 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java
+++ b/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.MongoTemplate;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java
index 70dadb0c3..1ba1677d8 100644
--- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java
+++ b/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.mapping.Document;
@Document
public class Resume {
diff --git a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
index 949a43d1e..4c66ef574 100644
--- a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
+++ b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
@@ -20,22 +20,22 @@
-
+
-
+
-
+
-
+
target/generated-test-sources
- org.springframework.data.document.mongodb.repository.MongoAnnotationProcessor
+ org.springframework.data.mongodb.repository.MongoAnnotationProcessor
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/package-info.java
deleted file mode 100644
index 4467b5ec6..000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/monitor/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * MongoDB specific JMX monitoring support.
- */
-package org.springframework.data.document.mongodb.monitor;
-
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/package-info.java
deleted file mode 100644
index 716e2e20e..000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * MongoDB core support.
- */
-package org.springframework.data.document.mongodb;
-
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java
deleted file mode 100644
index 49bdc8c00..000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * MongoDB specific query and update support.
- */
-package org.springframework.data.document.mongodb.query;
-
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java
deleted file mode 100644
index 9c078e437..000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * MongoDB specific repository implementation.
- */
-package org.springframework.data.document.mongodb.repository;
-
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java
index a2455f520..f7d4b3536 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CannotGetMongoDbConnectionException.java
@@ -13,7 +13,7 @@
* 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;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionCallback.java
similarity index 91%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionCallback.java
index 513e6b9d8..c07e53d0c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionCallback.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DBCollection;
import com.mongodb.MongoException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionOptions.java
similarity index 93%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionOptions.java
index 96394bf60..1e3eb8b58 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CollectionOptions.java
@@ -13,7 +13,7 @@
* 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;
/**
* Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CursorPreparer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CursorPreparer.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CursorPreparer.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CursorPreparer.java
index 13659923e..4b9c3b800 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CursorPreparer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CursorPreparer.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DBCursor;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbCallback.java
similarity index 91%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbCallback.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbCallback.java
index 9bd6943c6..8c5fc53b0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbCallback.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DB;
import com.mongodb.MongoException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbHolder.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbHolder.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbHolder.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbHolder.java
index 375a9d704..0827db049 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/DbHolder.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbHolder.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/InvalidMongoDbApiUsageException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/InvalidMongoDbApiUsageException.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java
index 046e7ad28..ae2d06a73 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/InvalidMongoDbApiUsageException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.dao.InvalidDataAccessApiUsageException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdmin.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdmin.java
similarity index 83%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdmin.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdmin.java
index ec6f9d835..743252c21 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdmin.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdmin.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DB;
import com.mongodb.Mongo;
@@ -45,7 +45,7 @@ public class MongoAdmin implements MongoAdminOperations {
}
/* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.MongoAdminOperations#dropDatabase(java.lang.String)
+ * @see org.springframework.data.mongodb.MongoAdminOperations#dropDatabase(java.lang.String)
*/
@ManagedOperation
public void dropDatabase(String databaseName) {
@@ -53,7 +53,7 @@ public class MongoAdmin implements MongoAdminOperations {
}
/* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.MongoAdminOperations#createDatabase(java.lang.String)
+ * @see org.springframework.data.mongodb.MongoAdminOperations#createDatabase(java.lang.String)
*/
@ManagedOperation
public void createDatabase(String databaseName) {
@@ -61,7 +61,7 @@ public class MongoAdmin implements MongoAdminOperations {
}
/* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.MongoAdminOperations#getDatabaseStats(java.lang.String)
+ * @see org.springframework.data.mongodb.MongoAdminOperations#getDatabaseStats(java.lang.String)
*/
@ManagedOperation
public String getDatabaseStats(String databaseName) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdminOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdminOperations.java
similarity index 84%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdminOperations.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdminOperations.java
index 40113cbd6..398847eb0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoAdminOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdminOperations.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.jmx.export.annotation.ManagedOperation;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoCollectionUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoCollectionUtils.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java
index e0675e13a..5c2374173 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoCollectionUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.util.StringUtils;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java
similarity index 80%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java
index 5c78e9051..742a36230 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.dao.DataAccessException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbUtils.java
similarity index 99%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbUtils.java
index 1d83a6cf2..c66d89fd3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import com.mongodb.DB;
import com.mongodb.Mongo;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDocumentWriter.java
similarity index 90%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDocumentWriter.java
index 3ae2f5579..b83724b74 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDocumentWriter.java
@@ -13,7 +13,7 @@
* 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;
public interface MongoDocumentWriter {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExceptionTranslator.java
similarity index 98%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExceptionTranslator.java
index ebee63c70..93b557b6b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoExceptionTranslator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExceptionTranslator.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.MongoException;
import com.mongodb.MongoException.CursorNotFound;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoFactoryBean.java
similarity index 98%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoFactoryBean.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoFactoryBean.java
index 54990351c..b4f9b8fee 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoFactoryBean.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import java.util.List;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOperations.java
similarity index 99%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOperations.java
index 9f521c028..68302e41a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOperations.java
@@ -13,7 +13,7 @@
* 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 java.util.Collection;
import java.util.List;
@@ -24,9 +24,9 @@ import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.WriteResult;
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.Update;
+import org.springframework.data.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.query.Query;
+import org.springframework.data.mongodb.query.Update;
/**
* Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOptionsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOptionsFactoryBean.java
similarity index 99%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOptionsFactoryBean.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOptionsFactoryBean.java
index dca66ac7a..41752e06e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoOptionsFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOptionsFactoryBean.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.MongoOptions;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoPropertyDescriptors.java
similarity index 99%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoPropertyDescriptors.java
index 029c99155..fef9a4b2e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoPropertyDescriptors.java
@@ -13,7 +13,7 @@
* 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 java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoReader.java
similarity index 93%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoReader.java
index 1e5c61fb2..2c98f602b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoReader.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DBObject;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSynchronization.java
similarity index 87%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSynchronization.java
index 2fe6373e2..dc2683b10 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSynchronization.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.transaction.support.ResourceHolder;
import org.springframework.transaction.support.ResourceHolderSynchronization;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTemplate.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTemplate.java
index 96ff6907f..582235070 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTemplate.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
-import static org.springframework.data.document.mongodb.query.Criteria.*;
+import static org.springframework.data.mongodb.query.Criteria.*;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -53,26 +53,26 @@ import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverter;
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-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.document.mongodb.mapping.event.AfterConvertEvent;
-import org.springframework.data.document.mongodb.mapping.event.AfterLoadEvent;
-import org.springframework.data.document.mongodb.mapping.event.AfterSaveEvent;
-import org.springframework.data.document.mongodb.mapping.event.BeforeConvertEvent;
-import org.springframework.data.document.mongodb.mapping.event.BeforeSaveEvent;
-import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
-import org.springframework.data.document.mongodb.mapping.event.MongoMappingEventPublisher;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.QueryMapper;
-import org.springframework.data.document.mongodb.query.Update;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.model.BeanWrapper;
import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.convert.MongoConverter;
+import org.springframework.data.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.mapping.event.AfterConvertEvent;
+import org.springframework.data.mongodb.mapping.event.AfterLoadEvent;
+import org.springframework.data.mongodb.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.mapping.event.BeforeConvertEvent;
+import org.springframework.data.mongodb.mapping.event.BeforeSaveEvent;
+import org.springframework.data.mongodb.mapping.event.MongoMappingEvent;
+import org.springframework.data.mongodb.mapping.event.MongoMappingEventPublisher;
+import org.springframework.data.mongodb.query.Query;
+import org.springframework.data.mongodb.query.QueryMapper;
+import org.springframework.data.mongodb.query.Update;
import org.springframework.jca.cci.core.ConnectionCallback;
import org.springframework.util.Assert;
@@ -244,7 +244,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
/**
* Returns the default
- * {@link org.springframework.data.document.mongodb.convert.MongoConverter}.
+ * {@link org.springframework.data.mongodb.convert.MongoConverter}.
*
* @return
*/
@@ -254,7 +254,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
/**
* Returns the
- * {@link org.springframework.data.document.mongodb.MongoDbFactory}.
+ * {@link org.springframework.data.mongodb.MongoDbFactory}.
*
* @return
*/
@@ -269,7 +269,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
/*
* (non-Javadoc)
*
- * @see org.springframework.data.document.mongodb.MongoOperations#
+ * @see org.springframework.data.mongodb.MongoOperations#
* getDefaultCollectionName()
*/
public String getCollectionName(Class entityClass) {
@@ -280,7 +280,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#executeCommand
+ * org.springframework.data.mongodb.MongoOperations#executeCommand
* (java.lang.String)
*/
public CommandResult executeCommand(String jsonCommand) {
@@ -291,7 +291,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#executeCommand
+ * org.springframework.data.mongodb.MongoOperations#executeCommand
* (com.mongodb.DBObject)
*/
public CommandResult executeCommand(final DBObject command) {
@@ -319,7 +319,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+ * org.springframework.data.mongodb.MongoOperations#execute(org.
* springframework.data.document.mongodb.DBCallback)
*/
public T execute(DbCallback action) {
@@ -338,7 +338,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+ * org.springframework.data.mongodb.MongoOperations#execute(org.
* springframework.data.document.mongodb.CollectionCallback)
*/
public T execute(Class entityClass, CollectionCallback callback) {
@@ -349,7 +349,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+ * org.springframework.data.mongodb.MongoOperations#execute(org.
* springframework.data.document.mongodb.CollectionCallback,
* java.lang.String)
*/
@@ -370,8 +370,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#executeInSession
- * (org.springframework.data.document.mongodb.DBCallback)
+ * org.springframework.data.mongodb.MongoOperations#executeInSession
+ * (org.springframework.data.mongodb.DBCallback)
*/
public T executeInSession(final DbCallback action) {
@@ -391,7 +391,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#createCollection
+ * org.springframework.data.mongodb.MongoOperations#createCollection
* (java.lang.Class)
*/
public DBCollection createCollection(Class entityClass) {
@@ -402,9 +402,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#createCollection
+ * org.springframework.data.mongodb.MongoOperations#createCollection
* (java.lang.Class,
- * org.springframework.data.document.mongodb.CollectionOptions)
+ * org.springframework.data.mongodb.CollectionOptions)
*/
public DBCollection createCollection(Class entityClass,
CollectionOptions collectionOptions) {
@@ -415,7 +415,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#createCollection
+ * org.springframework.data.mongodb.MongoOperations#createCollection
* (java.lang.String)
*/
public DBCollection createCollection(final String collectionName) {
@@ -426,9 +426,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#createCollection
+ * org.springframework.data.mongodb.MongoOperations#createCollection
* (java.lang.String,
- * org.springframework.data.document.mongodb.CollectionOptions)
+ * org.springframework.data.mongodb.CollectionOptions)
*/
public DBCollection createCollection(final String collectionName,
final CollectionOptions collectionOptions) {
@@ -440,7 +440,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#getCollection
+ * org.springframework.data.mongodb.MongoOperations#getCollection
* (java.lang.String)
*/
public DBCollection getCollection(final String collectionName) {
@@ -456,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#collectionExists
+ * org.springframework.data.mongodb.MongoOperations#collectionExists
* (java.lang.Class)
*/
public boolean collectionExists(Class entityClass) {
@@ -467,7 +467,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#collectionExists
+ * org.springframework.data.mongodb.MongoOperations#collectionExists
* (java.lang.String)
*/
public boolean collectionExists(final String collectionName) {
@@ -483,7 +483,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#dropCollection
+ * org.springframework.data.mongodb.MongoOperations#dropCollection
* (java.lang.Class)
*/
public void dropCollection(Class entityClass) {
@@ -496,7 +496,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#dropCollection
+ * org.springframework.data.mongodb.MongoOperations#dropCollection
* (java.lang.String)
*/
public void dropCollection(String collectionName) {
@@ -628,7 +628,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#insert(java
+ * org.springframework.data.mongodb.MongoOperations#insert(java
* .lang .Object)
*/
public void insert(Object objectToSave) {
@@ -640,7 +640,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#insert(java
+ * org.springframework.data.mongodb.MongoOperations#insert(java
* .lang .String, java.lang.Object)
*/
public void insert(Object objectToSave, String collectionName) {
@@ -701,7 +701,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#insertList(java
+ * org.springframework.data.mongodb.MongoOperations#insertList(java
* .util.List)
*/
public void insert(Collection batchToSave, Class entityClass) {
@@ -712,7 +712,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#insertList(java
+ * org.springframework.data.mongodb.MongoOperations#insertList(java
* .lang.String, java.util.List)
*/
public void insert(Collection batchToSave,
@@ -724,7 +724,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#insertAll(java
+ * org.springframework.data.mongodb.MongoOperations#insertAll(java
* .util.Collection)
*/
public void insertAll(Collection objectsToSave) {
@@ -790,7 +790,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#save(java.lang
+ * org.springframework.data.mongodb.MongoOperations#save(java.lang
* .Object)
*/
public void save(Object objectToSave) {
@@ -801,7 +801,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#save(java.lang
+ * org.springframework.data.mongodb.MongoOperations#save(java.lang
* .String, java.lang.Object)
*/
public void save(Object objectToSave, String collectionName) {
@@ -901,7 +901,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#updateFirst(com
+ * org.springframework.data.mongodb.MongoOperations#updateFirst(com
* .mongodb.DBObject, com.mongodb.DBObject)
*/
public WriteResult updateFirst(Query query, Update update,
@@ -914,7 +914,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#updateFirst
+ * org.springframework.data.mongodb.MongoOperations#updateFirst
* (java .lang.String, com.mongodb.DBObject, com.mongodb.DBObject)
*/
public WriteResult updateFirst(final Query query,
@@ -926,7 +926,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#updateMulti(com
+ * org.springframework.data.mongodb.MongoOperations#updateMulti(com
* .mongodb.DBObject, com.mongodb.DBObject)
*/
public WriteResult updateMulti(Query query, Update update,
@@ -939,7 +939,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#updateMulti
+ * org.springframework.data.mongodb.MongoOperations#updateMulti
* (java .lang.String, com.mongodb.DBObject, com.mongodb.DBObject)
*/
public WriteResult updateMulti(final Query query, final Update update,
@@ -1048,7 +1048,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#remove(java
+ * org.springframework.data.mongodb.MongoOperations#remove(java
* .lang .String, com.mongodb.DBObject)
*/
public void remove(final Query query, String collectionName) {
@@ -1059,7 +1059,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
* (non-Javadoc)
*
* @see
- * org.springframework.data.document.mongodb.MongoOperations#getCollection
+ * org.springframework.data.mongodb.MongoOperations#getCollection
* (java.lang.Class)
*/
public List findAll(Class entityClass) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoWriter.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoWriter.java
index 90def42f3..e3e4563ea 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoWriter.java
@@ -13,7 +13,7 @@
* 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 com.mongodb.DBObject;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoDbFactory.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoDbFactory.java
index cec851e6d..617987ecf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoDbFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/UncategorizedMongoDbException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/UncategorizedMongoDbException.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java
index 6d35f8a0c..df7384a0b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/UncategorizedMongoDbException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
import org.springframework.dao.UncategorizedDataAccessException;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/WriteResultChecking.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/WriteResultChecking.java
similarity index 53%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/WriteResultChecking.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/WriteResultChecking.java
index d2bb144f7..7cc9ebdc5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/WriteResultChecking.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/WriteResultChecking.java
@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
public enum WriteResultChecking {
NONE, LOG, EXCEPTION
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/mongodb/config/AbstractMongoConfiguration.java
similarity index 86%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/AbstractMongoConfiguration.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
index 1f84f70f8..2688fb06b 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/mongodb/config/AbstractMongoConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
import java.util.HashSet;
import java.util.Set;
@@ -26,13 +26,13 @@ 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.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
-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.mapping.context.MappingContextAwareBeanPostProcessor;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoTemplate;
+import org.springframework.data.mongodb.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.mapping.Document;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
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/BeanNames.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/BeanNames.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
index daa7820c9..776e24e32 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/BeanNames.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
/**
* @author Jon Brisbin
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
similarity index 94%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
index 8b6defefd..297576bd5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
import java.util.List;
import java.util.Set;
@@ -38,12 +38,12 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.data.annotation.Persistent;
-import org.springframework.data.document.mongodb.convert.CustomConversions;
-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.mapping.context.MappingContextAwareBeanPostProcessor;
+import org.springframework.data.mongodb.convert.CustomConversions;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.mapping.Document;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntityIndexCreator;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
similarity index 93%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
index dcdd7ccca..f62fc91fc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoDbFactoryParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.MongoFactoryBean;
+import org.springframework.data.mongodb.SimpleMongoDbFactory;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java
index c3bf6fbd6..7cf266c9d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -21,8 +21,8 @@ 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.data.mongodb.MongoAdmin;
+import org.springframework.data.mongodb.monitor.*;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java
similarity index 91%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java
index 91910d144..ce4a75349 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
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.data.mongodb.MongoFactoryBean;
+import org.springframework.data.mongodb.MongoOptionsFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryConfigParser.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryConfigParser.java
index 80d123630..b4679f667 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryConfigParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryConfigParser.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
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.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
import org.w3c.dom.Element;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryNamespaceHandler.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryNamespaceHandler.java
index 875ea3070..15d111218 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoRepositoryNamespaceHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryNamespaceHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/ParsingUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java
similarity index 95%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/ParsingUtils.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java
index 7b0893107..690b61edd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/ParsingUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoOptionsFactoryBean;
+import org.springframework.data.mongodb.MongoOptionsFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
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/mongodb/config/SimpleMongoRepositoryConfiguration.java
similarity index 90%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/SimpleMongoRepositoryConfiguration.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/SimpleMongoRepositoryConfiguration.java
index 42be4dec1..9c7ce29a5 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/mongodb/config/SimpleMongoRepositoryConfiguration.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
-import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean;
+import org.springframework.data.mongodb.repository.MongoRepositoryFactoryBean;
import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
import org.springframework.data.repository.config.RepositoryConfig;
@@ -48,7 +48,7 @@ public class SimpleMongoRepositoryConfiguration
}
/**
- * Returns the bean name of the {@link org.springframework.data.document.mongodb.MongoTemplate} to be referenced.
+ * Returns the bean name of the {@link org.springframework.data.mongodb.MongoTemplate} to be referenced.
*
* @return
*/
@@ -136,7 +136,7 @@ public class SimpleMongoRepositoryConfiguration
/*
* (non-Javadoc)
*
- * @see org.springframework.data.document.mongodb.repository.config.
+ * @see org.springframework.data.mongodb.repository.config.
* SimpleMongoRepositoryConfiguration
* .MongoRepositoryConfiguration#getMongoTemplateRef()
*/
@@ -146,7 +146,7 @@ public class SimpleMongoRepositoryConfiguration
}
/* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+ * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
*/
public boolean getCreateQueryIndexes() {
@@ -177,7 +177,7 @@ public class SimpleMongoRepositoryConfiguration
/*
* (non-Javadoc)
*
- * @see org.springframework.data.document.mongodb.repository.config.
+ * @see org.springframework.data.mongodb.repository.config.
* SimpleMongoRepositoryConfiguration
* .MongoRepositoryConfiguration#getMongoTemplateRef()
*/
@@ -187,7 +187,7 @@ public class SimpleMongoRepositoryConfiguration
}
/* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+ * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
*/
public boolean getCreateQueryIndexes() {
return getParent().getCreateQueryIndexes();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
similarity index 58%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/package-info.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
index ca2b4a77e..f098200af 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
@@ -1,5 +1,5 @@
/**
* Spring XML namespace configuration for MongoDB specific repositories.
*/
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/AbstractMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/AbstractMongoConverter.java
similarity index 87%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/AbstractMongoConverter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/AbstractMongoConverter.java
index f5c284925..b28198449 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/AbstractMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/AbstractMongoConverter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -28,12 +28,13 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigIntegerToObjectIdConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.ObjectIdToBigIntegerConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.ObjectIdToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToObjectIdConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.BigIntegerToObjectIdConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.ObjectIdToBigIntegerConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.ObjectIdToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToObjectIdConverter;
+
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
@@ -95,7 +96,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
/*
* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.convert.MongoConverter#getConversionService()
+ * @see org.springframework.data.mongodb.convert.MongoConverter#getConversionService()
*/
public ConversionService getConversionService() {
return conversionService;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/CustomConversions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/CustomConversions.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/CustomConversions.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/CustomConversions.java
index 7d567a7ae..297f23902 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/CustomConversions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/CustomConversions.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,9 +30,9 @@ import org.springframework.core.convert.converter.ConverterFactory;
import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
import org.springframework.util.Assert;
import com.mongodb.DBObject;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MappingMongoConverter.java
similarity index 96%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MappingMongoConverter.java
index d18405737..f5311db19 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MappingMongoConverter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
@@ -42,9 +42,6 @@ import org.springframework.context.expression.BeanFactoryResolver;
import org.springframework.core.CollectionFactory;
import org.springframework.core.convert.ConversionException;
import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
import org.springframework.data.mapping.Association;
import org.springframework.data.mapping.AssociationHandler;
import org.springframework.data.mapping.PreferredConstructor;
@@ -54,6 +51,9 @@ import org.springframework.data.mapping.model.BeanWrapper;
import org.springframework.data.mapping.model.MappingException;
import org.springframework.data.mapping.model.ParameterValueProvider;
import org.springframework.data.mapping.model.SpELAwareParameterValueProvider;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import org.springframework.expression.Expression;
@@ -103,7 +103,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
/*
* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.convert.MongoConverter#getMappingContext()
+ * @see org.springframework.data.mongodb.convert.MongoConverter#getMappingContext()
*/
public MappingContext, MongoPersistentProperty> getMappingContext() {
return mappingContext;
@@ -130,7 +130,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
/*
* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
+ * @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
*/
public T convertObjectId(ObjectId id, Class targetType) {
return conversionService.convert(id, targetType);
@@ -138,7 +138,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
/*
* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
+ * @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
*/
public ObjectId convertObjectId(Object id) {
return conversionService.convert(id, ObjectId.class);
@@ -146,7 +146,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
/*
* (non-Javadoc)
- * @see org.springframework.data.document.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
+ * @see org.springframework.data.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
*/
public S read(Class clazz, final DBObject dbo) {
return read(ClassTypeInformation.from(clazz), dbo);
@@ -293,7 +293,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
* Root entry method into write conversion. Adds a type discriminator to the {@link DBObject}. Shouldn't be called for
* nested conversions.
*
- * @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
+ * @see org.springframework.data.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
*/
public void write(final Object obj, final DBObject dbo) {
@@ -613,7 +613,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
dbObject.put(key, valueToSet);
}
- protected DBRef createDBRef(Object target, org.springframework.data.document.mongodb.mapping.DBRef dbref) {
+ protected DBRef createDBRef(Object target, org.springframework.data.mongodb.mapping.DBRef dbref) {
MongoPersistentEntity targetEntity = mappingContext.getPersistentEntity(target.getClass());
if (null == targetEntity || null == targetEntity.getIdProperty()) {
return null;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoBeanWrapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoBeanWrapper.java
similarity index 92%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoBeanWrapper.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoBeanWrapper.java
index 5527abada..4a1909695 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoBeanWrapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoBeanWrapper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
import static org.springframework.beans.PropertyAccessorFactory.forBeanPropertyAccess;
import static org.springframework.beans.PropertyAccessorFactory.forDirectFieldAccess;
@@ -22,8 +22,8 @@ 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.data.mongodb.MongoPropertyDescriptors;
+import org.springframework.data.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
import org.springframework.util.Assert;
/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoConverter.java
similarity index 80%
rename from spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoConverter.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoConverter.java
index 2caae595f..e5efc66b0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoConverter.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
import com.mongodb.BasicDBList;
import org.bson.types.ObjectId;
import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoReader;
-import org.springframework.data.document.mongodb.MongoWriter;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoReader;
+import org.springframework.data.mongodb.MongoWriter;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
public interface MongoConverter extends MongoWriter