Skip to content

Commit e18f5c2

Browse files
committed
DATAJPA-1448 - Polishing.
Formatting.
1 parent 5b6e525 commit e18f5c2

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
8787

8888
registerBeanConfigurerAspectIfNecessary(registry);
8989
super.registerBeanDefinitions(annotationMetadata, registry);
90-
registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class)
91-
.getRawBeanDefinition(), AuditingBeanFactoryPostProcessor.class.getName(), registry);
90+
registerInfrastructureBeanWithId(
91+
BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class).getRawBeanDefinition(),
92+
AuditingBeanFactoryPostProcessor.class.getName(), registry);
9293
}
9394

9495
/*
@@ -132,7 +133,7 @@ private void registerBeanConfigurerAspectIfNecessary(BeanDefinitionRegistry regi
132133
def.setFactoryMethodName("aspectOf");
133134
def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
134135

135-
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, new BeanComponentDefinition(def,
136-
BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
136+
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME,
137+
new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
137138
}
138139
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
*/
1616
package org.springframework.data.jpa.repository.config;
1717

18-
import static org.mockito.ArgumentMatchers.*;
18+
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;
2020

2121
import org.junit.Test;
2222
import org.junit.runner.RunWith;
2323
import org.mockito.Mock;
24+
import org.mockito.Mockito;
2425
import org.mockito.runners.MockitoJUnitRunner;
26+
import org.springframework.beans.factory.config.BeanDefinition;
2527
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2628
import org.springframework.core.type.AnnotationMetadata;
2729
import org.springframework.core.type.classreading.MetadataReader;
@@ -66,7 +68,7 @@ public void doesNotRegisterBeanConfigurerTwice() throws Exception {
6668
registrar.registerBeanDefinitions(annotationMetadata, registry);
6769

6870
// Then the bean is not registered again
69-
verify(registry, times(0)).registerBeanDefinition(eq(beanName), any());
71+
verify(registry, times(0)).registerBeanDefinition(eq(beanName), Mockito.<BeanDefinition> any());
7072

7173
registrar.registerBeanDefinitions(annotationMetadata, registry);
7274
}

0 commit comments

Comments
 (0)