Fix merge

Alejandro Betancur Barrientos · Alejandro Betancur Barrientos · commit 9f23b3e3f129 · 2021-03-16T15:33:57.000-05:00
diff --git a/async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/DirectAsyncGatewayConfig.java b/async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/DirectAsyncGatewayConfig.java
@@ -5,7 +5,7 @@
 import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.impl.listeners.ApplicationReplyListener;
-import org.reactivecommons.async.impl.reply.ReactiveReplyRouter;
+import org.reactivecommons.async.parent.reply.ReactiveReplyRouter;
 import org.reactivecommons.async.parent.config.BrokerConfig;
 
 import java.nio.ByteBuffer;
diff --git a/async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/RabbitMqConfig.java b/async/async-commons-standalone/src/main/java/org/reactivecommons/async/impl/config/RabbitMqConfig.java
@@ -6,7 +6,7 @@
 import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
 import org.reactivecommons.async.impl.communications.TopologyCreator;
 import org.reactivecommons.async.parent.converters.MessageConverter;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.converters.json.ObjectMapperSupplier;
 import reactor.core.publisher.Mono;
 import reactor.rabbitmq.*;
diff --git a/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/RabbitMqConfig.java b/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/RabbitMqConfig.java
@@ -20,7 +20,7 @@
 import org.reactivecommons.async.impl.config.props.BrokerConfigProps;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.parent.converters.json.DefaultObjectMapperSupplier;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.converters.json.ObjectMapperSupplier;
 import org.reactivecommons.async.parent.ext.CustomErrorReporter;
 import org.reactivecommons.async.parent.config.BrokerConfig;
diff --git a/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/props/BrokerConfigProps.java b/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/props/BrokerConfigProps.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.async.parent.config.IBrokerConfigProps;
-import org.reactivecommons.async.impl.utils.NameGenerator;
+import org.reactivecommons.async.parent.utils.NameGenerator;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/props/NotificationProps.java b/async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/props/NotificationProps.java
@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.reactivecommons.async.impl.utils.NameGenerator;
+import org.reactivecommons.async.parent.utils.NameGenerator;
 
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/impl/DynamicRegistryImp.java b/async/async-commons/src/main/java/org/reactivecommons/async/impl/DynamicRegistryImp.java
@@ -1,3 +1,4 @@
+
 package org.reactivecommons.async.impl;
 
 import lombok.RequiredArgsConstructor;
diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/impl/RabbitDirectAsyncGateway.java b/async/async-commons/src/main/java/org/reactivecommons/async/impl/RabbitDirectAsyncGateway.java
@@ -79,7 +79,7 @@ public <T> Mono<Void> reply(T response, From from) {
         headers.put(CORRELATION_ID, from.getCorrelationID());
 
         if (response == null) {
-            headers.put(Headers.COMPLETION_ONLY_SIGNAL, TRUE.toString());
+            headers.put(COMPLETION_ONLY_SIGNAL, TRUE.toString());
         }
 
         return sender.sendNoConfirm(response, "globalReply", from.getReplyID(), headers, false);
diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/impl/converters/json/JacksonMessageConverter.java b/async/async-commons/src/main/java/org/reactivecommons/async/impl/converters/json/JacksonMessageConverter.java
@@ -1,4 +1,4 @@
-package org.reactivecommons.async.parent.converters.json;
+package org.reactivecommons.async.impl.converters.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListener.java b/async/async-commons/src/main/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListener.java
@@ -22,7 +22,7 @@
 import java.util.function.Function;
 
 import static java.util.Optional.ofNullable;
-import static org.reactivecommons.async.impl.Headers.*;
+import static org.reactivecommons.async.parent.Headers.*;
 
 @Log
 //TODO: Organizar inferencia de tipos de la misma forma que en comandos y eventos
diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/impl/listeners/ApplicationReplyListener.java b/async/async-commons/src/main/java/org/reactivecommons/async/impl/listeners/ApplicationReplyListener.java
@@ -9,7 +9,7 @@
 
 import java.util.logging.Level;
 
-import static org.reactivecommons.async.impl.Headers.*;
+import static org.reactivecommons.async.parent.Headers.*;
 import static reactor.rabbitmq.ResourcesSpecification.*;
 
 @Log
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/RabbitDirectAsyncGatewayTest.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/RabbitDirectAsyncGatewayTest.java
@@ -16,7 +16,7 @@
 import org.reactivecommons.async.parent.config.BrokerConfig;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.parent.converters.json.DefaultObjectMapperSupplier;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.reply.ReactiveReplyRouter;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/communications/ReactiveMessageSenderTest.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/communications/ReactiveMessageSenderTest.java
@@ -10,7 +10,7 @@
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivecommons.async.parent.converters.MessageConverter;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/converters/json/JacksonMessageConverterTest.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/converters/json/JacksonMessageConverterTest.java
@@ -1,13 +1,14 @@
-package org.reactivecommons.async.parent.converter.json;
+package org.reactivecommons.async.impl.converters.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.AsyncQuery;
 import org.reactivecommons.async.parent.communications.Message;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+
 
 import java.io.IOException;
 import java.util.Date;
@@ -46,7 +47,7 @@ public void readValue() {
         Date date = new Date();
         final Message message = converter.toMessage(new SampleClass("35", "name1", date));
         final SampleClass value = converter.readValue(message, SampleClass.class);
-        assertThat(value).extracting(SampleClass::getId, SampleClass::getName, SampleClass::getDate)
+        Assertions.assertThat(value).extracting(SampleClass::getId, SampleClass::getName, SampleClass::getDate)
                 .containsExactly("35", "name1", date);
     }
 
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/converters/json/SampleClass.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/converters/json/SampleClass.java
@@ -0,0 +1,14 @@
+package org.reactivecommons.async.impl.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;
+}
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationCommandListenerPerfTest.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationCommandListenerPerfTest.java
@@ -22,7 +22,7 @@
 import org.reactivecommons.async.impl.communications.TopologyCreator;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.parent.converters.json.DefaultObjectMapperSupplier;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.ext.CustomErrorReporter;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListenerTest.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListenerTest.java
@@ -17,7 +17,7 @@
 import org.reactivecommons.async.impl.communications.TopologyCreator;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.parent.converters.json.DefaultObjectMapperSupplier;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.ext.CustomErrorReporter;
 import reactor.core.publisher.Mono;
 import reactor.rabbitmq.Receiver;
diff --git a/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ListenerReporterTestSuperClass.java b/async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ListenerReporterTestSuperClass.java
@@ -21,7 +21,7 @@
 import org.reactivecommons.async.impl.communications.TopologyCreator;
 import org.reactivecommons.async.parent.converters.MessageConverter;
 import org.reactivecommons.async.parent.converters.json.DefaultObjectMapperSupplier;
-import org.reactivecommons.async.parent.converters.json.JacksonMessageConverter;
+import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.parent.ext.CustomErrorReporter;
 import reactor.core.publisher.Flux;
 import reactor.rabbitmq.*;
diff --git a/async/async-parent/async-parent.gradle b/async/async-parent/async-parent.gradle
@@ -13,7 +13,10 @@ repositories {
 }
 
 dependencies {
-    api project(":async-commons")
+    api project(":async-commons-api")
+    api project(":domain-events-api")
 
+    compileOnly 'io.projectreactor:reactor-core'
+    api 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation 'io.projectreactor:reactor-test'
 }
diff --git a/async/async-parent/src/test/resources/candidateNamesForMatching.txt b/async/async-parent/src/test/resources/candidateNamesForMatching.txt
diff --git a/async/async-parent/src/test/resources/concrete_names_for_matching.txt b/async/async-parent/src/test/resources/concrete_names_for_matching.txt
diff --git a/async/async-parent/src/test/resources/wildcard_names_for_matching.txt b/async/async-parent/src/test/resources/wildcard_names_for_matching.txt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`package org.reactivecommons.async.impl;`
`2`	`3`
`3`	`4`	`import lombok.RequiredArgsConstructor;`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public <T> Mono<Void> reply(T response, From from) {`
`79`	`79`	`headers.put(CORRELATION_ID, from.getCorrelationID());`
`80`	`80`
`81`	`81`	`if (response == null) {`
`82`		`- headers.put(Headers.COMPLETION_ONLY_SIGNAL, TRUE.toString());`
	`82`	`+ headers.put(COMPLETION_ONLY_SIGNAL, TRUE.toString());`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`return sender.sendNoConfirm(response, "globalReply", from.getReplyID(), headers, false);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.reactivecommons.async.parent.converters.json;`
	`1`	`+package org.reactivecommons.async.impl.converters.json;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.databind.JsonNode;`
`4`	`4`	`import com.fasterxml.jackson.databind.ObjectMapper;`