From 44c1c3cf068e097a0910aa8038c08466c5d666ca Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 28 Jul 2014 20:13:23 +0200 Subject: [PATCH] DATAJPA-579 - Adapt to new multi-store configuration detection. We now consider repositories managing domain types annotated with @Entity and @MappedSuperclass as JPA repositories. Related ticket: DATACMNS-526. --- .../config/JpaRepositoryConfigExtension.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java index e11c9d94c..24e1c5707 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java @@ -17,6 +17,13 @@ package org.springframework.data.jpa.repository.config; import static org.springframework.data.jpa.repository.config.BeanDefinitionNames.*; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collection; +import java.util.Locale; + +import javax.persistence.Entity; +import javax.persistence.MappedSuperclass; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnit; @@ -51,6 +58,15 @@ public class JpaRepositoryConfigExtension extends RepositoryConfigurationExtensi private static final Class PAB_POST_PROCESSOR = PersistenceAnnotationBeanPostProcessor.class; private static final String DEFAULT_TRANSACTION_MANAGER_BEAN_NAME = "transactionManager"; + /* + * (non-Javadoc) + * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName() + */ + @Override + public String getModuleName() { + return "JPA"; + } + /* * (non-Javadoc) * @see org.springframework.data.repository.config14.RepositoryConfigurationExtension#getRepositoryInterface() @@ -65,7 +81,17 @@ public class JpaRepositoryConfigExtension extends RepositoryConfigurationExtensi */ @Override protected String getModulePrefix() { - return "jpa"; + return getModuleName().toLowerCase(Locale.US); + } + + /* + * (non-Javadoc) + * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations() + */ + @Override + @SuppressWarnings("unchecked") + protected Collection> getIdentifyingAnnotations() { + return Arrays.asList(Entity.class, MappedSuperclass.class); } /*