Rename yangtools.concepts.Variant to Either

[yangtools.git] / yang / yang-common / src / main / java / org / opendaylight / yangtools / yang / common / AbstractCanonicalValueValidator.java

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/AbstractCanonicalValueValidator.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/AbstractCanonicalValueValidator.java
index 2d6c247dd07f0542fbfd61600ca8a67a1348bb96..ab3859713b17a024cf5d864a5b95aa9eeb1dd074 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/AbstractCanonicalValueValidator.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/AbstractCanonicalValueValidator.java
@@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.yangtools.concepts.Variant;
+import org.opendaylight.yangtools.concepts.Either;
 
 /**
  * Abstract base class for implementing validators.
@@ -52,16 +52,16 @@ public abstract class AbstractCanonicalValueValidator<T extends DerivedString<T>
     }
 
     @Override
-    public final Variant<T, CanonicalValueViolation> validateRepresentation(final T value) {
+    public final Either<T, CanonicalValueViolation> validateRepresentation(final T value) {
         return validatedClass.isAssignableFrom(value.validator().getValidatedRepresentationClass())
-                ? Variant.ofFirst(validatedClass.cast(value)) : validate(value);
+                ? Either.ofFirst(validatedClass.cast(value)) : validate(value);
     }
 
     @Override
-    public final Variant<T, CanonicalValueViolation> validateRepresentation(final T value,
+    public final Either<T, CanonicalValueViolation> validateRepresentation(final T value,
             final String canonicalString) {
         return validatedClass.isAssignableFrom(value.validator().getValidatedRepresentationClass())
-                ? Variant.ofFirst(validatedClass.cast(value)) : validate(value, requireNonNull(canonicalString));
+                ? Either.ofFirst(validatedClass.cast(value)) : validate(value, requireNonNull(canonicalString));
     }
 
     /**
@@ -72,7 +72,7 @@ public abstract class AbstractCanonicalValueValidator<T extends DerivedString<T>
      * @return Validated representation or CanonicalValueViolation
      * @throws NullPointerException if {@code value} is null
      */
-    protected Variant<T, CanonicalValueViolation> validate(final T value) {
+    protected Either<T, CanonicalValueViolation> validate(final T value) {
         return validate(value, value.toCanonicalString());
     }
 
@@ -85,5 +85,5 @@ public abstract class AbstractCanonicalValueValidator<T extends DerivedString<T>
      * @return Validated representation
      * @throws NullPointerException if {@code value} or {@code canonicalString} is null.
      */
-    protected abstract Variant<T, CanonicalValueViolation> validate(T value, String canonicalString);
+    protected abstract Either<T, CanonicalValueViolation> validate(T value, String canonicalString);
 }