X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fpersisted%2FAbstractVersionException.java;h=e634a2de7a029270ada915be0915e2f54baeecd9;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hp=997fa45c6b1e0bc01466c47897d2e52ad1780862;hpb=8232a626b43fdd2f5799da0fbcfb0f02d3c8f4fb;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionException.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionException.java index 997fa45c6b..e634a2de7a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionException.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionException.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; +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 PayloadVersion}. @@ -19,12 +20,13 @@ import javax.annotation.Nonnull; @Beta public abstract class AbstractVersionException extends Exception { private static final long serialVersionUID = 1L; - private final PayloadVersion closestVersion; + + private final @NonNull PayloadVersion closestVersion; private final int version; AbstractVersionException(final String message, final short version, final PayloadVersion closestVersion) { super(message); - this.closestVersion = Preconditions.checkNotNull(closestVersion); + this.closestVersion = requireNonNull(closestVersion); this.version = Short.toUnsignedInt(version); } @@ -42,9 +44,7 @@ public abstract class AbstractVersionException extends Exception { * * @return Closest supported {@link PayloadVersion} */ - @Nonnull - public final PayloadVersion getClosestVersion() { + public final @NonNull PayloadVersion getClosestVersion() { return closestVersion; } - }