Skip to content

Commit 595b935

Browse files
committed
complete merge, fix conflicts
2 parents d5678ae + cc06b40 commit 595b935

File tree

116 files changed

+431
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+431
-392
lines changed

README.md

Lines changed: 1 addition & 1 deletion

acceptance/async-tests/src/test/java/org/reactivecommons/test/CommandsProcessPerfTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.reactivecommons.api.domain.Command;
66
import org.reactivecommons.async.api.DirectAsyncGateway;
77
import org.reactivecommons.async.api.HandlerRegistry;
8-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
9-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
8+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.beans.factory.annotation.Value;
1212
import org.springframework.boot.SpringApplication;

acceptance/async-tests/src/test/java/org/reactivecommons/test/DirectGatewayPerfTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.assertj.core.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import org.reactivecommons.api.domain.Command;
6-
import org.reactivecommons.async.impl.RabbitDirectAsyncGateway;
7-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
6+
import org.reactivecommons.async.rabbit.RabbitDirectAsyncGateway;
7+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.beans.factory.annotation.Value;
1010
import org.springframework.boot.SpringApplication;

acceptance/async-tests/src/test/java/org/reactivecommons/test/DynamicRegistryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.reactivecommons.api.domain.DomainEventBus;
66
import org.reactivecommons.async.api.DynamicRegistry;
77
import org.reactivecommons.async.api.handlers.EventHandler;
8-
import org.reactivecommons.async.impl.config.annotations.EnableDomainEventBus;
9-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
8+
import org.reactivecommons.async.rabbit.config.annotations.EnableDomainEventBus;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1010
import org.reactivestreams.Publisher;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Value;

acceptance/async-tests/src/test/java/org/reactivecommons/test/QueryProcessPerfTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.reactivecommons.async.api.AsyncQuery;
66
import org.reactivecommons.async.api.DirectAsyncGateway;
77
import org.reactivecommons.async.api.HandlerRegistry;
8-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
9-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
8+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.beans.factory.annotation.Value;
1212
import org.springframework.boot.SpringApplication;

acceptance/async-tests/src/test/java/org/reactivecommons/test/SimpleDirectCommunicationTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
import org.reactivecommons.async.api.DirectAsyncGateway;
77
import org.reactivecommons.async.api.HandlerRegistry;
88
import org.reactivecommons.async.api.handlers.CommandHandler;
9-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
10-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
10+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Value;
1313
import org.springframework.boot.SpringApplication;
1414
import org.springframework.boot.autoconfigure.SpringBootApplication;
1515
import org.springframework.boot.test.context.SpringBootTest;
1616
import org.springframework.context.annotation.Bean;
17-
import org.springframework.test.context.junit4.SpringRunner;
1817
import reactor.core.publisher.Mono;
1918
import reactor.core.publisher.UnicastProcessor;
2019
import reactor.test.StepVerifier;

acceptance/async-tests/src/test/java/org/reactivecommons/test/SimpleEventNotificationTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
import org.reactivecommons.api.domain.DomainEventBus;
66
import org.reactivecommons.async.api.HandlerRegistry;
77
import org.reactivecommons.async.api.handlers.EventHandler;
8-
import org.reactivecommons.async.impl.config.annotations.EnableDomainEventBus;
9-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
8+
import org.reactivecommons.async.rabbit.config.annotations.EnableDomainEventBus;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.SpringApplication;
1212
import org.springframework.boot.autoconfigure.SpringBootApplication;
1313
import org.springframework.boot.test.context.SpringBootTest;
1414
import org.springframework.context.annotation.Bean;
15-
import org.springframework.test.context.junit4.SpringRunner;
1615
import reactor.core.publisher.UnicastProcessor;
1716
import reactor.test.StepVerifier;
1817

acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/BlockingCommandHandlePerfTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
import org.reactivecommons.async.api.DirectAsyncGateway;
66
import org.reactivecommons.async.api.HandlerRegistry;
77
import org.reactivecommons.async.api.handlers.CommandHandler;
8-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
9-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
8+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.beans.factory.annotation.Value;
1212
import org.springframework.boot.SpringApplication;
1313
import org.springframework.boot.autoconfigure.SpringBootApplication;
1414
import org.springframework.boot.test.context.SpringBootTest;
1515
import org.springframework.context.annotation.Bean;
16-
import org.springframework.test.context.junit4.SpringRunner;
1716
import reactor.core.publisher.Flux;
1817
import reactor.core.publisher.UnicastProcessor;
1918
import reactor.test.StepVerifier;

acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/ParallelOnBlockingInSubscriptionTimeTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
import org.reactivecommons.async.api.DirectAsyncGateway;
77
import org.reactivecommons.async.api.HandlerRegistry;
88
import org.reactivecommons.async.api.handlers.CommandHandler;
9-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
10-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
10+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Value;
1313
import org.springframework.boot.SpringApplication;
1414
import org.springframework.boot.autoconfigure.SpringBootApplication;
1515
import org.springframework.boot.test.context.SpringBootTest;
1616
import org.springframework.context.annotation.Bean;
17-
import org.springframework.test.context.junit4.SpringRunner;
1817
import reactor.core.publisher.Flux;
1918
import reactor.core.publisher.UnicastProcessor;
2019
import reactor.test.StepVerifier;

acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/SimpleCommandHandlePerfTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
import org.reactivecommons.async.api.DirectAsyncGateway;
77
import org.reactivecommons.async.api.HandlerRegistry;
88
import org.reactivecommons.async.api.handlers.CommandHandler;
9-
import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
10-
import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
9+
import org.reactivecommons.async.rabbit.config.annotations.EnableDirectAsyncGateway;
10+
import org.reactivecommons.async.rabbit.config.annotations.EnableMessageListeners;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Value;
1313
import org.springframework.boot.SpringApplication;
1414
import org.springframework.boot.autoconfigure.SpringBootApplication;
1515
import org.springframework.boot.test.context.SpringBootTest;
1616
import org.springframework.context.annotation.Bean;
17-
import org.springframework.test.context.junit4.SpringRunner;
1817
import reactor.core.publisher.Flux;
1918
import reactor.core.publisher.UnicastProcessor;
2019
import reactor.test.StepVerifier;

0 commit comments

Comments
 (0)