X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FClientIdentifier.java;h=69e803ef42b7e2e31bbcfe81836d5ba42912ab7e;hb=139f7a412c8d96fa9d03113439d622c30218c7ce;hp=c317ac31b6985710e4e25477656880033d47a2b6;hpb=a2aa9ed45fe099f6d3611fc22338bfcaebd6d084;p=controller.git diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java index c317ac31b6..69e803ef42 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.cluster.access.concepts; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; import java.io.DataInput; import java.io.DataOutput; @@ -17,6 +16,7 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.cds.types.rev191024.ClientGeneration; import org.opendaylight.yangtools.concepts.WritableIdentifier; @@ -29,10 +29,11 @@ import org.opendaylight.yangtools.yang.common.Uint64; * * @author Robert Varga */ -@Beta public final class ClientIdentifier implements WritableIdentifier { private static final class Proxy implements Externalizable { + @Serial private static final long serialVersionUID = 1L; + private FrontendIdentifier frontendId; private long generation; @@ -65,6 +66,7 @@ public final class ClientIdentifier implements WritableIdentifier { } } + @Serial private static final long serialVersionUID = 1L; private final @NonNull FrontendIdentifier frontendId; @@ -110,21 +112,16 @@ public final class ClientIdentifier implements WritableIdentifier { @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof ClientIdentifier)) { - return false; - } - - final ClientIdentifier other = (ClientIdentifier) obj; - return generation == other.generation && frontendId.equals(other.frontendId); + return this == obj || obj instanceof ClientIdentifier other && generation == other.generation + && frontendId.equals(other.frontendId); } @Override public String toString() { - return MoreObjects.toStringHelper(ClientIdentifier.class).add("frontend", frontendId) - .add("generation", Long.toUnsignedString(generation)).toString(); + return MoreObjects.toStringHelper(ClientIdentifier.class) + .add("frontend", frontendId) + .add("generation", Long.toUnsignedString(generation)) + .toString(); } private Object writeReplace() {