From 502576b30dbb1c54f25a70db62e3438e88c04de8 Mon Sep 17 00:00:00 2001 From: Andrew Walters Date: Thu, 3 Dec 2015 17:10:06 +0000 Subject: [PATCH] DATAJPA-834 - Use less common bean name for EntityManagerBeanDefinitionRegistrarPostProcessor. Replacing bean name "foo" with more meaningful value injected via constant as a bean probably shouldn't have "foo" as its name when everything else has meaningful values defined in constants. Renamed bean and extracted constant alongside others referenced within the file. Original pull request: #159. --- .../data/jpa/repository/config/BeanDefinitionNames.java | 1 + .../jpa/repository/config/JpaRepositoryConfigExtension.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/config/BeanDefinitionNames.java b/src/main/java/org/springframework/data/jpa/repository/config/BeanDefinitionNames.java index 0d6a478f2..906a124d0 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/BeanDefinitionNames.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/BeanDefinitionNames.java @@ -25,4 +25,5 @@ interface BeanDefinitionNames { public static final String JPA_MAPPING_CONTEXT_BEAN_NAME = "jpaMappingContext"; public static final String JPA_CONTEXT_BEAN_NAME = "jpaContext"; + public static final String EM_BEAN_DEFINITION_REGISTRAR_POST_PROCESSOR_BEAN_NAME = "emBeanDefinitionRegistrarPostProcessor"; } 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 f3c073495..307aa005b 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 @@ -164,7 +164,7 @@ public class JpaRepositoryConfigExtension extends RepositoryConfigurationExtensi Object source = config.getSource(); registerIfNotAlreadyRegistered(new RootBeanDefinition(EntityManagerBeanDefinitionRegistrarPostProcessor.class), - registry, "foo", source); + registry, EM_BEAN_DEFINITION_REGISTRAR_POST_PROCESSOR_BEAN_NAME, source); registerIfNotAlreadyRegistered(new RootBeanDefinition(JpaMetamodelMappingContextFactoryBean.class), registry, JPA_MAPPING_CONTEXT_BEAN_NAME, source);