fix toString() methods of various model classes

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Feb 24, 2022 · a5dee83 · a5dee83
1 parent a081de0
commit a5dee83
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 20 deletions.
diff --git a/...odel/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java b/...odel/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
@@ -18,19 +18,24 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.FieldType;
+import org.eclipse.ditto.base.model.json.JsonParsableCommand;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.FeatureToggle;
+import org.eclipse.ditto.base.model.signals.UnsupportedSchemaVersionException;
+import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
+import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.json.FieldType;
-import org.eclipse.ditto.base.model.json.JsonParsableCommand;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.Attributes;
 import org.eclipse.ditto.things.model.AttributesModelFactory;
@@ -42,10 +47,6 @@
 import org.eclipse.ditto.things.model.ThingDefinition;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
-import org.eclipse.ditto.base.model.signals.FeatureToggle;
-import org.eclipse.ditto.base.model.signals.UnsupportedSchemaVersionException;
-import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
-import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommandSizeValidator;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributePointerInvalidException;
@@ -473,14 +474,25 @@ static final class JsonFields {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
         final MergeThing that = (MergeThing) o;
         return that.canEqual(this) && thingId.equals(that.thingId) && path.equals(that.path) &&
                 value.equals(that.value);
     }
 
+    @Override
+    protected boolean canEqual(@Nullable final Object other) {
+        return other instanceof MergeThing;
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(super.hashCode(), thingId, path, value);

diff --git a/.../main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingResponse.java b/.../main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingResponse.java
@@ -196,6 +196,11 @@ public int hashCode() {
         return Objects.hash(super.hashCode(), thingId, path);
     }
 
+    @Override
+    protected boolean canEqual(@Nullable final Object other) {
+        return other instanceof MergeThingResponse;
+    }
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" +

diff --git a/...ain/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertyCreated.java b/...ain/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertyCreated.java
@@ -247,7 +247,7 @@ protected boolean canEqual(@Nullable final Object other) {
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" + super.toString() + ", featureId=" + featureId
-                + ", desiredPropertyPointer=" + desiredPropertyPointer + ", desiredPropertyValue" + desiredPropertyValue + "]";
+                + ", desiredPropertyPointer=" + desiredPropertyPointer + ", desiredPropertyValue=" + desiredPropertyValue + "]";
     }
 
 }
diff --git a/...in/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertyModified.java b/...in/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertyModified.java
@@ -249,7 +249,7 @@ protected boolean canEqual(@Nullable final Object other) {
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" + super.toString() + ", featureId=" + featureId
-                + ", desiredPropertyPointer=" + desiredPropertyPointer + ", desiredPropertyValue" +
+                + ", desiredPropertyPointer=" + desiredPropertyPointer + ", desiredPropertyValue=" +
                 desiredPropertyValue + "]";
     }
 

diff --git a/...l/src/main/java/org/eclipse/ditto/things/model/signals/events/FeaturePropertyCreated.java b/...l/src/main/java/org/eclipse/ditto/things/model/signals/events/FeaturePropertyCreated.java
@@ -247,7 +247,7 @@ protected boolean canEqual(@Nullable final Object other) {
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" + super.toString() + ", featureId=" + featureId
-                + ", propertyPointer=" + propertyPointer + ", propertyValue" + propertyValue + "]";
+                + ", propertyPointer=" + propertyPointer + ", propertyValue=" + propertyValue + "]";
     }
 
 }
diff --git a/.../src/main/java/org/eclipse/ditto/things/model/signals/events/FeaturePropertyModified.java b/.../src/main/java/org/eclipse/ditto/things/model/signals/events/FeaturePropertyModified.java
@@ -247,7 +247,7 @@ protected boolean canEqual(@Nullable final Object other) {
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" + super.toString() + ", featureId=" + featureId
-                + ", propertyPointer=" + propertyPointer + ", propertyValue" + propertyValue + "]";
+                + ", propertyPointer=" + propertyPointer + ", propertyValue=" + propertyValue + "]";
     }
 
 }
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingMerged.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingMerged.java
@@ -168,24 +168,34 @@ private void checkSchemaVersion() {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
         final ThingMerged that = (ThingMerged) o;
         return that.canEqual(this) && thingId.equals(that.thingId) &&
                 path.equals(that.path) &&
                 value.equals(that.value);
     }
 
+    @Override
+    protected boolean canEqual(@Nullable final Object other) {
+        return other instanceof ThingMerged;
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(super.hashCode(), thingId, path, value);
     }
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + " [" +
-                "thingId=" + thingId +
+        return getClass().getSimpleName() + " [" + super.toString() +
                 ", path=" + path +
                 ", value=" + value +
                 "]";