diff --git a/java/pom.xml b/java/pom.xml index 8c5928d0..418f3379 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -836,11 +836,6 @@ ditto-thingsearch-model ${ditto.version} - - org.eclipse.ditto - ditto-signals-commands-messages - ${ditto.version} - org.eclipse.ditto ditto-policies-model diff --git a/java/src/main/assembly/assembly.xml b/java/src/main/assembly/assembly.xml index 0c398801..06783b0c 100755 --- a/java/src/main/assembly/assembly.xml +++ b/java/src/main/assembly/assembly.xml @@ -40,7 +40,6 @@ org.eclipse.ditto:ditto-things-model org.eclipse.ditto:ditto-thingsearch-model org.eclipse.ditto:ditto-model-messages - org.eclipse.ditto:ditto-signals-commands-messages org.eclipse.ditto:ditto-protocol org.eclipse.ditto:ditto-client 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 index ebbad863..f55b9dba 100644 --- 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 index aa2e7403..cb45093f 100755 --- 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/java/src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java b/java/src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java index 9ad797e7..e1adfa50 100755 --- a/java/src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java +++ b/java/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 index b3036879..24ae2e56 100644 --- 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 index 9b272d11..9625dd6d 100755 --- 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;