diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventJMSProducerConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventJMSProducerConfiguration.java index bc765b146..5ef9c6871 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventJMSProducerConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventJMSProducerConfiguration.java @@ -39,14 +39,14 @@ import org.springframework.integration.jms.dsl.Jms; public class ExternalEventJMSProducerConfiguration { @Autowired - private DirectChannel outboundRequests; + private DirectChannel outboundRequestsEvents; @Autowired private FineractProperties fineractProperties; @Bean - public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlows.from(outboundRequests) // + public IntegrationFlow outboundFlowEvents(ActiveMQConnectionFactory connectionFactory) { + return IntegrationFlows.from(outboundRequestsEvents) // .log(LoggingHandler.Level.DEBUG) // .handle(Jms.outboundAdapter(connectionFactory) .destination(fineractProperties.getEvents().getExternal().getProducer().getJms().getEventQueueName())) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventProducerConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventProducerConfiguration.java index 6896228cb..b99275830 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventProducerConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/config/ExternalEventProducerConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.integration.config.EnableIntegration; public class ExternalEventProducerConfiguration { @Bean - public DirectChannel outboundRequests() { + public DirectChannel outboundRequestsEvents() { return new DirectChannel(); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/producer/ExternalEventProducer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/producer/ExternalEventProducer.java index bf720ca29..daf5b0151 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/producer/ExternalEventProducer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/producer/ExternalEventProducer.java @@ -27,6 +27,6 @@ import org.springframework.integration.annotation.MessagingGateway; @ConditionalOnProperty(value = "fineract.events.external.enabled", havingValue = "true") public interface ExternalEventProducer { - @Gateway(requestChannel = "outboundRequests", replyTimeout = 2, requestTimeout = 200) + @Gateway(requestChannel = "outboundRequestsEvents", replyTimeout = 2, requestTimeout = 200) void sendEvent(byte[] message) throws AcknowledgementTimeoutException; } diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/producer/EventsJMSIntegrationTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/producer/EventsJMSIntegrationTest.java index d7a611d93..bc666406e 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/producer/EventsJMSIntegrationTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/producer/EventsJMSIntegrationTest.java @@ -54,8 +54,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; public class EventsJMSIntegrationTest { @Autowired - @Qualifier("outboundRequests") - private DirectChannel outboundRequests; + @Qualifier("outboundRequestsEvents") + private DirectChannel outboundRequestsEvents; @Autowired private ContextConfiguration.TestChannelInterceptor testChannelInterceptor; @@ -65,7 +65,7 @@ public class EventsJMSIntegrationTest { @Test public void testJmsDownstreamChannelIntegration() { - assertThat(outboundRequests.getSubscriberCount()).isEqualTo(1); + assertThat(outboundRequestsEvents.getSubscriberCount()).isEqualTo(1); } @Test @@ -74,7 +74,7 @@ public class EventsJMSIntegrationTest { underTest.sendEvent(new byte[0]); underTest.sendEvent(new byte[0]); // then - assertTrue(outboundRequests.getInterceptors().contains(this.testChannelInterceptor)); + assertTrue(outboundRequestsEvents.getInterceptors().contains(this.testChannelInterceptor)); assertThat(testChannelInterceptor.getInvoked()).isEqualTo(2); } @@ -87,19 +87,19 @@ public class EventsJMSIntegrationTest { private static ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); @Bean - public DirectChannel outboundRequests() { + public DirectChannel outboundRequestsEvents() { return new DirectChannel(); } @Bean public IntegrationFlow outboundFlow() { - return IntegrationFlows.from("outboundRequests") // + return IntegrationFlows.from("outboundRequestsEvents") // .log(LoggingHandler.Level.DEBUG) // .handle(Jms.outboundAdapter(connectionFactory).destination("destinationChannel")).get(); } @Component - @GlobalChannelInterceptor(patterns = "outboundRequests") + @GlobalChannelInterceptor(patterns = "outboundRequestsEvents") public static class TestChannelInterceptor implements ChannelInterceptor { private final AtomicInteger invoked = new AtomicInteger();