X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fyang-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fcommon%2FQName.java;h=d836d9287d8ad86d814deafe13e0de13e44d9aef;hb=a6a3d1e07ba12cc69b7fc5651abeb7eca5fb5c5e;hp=60072a1b5955967a49c2106e38eea812802ca7e1;hpb=650caaea10614de461155de677540936edba23b1;p=yangtools.git diff --git a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index 60072a1b59..d836d9287d 100644 --- a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -223,8 +223,8 @@ public final class QName extends AbstractQName implements Comparable { * @throws IOException if I/O error occurs */ public static @NonNull QName readFrom(final DataInput in) throws IOException { - if (in instanceof QNameAwareDataInput) { - return ((QNameAwareDataInput) in).readQName(); + if (in instanceof QNameAwareDataInput aware) { + return aware.readQName(); } final QNameModule module = QNameModule.readFrom(in); @@ -306,14 +306,8 @@ public final class QName extends AbstractQName implements Comparable { */ @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof QName)) { - return false; - } - final QName other = (QName) obj; - return Objects.equals(getLocalName(), other.getLocalName()) && module.equals(other.module); + return this == obj || obj instanceof QName other && getLocalName().equals(other.getLocalName()) + && module.equals(other.module); } @Override @@ -380,8 +374,8 @@ public final class QName extends AbstractQName implements Comparable { @Override public void writeTo(final DataOutput out) throws IOException { - if (out instanceof QNameAwareDataOutput) { - ((QNameAwareDataOutput) out).writeQName(this); + if (out instanceof QNameAwareDataOutput aware) { + aware.writeQName(this); } else { module.writeTo(out); out.writeUTF(getLocalName());