From: Martin Vitez Date: Mon, 16 Sep 2013 14:03:18 +0000 (+0200) Subject: Refactored implementation of getBaseType method for yang built-in types. X-Git-Tag: yangtools-0.1.0~23^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9b3f61b5b4ec4ee60eb931a256902bdf3c13968d;p=yangtools.git Refactored implementation of getBaseType method for yang built-in types. Method now returns null instead of reference to itself. Signed-off-by: Martin Vitez --- diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend index 364785dede..8bc95f38a5 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend @@ -1358,7 +1358,7 @@ public class BindingGeneratorImpl implements BindingGenerator { var Type returnType = null; if (typeDef instanceof EnumTypeDefinition) { returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf); - val enumTypeDef = enumTypeDefFromExtendedType(typeDef); + val enumTypeDef = typeDef as EnumTypeDefinition; val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName, typeBuilder); if (enumBuilder !== null) { @@ -1875,7 +1875,7 @@ public class BindingGeneratorImpl implements BindingGenerator { if (typeDef instanceof UnionTypeDefinition) { genTOBuilders.addAll( (typeProvider as TypeProviderImpl). - provideGeneratedTOBuildersForUnionTypeDef(packageName, typeDef, classNameFromLeaf, leaf)); + provideGeneratedTOBuildersForUnionTypeDef(packageName, (typeDef as UnionTypeDefinition), classNameFromLeaf, leaf)); } else if (typeDef instanceof BitsTypeDefinition) { genTOBuilders.add( ((typeProvider as TypeProviderImpl) ). diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java index fe3d6e1236..d39fcff75c 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java @@ -7,13 +7,8 @@ */ package org.opendaylight.yangtools.sal.binding.yang.types; -import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.moduleNamespaceToPackageName; -import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.packageNameForGeneratedType; -import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.parseToClassName; -import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.parseToValidParamName; -import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode; -import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNodeForRelativeXPath; -import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule; +import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*; +import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*; import java.util.ArrayList; import java.util.HashMap; @@ -82,7 +77,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Creates new instance of class TypeProviderImpl. - * + * * @param schemaContext * contains the schema data red from YANG files * @throws IllegalArgumentException @@ -99,7 +94,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Puts refType to map with key refTypePath - * + * * @param refTypePath * schema path used as the map key * @param refType @@ -109,20 +104,19 @@ public final class TypeProviderImpl implements TypeProvider { *
  • if refTypePath equal null
    • *
  • if refType equal null
    • * - * + * */ public void putReferencedType(final SchemaPath refTypePath, final Type refType) { Preconditions.checkArgument(refTypePath != null, "Path reference of Enumeration Type Definition cannot be NULL!"); - Preconditions.checkArgument(refType != null, "Reference to Enumeration Type cannot be NULL!"); referencedTypes.put(refTypePath, refType); } /** - * + * * Converts basic YANG type type to JAVA Type. - * + * * @param type * string with YANG name of type * @returns JAVA Type for YANG type type @@ -137,7 +131,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts schema definition type typeDefinition to JAVA * Type - * + * * @param typeDefinition * type definition which is converted to JAVA type * @throws IllegalArgumentException @@ -180,7 +174,7 @@ public final class TypeProviderImpl implements TypeProvider { * Returns JAVA Type for instances of the type * LeafrefTypeDefinition or * IdentityrefTypeDefinition. - * + * * @param typeDefinition * type definition which is converted to JAVA Type * @return JAVA Type instance for typeDefinition @@ -200,7 +194,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Returns JAVA Type for instances of the type * ExtendedType. - * + * * @param typeDefinition * type definition which is converted to JAVA Type * @return JAVA Type instance for typeDefinition @@ -241,11 +235,11 @@ public final class TypeProviderImpl implements TypeProvider { * Seeks for identity reference idref the JAVA * type.
    *
    - * + * * Example:
    * If identy which is referenced via idref has name Idn * then returning type is {@code Class}     - * + * * @param idref * identityref type definition for which JAVA Type * is sought @@ -275,7 +269,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts typeDefinition to concrete JAVA Type. - * + * * @param typeDefinition * type definition which should be converted to JAVA * Type @@ -320,7 +314,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Gets base type definition for extendTypeDef. The method is * recursivelly called until non ExtendedType type is found. - * + * * @param extendTypeDef * type definition for which is the base type definition sought * @return type definition which is base type for extendTypeDef @@ -340,10 +334,10 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts leafrefType to JAVA Type. - * + * * The path of leafrefType is followed to find referenced node * and its Type is returned. - * + * * @param leafrefType * leafref type definition for which is the type sought * @return JAVA Type of data schema node which is referenced in @@ -353,7 +347,7 @@ public final class TypeProviderImpl implements TypeProvider { *
  • if leafrefType equal null
    • *
  • if path statement of leafrefType equal null
    • * - * + * */ public Type provideTypeForLeafref(final LeafrefTypeDefinition leafrefType, final SchemaNode parentNode) { Type returnType = null; @@ -394,7 +388,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Checks if dataNode is LeafSchemaNode and if it * so then checks if it is of type EnumTypeDefinition. - * + * * @param dataNode * data schema node for which is checked if it is leaf and if it * is of enum type @@ -417,7 +411,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Checks if dataNode is LeafListSchemaNode and if * it so then checks if it is of type EnumTypeDefinition. - * + * * @param dataNode * data schema node for which is checked if it is leaflist and if * it is of enum type @@ -442,7 +436,7 @@ public final class TypeProviderImpl implements TypeProvider { * Converts enumTypeDef to * {@link org.opendaylight.yangtools.sal.binding.model.api.Enumeration * enumeration}. - * + * * @param enumTypeDef * enumeration type definition which is converted to enumeration * @param enumName @@ -479,7 +473,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Adds enumeration to typeBuilder. The enumeration data are * taken from enumTypeDef. - * + * * @param enumTypeDef * enumeration type definition is source of enumeration data for * typeBuilder @@ -497,7 +491,7 @@ public final class TypeProviderImpl implements TypeProvider { *
  • if name of enumTypeDef equal null
    • *
  • if name of typeBuilder equal null
    • * - * + * */ private Enumeration addInnerEnumerationToTypeBuilder(final EnumTypeDefinition enumTypeDef, final String enumName, final GeneratedTypeBuilderBase typeBuilder) { @@ -518,7 +512,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts dataNode to JAVA Type. - * + * * @param dataNode * contains information about YANG type * @return JAVA Type representation of dataNode @@ -540,7 +534,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Passes through all modules and through all its type definitions and * convert it to generated types. - * + * * The modules are firstly sorted by mutual dependencies. The modules are * sequentially passed. All type definitions of a module are at the * beginning sorted so that type definition with less amount of references @@ -549,7 +543,7 @@ public final class TypeProviderImpl implements TypeProvider { * {@link TypeProviderImpl#genTypeDefsContextMap genTypeDefsContextMap} * which map current module name to the map which maps type names to * returned types (generated types). - * + * */ private void resolveTypeDefsFromContext() { final Set modules = schemaContext.getModules(); @@ -583,7 +577,7 @@ public final class TypeProviderImpl implements TypeProvider { } /** - * + * * @param basePackageName * string with name of package to which the module belongs * @param moduleName @@ -611,7 +605,7 @@ public final class TypeProviderImpl implements TypeProvider { returnType = provideGeneratedTOFromExtendedType(innerExtendedType, basePackageName, typedefName); } else if (innerTypeDefinition instanceof UnionTypeDefinition) { final GeneratedTOBuilder genTOBuilder = provideGeneratedTOBuilderForUnionTypeDef(basePackageName, - typedef, typedefName, typedef); + (UnionTypeDefinition) innerTypeDefinition, typedefName, typedef); returnType = genTOBuilder.toInstance(); } else if (innerTypeDefinition instanceof EnumTypeDefinition) { final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) innerTypeDefinition; @@ -643,7 +637,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Wraps base YANG type to generated TO. - * + * * @param basePackageName * string with name of package to which the module belongs * @param typedef @@ -675,7 +669,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts output list of generated TO builders to one TO builder (first * from list) which contains the remaining builders as its enclosing TO. - * + * * @param basePackageName * string with name of package to which the module belongs * @param typedef @@ -687,7 +681,7 @@ public final class TypeProviderImpl implements TypeProvider { * builders */ public GeneratedTOBuilder provideGeneratedTOBuilderForUnionTypeDef(final String basePackageName, - final TypeDefinition typedef, String typeDefName, SchemaNode parentNode) { + final UnionTypeDefinition typedef, String typeDefName, SchemaNode parentNode) { final List genTOBuilders = provideGeneratedTOBuildersForUnionTypeDef(basePackageName, typedef, typeDefName, parentNode); GeneratedTOBuilder resultTOBuilder = null; @@ -705,7 +699,7 @@ public final class TypeProviderImpl implements TypeProvider { * Converts typedef to generated TO with * typeDefName. Every union type from typedef is * added to generated TO builder as property. - * + * * @param basePackageName * string with name of package to which the module belongs * @param typedef @@ -722,7 +716,7 @@ public final class TypeProviderImpl implements TypeProvider { * */ public List provideGeneratedTOBuildersForUnionTypeDef(final String basePackageName, - final TypeDefinition typedef, final String typeDefName, final SchemaNode parentNode) { + final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode) { Preconditions.checkArgument(basePackageName != null, "Base Package Name cannot be NULL!"); Preconditions.checkArgument(typedef != null, "Type Definition cannot be NULL!"); Preconditions.checkArgument(typedef.getQName() != null, @@ -730,10 +724,8 @@ public final class TypeProviderImpl implements TypeProvider { final List generatedTOBuilders = new ArrayList<>(); - final TypeDefinition baseTypeDefinition = typedef.getBaseType(); - if ((baseTypeDefinition != null) && (baseTypeDefinition instanceof UnionTypeDefinition)) { - final UnionTypeDefinition unionTypeDef = (UnionTypeDefinition) baseTypeDefinition; - final List> unionTypes = unionTypeDef.getTypes(); + if (typedef != null) { + final List> unionTypes = typedef.getTypes(); final GeneratedTOBuilder unionGenTOBuilder; if (typeDefName != null && !typeDefName.isEmpty()) { @@ -748,7 +740,7 @@ public final class TypeProviderImpl implements TypeProvider { for (final TypeDefinition unionType : unionTypes) { final String unionTypeName = unionType.getQName().getLocalName(); if (unionType instanceof UnionType) { - generatedTOBuilders.addAll(resolveUnionSubtypeAsUnion(unionGenTOBuilder, unionType, + generatedTOBuilders.addAll(resolveUnionSubtypeAsUnion(unionGenTOBuilder, (UnionType) unionType, basePackageName, parentNode)); } else if (unionType instanceof ExtendedType) { resolveExtendedSubtypeAsUnion(unionGenTOBuilder, (ExtendedType) unionType, unionTypeName, @@ -775,14 +767,14 @@ public final class TypeProviderImpl implements TypeProvider { /** * Wraps code which handle case when union subtype is also of the type * UnionType. - * + * * In this case the new generated TO is created for union subtype (recursive * call of method * {@link #provideGeneratedTOBuilderForUnionTypeDef(String, TypeDefinition, String) * provideGeneratedTOBuilderForUnionTypeDef} and in parent TO builder * parentUnionGenTOBuilder is created property which type is * equal to new generated TO. - * + * * @param parentUnionGenTOBuilder * generated TO builder to which is the property with the child * union subtype added @@ -795,7 +787,7 @@ public final class TypeProviderImpl implements TypeProvider { * provideGeneratedTOBuildersForUnionTypeDef method. */ private List resolveUnionSubtypeAsUnion(final GeneratedTOBuilder parentUnionGenTOBuilder, - final TypeDefinition unionSubtype, final String basePackageName, final SchemaNode parentNode) { + final UnionTypeDefinition unionSubtype, final String basePackageName, final SchemaNode parentNode) { final String newTOBuilderName = provideAvailableNameForGenTOBuilder(parentUnionGenTOBuilder.getName()); final List subUnionGenTOBUilders = provideGeneratedTOBuildersForUnionTypeDef( basePackageName, unionSubtype, newTOBuilderName, parentNode); @@ -813,11 +805,11 @@ public final class TypeProviderImpl implements TypeProvider { /** * Wraps code which handle case when union subtype is of the type * ExtendedType. - * + * * If TO for this type already exists it is used for the creation of the * property in parentUnionGenTOBuilder. In other case the base * type is used for the property creation. - * + * * @param parentUnionGenTOBuilder * generated TO builder in which new property is created * @param unionSubtype @@ -852,7 +844,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Searches for generated TO for searchedTypeDef type * definition in {@link #genTypeDefsContextMap genTypeDefsContextMap} - * + * * @param searchedTypeName * string with name of searchedTypeDef * @return generated TO for searchedTypeDef or @@ -873,7 +865,7 @@ public final class TypeProviderImpl implements TypeProvider { * Stores generated TO created from genTOBuilder for * newTypeDef to {@link #genTypeDefsContextMap * genTypeDefsContextMap} if the module for newTypeDef exists - * + * * @param newTypeDef * type definition for which is genTOBuilder created * @param genTOBuilder @@ -894,7 +886,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Adds a new property with the name propertyName and with type * type to unonGenTransObject. - * + * * @param unionGenTransObject * generated TO to which should be property added * @param type @@ -919,7 +911,7 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts typedef to the generated TO builder. - * + * * @param basePackageName * string with name of package to which the module belongs * @param typedef @@ -944,10 +936,10 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts typeDef which should be of the type * BitsTypeDefinition to GeneratedTOBuilder. - * + * * All the bits of the typeDef are added to returning generated TO as * properties. - * + * * @param basePackageName * string with name of package to which the module belongs * @param typeDef @@ -994,13 +986,13 @@ public final class TypeProviderImpl implements TypeProvider { /** * Converts the pattern constraints from typedef to the list of * the strings which represents these constraints. - * + * * @param typedef * extended type in which are the pattern constraints sought * @return list of strings which represents the constraint patterns * @throws IllegalArgumentException * if typedef equals null - * + * */ private List resolveRegExpressionsFromTypedef(ExtendedType typedef) { final List regExps = new ArrayList(); @@ -1022,10 +1014,10 @@ public final class TypeProviderImpl implements TypeProvider { } /** - * + * * Adds to the genTOBuilder the constant which contains regular * expressions from the regularExpressions - * + * * @param genTOBuilder * generated TO builder to which are * regular expressions added @@ -1055,11 +1047,11 @@ public final class TypeProviderImpl implements TypeProvider { * innerExtendedType, about the package name * typedefName and about the generated TO name * typedefName. - * + * * It is supposed that innerExtendedType is already present in * {@link TypeProviderImpl#genTypeDefsContextMap genTypeDefsContextMap} to * be possible set it as extended type for the returning generated TO. - * + * * @param innerExtendedType * extended type which is part of some other extended type * @param basePackageName @@ -1109,7 +1101,7 @@ public final class TypeProviderImpl implements TypeProvider { * equal depth. In next step are lists from this map concatenated to one * list in ascending order according to their depth. All type definitions * are in the list behind all type definitions on which depends. - * + * * @param unsortedTypeDefinitions * list of type definitions which should be sorted by depth * @return list of type definitions sorted according their each other @@ -1142,14 +1134,16 @@ public final class TypeProviderImpl implements TypeProvider { /** * Returns how many immersion is necessary to get from the type definition * to the base type. - * + * * @param typeDefinition * type definition for which is depth sought. * @return number of immersions which are necessary to get from the type * definition to the base type */ private int getTypeDefinitionDepth(final TypeDefinition typeDefinition) { - Preconditions.checkArgument(typeDefinition != null, "Type definition can't be null"); + if (typeDefinition == null) { + return 1; + } int depth = 1; TypeDefinition baseType = typeDefinition.getBaseType(); @@ -1174,7 +1168,7 @@ public final class TypeProviderImpl implements TypeProvider { * Returns string which contains the same value as name but * integer suffix is incremented by one. If name contains no * number suffix then number 1 is added. - * + * * @param name * string with name of augmented node * @return string with the number suffix incremented by one (or 1 is added) diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java index bf6f6ae5f0..61647ddbfa 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; * interface which represents SIGNED Integer values defined in Yang language.
    * The integer built-in types in Yang are int8, int16, int32, int64. They * represent signed integers of different sizes: - * + * *
      *
    • int8 - represents integer values between -128 and 127, inclusively.
      • *
    • int16 - represents integer values between -32768 and 32767, inclusively.
      • @@ -32,9 +32,9 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; *
    • int64 - represents integer values between -9223372036854775808 and * 9223372036854775807, inclusively.
      • *
    - * + * */ -public abstract class AbstractSignedInteger implements IntegerTypeDefinition { +abstract class AbstractSignedInteger implements IntegerTypeDefinition { private final QName name; private final SchemaPath path; private final String description; @@ -61,6 +61,11 @@ public abstract class AbstractSignedInteger implements IntegerTypeDefinition { "https://tools.ietf.org/html/rfc6020#section-9.2.4")); } + @Override + public IntegerTypeDefinition getBaseType() { + return null; + } + @Override public String getUnits() { return units; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java index 04ee7cecd2..df740b86c1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit * interface which represents UNSIGNED Integer values defined in Yang language.
    * The integer built-in types in Yang are uint8, uint16, uint32, and uint64. * They represent unsigned integers of different sizes: - * + * *
      *
    • uint8 - represents integer values between 0 and 255, inclusively.
      • *
    • uint16 - represents integer values between 0 and 65535, inclusively.
      • @@ -28,9 +28,9 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit *
    • uint64 - represents integer values between 0 and 18446744073709551615, * inclusively.
      • *
    - * + * */ -public abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition { +abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition { private static final long MIN_VALUE = 0; private final QName name; private final SchemaPath path; @@ -40,7 +40,7 @@ public abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefi private final List rangeStatements; /** - * + * * @param name * @param description * @param maxRange @@ -57,6 +57,11 @@ public abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefi "https://tools.ietf.org/html/rfc6020#section-9.2.4")); } + @Override + public UnsignedIntegerTypeDefinition getBaseType() { + return null; + } + @Override public String getUnits() { return units; 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 d7495ada74..fa5c7aa4c5 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 @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; /** * The default implementation of Binary Type Definition interface. - * + * * @see BinaryTypeDefinition */ public final class BinaryType implements BinaryTypeDefinition { @@ -46,18 +46,18 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public BinaryTypeDefinition getBaseType() { - return this; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -67,7 +67,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -79,7 +79,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -89,7 +89,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -99,7 +99,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -110,7 +110,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -120,7 +120,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override @@ -130,7 +130,7 @@ public final class BinaryType implements BinaryTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.base.type.api.BinaryTypeDefinition * #getLengthConstraint () 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 cacfeb305d..c53df1bc6a 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 @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; /** * The default implementation of Bits Type Definition interface. - * + * * @see BitsTypeDefinition */ public final class BitsType implements BitsTypeDefinition { @@ -29,26 +29,24 @@ public final class BitsType implements BitsTypeDefinition { + "numbers starting at 0. Each bit number has an assigned name."; private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.7"; - private final BitsTypeDefinition baseType; private final List bits; private static final String UNITS = ""; /** * Default constructor.
    * Instantiates Bits type as empty bits list. - * + * * @param path */ public BitsType(final SchemaPath path) { super(); this.bits = Collections.emptyList(); this.path = path; - this.baseType = this; } /** * Constructor with explicit definition of bits assigned to BitsType. - * + * * @param path * @param bits */ @@ -56,23 +54,22 @@ public final class BitsType implements BitsTypeDefinition { super(); this.bits = Collections.unmodifiableList(bits); this.path = path; - this.baseType = this; } /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public BitsTypeDefinition getBaseType() { - return baseType; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -82,7 +79,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -94,7 +91,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -104,7 +101,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -114,7 +111,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -125,7 +122,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -135,7 +132,7 @@ public final class BitsType implements BitsTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override 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 9d7aff3366..b4740884fb 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 @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; /** * The default implementation of Boolean Type Definition interface. - * + * * @see BooleanTypeDefinition */ public final class BooleanType implements BooleanTypeDefinition { @@ -41,18 +41,18 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public BooleanTypeDefinition getBaseType() { - return this; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -62,7 +62,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -74,7 +74,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -84,7 +84,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -94,7 +94,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -105,7 +105,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -115,7 +115,7 @@ public final class BooleanType implements BooleanTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override 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 5242e40f2f..666747915f 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 @@ -21,8 +21,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; /** * The default implementation of Decimal Type Definition interface. - * - * + * + * * @see DecimalTypeDefinition */ public final class Decimal64 implements DecimalTypeDefinition { @@ -40,7 +40,6 @@ public final class Decimal64 implements DecimalTypeDefinition { private final List rangeStatements; private final Integer fractionDigits; - private final DecimalTypeDefinition baseType; private static final int MAX_NUMBER_OF_FRACTION_DIGITS = 18; /** @@ -54,11 +53,11 @@ public final class Decimal64 implements DecimalTypeDefinition { * {@link DecimalTypeDefinition}
    * If the fraction digits are not defined inner the definition boundaries * the constructor will throw {@link IllegalArgumentException} - * + * * @param path * @param fractionDigits * integer between 1 and 18 inclusively - * + * * @see DecimalTypeDefinition * @exception IllegalArgumentException */ @@ -70,12 +69,11 @@ public final class Decimal64 implements DecimalTypeDefinition { this.fractionDigits = fractionDigits; rangeStatements = defaultRangeStatements(); this.path = path; - this.baseType = this; } /** * Returns unmodifiable List with default definition of Range Statements. - * + * * @return unmodifiable List with default definition of Range Statements. */ private List defaultRangeStatements() { @@ -90,7 +88,7 @@ public final class Decimal64 implements DecimalTypeDefinition { @Override public DecimalTypeDefinition getBaseType() { - return baseType; + return null; } @Override 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 ee56f760d4..c4f78c621d 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 @@ -35,7 +35,7 @@ public final class EmptyType implements EmptyTypeDefinition { @Override public EmptyTypeDefinition getBaseType() { - return this; + return null; } @Override 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 3ae8eb346d..ea0e9f3fe1 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; /** * The default implementation of Enumertaion Type Definition * interface. - * + * * @see EnumTypeDefinition */ public final class EnumerationType implements EnumTypeDefinition { @@ -31,38 +31,35 @@ public final class EnumerationType implements EnumTypeDefinition { private final EnumPair defaultEnum; private final List enums; private static final String UNITS = ""; - private final EnumTypeDefinition baseType; public EnumerationType(final SchemaPath path, final List enums) { super(); this.path = path; this.enums = Collections.unmodifiableList(enums); this.defaultEnum = null; - this.baseType = this; } public EnumerationType(final SchemaPath path, final EnumPair defaultEnum, final List enums) { super(); this.path = path; - this.baseType = this; this.defaultEnum = defaultEnum; this.enums = Collections.unmodifiableList(enums); } /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public EnumTypeDefinition getBaseType() { - return baseType; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -72,7 +69,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -84,7 +81,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -94,7 +91,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -104,7 +101,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -115,7 +112,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -125,7 +122,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override @@ -135,7 +132,7 @@ public final class EnumerationType implements EnumTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.base.type.api.EnumTypeDefinition * #getValues() 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 1156762cca..d7ba3dc771 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; /** * The default implementation of Identityref Type Definition * interface. - * + * * @see IdentityrefTypeDefinition */ public final class IdentityrefType implements IdentityrefTypeDefinition { @@ -27,14 +27,12 @@ public final class IdentityrefType implements IdentityrefTypeDefinition { private final SchemaPath path; private static final String DESCRIPTION = "The identityref type is used to reference an existing identity."; private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.10"; - private final IdentityrefTypeDefinition baseType; private final QName identity; private static final String UNITS = ""; public IdentityrefType(QName identity, SchemaPath schemaPath) { this.identity = identity; this.path = schemaPath; - this.baseType = this; } @Override @@ -84,7 +82,7 @@ public final class IdentityrefType implements IdentityrefTypeDefinition { @Override public IdentityrefTypeDefinition getBaseType() { - return baseType; + return null; } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java index 4949d4ebee..aae5b8ee1f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefi /** * The default implementation of Instance Identifier Type * Definition interface. - * + * * @see InstanceIdentifierTypeDefinition */ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinition { @@ -48,18 +48,18 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public InstanceIdentifierTypeDefinition getBaseType() { - return this; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -69,7 +69,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -81,7 +81,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -91,7 +91,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -101,7 +101,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -112,7 +112,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -122,7 +122,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override @@ -132,7 +132,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getExtensionSchemaNodes * () @@ -144,7 +144,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.type. * InstanceIdentifierTypeDefinition# getPathStatement() */ @@ -155,7 +155,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.type. * InstanceIdentifierTypeDefinition# requireInstance() */ 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 d73bf754ff..63caa24500 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 @@ -8,13 +8,12 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; /** * Implementation of Yang int16 built-in type.
    * int16 represents integer values between -32768 and 32767, inclusively. The * Java counterpart of Yang int16 built-in type is {@link Short}. - * + * * @see AbstractSignedInteger */ public final class Int16 extends AbstractSignedInteger { @@ -33,11 +32,6 @@ public final class Int16 extends AbstractSignedInteger { return instance; } - @Override - public IntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 799ca00d0c..b043d40a7e 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 @@ -8,16 +8,15 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; /** * Implementation of Yang int32 built-in type.
    * int32 represents integer values between -2147483648 and 2147483647, * inclusively. The Java counterpart of Yang int32 built-in type is * {@link Integer}. - * + * * @see AbstractSignedInteger - * + * */ public final class Int32 extends AbstractSignedInteger { private static Int32 instance; @@ -35,11 +34,6 @@ public final class Int32 extends AbstractSignedInteger { return instance; } - @Override - public IntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 a22d2d5a6c..5f42022547 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 @@ -8,14 +8,13 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; /** * Implementation of Yang int64 built-in type.
    * int64 represents integer values between -9223372036854775808 and * 9223372036854775807, inclusively. The Java counterpart of Yang int64 built-in * type is {@link Long}. - * + * */ public final class Int64 extends AbstractSignedInteger { private static Int64 instance; @@ -33,11 +32,6 @@ public final class Int64 extends AbstractSignedInteger { return instance; } - @Override - public IntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 16f7ee68f5..5df2db696f 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 @@ -8,13 +8,12 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; /** * Implementation of Yang int8 built-in type.
    * int8 represents integer values between -128 and 127, inclusively. The Java * counterpart of Yang int8 built-in type is {@link Byte}. - * + * * @see AbstractSignedInteger */ public final class Int8 extends AbstractSignedInteger { @@ -33,11 +32,6 @@ public final class Int8 extends AbstractSignedInteger { return instance; } - @Override - public IntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 f5a9bbf559..8ef325cfdf 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 @@ -37,7 +37,7 @@ public final class Leafref implements LeafrefTypeDefinition { @Override public LeafrefTypeDefinition getBaseType() { - return this; + return null; } @Override 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 727229bdae..905278357e 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 @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; /** * The default implementation of String Type Definition interface. - * + * * @see StringTypeDefinition */ public final class StringType implements StringTypeDefinition { @@ -51,18 +51,18 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @Override public StringTypeDefinition getBaseType() { - return this; + return null; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -72,7 +72,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -84,7 +84,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -94,7 +94,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -104,7 +104,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -115,7 +115,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -125,7 +125,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override @@ -135,7 +135,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * com.csico.yang.model.base.type.api.StringTypeDefinition#getLengthStatements * () @@ -147,7 +147,7 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * com.csico.yang.model.base.type.api.StringTypeDefinition#getPatterns() */ 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 120f4926cf..4c386c48d5 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 @@ -8,13 +8,12 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; /** * Implementation of Yang uint16 built-in type.
    * uint16 represents integer values between 0 and 65535, inclusively. The Java * counterpart of Yang uint16 built-in type is {@link Integer}. - * + * */ public final class Uint16 extends AbstractUnsignedInteger { public static final int MAX_VALUE = 65535; @@ -33,11 +32,6 @@ public final class Uint16 extends AbstractUnsignedInteger { return instance; } - @Override - public UnsignedIntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 375a26bf91..dd3183d51b 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 @@ -8,12 +8,11 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; /** * Implementation of Yang uint32 built-in type.
    * uint32 represents integer values between 0 and 4294967295, inclusively. - * + * */ public final class Uint32 extends AbstractUnsignedInteger { public static final long MAX_VALUE = 4294967295L; @@ -32,11 +31,6 @@ public final class Uint32 extends AbstractUnsignedInteger { return instance; } - @Override - public UnsignedIntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 e003873eb6..555b76f5fe 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 @@ -10,14 +10,13 @@ package org.opendaylight.yangtools.yang.model.util; import java.math.BigInteger; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; /** * Implementation of Yang uint64 built-in type.
    * uint64 represents integer values between 0 and 18446744073709551615, * inclusively. The Java counterpart of Yang uint64 built-in type is * {@link BigInteger}. - * + * */ public final class Uint64 extends AbstractUnsignedInteger { public static final BigInteger MAX_VALUE = new BigInteger("18446744073709551615"); @@ -36,11 +35,6 @@ public final class Uint64 extends AbstractUnsignedInteger { return instance; } - @Override - public UnsignedIntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 4c36ae1d90..2212585f02 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 @@ -8,12 +8,11 @@ package org.opendaylight.yangtools.yang.model.util; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; /** * Implementation of Yang uint8 built-in type.
    * uint8 represents integer values between 0 and 255, inclusively. - * + * * @see AbstractUnsignedInteger */ public final class Uint8 extends AbstractUnsignedInteger { @@ -33,11 +32,6 @@ public final class Uint8 extends AbstractUnsignedInteger { return instance; } - @Override - public UnsignedIntegerTypeDefinition getBaseType() { - return this; - } - @Override public Object getDefaultValue() { return null; 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 a12c1c1119..99390b0980 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 @@ -33,7 +33,7 @@ public final class UnionType implements UnionTypeDefinition { @Override public UnionTypeDefinition getBaseType() { - return this; + return null; } @Override diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java index aab41b8534..2fc4bea95e 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java @@ -1,6 +1,7 @@ package org.opendaylight.yangtools.yang.model.util; import static org.junit.Assert.*; + import org.junit.Test; public class Int8Test { @@ -10,7 +11,7 @@ public class Int8Test { Int8 int8 = Int8.getInstance(); Int8 int8Second = Int8.getInstance(); assertTrue("The method 'getInstance()' has to return the same instance", int8 == int8Second); - assertTrue("The method 'getBaseType()' is returning incorrect value", int8.getBaseType() == int8); + assertTrue("The method 'getBaseType()' is returning incorrect value", int8.getBaseType() == null); assertTrue("The method 'getDefaultType()' is returning incorrect value", int8.getDefaultValue() == null); assertEquals("The method 'toString()' is returning incorrect value", "type (urn:ietf:params:xml:ns:yang:1)int8", int8.toString());