Skip to content

Commit 99670b3

Browse files
committed
Allow overriding DateTimeProvider via Bean Definition
use autowired properties for AuditorAware and DateTimeProvider when explicit references are not provided See: #3177 Signed-off-by: JaeYeon Kim <ghgh415263@naver.com>
1 parent 1228d09 commit 99670b3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
* @author Thomas Darimont
4343
* @author Oliver Gierke
4444
* @author Francisco Soler
45+
* @author Jaeyeon Kim
4546
*/
4647
public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBeanDefinitionRegistrar {
4748

@@ -121,7 +122,7 @@ protected BeanDefinitionBuilder configureDefaultAuditHandlerAttributes(AuditingC
121122
builder.addPropertyValue(AUDITOR_AWARE,
122123
createLazyInitTargetSourceBeanDefinition(configuration.getAuditorAwareRef()));
123124
} else {
124-
builder.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE);
125+
builder.addAutowiredProperty(AUDITOR_AWARE);
125126
}
126127

127128
builder.addPropertyValue(SET_DATES, configuration.isSetDates());
@@ -130,7 +131,7 @@ protected BeanDefinitionBuilder configureDefaultAuditHandlerAttributes(AuditingC
130131
if (StringUtils.hasText(configuration.getDateTimeProviderRef())) {
131132
builder.addPropertyReference(DATE_TIME_PROVIDER, configuration.getDateTimeProviderRef());
132133
} else {
133-
builder.addPropertyValue(DATE_TIME_PROVIDER, CurrentDateTimeProvider.INSTANCE);
134+
builder.addAutowiredProperty(DATE_TIME_PROVIDER);
134135
}
135136

136137
builder.setRole(AbstractBeanDefinition.ROLE_INFRASTRUCTURE);

0 commit comments

Comments
 (0)