From c4eca7eaddc62cc80073f04e74c7ffb771e1a04a Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 28 Nov 2012 17:35:47 +0100 Subject: [PATCH] DATAMONGO-581 - Expose the PersistentEntity managed in the repository factory bean. MongoRepositoryFactoryBean now populates the MappingContext of the super class when the MongoOperations instance is set. --- .../support/MongoRepositoryFactoryBean.java | 2 +- .../MongoNamespaceIntegrationTests.java | 38 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java index 2176290a8..523b63c94 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java @@ -41,8 +41,8 @@ public class MongoRepositoryFactoryBean, S, ID exten * @param operations the operations to set */ public void setMongoOperations(MongoOperations operations) { - this.operations = operations; + setMappingContext(operations.getConverter().getMappingContext()); } /** diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java index a82eb6e1f..87476a10c 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java @@ -1,16 +1,37 @@ +/* + * Copyright 2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.repository.config; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionReader; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; +import org.springframework.data.mapping.PersistentEntity; +import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; import org.springframework.data.mongodb.repository.AbstractPersonRepositoryIntegrationTests; +import org.springframework.data.mongodb.repository.Person; +import org.springframework.data.repository.support.Repositories; import org.springframework.test.context.ContextConfiguration; /** @@ -24,6 +45,9 @@ public class MongoNamespaceIntegrationTests extends AbstractPersonRepositoryInte DefaultListableBeanFactory factory; BeanDefinitionReader reader; + @Autowired + ApplicationContext context; + @Before @Override public void setUp() throws InterruptedException { @@ -39,4 +63,16 @@ public class MongoNamespaceIntegrationTests extends AbstractPersonRepositoryInte BeanDefinition definition = factory.getBeanDefinition("personRepository"); assertThat(definition, is(notNullValue())); } + + /** + * @see DATAMONGO-581 + */ + @Test + public void exposesPersistentEntity() { + + Repositories repositories = new Repositories(context); + PersistentEntity entity = repositories.getPersistentEntity(Person.class); + assertThat(entity, is(notNullValue())); + assertThat(entity, is(instanceOf(MongoPersistentEntity.class))); + } }