|
21 | 21 |
|
22 | 22 | import org.springframework.aop.framework.ProxyFactoryBean; |
23 | 23 | import org.springframework.aop.target.LazyInitTargetSource; |
24 | | -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; |
25 | 24 | import org.springframework.beans.factory.config.BeanDefinition; |
26 | 25 | import org.springframework.beans.factory.support.AbstractBeanDefinition; |
27 | 26 | import org.springframework.beans.factory.support.BeanDefinitionBuilder; |
28 | 27 | import org.springframework.beans.factory.support.BeanDefinitionRegistry; |
29 | 28 | import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; |
30 | 29 | import org.springframework.core.type.AnnotationMetadata; |
31 | 30 | import org.springframework.data.auditing.AuditingHandler; |
32 | | -import org.springframework.data.auditing.CurrentDateTimeProvider; |
33 | 31 | import org.springframework.util.Assert; |
34 | 32 | import org.springframework.util.StringUtils; |
35 | 33 |
|
|
42 | 40 | * @author Thomas Darimont |
43 | 41 | * @author Oliver Gierke |
44 | 42 | * @author Francisco Soler |
| 43 | + * @author Jaeyeon Kim |
45 | 44 | */ |
46 | 45 | public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBeanDefinitionRegistrar { |
47 | 46 |
|
@@ -117,20 +116,18 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon |
117 | 116 | protected BeanDefinitionBuilder configureDefaultAuditHandlerAttributes(AuditingConfiguration configuration, |
118 | 117 | BeanDefinitionBuilder builder) { |
119 | 118 |
|
| 119 | + builder.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); |
| 120 | + |
120 | 121 | if (StringUtils.hasText(configuration.getAuditorAwareRef())) { |
121 | 122 | builder.addPropertyValue(AUDITOR_AWARE, |
122 | 123 | createLazyInitTargetSourceBeanDefinition(configuration.getAuditorAwareRef())); |
123 | | - } else { |
124 | | - builder.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE); |
125 | 124 | } |
126 | 125 |
|
127 | 126 | builder.addPropertyValue(SET_DATES, configuration.isSetDates()); |
128 | 127 | builder.addPropertyValue(MODIFY_ON_CREATE, configuration.isModifyOnCreate()); |
129 | 128 |
|
130 | 129 | if (StringUtils.hasText(configuration.getDateTimeProviderRef())) { |
131 | 130 | builder.addPropertyReference(DATE_TIME_PROVIDER, configuration.getDateTimeProviderRef()); |
132 | | - } else { |
133 | | - builder.addPropertyValue(DATE_TIME_PROVIDER, CurrentDateTimeProvider.INSTANCE); |
134 | 131 | } |
135 | 132 |
|
136 | 133 | builder.setRole(AbstractBeanDefinition.ROLE_INFRASTRUCTURE); |
|
0 commit comments