Adapt to things module restructuring in ditto

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Apr 21, 2021 · 0a35944 · 0a35944
1 parent 00cf1c9
commit 0a35944
Show file tree

Hide file tree

Showing 298 changed files with 1,299 additions and 1,331 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -828,7 +828,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-model-things</artifactId>
+            <artifactId>ditto-things-model</artifactId>
             <version>${ditto.version}</version>
         </dependency>
         <dependency>
@@ -842,21 +842,11 @@
             <artifactId>ditto-signals-base</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-acks-things</artifactId>
-            <version>${ditto.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-commands-base</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-commands-things</artifactId>
-            <version>${ditto.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-commands-messages</artifactId>
@@ -872,11 +862,6 @@
             <artifactId>ditto-signals-events-base</artifactId>
             <version>${ditto.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-events-things</artifactId>
-            <version>${ditto.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-events-thingsearch</artifactId>
@@ -1035,7 +1020,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-model-things</artifactId>
+            <artifactId>ditto-things-model</artifactId>
             <type>test-jar</type>
             <version>${ditto.version}</version>
             <scope>test</scope>
@@ -1054,27 +1039,13 @@
             <version>${ditto.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-commands-things</artifactId>
-            <type>test-jar</type>
-            <version>${ditto.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-signals-events-base</artifactId>
             <type>test-jar</type>
             <version>${ditto.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-signals-events-things</artifactId>
-            <type>test-jar</type>
-            <version>${ditto.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <pluginRepositories>

diff --git a/java/src/main/assembly/assembly.xml b/java/src/main/assembly/assembly.xml
@@ -38,17 +38,14 @@
                 <include>org.eclipse.ditto:ditto-model-jwt</include>
                 <include>org.eclipse.ditto:ditto-policies-model</include>
                 <include>org.eclipse.ditto:ditto-model-messages</include>
-                <include>org.eclipse.ditto:ditto-model-things</include>
+                <include>org.eclipse.ditto:ditto-things-model</include>
                 <include>org.eclipse.ditto:ditto-model-thingsearch</include>
                 <include>org.eclipse.ditto:ditto-signals-base</include>
                 <include>org.eclipse.ditto:ditto-signals-acks-base</include>
-                <include>org.eclipse.ditto:ditto-signals-acks-things</include>
                 <include>org.eclipse.ditto:ditto-signals-commands-base</include>
                 <include>org.eclipse.ditto:ditto-signals-commands-thingsearch</include>
-                <include>org.eclipse.ditto:ditto-signals-commands-things</include>
                 <include>org.eclipse.ditto:ditto-signals-commands-messages</include>
                 <include>org.eclipse.ditto:ditto-signals-events-base</include>
-                <include>org.eclipse.ditto:ditto-signals-events-things</include>
                 <include>org.eclipse.ditto:ditto-signals-events-thingsearch</include>
                 <include>org.eclipse.ditto:ditto-signals-announcements-base</include>
                 <include>org.eclipse.ditto:ditto-protocol</include>

diff --git a/java/src/main/java/org/eclipse/ditto/client/DittoClient.java b/java/src/main/java/org/eclipse/ditto/client/DittoClient.java
@@ -29,15 +29,15 @@ public interface DittoClient {
 
     /**
      * Returns the client's {@link Twin} singleton which provides the necessary functionality to manage and monitor
-     * {@link org.eclipse.ditto.model.things.Thing}s.
+     * {@link org.eclipse.ditto.things.model.Thing}s.
      *
      * @return the Twin handle
      */
     Twin twin();
 
     /**
      * Returns the client's {@link Live} singleton which provides the necessary functionality to manage and monitor
-     * {@link org.eclipse.ditto.model.things.Thing}s.
+     * {@link org.eclipse.ditto.things.model.Thing}s.
      *
      * @return the Live handle
      */

diff --git a/java/src/main/java/org/eclipse/ditto/client/ack/ResponseConsumer.java b/java/src/main/java/org/eclipse/ditto/client/ack/ResponseConsumer.java
@@ -14,7 +14,7 @@
 
 import java.util.function.BiConsumer;
 
-import org.eclipse.ditto.signals.commands.things.ThingErrorResponse;
+import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 
 /**
  * Interface encapsulating a {@link java.util.function.BiConsumer} which is notified about responses with either the

diff --git a/java/src/main/java/org/eclipse/ditto/client/ack/internal/package-info.java b/java/src/main/java/org/eclipse/ditto/client/ack/internal/package-info.java
@@ -13,7 +13,7 @@
 
 /**
  * Contains an API around {@link org.eclipse.ditto.client.changes.Change}s for both {@link
- * org.eclipse.ditto.model.things.Thing}s and {@link org.eclipse.ditto.model.things.Feature}s.
+ * org.eclipse.ditto.things.model.Thing}s and {@link org.eclipse.ditto.things.model.Feature}s.
  */
 @org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
 package org.eclipse.ditto.client.ack.internal;
diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/FeatureChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/FeatureChange.java
@@ -12,7 +12,7 @@
  */
 package org.eclipse.ditto.client.changes;
 
-import org.eclipse.ditto.model.things.Feature;
+import org.eclipse.ditto.things.model.Feature;
 import org.eclipse.ditto.signals.base.WithFeatureId;
 
 /**

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/FeaturesChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/FeaturesChange.java
@@ -12,7 +12,7 @@
  */
 package org.eclipse.ditto.client.changes;
 
-import org.eclipse.ditto.model.things.Features;
+import org.eclipse.ditto.things.model.Features;
 
 /**
  * Represents a change of a Thing regarding its {@link Features}.

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/ThingChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/ThingChange.java
@@ -14,7 +14,7 @@
 
 import java.util.Optional;
 
-import org.eclipse.ditto.model.things.Thing;
+import org.eclipse.ditto.things.model.Thing;
 
 /**
  * Represents a change of a {@link Thing}.

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableFeatureChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableFeatureChange.java
@@ -34,7 +34,7 @@
 import org.eclipse.ditto.model.base.entity.id.EntityId;
 import org.eclipse.ditto.model.base.entity.type.EntityType;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
-import org.eclipse.ditto.model.things.Feature;
+import org.eclipse.ditto.things.model.Feature;
 import org.eclipse.ditto.signals.acks.base.Acknowledgement;
 
 /**

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableFeaturesChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableFeaturesChange.java
@@ -34,7 +34,7 @@
 import org.eclipse.ditto.model.base.entity.id.EntityId;
 import org.eclipse.ditto.model.base.entity.type.EntityType;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
-import org.eclipse.ditto.model.things.Features;
+import org.eclipse.ditto.things.model.Features;
 import org.eclipse.ditto.signals.acks.base.Acknowledgement;
 
 /**

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableThingChange.java b/java/src/main/java/org/eclipse/ditto/client/changes/internal/ImmutableThingChange.java
@@ -35,8 +35,8 @@
 import org.eclipse.ditto.model.base.entity.id.EntityId;
 import org.eclipse.ditto.model.base.entity.type.EntityType;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
-import org.eclipse.ditto.model.things.Thing;
-import org.eclipse.ditto.model.things.ThingId;
+import org.eclipse.ditto.things.model.Thing;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.signals.acks.base.Acknowledgement;
 
 /**

diff --git a/java/src/main/java/org/eclipse/ditto/client/changes/package-info.java b/java/src/main/java/org/eclipse/ditto/client/changes/package-info.java
@@ -13,7 +13,7 @@
 
 /**
  * Contains an API around {@link org.eclipse.ditto.client.changes.Change}s for both {@link
- * org.eclipse.ditto.model.things.Thing}s and {@link org.eclipse.ditto.model.things.Feature}s.
+ * org.eclipse.ditto.things.model.Thing}s and {@link org.eclipse.ditto.things.model.Feature}s.
  */
 @org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
 package org.eclipse.ditto.client.changes;
diff --git a/java/src/main/java/org/eclipse/ditto/client/internal/AbstractHandle.java b/java/src/main/java/org/eclipse/ditto/client/internal/AbstractHandle.java
@@ -39,7 +39,7 @@
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
 import org.eclipse.ditto.model.base.headers.DittoHeadersSettable;
 import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
-import org.eclipse.ditto.model.things.ThingId;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.protocol.HeaderTranslator;
@@ -53,8 +53,8 @@
 import org.eclipse.ditto.signals.commands.base.ErrorResponse;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommand;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommandResponse;
-import org.eclipse.ditto.signals.commands.things.ThingCommand;
-import org.eclipse.ditto.signals.commands.things.modify.ThingModifyCommandResponse;
+import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
+import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommandResponse;
 
 /**
  * Super class of API handles including common methods for request-response handling.

diff --git a/java/src/main/java/org/eclipse/ditto/client/internal/BusAddressFactory.java b/java/src/main/java/org/eclipse/ditto/client/internal/BusAddressFactory.java
@@ -27,8 +27,8 @@
 import static org.eclipse.ditto.client.internal.BusAddressPatterns.THING_PATTERN;
 
 import org.eclipse.ditto.json.JsonPointer;
-import org.eclipse.ditto.model.things.ThingId;
-import org.eclipse.ditto.signals.commands.things.ThingResourceMapper;
+import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.things.model.signals.commands.ThingResourceMapper;
 
 /**
  * Factory creates bus addresses for different parts of a thing.

diff --git a/java/src/main/java/org/eclipse/ditto/client/internal/CommonManagementImpl.java b/java/src/main/java/org/eclipse/ditto/client/internal/CommonManagementImpl.java
@@ -62,23 +62,23 @@
 import org.eclipse.ditto.model.messages.MessageDirection;
 import org.eclipse.ditto.model.messages.MessageHeaders;
 import org.eclipse.ditto.policies.model.Policy;
-import org.eclipse.ditto.model.things.Feature;
-import org.eclipse.ditto.model.things.Features;
-import org.eclipse.ditto.model.things.Thing;
-import org.eclipse.ditto.model.things.ThingId;
-import org.eclipse.ditto.model.things.ThingsModelFactory;
+import org.eclipse.ditto.things.model.Feature;
+import org.eclipse.ditto.things.model.Features;
+import org.eclipse.ditto.things.model.Thing;
+import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.signals.base.Signal;
 import org.eclipse.ditto.signals.base.WithOptionalEntity;
 import org.eclipse.ditto.signals.commands.base.CommandResponse;
 import org.eclipse.ditto.signals.commands.base.ErrorResponse;
-import org.eclipse.ditto.signals.commands.things.ThingErrorResponse;
-import org.eclipse.ditto.signals.commands.things.modify.CreateThing;
-import org.eclipse.ditto.signals.commands.things.modify.DeleteThing;
-import org.eclipse.ditto.signals.commands.things.modify.ModifyThing;
-import org.eclipse.ditto.signals.commands.things.query.RetrieveThings;
-import org.eclipse.ditto.signals.commands.things.query.RetrieveThingsResponse;
+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.DeleteThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.ModifyThing;
+import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThings;
+import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThingsResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/java/src/main/java/org/eclipse/ditto/client/internal/DefaultDittoClient.java b/java/src/main/java/org/eclipse/ditto/client/internal/DefaultDittoClient.java
@@ -46,7 +46,7 @@
 import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
 import org.eclipse.ditto.model.messages.Message;
 import org.eclipse.ditto.model.messages.MessageDirection;
-import org.eclipse.ditto.model.things.ThingId;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.protocol.HeaderTranslator;
@@ -56,34 +56,34 @@
 import org.eclipse.ditto.signals.acks.base.Acknowledgement;
 import org.eclipse.ditto.signals.base.Signal;
 import org.eclipse.ditto.signals.commands.base.ErrorResponse;
-import org.eclipse.ditto.signals.events.things.AttributeCreated;
-import org.eclipse.ditto.signals.events.things.AttributeDeleted;
-import org.eclipse.ditto.signals.events.things.AttributeModified;
-import org.eclipse.ditto.signals.events.things.AttributesCreated;
-import org.eclipse.ditto.signals.events.things.AttributesDeleted;
-import org.eclipse.ditto.signals.events.things.AttributesModified;
-import org.eclipse.ditto.signals.events.things.FeatureCreated;
-import org.eclipse.ditto.signals.events.things.FeatureDeleted;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesCreated;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesDeleted;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertiesModified;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyCreated;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyDeleted;
-import org.eclipse.ditto.signals.events.things.FeatureDesiredPropertyModified;
-import org.eclipse.ditto.signals.events.things.FeatureModified;
-import org.eclipse.ditto.signals.events.things.FeaturePropertiesCreated;
-import org.eclipse.ditto.signals.events.things.FeaturePropertiesDeleted;
-import org.eclipse.ditto.signals.events.things.FeaturePropertiesModified;
-import org.eclipse.ditto.signals.events.things.FeaturePropertyCreated;
-import org.eclipse.ditto.signals.events.things.FeaturePropertyDeleted;
-import org.eclipse.ditto.signals.events.things.FeaturePropertyModified;
-import org.eclipse.ditto.signals.events.things.FeaturesCreated;
-import org.eclipse.ditto.signals.events.things.FeaturesDeleted;
-import org.eclipse.ditto.signals.events.things.FeaturesModified;
-import org.eclipse.ditto.signals.events.things.ThingCreated;
-import org.eclipse.ditto.signals.events.things.ThingDeleted;
-import org.eclipse.ditto.signals.events.things.ThingMerged;
-import org.eclipse.ditto.signals.events.things.ThingModified;
+import org.eclipse.ditto.things.model.signals.events.AttributeCreated;
+import org.eclipse.ditto.things.model.signals.events.AttributeDeleted;
+import org.eclipse.ditto.things.model.signals.events.AttributeModified;
+import org.eclipse.ditto.things.model.signals.events.AttributesCreated;
+import org.eclipse.ditto.things.model.signals.events.AttributesDeleted;
+import org.eclipse.ditto.things.model.signals.events.AttributesModified;
+import org.eclipse.ditto.things.model.signals.events.FeatureCreated;
+import org.eclipse.ditto.things.model.signals.events.FeatureDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertiesCreated;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertiesDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertiesModified;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertyCreated;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertyDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertyModified;
+import org.eclipse.ditto.things.model.signals.events.FeatureModified;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertiesCreated;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertiesDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertiesModified;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertyCreated;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertyDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeaturePropertyModified;
+import org.eclipse.ditto.things.model.signals.events.FeaturesCreated;
+import org.eclipse.ditto.things.model.signals.events.FeaturesDeleted;
+import org.eclipse.ditto.things.model.signals.events.FeaturesModified;
+import org.eclipse.ditto.things.model.signals.events.ThingCreated;
+import org.eclipse.ditto.things.model.signals.events.ThingDeleted;
+import org.eclipse.ditto.things.model.signals.events.ThingMerged;
+import org.eclipse.ditto.things.model.signals.events.ThingModified;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/java/src/main/java/org/eclipse/ditto/client/internal/HandlerRegistry.java b/java/src/main/java/org/eclipse/ditto/client/internal/HandlerRegistry.java
@@ -29,7 +29,7 @@
 import org.eclipse.ditto.client.management.FeatureHandle;
 import org.eclipse.ditto.client.management.ThingHandle;
 import org.eclipse.ditto.client.registration.DuplicateRegistrationIdException;
-import org.eclipse.ditto.model.things.ThingId;
+import org.eclipse.ditto.things.model.ThingId;
 
 /**
  * Manages handlers on an {@link PointerBus}. Allows registration and deregistration of consumers based on a {@code