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%2FAbstractVersionException.java;h=0567ef119110f2841ebf6882edeb2a2a47578bb6;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hp=e416fc63acaf847c2193af1a620bb4f1d89abc0f;hpb=93fd87f9e46446be9eb8538669ebbfade205590e;p=controller.git diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/AbstractVersionException.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/AbstractVersionException.java index e416fc63ac..0567ef1191 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/AbstractVersionException.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/AbstractVersionException.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.access; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; /** * Abstract base exception used for reporting version mismatches from {@link ABIVersion}. @@ -19,12 +20,12 @@ import javax.annotation.Nonnull; @Beta public abstract class AbstractVersionException extends Exception { private static final long serialVersionUID = 1L; - private final ABIVersion closestVersion; + private final @NonNull ABIVersion closestVersion; private final int version; AbstractVersionException(final String message, final short version, final ABIVersion closestVersion) { super(message); - this.closestVersion = Preconditions.checkNotNull(closestVersion); + this.closestVersion = requireNonNull(closestVersion); this.version = Short.toUnsignedInt(version); } @@ -42,8 +43,7 @@ public abstract class AbstractVersionException extends Exception { * * @return Closest supported {@link ABIVersion} */ - @Nonnull - public final ABIVersion getClosestVersion() { + public final @NonNull ABIVersion getClosestVersion() { return closestVersion; }