From 954e76aff55b195f00112b46b42596a36c14c782 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 23 Oct 2018 16:32:58 +0200 Subject: [PATCH] Migrate yang.model.api.type to JDT annotations This is trivial use of arguments, migrate all interfaces and internal utility methods to JDT annotations. Change-Id: Ic95d7051aa19b4f88d994da5c9586b7fa3a75ef7 Signed-off-by: Robert Varga --- .../model/api/type/BinaryTypeDefinition.java | 8 +++--- .../model/api/type/BitsTypeDefinition.java | 7 +++--- .../model/api/type/BooleanTypeDefinition.java | 8 +++--- .../model/api/type/EmptyTypeDefinition.java | 8 +++--- .../model/api/type/EnumTypeDefinition.java | 7 +++--- .../api/type/IdentityrefTypeDefinition.java | 11 ++++---- .../InstanceIdentifierTypeDefinition.java | 8 +++--- .../model/api/type/Int16TypeDefinition.java | 9 ++++--- .../model/api/type/Int32TypeDefinition.java | 9 ++++--- .../model/api/type/Int64TypeDefinition.java | 9 ++++--- .../model/api/type/Int8TypeDefinition.java | 9 ++++--- .../model/api/type/LeafrefTypeDefinition.java | 8 +++--- .../model/api/type/StringTypeDefinition.java | 13 +++++----- .../yang/model/api/type/TypeDefinitions.java | 25 ++++++++++--------- .../model/api/type/Uint16TypeDefinition.java | 9 ++++--- .../model/api/type/Uint32TypeDefinition.java | 9 ++++--- .../model/api/type/Uint64TypeDefinition.java | 8 +++--- .../model/api/type/Uint8TypeDefinition.java | 9 ++++--- .../model/util/type/BaseIdentityrefType.java | 3 ++- .../model/util/type/RestrictedStringType.java | 3 ++- 20 files changed, 110 insertions(+), 70 deletions(-) diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java index dfaa0a71fc..da7f4ad250 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java @@ -8,6 +8,8 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.Objects; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; /** * The binary built-in type represents any binary data, i.e., a sequence of @@ -26,16 +28,16 @@ import java.util.Objects; */ public interface BinaryTypeDefinition extends LengthRestrictedTypeDefinition { - static String toString(final BinaryTypeDefinition type) { + static String toString(final @NonNull BinaryTypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("length", type.getLengthConstraint().orElse(null)).toString(); } - static int hashCode(final BinaryTypeDefinition type) { + static int hashCode(final @NonNull BinaryTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getLengthConstraint().orElse(null)); } - static boolean equals(final BinaryTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull BinaryTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java index c3a7730c77..89e8eb95dc 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.List; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -25,12 +26,12 @@ public interface BitsTypeDefinition extends TypeDefinition { */ @NonNull List getBits(); - static int hashCode(final BitsTypeDefinition type) { + static int hashCode(final @NonNull BitsTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getBits()); } - static boolean equals(final BitsTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull BitsTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -39,7 +40,7 @@ public interface BitsTypeDefinition extends TypeDefinition { return other != null && type.getBits().equals(other.getBits()); } - static String toString(final BitsTypeDefinition type) { + static String toString(final @NonNull BitsTypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("bits", type.getBits()).toString(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java index 717da88288..7b186895ca 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java @@ -7,6 +7,8 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; /** @@ -15,11 +17,11 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; */ public interface BooleanTypeDefinition extends TypeDefinition { - static int hashCode(final BooleanTypeDefinition type) { + static int hashCode(final @NonNull BooleanTypeDefinition type) { return TypeDefinitions.basicHashCode(type); } - static boolean equals(final BooleanTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull BooleanTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -27,7 +29,7 @@ public interface BooleanTypeDefinition extends TypeDefinition { - static int hashCode(final EmptyTypeDefinition type) { + static int hashCode(final @NonNull EmptyTypeDefinition type) { return TypeDefinitions.basicHashCode(type); } - static boolean equals(final EmptyTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull EmptyTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -23,7 +25,7 @@ public interface EmptyTypeDefinition extends TypeDefinition return TypeDefinitions.castIfEquals(EmptyTypeDefinition.class, type, obj) != null; } - static String toString(final EmptyTypeDefinition type) { + static String toString(final @NonNull EmptyTypeDefinition type) { return TypeDefinitions.toStringHelper(type).toString(); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java index f4e8a1d6b6..d07c03090e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.List; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -46,7 +47,7 @@ public interface EnumTypeDefinition extends TypeDefinition { */ @NonNull List getValues(); - static boolean equals(final EnumTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull EnumTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -55,13 +56,13 @@ public interface EnumTypeDefinition extends TypeDefinition { return other != null && type.getValues().equals(other.getValues()); } - static int hashCode(final EnumTypeDefinition type) { + static int hashCode(final @NonNull EnumTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue(), type.getValues()); } - static String toString(final EnumTypeDefinition type) { + static String toString(final @NonNull EnumTypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("values", type.getValues()).toString(); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java index 238854bbcf..643030f858 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java @@ -9,7 +9,8 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.Objects; import java.util.Set; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -23,14 +24,14 @@ public interface IdentityrefTypeDefinition extends TypeDefinition getIdentities(); + @NonNull Set getIdentities(); - static int hashCode(final IdentityrefTypeDefinition type) { + static int hashCode(final @NonNull IdentityrefTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getIdentities()); } - static boolean equals(final IdentityrefTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull IdentityrefTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -40,7 +41,7 @@ public interface IdentityrefTypeDefinition extends TypeDefinitioninstance-identifier YANG built-in type. */ public interface InstanceIdentifierTypeDefinition extends RequireInstanceRestrictedTypeDefinition { - static int hashCode(final InstanceIdentifierTypeDefinition type) { + static int hashCode(final @NonNull InstanceIdentifierTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.requireInstance()); } - static boolean equals(final InstanceIdentifierTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull InstanceIdentifierTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -29,7 +31,7 @@ public interface InstanceIdentifierTypeDefinition return other != null && type.requireInstance() == other.requireInstance(); } - static String toString(final InstanceIdentifierTypeDefinition type) { + static String toString(final @NonNull InstanceIdentifierTypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("requireInstance", type.requireInstance()).toString(); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java index a7f52d30bd..d8856e3473 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from int16 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Int16TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Int16TypeDefinition type) { + static int hashCode(final @NonNull Int16TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Int16TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Int16TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Int16TypeDefinition.class, type, obj); } - static String toString(final Int16TypeDefinition type) { + static String toString(final @NonNull Int16TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java index 5d9a192b2a..e4874433df 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from int32 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Int32TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Int32TypeDefinition type) { + static int hashCode(final @NonNull Int32TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Int32TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Int32TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Int32TypeDefinition.class, type, obj); } - static String toString(final Int32TypeDefinition type) { + static String toString(final @NonNull Int32TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java index 5fb460ca5a..d27267f38a 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from int64 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Int64TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Int64TypeDefinition type) { + static int hashCode(final @NonNull Int64TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Int64TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Int64TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Int64TypeDefinition.class, type, obj); } - static String toString(final Int64TypeDefinition type) { + static String toString(final @NonNull Int64TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java index 3747accfd0..d5f94d7000 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from int8 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Int8TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Int8TypeDefinition type) { + static int hashCode(final @NonNull Int8TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Int8TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Int8TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Int8TypeDefinition.class, type, obj); } - static String toString(final Int8TypeDefinition type) { + static String toString(final @NonNull Int8TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java index 80d7f40edf..e71f607742 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java @@ -8,6 +8,8 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.Objects; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; public interface LeafrefTypeDefinition extends RequireInstanceRestrictedTypeDefinition { @@ -24,12 +26,12 @@ public interface LeafrefTypeDefinition extends RequireInstanceRestrictedTypeDefi @Override boolean requireInstance(); - static int hashCode(final LeafrefTypeDefinition type) { + static int hashCode(final @NonNull LeafrefTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getPathStatement()); } - static boolean equals(final LeafrefTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull LeafrefTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -38,7 +40,7 @@ public interface LeafrefTypeDefinition extends RequireInstanceRestrictedTypeDefi return other != null && type.getPathStatement().equals(other.getPathStatement()); } - static String toString(final LeafrefTypeDefinition type) { + static String toString(final @NonNull LeafrefTypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("pathStatement", type.getPathStatement()).toString(); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java index 12bb0e0194..f4bbffa909 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java @@ -9,6 +9,8 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.util.List; import java.util.Objects; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; /** * Contains method for getting data from the string YANG built-in type. @@ -17,19 +19,18 @@ public interface StringTypeDefinition extends LengthRestrictedTypeDefinitionpattern substatement of the type + * @return list of pattern constraints which are specified in the {@code pattern} substatement of the {@code type} * statement */ - List getPatternConstraints(); + @NonNull List getPatternConstraints(); - static int hashCode(final StringTypeDefinition type) { + static int hashCode(final @NonNull StringTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getLengthConstraint().orElse(null), type.getPatternConstraints()); } - static boolean equals(final StringTypeDefinition type, final Object obj) { + static boolean equals(final @NonNull StringTypeDefinition type, final @Nullable Object obj) { if (type == obj) { return true; } @@ -39,7 +40,7 @@ public interface StringTypeDefinition extends LengthRestrictedTypeDefinition type) { + static int basicHashCode(final @NonNull TypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null)); } - static int hashCode(final RangeRestrictedTypeDefinition type) { + static int hashCode(final @NonNull RangeRestrictedTypeDefinition type) { return Objects.hash(type.getPath(), type.getUnknownSchemaNodes(), type.getBaseType(), type.getUnits().orElse(null), type.getDefaultValue().orElse(null), type.getRangeConstraint().orElse(null)); } - static > boolean equals(final Class clazz, - final T type, final Object obj) { + static > boolean equals(final @NonNull Class clazz, + final @NonNull T type, final @Nullable Object obj) { if (type == obj) { return true; } - final T other = castIfEquals(clazz, type, obj); + final @Nullable T other = castIfEquals(clazz, type, obj); return other != null && type.getRangeConstraint().equals(other.getRangeConstraint()); } - static String toString(final RangeRestrictedTypeDefinition type) { + static @NonNull String toString(final @NonNull RangeRestrictedTypeDefinition type) { return toStringHelper(type).toString(); } - @Nullable - static > T castIfEquals(final Class clazz, final T type, final Object obj) { + static > @Nullable T castIfEquals(final @NonNull Class clazz, final @NonNull T type, + final @Nullable Object obj) { if (!clazz.isInstance(obj)) { return null; } - final T other = clazz.cast(obj); + final @NonNull T other = clazz.cast(obj); return Objects.equals(type.getPath(), other.getPath()) && Objects.equals(type.getBaseType(), other.getBaseType()) && Objects.equals(type.getDefaultValue(), other.getDefaultValue()) @@ -56,7 +57,7 @@ final class TypeDefinitions { && Objects.equals(type.getUnits(), other.getUnits()) ? other : null; } - static ToStringHelper toStringHelper(final TypeDefinition type) { + static @NonNull ToStringHelper toStringHelper(final @NonNull TypeDefinition type) { return MoreObjects.toStringHelper(type).omitNullValues() .add("path", type.getPath()) .add("baseType", type.getBaseType()) @@ -67,7 +68,7 @@ final class TypeDefinitions { .add("units", type.getUnits().orElse(null)); } - static ToStringHelper toStringHelper(final RangeRestrictedTypeDefinition type) { + static @NonNull ToStringHelper toStringHelper(final @NonNull RangeRestrictedTypeDefinition type) { return toStringHelper((TypeDefinition) type).add("range", type.getRangeConstraint().orElse(null)); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java index 65ebfce86e..2617f96f3d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from uint16 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Uint16TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Uint16TypeDefinition type) { + static int hashCode(final @NonNull Uint16TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Uint16TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Uint16TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Uint16TypeDefinition.class, type, obj); } - static String toString(final Uint16TypeDefinition type) { + static String toString(final @NonNull Uint16TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java index 398fb29a97..272ab98283 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from uint32 type. * @@ -14,15 +17,15 @@ package org.opendaylight.yangtools.yang.model.api.type; */ public interface Uint32TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Uint32TypeDefinition type) { + static int hashCode(final @NonNull Uint32TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Uint32TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Uint32TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Uint32TypeDefinition.class, type, obj); } - static String toString(final Uint32TypeDefinition type) { + static String toString(final @NonNull Uint32TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java index 1027f11db2..5e78c0c749 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java @@ -8,6 +8,8 @@ package org.opendaylight.yangtools.yang.model.api.type; import java.math.BigInteger; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; /** * Type definition derived from uint64 type. @@ -16,15 +18,15 @@ import java.math.BigInteger; */ public interface Uint64TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Uint64TypeDefinition type) { + static int hashCode(final @NonNull Uint64TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Uint64TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Uint64TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Uint64TypeDefinition.class, type, obj); } - static String toString(final Uint64TypeDefinition type) { + static String toString(final @NonNull Uint64TypeDefinition type) { return TypeDefinitions.toString(type); } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java index 5c3d867737..0fcd6fd620 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.type; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * Type definition derived from uint8 type. * @@ -15,15 +18,15 @@ package org.opendaylight.yangtools.yang.model.api.type; public interface Uint8TypeDefinition extends RangeRestrictedTypeDefinition { - static int hashCode(final Uint8TypeDefinition type) { + static int hashCode(final @NonNull Uint8TypeDefinition type) { return TypeDefinitions.hashCode(type); } - static boolean equals(final Uint8TypeDefinition type, final Object obj) { + static boolean equals(final @NonNull Uint8TypeDefinition type, final @Nullable Object obj) { return TypeDefinitions.equals(Uint8TypeDefinition.class, type, obj); } - static String toString(final Uint8TypeDefinition type) { + static String toString(final @NonNull Uint8TypeDefinition type) { return TypeDefinitions.toStringHelper(type).add("range", type.getRangeConstraint().orElse(null)).toString(); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java index 7c547560df..a7467275a2 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java @@ -11,6 +11,7 @@ import static java.util.Objects.requireNonNull; import java.util.List; import java.util.Set; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -18,7 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class BaseIdentityrefType extends AbstractBaseType implements IdentityrefTypeDefinition { - private final Set identities; + private final @NonNull Set identities; BaseIdentityrefType(final SchemaPath path, final List unknownSchemaNodes, final Set identities) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java index 6e9f3d7d95..6036ca285a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -19,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; final class RestrictedStringType extends AbstractLengthRestrictedType implements StringTypeDefinition { - private final List patternConstraints; + private final @NonNull List patternConstraints; RestrictedStringType(final StringTypeDefinition baseType, final SchemaPath path, final Collection unknownSchemaNodes, -- 2.36.6