From 706b37ddd2d46bd82a0b2c114ca4389dc7679568 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.sk>
Date: Sun, 15 Nov 2015 12:47:51 +0100
Subject: [PATCH] BUG-865: mark yang-model-util types as deprecated

Having these classes out in the open creates confusion in users.
Deprecate them in favor of util.type.{Base,Derived,Restricted}Types(),
which do not leak implementation details.

Change-Id: Ib690a43d7e956e5ed0cac13a6276cb03fd049843
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
---
 .../opendaylight/yangtools/yang/model/util/BaseTypes.java    | 3 +++
 .../opendaylight/yangtools/yang/model/util/BinaryType.java   | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/BitsType.java | 2 ++
 .../opendaylight/yangtools/yang/model/util/BooleanType.java  | 3 ++-
 .../opendaylight/yangtools/yang/model/util/Decimal64.java    | 2 ++
 .../opendaylight/yangtools/yang/model/util/DerivedType.java  | 5 ++++-
 .../opendaylight/yangtools/yang/model/util/EmptyType.java    | 5 ++++-
 .../yangtools/yang/model/util/EnumerationType.java           | 2 ++
 .../yangtools/yang/model/util/IdentityrefType.java           | 2 ++
 .../yangtools/yang/model/util/InstanceIdentifierType.java    | 3 ++-
 .../org/opendaylight/yangtools/yang/model/util/Int16.java    | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Int32.java    | 3 ++-
 .../org/opendaylight/yangtools/yang/model/util/Int64.java    | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Int8.java     | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Leafref.java  | 2 ++
 .../opendaylight/yangtools/yang/model/util/StringType.java   | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Uint16.java   | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Uint32.java   | 2 ++
 .../org/opendaylight/yangtools/yang/model/util/Uint64.java   | 3 ++-
 .../org/opendaylight/yangtools/yang/model/util/Uint8.java    | 2 ++
 .../opendaylight/yangtools/yang/model/util/UnionType.java    | 4 ++++
 21 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
index 9e96fcc557..dfc5dfb5c4 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
@@ -115,11 +115,14 @@ public final class BaseTypes {
      * @return Returns default instance or {@link Optional#absent()} if default
      *         instance does not exists
      *
+     * @deprecated Use parser-specific lookup tables.
      */
+    @Deprecated
     public static Optional<TypeDefinition<?>> defaultBaseTypeFor(final String typeName) {
         return Optional.<TypeDefinition<?>> fromNullable(defaultBaseTypeForImpl(typeName));
     }
 
+    @Deprecated
     private static TypeDefinition<?> defaultBaseTypeForImpl(final String typeName) {
         Preconditions.checkNotNull(typeName, "typeName must not be null.");
 
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
index 061a0c6461..c323a1ac24 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
@@ -22,7 +22,9 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
  * The <code>default</code> implementation of Binary Type Definition interface.
  *
  * @see BinaryTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#binaryType()} instead
  */
+@Deprecated
 public final class BinaryType implements BinaryTypeDefinition {
     private static final String DESCRIPTION = "The binary built-in type represents any binary data, i.e., a sequence of octets.";
     private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.8";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
index b277834f07..588e6d04c0 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
@@ -22,7 +22,9 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
  * The <code>default</code> implementation of Bits Type Definition interface.
  *
  * @see BitsTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#bitsTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class BitsType implements BitsTypeDefinition {
     private static final QName NAME = BaseTypes.BITS_QNAME;
     private static final String DESCRIPTION = "The bits built-in type represents a bit set. "
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
index 20ec00cce2..3783da14f9 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
@@ -20,7 +19,9 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
  * The <code>default</code> implementation of Boolean Type Definition interface.
  *
  * @see BooleanTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#booleanType()} instead
  */
+@Deprecated
 public final class BooleanType implements BooleanTypeDefinition {
     private static final BooleanType INSTANCE = new BooleanType();
     private static final SchemaPath PATH = SchemaPath.create(true, BaseTypes.BOOLEAN_QNAME);
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
index ef259fdbdb..26aba5774c 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
@@ -25,7 +25,9 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
  * The <code>default</code> implementation of Decimal Type Definition interface.
  *
  * @see DecimalTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#decimalTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class Decimal64 implements DecimalTypeDefinition {
     private static final String DESCRIPTION = "The decimal64 type represents a subset of the real numbers, which can "
             + "be represented by decimal numerals. The value space of decimal64 is the set of numbers that can "
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java
index 0f9400a6ef..74ff865d17 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java
@@ -35,7 +35,10 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit
  * preserving original implemented interface instead of {@link ExtendedType}
  * which does not preserve final type of data.
  *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.DerivedTypes} or
+ *             {@link org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes} instead
  */
+@Deprecated
 public abstract class DerivedType<T extends TypeDefinition<T>> implements TypeDefinition<T> {
 
     private final ExtendedType definition;
@@ -46,7 +49,7 @@ public abstract class DerivedType<T extends TypeDefinition<T>> implements TypeDe
         this.publicType = Preconditions.checkNotNull(publicType);
     }
 
-    public static TypeDefinition<?> from(TypeDefinition<?> type) {
+    public static TypeDefinition<?> from(final TypeDefinition<?> type) {
         if(type instanceof ExtendedType) {
             return from((ExtendedType) type);
         }
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
index 7efebad4d4..bdd7fb3f93 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
-
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -17,6 +16,10 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 
+/**
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#emptyType()} instead
+ */
+@Deprecated
 public final class EmptyType implements EmptyTypeDefinition, Immutable {
     private static final EmptyType INSTANCE = new EmptyType();
     private static final QName NAME = BaseTypes.EMPTY_QNAME;
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
index 36e589ea11..9d28eb2dff 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
@@ -24,7 +24,9 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
  * interface.
  *
  * @see EnumTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#enumerationTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class EnumerationType implements EnumTypeDefinition {
     private static final String DESCRIPTION = "The enumeration built-in type represents values from a set of assigned names.";
     private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.6";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
index 097e9ecb22..43def3464b 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
@@ -22,7 +22,9 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
  * interface.
  *
  * @see IdentityrefTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#identityrefTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class IdentityrefType implements IdentityrefTypeDefinition {
     private static final QName NAME = BaseTypes.IDENTITYREF_QNAME;
     private static final String DESCRIPTION = "The identityref type is used to reference an existing identity.";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifierType.java
index a0f45d89c8..452c9a7c80 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifierType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifierType.java
@@ -26,8 +26,9 @@ import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefi
  * returns false.
  *
  * @see InstanceIdentifierTypeDefinition
- *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#instanceIdentifierType()} instead
  */
+@Deprecated
 public final class InstanceIdentifierType implements InstanceIdentifierTypeDefinition, Immutable {
 
     private static final QName NAME = BaseTypes.INSTANCE_IDENTIFIER_QNAME;
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
index f88e7984a1..cf975bead3 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
@@ -15,7 +15,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * Java counterpart of Yang int16 built-in type is {@link Short}.
  *
  * @see AbstractSignedInteger
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#int16Type()} instead
  */
+@Deprecated
 public final class Int16 extends AbstractSignedInteger implements Immutable {
     private static final String DESCRIPTION = "int16  represents integer values between -32768 and 32767, inclusively.";
 
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
index d42768bc71..1acb55a4cc 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
@@ -16,8 +16,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * {@link Integer}.
  *
  * @see AbstractSignedInteger
- *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#int32Type()} instead
  */
+@Deprecated
 public final class Int32 extends AbstractSignedInteger implements Immutable {
     private static final String DESCRIPTION = "int32  represents integer values between -2147483648 and 2147483647, inclusively.";
 
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
index ea6830fa13..0e8a11dcfb 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
@@ -15,7 +15,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * 9223372036854775807, inclusively. The Java counterpart of Yang int64 built-in
  * type is {@link Long}.
  *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#int64Type()} instead
  */
+@Deprecated
 public final class Int64 extends AbstractSignedInteger implements Immutable {
     private static final String DESCRIPTION = "int64  represents integer values between -9223372036854775808 and 9223372036854775807, inclusively.";
 
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
index 61d7a46949..d16d7dc5c1 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
@@ -15,7 +15,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * counterpart of Yang int8 built-in type is {@link Byte}.
  *
  * @see AbstractSignedInteger
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#int8Type()} instead
  */
+@Deprecated
 public final class Int8 extends AbstractSignedInteger implements Immutable {
     private static final String DESCRIPTION = "represents integer values between -128 and 127, inclusively.";
 
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
index eab8b22ba8..e2688665bf 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
@@ -23,7 +23,9 @@ import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
  * interface.
  *
  * @see LeafrefTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#leafrefTypeBuilder(SchemaPath)} instead
  */
+@Deprecated
 public final class Leafref implements LeafrefTypeDefinition {
     private static final QName NAME = BaseTypes.constructQName("leafref");
     private static final SchemaPath PATH = SchemaPath.create(true, NAME);
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
index 7477ff0de5..911ed2c37a 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
@@ -24,7 +24,9 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
  * The <code>default</code> implementation of String Type Definition interface.
  *
  * @see StringTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#stringType()} instead
  */
+@Deprecated
 public final class StringType implements StringTypeDefinition, Immutable {
     private static final QName NAME = BaseTypes.STRING_QNAME;
     private static final SchemaPath PATH = SchemaPath.create(true, NAME);
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
index 5c233df5ad..afa95fea2d 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
@@ -14,7 +14,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * uint16 represents integer values between 0 and 65535, inclusively. The Java
  * counterpart of Yang uint16 built-in type is {@link Integer}.
  *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#uint16Type()} instead
  */
+@Deprecated
 public final class Uint16 extends AbstractUnsignedInteger implements Immutable {
     public static final int MAX_VALUE = 65535;
     private static final String DESCRIPTION = "uint16 represents integer values between 0 and 65535, inclusively.";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
index aef0f8fac2..c48c4d42cc 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
@@ -13,7 +13,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * Implementation of Yang uint32 built-in type. <br>
  * uint32 represents integer values between 0 and 4294967295, inclusively.
  *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#uint32Type()} instead
  */
+@Deprecated
 public final class Uint32 extends AbstractUnsignedInteger implements Immutable {
     public static final long MAX_VALUE = 4294967295L;
     private static final String DESCRIPTION = "uint32 represents integer values between 0 and 4294967295, inclusively.";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
index 3ec9d25369..3d872c0200 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.model.util;
 
 import java.math.BigInteger;
-
 import org.opendaylight.yangtools.concepts.Immutable;
 
 /**
@@ -17,7 +16,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * inclusively. The Java counterpart of Yang uint64 built-in type is
  * {@link BigInteger}.
  *
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#uint64Type()} instead
  */
+@Deprecated
 public final class Uint64 extends AbstractUnsignedInteger implements Immutable {
     public static final BigInteger MAX_VALUE = new BigInteger("18446744073709551615");
     private static final String DESCRIPTION = "uint64 represents integer values between 0 and 18446744073709551615, inclusively.";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
index f44ba754a7..4f0aad49d5 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
@@ -14,7 +14,9 @@ import org.opendaylight.yangtools.concepts.Immutable;
  * uint8 represents integer values between 0 and 255, inclusively.
  *
  * @see AbstractUnsignedInteger
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#uint8Type()} instead
  */
+@Deprecated
 public final class Uint8 extends AbstractUnsignedInteger implements Immutable {
     public static final int MAX_VALUE = 255;
     private static final String DESCRIPTION = "uint8  represents integer values between 0 and 255, inclusively.";
diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
index a27fc024ef..64094fc903 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
@@ -18,6 +18,10 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 
+/**
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#unionTypeBuilder(SchemaPath)} instead
+ */
+@Deprecated
 public final class UnionType implements UnionTypeDefinition {
     private static final SchemaPath PATH = SchemaPath.create(true, BaseTypes.UNION_QNAME);
     private static final String DESCRIPTION = "The union built-in type represents a value that corresponds to one of its member types.";
-- 
2.36.6