inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-8323 Switch to defaults from properties (#2776)

Browse Source
This commit is contained in:
Piotr Żurek
2024-07-12 11:31:06 +02:00
committed by GitHub
parent 05c4f2282e
commit 79b78448e0
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java
View File

@@ -64,13 +64,13 @@ public class EventSenderFactoryBean extends AbstractFactoryBean<EventSender>
this.dequeueThreadPoolExecutor = dequeueThreadPoolExecutor; this.dequeueThreadPoolExecutor = dequeueThreadPoolExecutor;
} }
@Value("${" + LEGACY_SKIP_QUEUE_PROPERTY + ":#{false}}") @Value("${" + LEGACY_SKIP_QUEUE_PROPERTY + "}")
public void setLegacySkipQueueConfig(boolean legacySkipQueueConfig) public void setLegacySkipQueueConfig(boolean legacySkipQueueConfig)
{ {
this.legacySkipQueueConfig = legacySkipQueueConfig; this.legacySkipQueueConfig = legacySkipQueueConfig;
} }
@Value("${" + EVENT_SEND_STRATEGY_PROPERTY + ":#{null}}") @Value("${" + EVENT_SEND_STRATEGY_PROPERTY + "}")
public void setConfiguredSenderName(String configuredSenderName) public void setConfiguredSenderName(String configuredSenderName)
{ {
this.configuredSenderName = configuredSenderName; this.configuredSenderName = configuredSenderName;
@@ -119,12 +119,12 @@ public class EventSenderFactoryBean extends AbstractFactoryBean<EventSender>
private DirectEventSender instantiateDirectSender() private DirectEventSender instantiateDirectSender()
{ {
return new DirectEventSender(event2MessageProducer); return new DirectEventSender(getEvent2MessageProducer());
} }
private EnqueuingEventSender instantiateAsyncSender() private EnqueuingEventSender instantiateAsyncSender()
{ {
return new EnqueuingEventSender(event2MessageProducer, enqueueThreadPoolExecutor, dequeueThreadPoolExecutor); return new EnqueuingEventSender(getEvent2MessageProducer(), enqueueThreadPoolExecutor, dequeueThreadPoolExecutor);
} }
private boolean isSenderNameConfigured() private boolean isSenderNameConfigured()
@@ -136,13 +136,23 @@ public class EventSenderFactoryBean extends AbstractFactoryBean<EventSender>
private boolean isLegacySkipQueueConfigured() private boolean isLegacySkipQueueConfigured()
{ {
return Optional.ofNullable(propertyResolver.getProperty(LEGACY_SKIP_QUEUE_PROPERTY, Boolean.class)) return Optional.ofNullable(resolveProperty(LEGACY_SKIP_QUEUE_PROPERTY, Boolean.class))
.orElse(legacySkipQueueConfig); .orElse(legacySkipQueueConfig);
} }
private String getConfiguredSenderName() private String getConfiguredSenderName()
{ {
return Optional.ofNullable(propertyResolver.getProperty(EVENT_SEND_STRATEGY_PROPERTY, String.class)) return Optional.ofNullable(resolveProperty(EVENT_SEND_STRATEGY_PROPERTY, String.class))
.orElse(configuredSenderName); .orElse(configuredSenderName);
} }
protected <T> T resolveProperty(String key, Class<T> targetType)
{
return propertyResolver.getProperty(key, targetType);
}
protected Event2MessageProducer getEvent2MessageProducer()
{
return event2MessageProducer;
}
} }

12
repository/src/main/resources/alfresco/events2-context.xml
View File

@@ -55,16 +55,18 @@
<property name="permissionService" ref="permissionService"/> <property name="permissionService" ref="permissionService"/>
</bean> </bean>
<bean id="nodeResourceHelper" class="org.alfresco.repo.event2.NodeResourceHelper" parent="baseNodeResourceHelper"/> <bean id="baseEventSender" abstract="true">
<bean id="eventGeneratorV2" class="org.alfresco.repo.event2.EventGenerator" parent="baseEventGeneratorV2"/>
<bean id="eventSender" class="org.alfresco.repo.event2.EventSenderFactoryBean" autowire="constructor">
<constructor-arg ref="event2MessageProducer"/> <constructor-arg ref="event2MessageProducer"/>
<constructor-arg ref="eventAsyncEnqueueThreadPool"/> <constructor-arg ref="eventAsyncEnqueueThreadPool"/>
<constructor-arg ref="eventAsyncDequeueThreadPool"/> <constructor-arg ref="eventAsyncDequeueThreadPool"/>
</bean> </bean>
<bean id="nodeResourceHelper" class="org.alfresco.repo.event2.NodeResourceHelper" parent="baseNodeResourceHelper"/>
<bean id="eventGeneratorV2" class="org.alfresco.repo.event2.EventGenerator" parent="baseEventGeneratorV2"/>
<bean id="eventSender" class="org.alfresco.repo.event2.EventSenderFactoryBean" autowire="constructor" parent="baseEventSender" />
<bean id="eventAsyncEnqueueThreadPool" class="org.alfresco.util.ThreadPoolExecutorFactoryBean"> <bean id="eventAsyncEnqueueThreadPool" class="org.alfresco.util.ThreadPoolExecutorFactoryBean">
<property name="poolName"> <property name="poolName">
<value>eventAsyncEnqueueThreadPool</value> <value>eventAsyncEnqueueThreadPool</value>