Adapt to message model restructuring in ditto

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Apr 27, 2021 · bc24947 · bc24947
1 parent 3328036
commit bc24947
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -836,11 +836,6 @@
             <artifactId>ditto-thingsearch-model</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-commands-messages</artifactId>
-            <version>${ditto.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-policies-model</artifactId>

diff --git a/java/src/main/assembly/assembly.xml b/java/src/main/assembly/assembly.xml
@@ -40,7 +40,6 @@
                 <include>org.eclipse.ditto:ditto-things-model</include>
                 <include>org.eclipse.ditto:ditto-thingsearch-model</include>
                 <include>org.eclipse.ditto:ditto-model-messages</include>
-                <include>org.eclipse.ditto:ditto-signals-commands-messages</include>
                 <include>org.eclipse.ditto:ditto-protocol</include>
                 <include>org.eclipse.ditto:ditto-client</include>
             </includes>

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveImpl.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveImpl.java
@@ -58,8 +58,8 @@
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.signals.commands.messages.MessageCommand;
-import org.eclipse.ditto.signals.commands.messages.MessageCommandResponse;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveMessagesUtil.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveMessagesUtil.java
@@ -34,12 +34,12 @@
 import org.eclipse.ditto.protocol.adapter.ProtocolAdapter;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
-import org.eclipse.ditto.signals.commands.messages.MessageCommand;
-import org.eclipse.ditto.signals.commands.messages.MessageCommandResponse;
-import org.eclipse.ditto.signals.commands.messages.SendFeatureMessage;
-import org.eclipse.ditto.signals.commands.messages.SendFeatureMessageResponse;
-import org.eclipse.ditto.signals.commands.messages.SendThingMessage;
-import org.eclipse.ditto.signals.commands.messages.SendThingMessageResponse;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
+import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessage;
+import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessageResponse;
+import org.eclipse.ditto.model.messages.signals.commands.SendThingMessage;
+import org.eclipse.ditto.model.messages.signals.commands.SendThingMessageResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java b/...src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java
@@ -45,8 +45,8 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
 import org.eclipse.ditto.base.model.signals.commands.ErrorResponse;
-import org.eclipse.ditto.signals.commands.messages.MessageCommandResponse;
-import org.eclipse.ditto.signals.commands.messages.MessagePayloadSerializer;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
+import org.eclipse.ditto.model.messages.signals.commands.MessagePayloadSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/java/src/test/java/org/eclipse/ditto/client/DittoClientLiveTest.java b/java/src/test/java/org/eclipse/ditto/client/DittoClientLiveTest.java
@@ -57,14 +57,14 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
 import org.eclipse.ditto.things.model.signals.acks.ThingAcknowledgementFactory;
 import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.signals.commands.messages.MessageCommand;
-import org.eclipse.ditto.signals.commands.messages.MessageCommandResponse;
-import org.eclipse.ditto.signals.commands.messages.SendClaimMessage;
-import org.eclipse.ditto.signals.commands.messages.SendClaimMessageResponse;
-import org.eclipse.ditto.signals.commands.messages.SendFeatureMessage;
-import org.eclipse.ditto.signals.commands.messages.SendFeatureMessageResponse;
-import org.eclipse.ditto.signals.commands.messages.SendThingMessage;
-import org.eclipse.ditto.signals.commands.messages.SendThingMessageResponse;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
+import org.eclipse.ditto.model.messages.signals.commands.SendClaimMessage;
+import org.eclipse.ditto.model.messages.signals.commands.SendClaimMessageResponse;
+import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessage;
+import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessageResponse;
+import org.eclipse.ditto.model.messages.signals.commands.SendThingMessage;
+import org.eclipse.ditto.model.messages.signals.commands.SendThingMessageResponse;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThingResponse;

diff --git a/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java b/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java
@@ -68,8 +68,8 @@
 import org.eclipse.ditto.base.model.signals.JsonParsable;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
-import org.eclipse.ditto.signals.commands.messages.MessageCommand;
-import org.eclipse.ditto.signals.commands.messages.MessageCommandResponse;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
+import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommand;