Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1448 - Polishing.

Browse Source 
Formatting.
This commit is contained in:
Oliver Drotbohm
2018-10-30 09:39:25 +01:00
parent 5b6e525151
commit e18f5c2ea3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
View File

@@ -87,8 +87,9 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
registerBeanConfigurerAspectIfNecessary(registry);
super.registerBeanDefinitions(annotationMetadata, registry);
registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class)
.getRawBeanDefinition(), AuditingBeanFactoryPostProcessor.class.getName(), registry);
registerInfrastructureBeanWithId(
BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class).getRawBeanDefinition(),
AuditingBeanFactoryPostProcessor.class.getName(), registry);
}
/*
@@ -132,7 +133,7 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
def.setFactoryMethodName("aspectOf");
def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, new BeanComponentDefinition(def,
BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME,
new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
}
}

6
src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java
View File

@@ -15,13 +15,15 @@
*/
package org.springframework.data.jpa.repository.config;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.classreading.MetadataReader;
@@ -66,7 +68,7 @@ public class JpaAuditingRegistrarUnitTests {
registrar.registerBeanDefinitions(annotationMetadata, registry);
// Then the bean is not registered again
verify(registry, times(0)).registerBeanDefinition(eq(beanName), any());
verify(registry, times(0)).registerBeanDefinition(eq(beanName), Mockito.<BeanDefinition> any());
registrar.registerBeanDefinitions(annotationMetadata, registry);
}