Common classes separation from RabbitMQ Implementation

acceptance/async-tests/async-tests.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":async-commons-starter")
+    compile project(":async-commons-rabbit-starter")
     compile('org.springframework.boot:spring-boot-starter')
 }
 

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

@@ -3,7 +3,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.reactivecommons.api.domain.Command;
-import org.reactivecommons.async.impl.RabbitDirectAsyncGateway;
+import org.reactivecommons.async.rabbit.RabbitDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -14,7 +14,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.test.StepVerifier;

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

@@ -12,7 +12,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.test.StepVerifier;
 

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

@@ -13,7 +13,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.test.StepVerifier;

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

@@ -14,7 +14,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.test.StepVerifier;

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

@@ -14,7 +14,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.test.StepVerifier;

async/async-commons/src/main/java/org/reactivecommons/async/impl/CommandExecutor.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/CommandExecutor.java

@@ -1,9 +1,9 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
 
 import org.reactivecommons.api.domain.Command;
-import org.reactivecommons.async.impl.communications.Message;
 import org.reactivecommons.async.api.handlers.CommandHandler;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 
 import java.util.function.Function;

async/async-commons/src/main/java/org/reactivecommons/async/impl/DiscardNotifier.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/DiscardNotifier.java

@@ -1,6 +1,6 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 
 public interface DiscardNotifier {

async/async-commons/src/main/java/org/reactivecommons/async/impl/EventExecutor.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/EventExecutor.java

@@ -1,9 +1,9 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
 
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.handlers.EventHandler;
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 
 import java.util.function.Function;

async/async-commons/src/main/java/org/reactivecommons/async/impl/FallbackStrategy.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/FallbackStrategy.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
 public enum FallbackStrategy {
     FAST_RETRY("ATTENTION!! Fast retry message to same Queue: %s"),

async/async-commons/src/main/java/org/reactivecommons/async/impl/Headers.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/Headers.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
 public final class Headers {
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/QueryExecutor.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/QueryExecutor.java

@@ -1,15 +1,15 @@
-package org.reactivecommons.async.impl;
+package org.reactivecommons.async.commons;
 
 
 import org.reactivecommons.async.api.From;
 import org.reactivecommons.async.api.handlers.QueryHandlerDelegate;
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 
 import java.util.function.Function;
 
-import static org.reactivecommons.async.impl.Headers.CORRELATION_ID;
-import static org.reactivecommons.async.impl.Headers.REPLY_ID;
+import static org.reactivecommons.async.commons.Headers.CORRELATION_ID;
+import static org.reactivecommons.async.commons.Headers.REPLY_ID;
 
 public class QueryExecutor<T, M> {
     private final QueryHandlerDelegate<T, M> queryHandler;

async/async-commons/src/main/java/org/reactivecommons/async/impl/communications/Message.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/communications/Message.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.communications;
+package org.reactivecommons.async.commons.communications;
 
 import java.util.Map;
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/config/BrokerConfig.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/config/BrokerConfig.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.commons.config;
 
 import java.time.Duration;
 import java.util.UUID;

async/async-commons/src/main/java/org/reactivecommons/async/impl/config/IBrokerConfigProps.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/config/IBrokerConfigProps.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.commons.config;
 
 public interface IBrokerConfigProps {
     String getEventsQueue();

async/async-commons/src/main/java/org/reactivecommons/async/impl/converters/MessageConverter.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/MessageConverter.java

@@ -1,9 +1,9 @@
-package org.reactivecommons.async.impl.converters;
+package org.reactivecommons.async.commons.converters;
 
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.AsyncQuery;
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 
 public interface MessageConverter {
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/converters/json/DefaultObjectMapperSupplier.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/json/DefaultObjectMapperSupplier.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.converters.json;
+package org.reactivecommons.async.commons.converters.json;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

async/async-commons/src/main/java/org/reactivecommons/async/impl/converters/json/ObjectMapperSupplier.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/json/ObjectMapperSupplier.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.converters.json;
+package org.reactivecommons.async.commons.converters.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/exceptions/MessageConversionException.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/exceptions/MessageConversionException.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.exceptions;
+package org.reactivecommons.async.commons.exceptions;
 
 public class MessageConversionException extends RuntimeException {
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/exceptions/SendFailureNoAckException.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/exceptions/SendFailureNoAckException.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.exceptions;
+package org.reactivecommons.async.commons.exceptions;
 
 public class SendFailureNoAckException extends RuntimeException {
     public SendFailureNoAckException(String message) {

async/async-commons/src/main/java/org/reactivecommons/async/impl/ext/CustomReporter.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/ext/CustomReporter.java

@@ -1,9 +1,9 @@
-package org.reactivecommons.async.impl.ext;
+package org.reactivecommons.async.commons.ext;
 
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.AsyncQuery;
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 
 public interface CustomReporter {

async/async-commons/src/main/java/org/reactivecommons/async/impl/reply/ReactiveReplyRouter.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/reply/ReactiveReplyRouter.java

@@ -1,6 +1,6 @@
-package org.reactivecommons.async.impl.reply;
+package org.reactivecommons.async.commons.reply;
 
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.UnicastProcessor;
 import reactor.util.concurrent.Queues;

async/async-commons/src/main/java/org/reactivecommons/async/impl/utils/NameGenerator.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/utils/NameGenerator.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils;
+package org.reactivecommons.async.commons.utils;
 
 import java.nio.ByteBuffer;
 import java.util.Base64;

async/async-commons/src/main/java/org/reactivecommons/async/impl/utils/matcher/Candidate.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/utils/matcher/Candidate.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 import lombok.Data;
 

async/async-commons/src/main/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcher.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/utils/matcher/KeyMatcher.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 import lombok.Data;
 import reactor.util.function.Tuple2;

async/async-commons/src/main/java/org/reactivecommons/async/impl/utils/matcher/Matcher.java → async/async-commons/src/main/java/org/reactivecommons/async/commons/utils/matcher/Matcher.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 import java.util.Set;
 

async/async-commons/src/test/java/org/reactivecommons/async/impl/converters/json/DefaultObjectMapperSupplierTest.java → async/async-commons/src/test/java/org/reactivecommons/async/commons/converters/json/DefaultObjectMapperSupplierTest.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.converters.json;
+package org.reactivecommons.async.commons.converters.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
@@ -37,4 +37,4 @@ public SampleClassExtra(String id, String name, Date date, Long newProp) {
         private final Long newProp;
     }
 
-}
+}

async/async-commons/src/test/java/org/reactivecommons/async/commons/converters/json/SampleClass.java

@@ -0,0 +1,14 @@
+package org.reactivecommons.async.commons.converters.json;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Date;
+
+@RequiredArgsConstructor
+@Getter
+class SampleClass {
+    private final String id;
+    private final String name;
+    private final Date date;
+}

async/async-commons/src/test/java/org/reactivecommons/async/impl/reply/ReactiveReplyRouterTest.java → async/async-commons/src/test/java/org/reactivecommons/async/commons/reply/ReactiveReplyRouterTest.java

@@ -1,8 +1,8 @@
-package org.reactivecommons.async.impl.reply;
+package org.reactivecommons.async.commons.reply;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-import org.reactivecommons.async.impl.communications.Message;
+import org.reactivecommons.async.commons.communications.Message;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 

async/async-commons/src/test/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcherPerformanceManualTest.java → async/async-commons/src/test/java/org/reactivecommons/async/commons/utils/matcher/KeyMatcherPerformanceManualTest.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

async/async-commons/src/test/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcherPerformanceWildcardTest.java → async/async-commons/src/test/java/org/reactivecommons/async/commons/utils/matcher/KeyMatcherPerformanceWildcardTest.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

async/async-commons/src/test/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcherTest.java → async/async-commons/src/test/java/org/reactivecommons/async/commons/utils/matcher/KeyMatcherTest.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.utils.matcher;
+package org.reactivecommons.async.commons.utils.matcher;
 
 
 import org.junit.jupiter.api.BeforeEach;

async/async-rabbit-standalone/async-commons-rabbit-standalone.gradle

@@ -0,0 +1,8 @@
+ext {
+    artifactId = 'async-commons-rabbit-standalone'
+    artifactDescription = 'Async Commons Standalone Config'
+}
+
+dependencies {
+    api project(':async-rabbit')
+}

async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/DirectAsyncGatewayConfig.java → async/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/config/DirectAsyncGatewayConfig.java

@@ -1,11 +1,12 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.rabbit.config;
 
-import org.reactivecommons.async.impl.RabbitDirectAsyncGateway;
-import org.reactivecommons.async.impl.communications.ReactiveMessageListener;
-import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
-import org.reactivecommons.async.impl.converters.MessageConverter;
-import org.reactivecommons.async.impl.listeners.ApplicationReplyListener;
-import org.reactivecommons.async.impl.reply.ReactiveReplyRouter;
+import org.reactivecommons.async.rabbit.RabbitDirectAsyncGateway;
+import org.reactivecommons.async.rabbit.communications.ReactiveMessageListener;
+import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
+import org.reactivecommons.async.commons.converters.MessageConverter;
+import org.reactivecommons.async.rabbit.listeners.ApplicationReplyListener;
+import org.reactivecommons.async.commons.reply.ReactiveReplyRouter;
+import org.reactivecommons.async.commons.config.BrokerConfig;
 
 import java.nio.ByteBuffer;
 import java.util.Base64;

async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/EventBusConfig.java → async/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/config/EventBusConfig.java

@@ -1,8 +1,8 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.rabbit.config;
 
 import org.reactivecommons.api.domain.DomainEventBus;
-import org.reactivecommons.async.impl.RabbitDomainEventBus;
-import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
+import org.reactivecommons.async.rabbit.RabbitDomainEventBus;
+import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
 
 import static reactor.rabbitmq.ExchangeSpecification.exchange;
 

async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/RabbitMqConfig.java → async/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/config/RabbitMqConfig.java

@@ -1,13 +1,13 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.rabbit.config;
 
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import lombok.extern.java.Log;
-import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
-import org.reactivecommons.async.impl.communications.TopologyCreator;
-import org.reactivecommons.async.impl.converters.MessageConverter;
-import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
-import org.reactivecommons.async.impl.converters.json.ObjectMapperSupplier;
+import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
+import org.reactivecommons.async.rabbit.communications.TopologyCreator;
+import org.reactivecommons.async.commons.converters.MessageConverter;
+import org.reactivecommons.async.rabbit.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
 import reactor.core.publisher.Mono;
 import reactor.rabbitmq.*;
 import reactor.util.retry.Retry;

async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/RabbitProperties.java → async/async-rabbit-standalone/src/main/java/org/reactivecommons/async/rabbit/config/RabbitProperties.java

@@ -1,4 +1,4 @@
-package org.reactivecommons.async.impl.config;
+package org.reactivecommons.async.rabbit.config;
 
 import lombok.Data;
 

async/async-commons-starter/async-commons-starter.gradle → async/async-rabbit-starter/async-commons-rabbit-starter.gradle

@@ -1,10 +1,10 @@
 ext {
-    artifactId = 'async-commons-starter'
+    artifactId = 'async-commons-rabbit-starter'
     artifactDescription = 'Async Commons Starter'
 }
 
 dependencies {
-    api project(':async-commons')
+    api project(':async-rabbit')
     compileOnly 'org.springframework.boot:spring-boot-starter'
 
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'

async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableCommandListeners.java → async/async-rabbit-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableCommandListeners.java

@@ -1,6 +1,6 @@
 package org.reactivecommons.async.impl.config.annotations;
 
-import org.reactivecommons.async.impl.config.CommandListenersConfig;
+import org.reactivecommons.async.rabbit.config.CommandListenersConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 

async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableDirectAsyncGateway.java → async/async-rabbit-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableDirectAsyncGateway.java

@@ -1,6 +1,6 @@
 package org.reactivecommons.async.impl.config.annotations;
 
-import org.reactivecommons.async.impl.config.DirectAsyncGatewayConfig;
+import org.reactivecommons.async.rabbit.config.DirectAsyncGatewayConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 

async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableDomainEventBus.java → async/async-rabbit-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableDomainEventBus.java

@@ -1,6 +1,6 @@
 package org.reactivecommons.async.impl.config.annotations;
 
-import org.reactivecommons.async.impl.config.EventBusConfig;
+import org.reactivecommons.async.rabbit.config.EventBusConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 

async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableEventListeners.java → async/async-rabbit-starter/src/main/java/org/reactivecommons/async/impl/config/annotations/EnableEventListeners.java

@@ -1,6 +1,6 @@
 package org.reactivecommons.async.impl.config.annotations;
 
-import org.reactivecommons.async.impl.config.EventListenersConfig;
+import org.reactivecommons.async.rabbit.config.EventListenersConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;