From 538a62efce24521353534a41a84f25d78b2d29a5 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 13 Jun 2011 20:25:15 -0700 Subject: [PATCH] Adapted package refactorings in Spring Data Commons. --- .../data/document/mongodb/MongoTemplate.java | 4 ++-- .../document/mongodb/convert/CustomConversions.java | 2 +- .../mongodb/convert/MappingMongoConverter.java | 8 ++++---- .../document/mongodb/convert/MongoConverter.java | 2 +- .../mongodb/convert/SimpleMongoConverter.java | 2 +- .../mongodb/mapping/BasicMongoPersistentEntity.java | 4 ++-- .../mapping/BasicMongoPersistentProperty.java | 8 ++++---- .../mongodb/mapping/MongoMappingContext.java | 4 ++-- .../mongodb/mapping/MongoPersistentEntity.java | 2 +- .../mongodb/mapping/MongoPersistentProperty.java | 4 ++-- .../mongodb/mapping/SimpleMongoMappingContext.java | 10 +++++----- .../mongodb/mapping/event/AfterSaveEvent.java | 3 ++- .../data/document/mongodb/query/QueryMapper.java | 2 +- .../repository/MappingMongoEntityInformation.java | 4 ++-- .../mongodb/repository/MongoEntityInformation.java | 2 +- .../mongodb/repository/MongoQueryMethod.java | 2 +- .../repository/MongoRepositoryFactoryBean.java | 12 ++++++------ .../mongodb/repository/QueryDslMongoRepository.java | 2 +- .../document/mongodb/MongoOperationsUnitTests.java | 2 +- .../BasicMongoPersistentPropertyUnitTests.java | 2 +- .../mapping/SimpleMappingContextUnitTests.java | 12 ++++++------ .../repository/MongoRepositoryFactoryUnitTests.java | 2 +- .../repository/StringBasedMongoQueryUnitTests.java | 2 +- 23 files changed, 49 insertions(+), 48 deletions(-) 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/document/mongodb/MongoTemplate.java index a7aaada1d..96ff6907f 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/document/mongodb/MongoTemplate.java @@ -70,8 +70,8 @@ import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent 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.BeanWrapper; -import org.springframework.data.mapping.model.MappingContext; +import org.springframework.data.mapping.context.MappingContext; +import org.springframework.data.mapping.model.BeanWrapper; import org.springframework.data.mapping.model.MappingException; import org.springframework.jca.cci.core.ConnectionCallback; import org.springframework.util.Assert; 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/document/mongodb/convert/CustomConversions.java index 6c8010857..6f6c64b8c 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/document/mongodb/convert/CustomConversions.java @@ -30,7 +30,7 @@ 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.mapping.SimpleTypeHolder; +import org.springframework.data.mapping.model.SimpleTypeHolder; 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/document/mongodb/convert/MappingMongoConverter.java index 37c5c349e..aeded467e 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/document/mongodb/convert/MappingMongoConverter.java @@ -45,14 +45,14 @@ 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.BeanWrapper; +import org.springframework.data.mapping.PreferredConstructor; 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.context.MappingContext; +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.PreferredConstructor; import org.springframework.data.mapping.model.SpELAwareParameterValueProvider; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; 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/document/mongodb/convert/MongoConverter.java index 0f23c949d..2caae595f 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/document/mongodb/convert/MongoConverter.java @@ -22,7 +22,7 @@ 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.model.MappingContext; +import org.springframework.data.mapping.context.MappingContext; public interface MongoConverter extends MongoWriter, MongoReader { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java index a8baa69e8..d6acb521b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java @@ -53,7 +53,7 @@ import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoP import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity; import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty; import org.springframework.data.document.mongodb.mapping.SimpleMongoMappingContext; -import org.springframework.data.mapping.model.MappingContext; +import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; import org.springframework.util.comparator.CompoundComparator; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentEntity.java index 6fbd4d157..8694ea612 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentEntity.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentEntity.java @@ -17,9 +17,9 @@ package org.springframework.data.document.mongodb.mapping; import org.springframework.data.document.mongodb.MongoCollectionUtils; -import org.springframework.data.mapping.BasicPersistentEntity; +import org.springframework.data.mapping.PersistentEntity; +import org.springframework.data.mapping.model.BasicPersistentEntity; import org.springframework.data.mapping.model.MappingException; -import org.springframework.data.mapping.model.PersistentEntity; import org.springframework.data.util.TypeInformation; import org.springframework.util.StringUtils; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentProperty.java index 039691121..7fe84af33 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentProperty.java @@ -25,12 +25,12 @@ import com.mongodb.DBObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.bson.types.ObjectId; -import org.springframework.data.mapping.AnnotationBasedPersistentProperty; -import org.springframework.data.mapping.SimpleTypeHolder; -import org.springframework.data.mapping.model.Association; +import org.springframework.data.mapping.Association; +import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty; +import org.springframework.data.mapping.model.SimpleTypeHolder; /** - * Mongo specific {@link org.springframework.data.mapping.model.PersistentProperty} implementation. + * Mongo specific {@link org.springframework.data.mapping.PersistentProperty} implementation. * * @author Oliver Gierke */ diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoMappingContext.java index 3a2820156..c6207f041 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoMappingContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoMappingContext.java @@ -23,8 +23,8 @@ import java.util.Set; import org.bson.types.CodeWScope; import org.bson.types.ObjectId; -import org.springframework.data.mapping.AbstractMappingContext; -import org.springframework.data.mapping.SimpleTypeHolder; +import org.springframework.data.mapping.context.AbstractMappingContext; +import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.util.TypeInformation; /** diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntity.java index c4030a8b9..a2d347d20 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntity.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntity.java @@ -1,6 +1,6 @@ package org.springframework.data.document.mongodb.mapping; -import org.springframework.data.mapping.model.PersistentEntity; +import org.springframework.data.mapping.PersistentEntity; /** * diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentProperty.java index 97b92ae8c..69cf73861 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentProperty.java @@ -15,10 +15,10 @@ */ package org.springframework.data.document.mongodb.mapping; -import org.springframework.data.mapping.model.PersistentProperty; +import org.springframework.data.mapping.PersistentProperty; /** - * Mongo specific {@link org.springframework.data.mapping.model.PersistentProperty} implementation. + * Mongo specific {@link org.springframework.data.mapping.PersistentProperty} implementation. * * @author Oliver Gierke */ diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/SimpleMongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/SimpleMongoMappingContext.java index c8eb58717..b276ca886 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/SimpleMongoMappingContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/SimpleMongoMappingContext.java @@ -21,11 +21,11 @@ import java.util.Arrays; import java.util.List; import org.springframework.data.document.mongodb.MongoCollectionUtils; -import org.springframework.data.mapping.AbstractMappingContext; -import org.springframework.data.mapping.BasicPersistentEntity; -import org.springframework.data.mapping.AbstractPersistentProperty; -import org.springframework.data.mapping.SimpleTypeHolder; -import org.springframework.data.mapping.model.Association; +import org.springframework.data.mapping.Association; +import org.springframework.data.mapping.context.AbstractMappingContext; +import org.springframework.data.mapping.model.AbstractPersistentProperty; +import org.springframework.data.mapping.model.BasicPersistentEntity; +import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.util.TypeInformation; /** diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/AfterSaveEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/AfterSaveEvent.java index 72d900030..a6dea8058 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/AfterSaveEvent.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/AfterSaveEvent.java @@ -17,7 +17,8 @@ package org.springframework.data.document.mongodb.mapping.event; import com.mongodb.DBObject; -import org.springframework.data.mapping.model.PersistentEntity; + +import org.springframework.data.mapping.PersistentEntity; /** * @author Jon Brisbin diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java index 91b902db5..2b837b1a1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java @@ -26,7 +26,7 @@ import org.bson.types.ObjectId; import org.springframework.core.convert.ConversionException; import org.springframework.data.document.mongodb.convert.MongoConverter; import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity; -import org.springframework.data.mapping.model.PersistentEntity; +import org.springframework.data.mapping.PersistentEntity; import org.springframework.util.Assert; /** diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java index 2323597f6..9e376d983 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java @@ -19,8 +19,8 @@ import java.io.Serializable; import org.springframework.data.document.mongodb.mapping.BasicMongoPersistentEntity; import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity; import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty; -import org.springframework.data.mapping.BeanWrapper; -import org.springframework.data.repository.support.AbstractEntityInformation; +import org.springframework.data.mapping.model.BeanWrapper; +import org.springframework.data.repository.core.support.AbstractEntityInformation; /** * {@link MongoEntityInformation} implementation using a {@link BasicMongoPersistentEntity} instance to lookup the diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java index f75baba7d..d60c42008 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java @@ -17,7 +17,7 @@ package org.springframework.data.document.mongodb.repository; import java.io.Serializable; -import org.springframework.data.repository.support.EntityInformation; +import org.springframework.data.repository.core.EntityInformation; /** * Mongo specific {@link EntityInformation}. diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java index 98f3981d9..6851b94cb 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java @@ -19,8 +19,8 @@ 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.core.RepositoryMetadata; 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; 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 498a4c405..4a32e62f8 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 @@ -33,19 +33,19 @@ import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty 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.context.MappingContext; import org.springframework.data.querydsl.QueryDslPredicateExecutor; import org.springframework.data.repository.Repository; +import org.springframework.data.repository.core.RepositoryMetadata; +import org.springframework.data.repository.core.support.QueryCreationListener; +import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport; +import org.springframework.data.repository.core.support.RepositoryFactorySupport; 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.QueryLookupStrategy.Key; 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; -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; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryDslMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryDslMongoRepository.java index f03a4578c..a0520e7ff 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryDslMongoRepository.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/QueryDslMongoRepository.java @@ -30,7 +30,7 @@ import org.springframework.data.domain.Sort.Order; import org.springframework.data.querydsl.EntityPathResolver; import org.springframework.data.querydsl.QueryDslPredicateExecutor; import org.springframework.data.querydsl.SimpleEntityPathResolver; -import org.springframework.data.repository.support.EntityMetadata; +import org.springframework.data.repository.core.EntityMetadata; import com.mongodb.DBObject; import com.mysema.query.mongodb.MongodbQuery; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoOperationsUnitTests.java index 4815e1be2..e743fe483 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoOperationsUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoOperationsUnitTests.java @@ -33,7 +33,7 @@ import org.springframework.data.document.mongodb.convert.AbstractMongoConverter; import org.springframework.data.document.mongodb.convert.MongoConverter; import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity; import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty; -import org.springframework.data.mapping.model.MappingContext; +import org.springframework.data.mapping.context.MappingContext; /** * Abstract base class for unit tests to specify behaviour we expect from {@link MongoOperations}. Subclasses return diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentPropertyUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentPropertyUnitTests.java index 7b9a6b020..1868b2a2e 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentPropertyUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/BasicMongoPersistentPropertyUnitTests.java @@ -22,7 +22,7 @@ import java.lang.reflect.Field; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.mapping.SimpleTypeHolder; +import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/SimpleMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/SimpleMappingContextUnitTests.java index 2343dfc17..8841c696f 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/SimpleMappingContextUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/SimpleMappingContextUnitTests.java @@ -5,22 +5,22 @@ import static org.junit.Assert.*; import org.junit.Test; import org.springframework.data.document.mongodb.mapping.SimpleMongoMappingContext.SimpleMongoPersistentEntity; -import org.springframework.data.mapping.model.PersistentProperty; /** + * Unit tests for {@link SimpleMongoMappingContext}. * * @author Oliver Gierke */ public class SimpleMappingContextUnitTests { @Test - public void testname() { + public void returnsIdPropertyCorrectly() { + SimpleMongoMappingContext context = new SimpleMongoMappingContext(); SimpleMongoPersistentEntity entity = context.getPersistentEntity(Person.class); - - assertThat(entity.getPersistentProperties().isEmpty(), is(false)); - - PersistentProperty idProperty = entity.getIdProperty(); + + MongoPersistentProperty idProperty = entity.getIdProperty(); + assertThat(idProperty, is(notNullValue())); assertThat(idProperty.getName(), is("id")); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryUnitTests.java index 39be0e600..905c278ac 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/MongoRepositoryFactoryUnitTests.java @@ -30,7 +30,7 @@ import org.springframework.data.document.mongodb.convert.MongoConverter; import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity; import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty; import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean.MongoRepositoryFactory; -import org.springframework.data.mapping.model.MappingContext; +import org.springframework.data.mapping.context.MappingContext; /** * Unit test for {@link MongoRepositoryFactory}. diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQueryUnitTests.java index 6e0c2693b..39b598ea2 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQueryUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQueryUnitTests.java @@ -33,7 +33,7 @@ import org.springframework.data.document.mongodb.convert.MongoConverter; import org.springframework.data.document.mongodb.mapping.MongoMappingContext; import org.springframework.data.document.mongodb.query.BasicQuery; import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean.EntityInformationCreator; -import org.springframework.data.repository.support.RepositoryMetadata; +import org.springframework.data.repository.core.RepositoryMetadata; import com.mongodb.BasicDBObject; import com.mongodb.DBObject;