[KOGITO-5718] Fix bogus Quarkus WARN for namespace clash (#1572)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
apache · Sep 6, 2021 · 13ac92a · 13ac92a
1 parent ecf1d33
commit 13ac92a
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 29 deletions.
diff --git a/...ito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/AddonsConfigDiscovery.java b/...ito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/AddonsConfigDiscovery.java
@@ -31,7 +31,7 @@ public class AddonsConfigDiscovery {
     private static final String PROMETHEUS_CLASS = "org.kie.kogito.monitoring.prometheus.common.rest.MetricsResource";
     private static final String MONITORING_CORE_CLASS = "org.kie.kogito.monitoring.core.common.MonitoringRegistry";
     private static final String TRACING_CLASS = "org.kie.kogito.tracing.decision.DecisionTracingListener";
-    private static final String QUARKUS_CLOUD_EVENTS = "org.kie.kogito.addon.cloudevents.quarkus.QuarkusCloudEventEmitter";
+    private static final String QUARKUS_CLOUD_EVENTS = "org.kie.kogito.addon.quarkus.messaging.QuarkusCloudEventEmitter";
     private static final String SPRING_CLOUD_EVENTS = "org.kie.kogito.addon.cloudevents.spring.SpringKafkaCloudEventEmitter";
     private static final String QUARKUS_EXPLAINABILITY = "org.kie.kogito.explainability.QuarkusExplainableResource";
     private static final String SPRING_EXPLAINABILITY = "org.kie.kogito.explainability.SpringBootExplainableResource";

diff --git a/.../src/main/resources/class-templates/events/CloudEventListenerResourceQuarkusTemplate.java b/.../src/main/resources/class-templates/events/CloudEventListenerResourceQuarkusTemplate.java
@@ -17,7 +17,7 @@
 
 import javax.ws.rs.Path;
 
-import org.kie.kogito.addon.cloudevents.quarkus.http.AbstractQuarkusCloudEventResource;
+import org.kie.kogito.addon.quarkus.messaging.common.http.AbstractQuarkusCloudEventResource;
 
 @Path("/")
 public class CloudEventListenerResource extends AbstractQuarkusCloudEventResource {

diff --git a/...ito-codegen-processes/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java b/...ito-codegen-processes/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
@@ -24,7 +24,7 @@
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
-import org.kie.kogito.addon.cloudevents.quarkus.AbstractQuarkusCloudEventEmitter;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventEmitter;
 
 import io.quarkus.runtime.Startup;
 

diff --git a/...to-codegen-processes/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java b/...to-codegen-processes/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
@@ -23,7 +23,7 @@
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
-import org.kie.kogito.addon.cloudevents.quarkus.AbstractQuarkusCloudEventReceiver;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver ;
 
 import io.quarkus.runtime.Startup;
 

diff --git a/...kus/AbstractQuarkusCloudEventEmitter.java → ...mon/AbstractQuarkusCloudEventEmitter.java b/...kus/AbstractQuarkusCloudEventEmitter.java → ...mon/AbstractQuarkusCloudEventEmitter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
@@ -24,7 +24,7 @@
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
-import org.kie.kogito.addon.cloudevents.quarkus.message.MessageFactory;
+import org.kie.kogito.addon.quarkus.messaging.common.message.MessageFactory;
 import org.kie.kogito.conf.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.EventMarshaller;

diff --git a/...us/AbstractQuarkusCloudEventReceiver.java → ...on/AbstractQuarkusCloudEventReceiver.java b/...us/AbstractQuarkusCloudEventReceiver.java → ...on/AbstractQuarkusCloudEventReceiver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.io.IOException;
 import java.util.Collection;

diff --git a/...us/QuarkusKogitoExtensionInitializer.java → ...on/QuarkusKogitoExtensionInitializer.java b/...us/QuarkusKogitoExtensionInitializer.java → ...on/QuarkusKogitoExtensionInitializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;

diff --git a/...events/quarkus/QuarkusTopicDiscovery.java → ...ssaging/common/QuarkusTopicDiscovery.java b/...events/quarkus/QuarkusTopicDiscovery.java → ...ssaging/common/QuarkusTopicDiscovery.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...kus/QuarkusTopicsInformationResource.java → ...mon/QuarkusTopicsInformationResource.java b/...kus/QuarkusTopicsInformationResource.java → ...mon/QuarkusTopicsInformationResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;

diff --git a/...tp/AbstractQuarkusCloudEventResource.java → ...tp/AbstractQuarkusCloudEventResource.java b/...tp/AbstractQuarkusCloudEventResource.java → ...tp/AbstractQuarkusCloudEventResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
@@ -28,7 +28,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.kie.kogito.addon.cloudevents.quarkus.AbstractQuarkusCloudEventReceiver;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
 import org.kie.kogito.cloudevents.Printer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...kus/http/CloudEventResourceException.java → ...mon/http/CloudEventResourceException.java b/...kus/http/CloudEventResourceException.java → ...mon/http/CloudEventResourceException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 import io.cloudevents.CloudEvent;
 

diff --git a/...tp/CloudEventResourceExceptionMapper.java → ...tp/CloudEventResourceExceptionMapper.java b/...tp/CloudEventResourceExceptionMapper.java → ...tp/CloudEventResourceExceptionMapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 import javax.enterprise.context.Dependent;
 import javax.ws.rs.core.Response;

diff --git a/...oudevents/quarkus/http/ResponseError.java → .../messaging/common/http/ResponseError.java b/...oudevents/quarkus/http/ResponseError.java → .../messaging/common/http/ResponseError.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 /**
  * Simple structure to hold CloudEvent processing errors

diff --git a/...n/cloudevents/quarkus/http/Responses.java → ...rkus/messaging/common/http/Responses.java b/...n/cloudevents/quarkus/http/Responses.java → ...rkus/messaging/common/http/Responses.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...sage/CloudEventHttpOutgoingDecorator.java → ...sage/CloudEventHttpOutgoingDecorator.java b/...sage/CloudEventHttpOutgoingDecorator.java → ...sage/CloudEventHttpOutgoingDecorator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import javax.ws.rs.core.HttpHeaders;
 

diff --git a/...nts/quarkus/message/MessageDecorator.java → ...ging/common/message/MessageDecorator.java b/...nts/quarkus/message/MessageDecorator.java → ...ging/common/message/MessageDecorator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 

diff --git a/...rkus/message/MessageDecoratorFactory.java → ...mmon/message/MessageDecoratorFactory.java b/...rkus/message/MessageDecoratorFactory.java → ...mmon/message/MessageDecoratorFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 /**
  * Provides a {@link MessageDecorator} instance. Ideally should not be used outside the {@link MessageFactory}.

diff --git a/...vents/quarkus/message/MessageFactory.java → ...saging/common/message/MessageFactory.java b/...vents/quarkus/message/MessageFactory.java → ...saging/common/message/MessageFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.cloudevents.message.MessagePayloadDecorator;

diff --git a/...quarkus/message/NoOpMessageDecorator.java → .../common/message/NoOpMessageDecorator.java b/...quarkus/message/NoOpMessageDecorator.java → .../common/message/NoOpMessageDecorator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 

diff --git a/...ts/quarkus/QuarkusTopicDiscoveryTest.java → ...ing/common/QuarkusTopicDiscoveryTest.java b/...ts/quarkus/QuarkusTopicDiscoveryTest.java → ...ing/common/QuarkusTopicDiscoveryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...oudevents/quarkus/http/ResponsesTest.java → .../messaging/common/http/ResponsesTest.java b/...oudevents/quarkus/http/ResponsesTest.java → .../messaging/common/http/ResponsesTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.http;
+package org.kie.kogito.addon.quarkus.messaging.common.http;
 
 import javax.ws.rs.core.Response;
 

diff --git a/...ventHttpOutgoingMessageDecoratorTest.java → ...ventHttpOutgoingMessageDecoratorTest.java b/...ventHttpOutgoingMessageDecoratorTest.java → ...ventHttpOutgoingMessageDecoratorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.junit.jupiter.api.Test;

diff --git a/...e/MessageMessageDecoratorFactoryTest.java → ...e/MessageMessageDecoratorFactoryTest.java b/...e/MessageMessageDecoratorFactoryTest.java → ...e/MessageMessageDecoratorFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus.message;
+package org.kie.kogito.addon.quarkus.messaging.common.message;
 
 import org.junit.jupiter.api.Test;
 

diff --git a/...nts/quarkus/QuarkusCloudEventEmitter.java → ...s/messaging/QuarkusCloudEventEmitter.java b/...nts/quarkus/QuarkusCloudEventEmitter.java → ...s/messaging/QuarkusCloudEventEmitter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -22,6 +22,7 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.eclipse.microprofile.reactive.messaging.Message;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventEmitter;
 import org.kie.kogito.event.KogitoEventStreams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ts/quarkus/QuarkusCloudEventReceiver.java → .../messaging/QuarkusCloudEventReceiver.java b/...ts/quarkus/QuarkusCloudEventReceiver.java → .../messaging/QuarkusCloudEventReceiver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.kie.kogito.addon.cloudevents.quarkus;
+package org.kie.kogito.addon.quarkus.messaging;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -29,6 +29,7 @@
 import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Acknowledgment.Strategy;
 import org.eclipse.microprofile.reactive.messaging.Message;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
 import org.kie.kogito.event.KogitoEventStreams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java b/...ration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java
@@ -21,7 +21,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 
-import org.kie.kogito.addon.cloudevents.quarkus.http.AbstractQuarkusCloudEventResource;
+import org.kie.kogito.addon.quarkus.messaging.common.http.AbstractQuarkusCloudEventResource;
 
 import io.cloudevents.CloudEvent;
 

diff --git a/...ts/src/test/java/org/kie/kogito/integrationtests/QuarkusKogitoExtensionInitializerIT.java b/...ts/src/test/java/org/kie/kogito/integrationtests/QuarkusKogitoExtensionInitializerIT.java
@@ -47,7 +47,7 @@ public void test() {
         KogitoExtension kogitoExtension = ExtensionProvider.getInstance().parseExtension(KogitoExtension.class, event);
 
         assertNotNull(kogitoExtension, "KogitoExtension not registered, please make sure " +
-                "bean org.kie.kogito.addon.cloudevents.quarkus.QuarkusKogitoExtensionInitializer has been loaded");
+                "bean org.kie.kogito.addon.quarkus.messaging.common.QuarkusKogitoExtensionInitializer has been loaded");
         assertEquals(DecisionTestUtils.MODEL_NAME, kogitoExtension.getDmnModelName());
         assertEquals(DecisionTestUtils.MODEL_NAMESPACE, kogitoExtension.getDmnModelNamespace());
     }