copied TestConstants from org.eclipse.ditto.things.model.signals.commands.TestConstants to client's "live" testcode

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>

Author: thjaeckle

java/pom.xml

@@ -190,7 +190,7 @@
         <revision>0-SNAPSHOT</revision>
 
         <!-- ### Compile dependencies versions -->
-        <ditto.version>${revision}</ditto.version>
+        <ditto.version>2.0.0</ditto.version>
         <minimal-json.version>0.9.5</minimal-json.version>
         <nv-websocket-client.version>2.12</nv-websocket-client.version>
         <classindex.version>3.8</classindex.version>
@@ -318,7 +318,6 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.2.0</version>
                     <configuration>
-                        <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
                         <detectJavaApiLink>false</detectJavaApiLink>
                     </configuration>
                 </plugin>

java/src/test/java/org/eclipse/ditto/client/live/TestConstants.java

@@ -16,16 +16,16 @@
 
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
 import org.eclipse.ditto.base.model.signals.commands.assertions.CommandAssertions;
 import org.eclipse.ditto.base.model.signals.commands.assertions.CommandResponseAssert;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThingResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommandResponse;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThingsResponse;
 import org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommandResponse;
-import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.things.model.signals.events.ThingModifiedEvent;
 import org.eclipse.ditto.things.model.signals.events.assertions.ThingEventAssertions;
 import org.eclipse.ditto.things.model.signals.events.assertions.ThingModifiedEventAssert;

java/src/test/java/org/eclipse/ditto/client/live/commands/assertions/LiveCommandAnswerAssert.java

@@ -12,8 +12,8 @@
  */
 package org.eclipse.ditto.client.live.commands.assertions;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommand;
 import org.eclipse.ditto.base.model.signals.commands.assertions.AbstractCommandAssert;
+import org.eclipse.ditto.client.live.commands.base.LiveCommand;
 
 /**
  * An Assert for {@link org.eclipse.ditto.client.live.commands.base.LiveCommand}s.

java/src/test/java/org/eclipse/ditto/client/live/commands/assertions/LiveCommandAssert.java

@@ -12,9 +12,9 @@
  */
 package org.eclipse.ditto.client.live.commands.assertions;
 
+import org.eclipse.ditto.base.model.signals.commands.assertions.CommandAssertions;
 import org.eclipse.ditto.client.live.commands.base.LiveCommand;
 import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
-import org.eclipse.ditto.base.model.signals.commands.assertions.CommandAssertions;
 
 /**
  * Custom test assertions for {@link org.eclipse.ditto.client.live.commands.base.LiveCommand}s.

java/src/test/java/org/eclipse/ditto/client/live/commands/assertions/LiveCommandAssertions.java

@@ -22,6 +22,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.client.live.commands.LiveCommandFactory;
 import org.eclipse.ditto.client.live.commands.base.LiveCommand;
 import org.eclipse.ditto.client.live.commands.modify.CreateThingLiveCommand;
@@ -48,10 +51,7 @@
 import org.eclipse.ditto.client.live.commands.query.RetrieveFeaturesLiveCommand;
 import org.eclipse.ditto.client.live.commands.query.RetrieveThingLiveCommand;
 import org.eclipse.ditto.client.live.commands.query.RetrieveThingsLiveCommand;
-import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteAttribute;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteAttributes;

java/src/test/java/org/eclipse/ditto/client/live/commands/assertions/LiveCommandFactoryTest.java

@@ -18,8 +18,8 @@
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
-import org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse;
 import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.junit.Test;
 import org.mockito.Mockito;

java/src/test/java/org/eclipse/ditto/client/live/commands/base/ImmutableLiveCommandAnswerTest.java

@@ -15,9 +15,9 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
-import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
 import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;

java/src/test/java/org/eclipse/ditto/client/live/commands/base/LiveCommandAnswerFactoryTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingConflictException;
 import org.junit.Before;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/CreateThingLiveCommandAnswerBuilderImplTest.java

@@ -21,9 +21,9 @@
 import java.text.MessageFormat;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/CreateThingLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributeNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributeNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteAttributeLiveCommandAnswerBuilderImplTest.java

@@ -20,10 +20,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteAttribute;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteAttributeLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributesNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributesNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteAttributesLiveCommandAnswerBuilderImplTest.java

@@ -22,7 +22,7 @@
 import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteAttributes;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteAttributesLiveCommandImplTest.java

@@ -15,10 +15,10 @@
 import static org.assertj.core.api.Assertions.assertThatNullPointerException;
 import static org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions.assertThat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDefinitionNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDefinitionNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDefinitionLiveCommandAnswerBuilderImplTest.java

@@ -20,7 +20,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatureDefinition;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDefinitionLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDesiredPropertiesNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDesiredPropertiesNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDesiredPropertiesLiveCommandAnswerBuilderImplTest.java

@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatureDesiredProperties;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDesiredPropertiesLiveCommandImplTest.java

@@ -16,11 +16,11 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDesiredPropertyNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureDesiredPropertyNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDesiredPropertyLiveCommandAnswerBuilderImplTest.java

@@ -20,10 +20,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatureDesiredProperty;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureDesiredPropertyLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeatureNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureLiveCommandAnswerBuilderImplTest.java

@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeature;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeatureLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturePropertiesNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturePropertiesNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturePropertiesLiveCommandAnswerBuilderImplTest.java

@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatureProperties;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturePropertiesLiveCommandImplTest.java

@@ -16,11 +16,11 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturePropertyNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturePropertyNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturePropertyLiveCommandAnswerBuilderImplTest.java

@@ -20,10 +20,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatureProperty;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturePropertyLiveCommandImplTest.java

@@ -16,11 +16,11 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturesNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.FeaturesNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturesLiveCommandAnswerBuilderImplTest.java

@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteFeatures;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteFeaturesLiveCommandImplTest.java

@@ -17,10 +17,10 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotDeletableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteThingLiveCommandAnswerBuilderImplTest.java

@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteThing;
 import org.junit.Before;
 import org.junit.Test;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/DeleteThingLiveCommandImplTest.java

@@ -16,11 +16,11 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
-import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
+import org.eclipse.ditto.client.live.TestConstants;
+import org.eclipse.ditto.client.live.commands.assertions.LiveCommandAssertions;
+import org.eclipse.ditto.client.live.commands.base.LiveCommandAnswer;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotModifiableException;

java/src/test/java/org/eclipse/ditto/client/live/commands/modify/MergeThingLiveCommandAnswerBuilderImplTest.java

@@ -20,10 +20,10 @@
 
 import java.text.MessageFormat;
 
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.client.live.TestConstants;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.things.model.signals.commands.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
 import org.junit.Before;
 import org.junit.Test;