#288 make some classes package-private to be available in tests

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
eclipse-ditto · Feb 2, 2021 · df6a34b · df6a34b
1 parent 514e519
commit df6a34b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...nds/things/src/main/java/org/eclipse/ditto/signals/commands/things/modify/MergeThing.java b/...nds/things/src/main/java/org/eclipse/ditto/signals/commands/things/modify/MergeThing.java
@@ -488,7 +488,7 @@ public JsonValue getValue() {
      * An enumeration of the JSON fields of a {@code MergeThing} command.
      */
     @Immutable
-    private static final class JsonFields {
+    static final class JsonFields {
 
         static final JsonFieldDefinition<String> JSON_PATH =
                 JsonFactory.newStringFieldDefinition("path", FieldType.REGULAR, JsonSchemaVersion.V_2);

diff --git a/...rc/test/java/org/eclipse/ditto/signals/commands/things/modify/MergeThingResponseTest.java b/...rc/test/java/org/eclipse/ditto/signals/commands/things/modify/MergeThingResponseTest.java
@@ -15,7 +15,6 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.eclipse.ditto.signals.commands.things.TestConstants.Thing.ABSOLUTE_LOCATION_ATTRIBUTE_POINTER;
-import static org.eclipse.ditto.signals.commands.things.TestConstants.Thing.LOCATION_ATTRIBUTE_VALUE;
 import static org.eclipse.ditto.signals.commands.things.TestConstants.Thing.THING_ID;
 import static org.eclipse.ditto.signals.commands.things.assertions.ThingCommandAssertions.assertThat;
 import static org.mutabilitydetector.unittesting.AllowedReason.provided;
@@ -29,7 +28,7 @@
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.json.assertions.DittoJsonAssertions;
-import org.eclipse.ditto.model.base.common.HttpStatusCode;
+import org.eclipse.ditto.model.base.common.HttpStatus;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
 import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
 import org.eclipse.ditto.model.things.ThingId;
@@ -49,7 +48,7 @@ public class MergeThingResponseTest {
     private static final JsonObject KNOWN_JSON = JsonFactory.newObjectBuilder()
             .set(ThingCommandResponse.JsonFields.TYPE, MergeThingResponse.TYPE)
             .set(ThingCommandResponse.JsonFields.JSON_THING_ID, THING_ID.toString())
-            .set(ThingCommandResponse.JsonFields.STATUS, HttpStatusCode.NO_CONTENT.toInt())
+            .set(ThingCommandResponse.JsonFields.STATUS, HttpStatus.NO_CONTENT.getCode())
             .set(MergeThing.JsonFields.JSON_PATH, ABSOLUTE_LOCATION_ATTRIBUTE_POINTER.toString())
             .build();
 

diff --git a/signals/events/things/src/main/java/org/eclipse/ditto/signals/events/things/ThingMerged.java b/signals/events/things/src/main/java/org/eclipse/ditto/signals/events/things/ThingMerged.java
@@ -194,7 +194,7 @@ public String toString() {
     /**
      * An enumeration of the JSON fields of a {@code ThingMerged} event.
      */
-    private static final class JsonFields {
+    static final class JsonFields {
 
         static final JsonFieldDefinition<String> JSON_PATH =
                 JsonFactory.newStringFieldDefinition("path", FieldType.REGULAR, JsonSchemaVersion.V_2);