inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[ACS-1291] Asynchronous mechanism to send events (#351)" as no events are sent to AMQ with this change

Browse Source 
This reverts commit f446031069.
This commit is contained in:
Bruno Bossola
2021-03-24 11:53:12 +00:00
parent 86fcf67016
commit 8c91145b39
4 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
View File

@@ -32,7 +32,6 @@ import java.util.Deque;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executor;
import org.alfresco.repo.event.v1.model.EventType;
import org.alfresco.repo.event.v1.model.RepoEvent;
@@ -96,7 +95,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
private PersonService personService;
protected NodeResourceHelper nodeResourceHelper;
private Executor threadPoolExecutor;
private NodeTypeFilter nodeTypeFilter;
private ChildAssociationTypeFilter childAssociationTypeFilter;
private EventUserFilter userFilter;
@@ -115,7 +113,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
PropertyCheck.mandatory(this, "transactionService", transactionService);
PropertyCheck.mandatory(this, "personService", personService);
PropertyCheck.mandatory(this, "nodeResourceHelper", nodeResourceHelper);
PropertyCheck.mandatory(this, "threadPoolExecutor", threadPoolExecutor);
this.nodeTypeFilter = eventFilterRegistry.getNodeTypeFilter();
this.childAssociationTypeFilter = eventFilterRegistry.getChildAssociationTypeFilter();
@@ -201,11 +198,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
this.nodeResourceHelper = nodeResourceHelper;
}
public void setThreadPoolExecutor(Executor threadPoolExecutor)
{
this.threadPoolExecutor = threadPoolExecutor;
}
@Override
public void onCreateNode(ChildAssociationRef childAssocRef)
{
@@ -435,11 +427,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
}
protected void sendEvent(NodeRef nodeRef, EventConsolidator consolidator)
{
threadPoolExecutor.execute(()-> sendEventNow(nodeRef, consolidator));
}
private void sendEventNow(NodeRef nodeRef, EventConsolidator consolidator)
{
if (consolidator.isTemporaryNode())
{
@@ -481,12 +468,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
}
protected void sendEvent(ChildAssociationRef childAssociationRef, ChildAssociationEventConsolidator consolidator)
{
threadPoolExecutor.execute(()-> sendEventNow(childAssociationRef, consolidator));
}
private void sendEventNow(ChildAssociationRef childAssociationRef,
ChildAssociationEventConsolidator consolidator)
{
if (consolidator.isTemporaryChildAssociation())
{
@@ -527,11 +508,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
}
protected void sendEvent(AssociationRef peerAssociationRef, PeerAssociationEventConsolidator consolidator)
{
threadPoolExecutor.execute(()-> sendEventNow(peerAssociationRef, consolidator));
}
private void sendEventNow(AssociationRef peerAssociationRef, PeerAssociationEventConsolidator consolidator)
{
if (consolidator.isTemporaryPeerAssociation())
{
@@ -557,7 +533,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
LOGGER.trace("List of Events:" + listOfEvents);
LOGGER.trace("Sending event:" + event);
}
// Need to execute this in another read txn because Camel expects it
transactionService.getRetryingTransactionHelper().doInTransaction((RetryingTransactionCallback<Void>) () -> {
event2MessageProducer.send(event);

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

@@ -56,23 +56,5 @@
<bean id="eventGeneratorV2" class="org.alfresco.repo.event2.EventGenerator" parent="baseEventGeneratorV2">
<property name="nodeResourceHelper" ref="nodeResourceHelper"/>
<property name="threadPoolExecutor">
<ref bean="eventAsyncThreadPool"/>
</property>
</bean>
<bean id="eventAsyncThreadPool" class="org.alfresco.util.ThreadPoolExecutorFactoryBean">
<property name="poolName">
<value>eventAsyncThreadPool</value>
</property>
<property name="corePoolSize">
<value>${repo.event2.threadPool.coreSize}</value>
</property>
<property name="maximumPoolSize">
<value>${repo.event2.threadPool.maximumSize}</value>
</property>
<property name="threadPriority">
<value>${repo.event2.threadPool.priority}</value>
</property>
</bean>
</beans>

4
repository/src/main/resources/alfresco/repository.properties
View File

@@ -1209,10 +1209,6 @@ repo.event2.filter.childAssocTypes=rn:rendition
repo.event2.filter.users=System, null
# Topic name
repo.event2.topic.endpoint=amqp:topic:alfresco.repo.event2
# Thread pool for async delivery
repo.event2.threadPool.priority=1
repo.event2.threadPool.coreSize=8
repo.event2.threadPool.maximumSize=10
# MNT-21083
# --DELETE_NOT_EXISTS - default settings

17
repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
View File

@@ -31,7 +31,6 @@ import static org.awaitility.Awaitility.await;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
import javax.jms.ConnectionFactory;
@@ -105,10 +104,6 @@ public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest
@Autowired
protected ObjectMapper event2ObjectMapper;
@Autowired @Qualifier("eventGeneratorV2")
protected EventGenerator eventGenerator;
protected NodeRef rootNodeRef;
@BeforeClass
@@ -148,18 +143,6 @@ public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest
});
}
@Before
public void forceEventGeneratorToBeSynchronous() {
eventGenerator.setThreadPoolExecutor(new Executor()
{
@Override
public void execute(Runnable command)
{
command.run();
}
});
}
@After
public void tearDown()
{