From 29421957bba0f04fdd44d92d5fc8e4a944da357d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 9 Dec 2023 13:37:24 +0100 Subject: [PATCH] Clean up DataTreeIdentifier a bit Use a simple hashCode() implementation and instanceof pattern to simplify equals(). Change-Id: I1312468eb97fad1991366f04970b3c2db27b6ff0 Signed-off-by: Robert Varga (cherry picked from commit ccf116abaf3eb6615f9391344ab692fb9734f2ff) --- .../mdsal/binding/api/DataTreeIdentifier.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/DataTreeIdentifier.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/DataTreeIdentifier.java index b2a92f9103..33cb59fe90 100644 --- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/DataTreeIdentifier.java +++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/DataTreeIdentifier.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.api; import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; -import java.io.Serial; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yangtools.concepts.HierarchicalIdentifier; @@ -22,7 +21,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; * data store type and the instance identifier of the root node. */ public final class DataTreeIdentifier implements HierarchicalIdentifier> { - @Serial + @java.io.Serial private static final long serialVersionUID = 1L; private final @NonNull InstanceIdentifier rootIdentifier; @@ -64,26 +63,13 @@ public final class DataTreeIdentifier implements Hierarchi @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + datastoreType.hashCode(); - result = prime * result + rootIdentifier.hashCode(); - return result; + return datastoreType.hashCode() * 31 + rootIdentifier.hashCode(); } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof DataTreeIdentifier)) { - return false; - } - final DataTreeIdentifier other = (DataTreeIdentifier) obj; - if (datastoreType != other.datastoreType) { - return false; - } - return rootIdentifier.equals(other.rootIdentifier); + return this == obj || obj instanceof DataTreeIdentifier other && datastoreType == other.datastoreType + && rootIdentifier.equals(other.rootIdentifier); } @Override -- 2.36.6