Migrate yang-model-util annotations

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / ConcreteTypes.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java
index 1f43830e590240ab74ed3637a392346d0da106ab..a1fd2cdd1d34d6f6d4f0148fe843612a4c69b05e 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.util.type;
 
 import com.google.common.annotations.Beta;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
@@ -35,13 +35,13 @@ import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
  * Support for creating {@link TypeDefinition} instances defined by leaf and leaf-list statements.
  */
 @Beta
+@NonNullByDefault
 public final class ConcreteTypes {
     private ConcreteTypes() {
         throw new UnsupportedOperationException();
     }
 
-    public static ConcreteTypeBuilder<?> concreteTypeBuilder(@Nonnull final TypeDefinition<?> baseType,
-            @Nonnull final SchemaPath path) {
+    public static ConcreteTypeBuilder<?> concreteTypeBuilder(final TypeDefinition<?> baseType, final SchemaPath path) {
         if (baseType instanceof BinaryTypeDefinition) {
             return concreteBinaryBuilder((BinaryTypeDefinition) baseType, path);
         } else if (baseType instanceof BitsTypeDefinition) {
@@ -86,9 +86,8 @@ public final class ConcreteTypes {
     }
 
     private static ConcreteTypeBuilder<BinaryTypeDefinition> concreteBinaryBuilder(
-            @Nonnull final BinaryTypeDefinition baseType, @Nonnull final SchemaPath path) {
+            final BinaryTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<BinaryTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public BinaryTypeDefinition buildType() {
                 return new DerivedBinaryType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -100,7 +99,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<BitsTypeDefinition> concreteBitsBuilder(final BitsTypeDefinition baseType,
             final SchemaPath path) {
         return new ConcreteTypeBuilder<BitsTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public BitsTypeDefinition buildType() {
                 return new DerivedBitsType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -110,9 +108,8 @@ public final class ConcreteTypes {
     }
 
     private static ConcreteTypeBuilder<BooleanTypeDefinition> concreteBooleanBuilder(
-            @Nonnull final BooleanTypeDefinition baseType, @Nonnull final SchemaPath path) {
+            final BooleanTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<BooleanTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public BooleanTypeDefinition buildType() {
                 return new DerivedBooleanType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -124,7 +121,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<DecimalTypeDefinition> concreteDecimalBuilder(
             final DecimalTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<DecimalTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public DecimalTypeDefinition buildType() {
                 return new DerivedDecimalType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -136,7 +132,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<EmptyTypeDefinition> concreteEmptyBuilder(final EmptyTypeDefinition baseType,
             final SchemaPath path) {
         return new ConcreteTypeBuilder<EmptyTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public EmptyTypeDefinition buildType() {
                 return new DerivedEmptyType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -148,7 +143,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<EnumTypeDefinition> concreteEnumerationBuilder(
             final EnumTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<EnumTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public EnumTypeDefinition buildType() {
                 return new DerivedEnumerationType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -160,7 +154,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<IdentityrefTypeDefinition> concreteIdentityrefBuilder(
             final IdentityrefTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<IdentityrefTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public IdentityrefTypeDefinition buildType() {
                 return new DerivedIdentityrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -172,7 +165,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<InstanceIdentifierTypeDefinition> concreteInstanceIdentifierBuilder(
             final InstanceIdentifierTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<InstanceIdentifierTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public InstanceIdentifierTypeDefinition buildType() {
                 return new DerivedInstanceIdentifierType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -184,7 +176,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Int8TypeDefinition> concreteInt8Builder(
             final Int8TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Int8TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Int8TypeDefinition buildType() {
                 return new DerivedInt8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -196,7 +187,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Int16TypeDefinition> concreteInt16Builder(
             final Int16TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Int16TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Int16TypeDefinition buildType() {
                 return new DerivedInt16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -208,7 +198,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Int32TypeDefinition> concreteInt32Builder(
             final Int32TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Int32TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Int32TypeDefinition buildType() {
                 return new DerivedInt32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -220,7 +209,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Int64TypeDefinition> concreteInt64Builder(
             final Int64TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Int64TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Int64TypeDefinition buildType() {
                 return new DerivedInt64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -232,7 +220,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<LeafrefTypeDefinition> concreteLeafrefBuilder(
             final LeafrefTypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<LeafrefTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public LeafrefTypeDefinition buildType() {
                 return new DerivedLeafrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -244,7 +231,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<StringTypeDefinition> concreteStringBuilder(final StringTypeDefinition baseType,
             final SchemaPath path) {
         return new ConcreteTypeBuilder<StringTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public StringTypeDefinition buildType() {
                 return new DerivedStringType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -256,7 +242,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<UnionTypeDefinition> concreteUnionBuilder(final UnionTypeDefinition baseType,
             final SchemaPath path) {
         return new ConcreteTypeBuilder<UnionTypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public DerivedUnionType buildType() {
                 return new DerivedUnionType(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -268,7 +253,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Uint8TypeDefinition> concreteUint8Builder(
             final Uint8TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Uint8TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Uint8TypeDefinition buildType() {
                 return new DerivedUint8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -280,7 +264,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Uint16TypeDefinition> concreteUint16Builder(
             final Uint16TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Uint16TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Uint16TypeDefinition buildType() {
                 return new DerivedUint16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -292,7 +275,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Uint32TypeDefinition> concreteUint32Builder(
             final Uint32TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Uint32TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Uint32TypeDefinition buildType() {
                 return new DerivedUint32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),
@@ -304,7 +286,6 @@ public final class ConcreteTypes {
     private static ConcreteTypeBuilder<Uint64TypeDefinition> concreteUint64Builder(
             final Uint64TypeDefinition baseType, final SchemaPath path) {
         return new ConcreteTypeBuilder<Uint64TypeDefinition>(baseType, path) {
-            @Nonnull
             @Override
             public Uint64TypeDefinition buildType() {
                 return new DerivedUint64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(),