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

ACS-1043 : Camel upgrade to 3.7.0 (#235)

Browse Source 
ACS-1043: Upgrade Camel version
This commit is contained in:
Denis Ungureanu
2021-01-12 11:41:23 +02:00
committed by GitHub
parent f9aaddd787
commit a9e54bd08c
26 changed files with 2821 additions and 2895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java
View File

@@ -47,28 +47,28 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations = "/test-messaging-context.xml")
public class CamelRoutesTest
{
@EndpointInject(uri = "mock:result1")
@EndpointInject("mock:result1")
protected MockEndpoint resultEndpoint1;
@EndpointInject(uri = "mock:result2")
@EndpointInject("mock:result2")
protected MockEndpoint resultEndpoint2;
@EndpointInject(uri = "mock:dlq")
@EndpointInject("mock:dlq")
protected MockEndpoint dlqEndpoint;
@Autowired
protected CamelContext camelContext;
@Produce(uri = "direct-vm:alfresco.test.1")
@Produce("direct-vm:alfresco.test.1")
protected ProducerTemplate template1;
@Produce(uri = "direct-vm:alfresco.test.2")
@Produce("direct-vm:alfresco.test.2")
protected ProducerTemplate template2;
@Produce(uri = "direct-vm:alfresco.default")
@Produce("direct-vm:alfresco.default")
protected ProducerTemplate template3;
@Produce(uri = "direct-vm:alfresco.test.transacted")
@Produce("direct-vm:alfresco.test.transacted")
protected ProducerTemplate template4;
@Autowired

7
repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java
View File

@@ -25,7 +25,7 @@
*/
package org.alfresco.messaging.camel.routes;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
/**
@@ -34,13 +34,14 @@ import org.springframework.stereotype.Component;
* @author Ray Gauss II
*/
@Component
public class TestingRouteBuilder extends SpringRouteBuilder
public class TestingRouteBuilder extends RouteBuilder
{
@Override
public void configure() throws Exception
{
from("direct-vm:alfresco.test.2").to("mock:result2");
from("direct-vm:alfresco.test.2")
.to("mock:result2");
}
}

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

@@ -131,10 +131,9 @@ public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest
// authenticate as admin
AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
this.rootNodeRef = retryingTransactionHelper.doInTransaction(() -> {
rootNodeRef = retryingTransactionHelper.doInTransaction(() -> {
// create a store and get the root node
StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE,
this.getClass().getName());
StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, getClass().getName());
if (!nodeService.exists(storeRef))
{
storeRef = nodeService.createStore(storeRef.getProtocol(),

3
repository/src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java
View File

@@ -29,14 +29,13 @@ import static org.mockito.Mockito.doThrow;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.support.DefaultExchange;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;

2
repository/src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java
View File

@@ -34,7 +34,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.ArrayList;
import java.util.Arrays;