From: Martin Vitez Date: Tue, 17 Sep 2013 09:37:55 +0000 (+0000) Subject: Merge "Test for class RefineHolder.java" X-Git-Tag: yangtools-0.1.0~22 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=45604e1ed6770040375e0112614b8a4b177263d9;hp=8ddf923f75c069641fa1ef5b2902bca9095d5f91;p=yangtools.git Merge "Test for class RefineHolder.java" --- diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml index 9eaba8792e..1f5ef17b42 100644 --- a/code-generator/binding-generator-api/pom.xml +++ b/code-generator/binding-generator-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index 60f6ff5734..aa75bd2e28 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 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 9bb36e07af..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,20 +986,20 @@ 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(); Preconditions.checkArgument(typedef != null, "typedef can't be null"); final TypeDefinition strTypeDef = baseTypeDefForExtendedType(typedef); if (strTypeDef instanceof StringType) { - final List patternConstraints = typedef.getPatterns(); + final List patternConstraints = typedef.getPatternConstraints(); if (!patternConstraints.isEmpty()) { String regEx; String modifiedRegEx; @@ -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/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml index 84bc8f8556..14677b467d 100644 --- a/code-generator/binding-generator-spi/pom.xml +++ b/code-generator/binding-generator-spi/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index d28873ec8e..d8b3e20f78 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index eb56ff1826..76b9223dbd 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml index 5c8dc5ba4e..01786ddc54 100644 --- a/code-generator/binding-model-api/pom.xml +++ b/code-generator/binding-model-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools binding-generator - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 @@ -16,7 +16,6 @@ org.opendaylight.yangtools yang-model-api - 0.5.7-SNAPSHOT diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index 88cd1ce491..24e1a6f313 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.yangtools - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/code-generator/pom.xml b/code-generator/pom.xml index fda59c0675..93663bdae5 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -8,14 +8,14 @@ 4.0.0 - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT binding-generator pom ${project.artifactId} ${project.artifactId} - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index 7aea52505a..d99ce33e91 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -4,7 +4,7 @@ model-iana org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index e64b7cd92d..38c11afdb5 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -4,7 +4,7 @@ model-iana org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 0b5cc3ee95..3d62dc5d53 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -4,7 +4,7 @@ model-parent org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index 72281e0fa2..0305d76ff1 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index f848125272..aab3808b01 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 64678ca0c7..8de7d741b9 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml index 10a1ef8d23..f163743895 100644 --- a/model/ietf/ietf-yang-types/pom.xml +++ b/model/ietf/ietf-yang-types/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index ae8f0627d9..b05fdb1afa 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -4,7 +4,7 @@ model-parent org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index 9eaf12fda0..f34e9f27c4 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -4,7 +4,7 @@ model-parent org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/model/pom.xml b/model/pom.xml index aa88d70575..5f2b31cd13 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -10,13 +10,13 @@ 4.0.0 org.opendaylight.yangtools.model model-parent - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT pom ${project.artifactId} ${project.artifactId} - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT UTF-8 2.4.0 @@ -70,7 +70,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT jar diff --git a/pom.xml b/pom.xml index 2d4d5fd37b..52c3f04cbf 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 1.7.2 http://nexus.opendaylight.org/content - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 2.4.0 diff --git a/yang/pom.xml b/yang/pom.xml index 43e687cc60..f3a6a180e9 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -9,7 +9,7 @@ 4.0.0 yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT pom diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index 28eb953224..df120f5fb3 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT bundle 4.0.0 diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 0cbdf56482..bc7d16bf1d 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT bundle diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index e552e353bf..3c4b0ad82f 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index afa32728c5..c7125cfbef 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 @@ -52,7 +52,6 @@ com.google.guava guava - 14.0.1 junit diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index d0bc4f6017..91d5839b27 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-ext/pom.xml b/yang/yang-ext/pom.xml index 47bf7802a2..564b975cf9 100644 --- a/yang/yang-ext/pom.xml +++ b/yang/yang-ext/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 @@ -55,7 +55,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT jar diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index 16cb106e37..de36b2f0e1 100644 --- a/yang/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml index 65e528cb40..eab0624935 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -56,7 +56,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml index a3de618277..e7babaca2e 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -43,7 +43,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml index 1c83191745..cd22876166 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml index 8f28c8442a..46eae7a0e5 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools generator-test1 - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT system ${project.basedir}/../GenerateTest1/target/generator-test1-0.5-SNAPSHOT.jar @@ -22,7 +22,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml index facddf2142..145e39bbac 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.yangtools - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test @@ -13,7 +13,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -40,7 +40,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml index 7877e0c515..a61ffd93ea 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -48,7 +48,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml index 4d01bb4755..844e1b1514 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -39,7 +39,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml index e48feb27ba..732ceea1c0 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml index 0654c37615..80a0fe8537 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -38,7 +38,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml index 87a5df0960..ce2ddfa88f 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT @@ -47,7 +47,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT test-jar diff --git a/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml index 527fb98180..f2fd04a1a5 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index 977dadc06c..5a43416a09 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 9f8ad6309e..fb0ab44b71 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 038b4b5c52..60f3d22ce8 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java index 82764762ce..0bed3b1165 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java @@ -108,7 +108,7 @@ * *
    length *
    {@link org.opendaylight.yangtools.yang.model.api.type.LengthConstraint} - *
    {@link org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition#getLengthStatements()} + *
    {@link org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition#getLengthConstraints()} * *
    list *
    {@link org.opendaylight.yangtools.yang.model.api.ListSchemaNode} @@ -164,8 +164,8 @@ * *
    range *
    {@link org.opendaylight.yangtools.yang.model.api.type.RangeConstraint} - *
    {@link org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition#getRangeStatements()} - *
    {@link org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition#getRangeStatements()} + *
    {@link org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition#getRangeConstraints()} + *
    {@link org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition#getRangeConstraints()} * *
    reference *
    {@link org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()} diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java index e3ace5d6e1..edf42c4d4b 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java @@ -25,7 +25,7 @@ public interface DecimalTypeDefinition extends TypeDefinitionrange which is substatement of the * type statement */ - List getRangeStatements(); + List getRangeConstraints(); /** * Returns integer between 1 and 18 inclusively.
    diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java index badd4e04a8..4e3611eb6f 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.model.api.type; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -public interface EmptyTypeDefinition extends - TypeDefinition { +public interface EmptyTypeDefinition extends TypeDefinition { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java index 03e29c5e04..bf1bc26873 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java @@ -28,13 +28,12 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * The Integer Built-In Types are defined in [RFC-6020] */ -public interface IntegerTypeDefinition extends - TypeDefinition { +public interface IntegerTypeDefinition extends TypeDefinition { /** * Returns Range Constraints defined for given Integer Type. * * @return Range Constraints defined for given Integer Type. */ - List getRangeStatements(); + List getRangeConstraints(); } 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 e1bf21ada4..b8fcb0b4e4 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 @@ -25,7 +25,7 @@ public interface StringTypeDefinition extends TypeDefinitionlenght substatement of the type * statement */ - List getLengthStatements(); + List getLengthConstraints(); /** * Returns patterns specified in the string. @@ -34,5 +34,5 @@ public interface StringTypeDefinition extends TypeDefinitionpattern substatement of the type * statement */ - List getPatterns(); + List getPatternConstraints(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java index 67704388ef..b4fd6205ae 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java @@ -11,19 +11,14 @@ import java.util.List; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -public interface UnknownTypeDefinition extends - TypeDefinition { +public interface UnknownTypeDefinition extends TypeDefinition { - List getRangeStatements(); + List getRangeConstraints(); - List getLengthStatements(); + List getLengthConstraints(); - List getPatterns(); - - LengthConstraint getLengthConstraint(); + List getPatternConstraints(); Integer getFractionDigits(); - boolean isReferenceOnly(); - } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java index 34315b1e83..b380044651 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java @@ -27,5 +27,5 @@ public interface UnsignedIntegerTypeDefinition extends TypeDefinitionRangeConstraint which represents the YANG * range substatement arguments. */ - List getRangeStatements(); + List getRangeConstraints(); } diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 799ac6bac8..1df6557080 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 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 8dd79e6a2d..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; @@ -92,7 +97,7 @@ public abstract class AbstractSignedInteger implements IntegerTypeDefinition { } @Override - public List getRangeStatements() { + public List getRangeConstraints() { return rangeStatements; } 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 646fecb9b6..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; @@ -88,7 +93,7 @@ public abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefi } @Override - public List getRangeStatements() { + public List getRangeConstraints() { return rangeStatements; } 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 64f1dc6e8e..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 @@ -134,7 +132,7 @@ public final class Decimal64 implements DecimalTypeDefinition { } @Override - public List getRangeStatements() { + public List getRangeConstraints() { return rangeStatements; } 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/ExtendedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java index 6e5229d4cb..4c2c17b63a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java @@ -256,15 +256,15 @@ public class ExtendedType implements TypeDefinition> { return builder.toString(); } - public List getRanges() { + public List getRangeConstraints() { return ranges; } - public List getLengths() { + public List getLengthConstraints() { return lengths; } - public List getPatterns() { + public List getPatternConstraints() { return patterns; } 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 93f0c7c13c..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,24 +135,24 @@ public final class StringType implements StringTypeDefinition { /* * (non-Javadoc) - * + * * @see * com.csico.yang.model.base.type.api.StringTypeDefinition#getLengthStatements * () */ @Override - public List getLengthStatements() { + public List getLengthConstraints() { return lengthStatements; } /* * (non-Javadoc) - * + * * @see * com.csico.yang.model.base.type.api.StringTypeDefinition#getPatterns() */ @Override - public List getPatterns() { + public List getPatternConstraints() { return patterns; } 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/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java index 748507f38a..23bb8395ca 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java @@ -25,7 +25,6 @@ public final class UnknownType implements UnknownTypeDefinition { private final SchemaPath path; private final String description; private final String reference; - private final boolean referenceOnly; private final List lengthStatements; private final List patterns; private final List rangeStatements; @@ -54,7 +53,6 @@ public final class UnknownType implements UnknownTypeDefinition { private Status status = Status.CURRENT; private String units = ""; private Object defaultValue = null; - private boolean referenceOnly = false; public Builder(final QName name, final String description, final String reference) { this.name = name; @@ -126,15 +124,9 @@ public final class UnknownType implements UnknownTypeDefinition { public UnknownTypeDefinition build() { return new UnknownType(this); } - - public void setReferenceOnly(boolean b) { - this.referenceOnly = b; - - } } private UnknownType(Builder builder) { - this.referenceOnly = builder.referenceOnly; this.name = builder.name; this.path = builder.path; this.description = builder.description; @@ -152,7 +144,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType() */ @@ -163,7 +155,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits() */ @Override @@ -173,7 +165,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue * () @@ -185,7 +177,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName() */ @Override @@ -195,7 +187,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath() */ @Override @@ -205,7 +197,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription() */ @@ -216,7 +208,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference() */ @Override @@ -226,7 +218,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus() */ @Override @@ -236,7 +228,7 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see * org.opendaylight.yangtools.yang.model.api.SchemaNode#getExtensionSchemaNodes * () @@ -248,58 +240,42 @@ public final class UnknownType implements UnknownTypeDefinition { /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition * #getRangeStatements() */ @Override - public List getRangeStatements() { + public List getRangeConstraints() { return rangeStatements; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition * #getLengthStatements() */ @Override - public List getLengthStatements() { + public List getLengthConstraints() { return lengthStatements; } /* * (non-Javadoc) - * + * * @see org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition * #getPatterns() */ @Override - public List getPatterns() { + public List getPatternConstraints() { return patterns; } - /* - * (non-Javadoc) - * - * @see org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition - * #getLengthConstraint() - */ - @Override - public LengthConstraint getLengthConstraint() { - return lengthConstraint; - } - @Override public Integer getFractionDigits() { return fractionDigits; } - @Override - public boolean isReferenceOnly() { - return referenceOnly; - } - @Override public int hashCode() { final int prime = 31; 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()); diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index 8d294616a9..9c02358351 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 88ef7280f9..c15ee82254 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.yangtools yang - 0.5.7-SNAPSHOT + 0.5.8-SNAPSHOT 4.0.0 diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/CopyUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/CopyUtils.java index 64f19e36bc..9e1ccd897e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/CopyUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/CopyUtils.java @@ -626,9 +626,9 @@ public final class CopyUtils { builder.setDescription(typedef.getDescription()); builder.setReference(typedef.getReference()); builder.setStatus(typedef.getStatus()); - builder.setRanges(typedef.getRanges()); - builder.setLengths(typedef.getLengths()); - builder.setPatterns(typedef.getPatterns()); + builder.setRanges(typedef.getRangeConstraints()); + builder.setLengths(typedef.getLengthConstraints()); + builder.setPatterns(typedef.getPatternConstraints()); builder.setFractionDigits(typedef.getFractionDigits()); final TypeDefinition type = typedef.getBaseType(); builder.setType(type); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java index 45d46c69bb..505fa97dee 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java @@ -127,7 +127,7 @@ public final class ParserListenerUtils { /** * Parse given tree and get first string value. - * + * * @param treeNode * tree to parse * @return first string value from given tree @@ -148,7 +148,7 @@ public final class ParserListenerUtils { /** * Parse 'description', 'reference' and 'status' statements and fill in * given builder. - * + * * @param ctx * context to parse * @param builder @@ -172,7 +172,7 @@ public final class ParserListenerUtils { /** * Parse given context and return its value; - * + * * @param ctx * status context * @return value parsed from context @@ -199,7 +199,7 @@ public final class ParserListenerUtils { /** * Parse given tree and returns units statement as string. - * + * * @param ctx * context to parse * @return value of units statement as string or null if there is no units @@ -219,7 +219,7 @@ public final class ParserListenerUtils { /** * Parse given tree and returns default statement as string. - * + * * @param ctx * context to parse * @return value of default statement as string or null if there is no @@ -239,7 +239,7 @@ public final class ParserListenerUtils { /** * Create SchemaPath from actualPath and new node name. - * + * * @param actualPath * current position in model * @return SchemaPath object @@ -252,7 +252,7 @@ public final class ParserListenerUtils { /** * Create java.util.List of QName objects from given key definition as * string. - * + * * @param keyDefinition * key definition as string * @param namespace @@ -280,7 +280,7 @@ public final class ParserListenerUtils { /** * Parse given type body of enumeration statement. - * + * * @param ctx * type body context to parse * @param path @@ -314,7 +314,7 @@ public final class ParserListenerUtils { /** * Parse enum statement context - * + * * @param ctx * enum statement context * @param highestValue @@ -491,7 +491,7 @@ public final class ParserListenerUtils { /** * Get and parse range from given type body context. - * + * * @param ctx * type body context to parse * @param moduleName @@ -516,7 +516,7 @@ public final class ParserListenerUtils { /** * Parse given range context. - * + * * @param ctx * range context to parse * @param moduleName @@ -559,7 +559,7 @@ public final class ParserListenerUtils { /** * Get and parse length from given type body context. - * + * * @param ctx * type body context to parse * @param moduleName @@ -584,7 +584,7 @@ public final class ParserListenerUtils { /** * Parse given length context. - * + * * @param ctx * length context to parse * @param moduleName @@ -651,7 +651,7 @@ public final class ParserListenerUtils { /** * Parse type body and return pattern constraints. - * + * * @param ctx * type body * @return list of pattern constraints @@ -675,7 +675,7 @@ public final class ParserListenerUtils { /** * Internal helper method. - * + * * @param ctx * pattern context * @return PatternConstraint object @@ -697,7 +697,7 @@ public final class ParserListenerUtils { /** * Parse given context and return pattern value. - * + * * @param ctx * context to parse * @return pattern value as String @@ -720,7 +720,7 @@ public final class ParserListenerUtils { /** * Get fraction digits value from type body. - * + * * @param ctx * type body context to parse * @param moduleName @@ -741,7 +741,7 @@ public final class ParserListenerUtils { /** * Parse decimal64 fraction-digits value. - * + * * @param ctx * decimal64 context * @param moduleName @@ -768,7 +768,7 @@ public final class ParserListenerUtils { /** * Internal helper method for parsing bit statements from given type body * context. - * + * * @param ctx * type body context to parse * @param actualPath @@ -801,7 +801,7 @@ public final class ParserListenerUtils { /** * Internal helper method for parsing bit context. - * + * * @param ctx * bit statement context to parse * @param highestPosition @@ -852,11 +852,11 @@ public final class ParserListenerUtils { /** * Parse 'ordered-by' statement. - * + * * The 'ordered-by' statement defines whether the order of entries within a * list are determined by the user or the system. The argument is one of the * strings "system" or "user". If not present, order defaults to "system". - * + * * @param ctx * Ordered_by_stmtContext * @return true, if ordered-by contains value 'user', false otherwise @@ -882,7 +882,7 @@ public final class ParserListenerUtils { /** * Get config statement from given context. If there is no config statement, * return config value of parent - * + * * @param ctx * context to parse * @param parent @@ -946,7 +946,7 @@ public final class ParserListenerUtils { /** * Parse config statement. - * + * * @param ctx * config context to parse * @param moduleName @@ -978,7 +978,7 @@ public final class ParserListenerUtils { /** * Parse type body and create UnknownType definition. - * + * * @param typedefQName * qname of current type * @param ctx @@ -1026,8 +1026,6 @@ public final class ParserListenerUtils { return result; } - } else { - unknownType.setReferenceOnly(true); } return unknownType.build(); @@ -1035,7 +1033,7 @@ public final class ParserListenerUtils { /** * Create TypeDefinition object based on given type name and type body. - * + * * @param typeName * name of type * @param typeBody @@ -1087,7 +1085,7 @@ public final class ParserListenerUtils { } } Decimal64 decimalType = new Decimal64(extBaseTypePath, fractionDigits); - constraints.addRanges(decimalType.getRangeStatements()); + constraints.addRanges(decimalType.getRangeConstraints()); baseType = decimalType; } else if (typeName.startsWith("int")) { IntegerTypeDefinition intType = null; @@ -1103,7 +1101,7 @@ public final class ParserListenerUtils { if (intType == null) { throw new YangParseException(moduleName, line, "Unknown yang type " + typeName); } - constraints.addRanges(intType.getRangeStatements()); + constraints.addRanges(intType.getRangeConstraints()); baseType = intType; } else if (typeName.startsWith("uint")) { UnsignedIntegerTypeDefinition uintType = null; @@ -1119,14 +1117,14 @@ public final class ParserListenerUtils { if (uintType == null) { throw new YangParseException(moduleName, line, "Unknown yang type " + typeName); } - constraints.addRanges(uintType.getRangeStatements()); + constraints.addRanges(uintType.getRangeConstraints()); baseType = uintType; } else if ("enumeration".equals(typeName)) { List enumConstants = getEnumConstants(typeBody, actualPath, moduleName); return new EnumerationType(baseTypePath, enumConstants); } else if ("string".equals(typeName)) { StringTypeDefinition stringType = StringType.getIntance(); - constraints.addLengths(stringType.getLengthStatements()); + constraints.addLengths(stringType.getLengthConstraints()); baseType = stringType; } else if ("bits".equals(typeName)) { return new BitsType(baseTypePath, getBits(typeBody, actualPath, moduleName)); @@ -1198,7 +1196,7 @@ public final class ParserListenerUtils { /** * Parse given context and find identityref base value. - * + * * @param ctx * type body * @return identityref base value as String @@ -1222,7 +1220,7 @@ public final class ParserListenerUtils { /** * Parse type body statement and find require-instance value. - * + * * @param ctx * type body context * @return require-instance value @@ -1249,7 +1247,7 @@ public final class ParserListenerUtils { /** * Parse type body statement and find leafref path. - * + * * @param ctx * type body context * @return leafref path as String @@ -1271,7 +1269,7 @@ public final class ParserListenerUtils { /** * Internal helper method for parsing must statement. - * + * * @param ctx * Must_stmtContext * @return MustDefinition object based on parsed context @@ -1320,7 +1318,7 @@ public final class ParserListenerUtils { /** * Parse given context and set constraints to constraints builder. - * + * * @param ctx * context to parse * @param constraints @@ -1390,7 +1388,7 @@ public final class ParserListenerUtils { /** * Parse given context and return yin value. - * + * * @param ctx * context to parse * @return true if value is 'true', false otherwise @@ -1417,7 +1415,7 @@ public final class ParserListenerUtils { /** * Check this base type. - * + * * @param typeName * base YANG type name * @param moduleName @@ -1448,7 +1446,7 @@ public final class ParserListenerUtils { /** * Parse refine statement. - * + * * @param refineCtx * refine statement * @param moduleName diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java index e4095d4627..e521f699aa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java @@ -306,20 +306,20 @@ public final class TypeUtils { */ private static TypeConstraints mergeConstraints(final TypeDefinition type, final TypeConstraints constraints) { if (type instanceof DecimalTypeDefinition) { - constraints.addRanges(((DecimalTypeDefinition) type).getRangeStatements()); + constraints.addRanges(((DecimalTypeDefinition) type).getRangeConstraints()); constraints.addFractionDigits(((DecimalTypeDefinition) type).getFractionDigits()); } else if (type instanceof IntegerTypeDefinition) { - constraints.addRanges(((IntegerTypeDefinition) type).getRangeStatements()); + constraints.addRanges(((IntegerTypeDefinition) type).getRangeConstraints()); } else if (type instanceof StringTypeDefinition) { - constraints.addPatterns(((StringTypeDefinition) type).getPatterns()); - constraints.addLengths(((StringTypeDefinition) type).getLengthStatements()); + constraints.addPatterns(((StringTypeDefinition) type).getPatternConstraints()); + constraints.addLengths(((StringTypeDefinition) type).getLengthConstraints()); } else if (type instanceof BinaryTypeDefinition) { constraints.addLengths(((BinaryTypeDefinition) type).getLengthConstraints()); } else if (type instanceof ExtendedType) { constraints.addFractionDigits(((ExtendedType) type).getFractionDigits()); - constraints.addLengths(((ExtendedType) type).getLengths()); - constraints.addPatterns(((ExtendedType) type).getPatterns()); - constraints.addRanges(((ExtendedType) type).getRanges()); + constraints.addLengths(((ExtendedType) type).getLengthConstraints()); + constraints.addPatterns(((ExtendedType) type).getPatternConstraints()); + constraints.addRanges(((ExtendedType) type).getRangeConstraints()); } return constraints; } @@ -356,9 +356,9 @@ public final class TypeUtils { TypeConstraints constraints = null; if (newBaseType == null) { tc.addFractionDigits(oldExtendedType.getFractionDigits()); - tc.addLengths(oldExtendedType.getLengths()); - tc.addPatterns(oldExtendedType.getPatterns()); - tc.addRanges(oldExtendedType.getRanges()); + tc.addLengths(oldExtendedType.getLengthConstraints()); + tc.addPatterns(oldExtendedType.getPatternConstraints()); + tc.addRanges(oldExtendedType.getRangeConstraints()); constraints = findConstraintsFromTypeBuilder(newBaseTypeBuilder, tc, modules, module, null); newType.setTypedef(newBaseTypeBuilder); } else { @@ -399,9 +399,9 @@ public final class TypeUtils { if (typeToResolve instanceof ExtendedType) { ExtendedType extType = (ExtendedType) typeToResolve; constraints.addFractionDigits(extType.getFractionDigits()); - constraints.addLengths(extType.getLengths()); - constraints.addPatterns(extType.getPatterns()); - constraints.addRanges(extType.getRanges()); + constraints.addLengths(extType.getLengthConstraints()); + constraints.addPatterns(extType.getPatternConstraints()); + constraints.addRanges(extType.getRangeConstraints()); return findConstraintsFromTypeDefinition(extType.getBaseType(), constraints); } else { mergeConstraints(typeToResolve, constraints); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java index 62304cdd6f..70e7ea229f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java @@ -115,11 +115,11 @@ public class TypesResolutionTest { assertTrue(ipv4.getBaseType() instanceof StringTypeDefinition); String expectedPattern = "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}" + "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" + "(%[\\p{N}\\p{L}]+)?"; - assertEquals(expectedPattern, ipv4.getPatterns().get(0).getRegularExpression()); + assertEquals(expectedPattern, ipv4.getPatternConstraints().get(0).getRegularExpression()); ExtendedType ipv6 = (ExtendedType) unionTypes.get(1); assertTrue(ipv6.getBaseType() instanceof StringTypeDefinition); - List ipv6Patterns = ipv6.getPatterns(); + List ipv6Patterns = ipv6.getPatternConstraints(); expectedPattern = "((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}" + "((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|" + "(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}" + "(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))" + "(%[\\p{N}\\p{L}]+)?"; @@ -136,15 +136,15 @@ public class TypesResolutionTest { Set> typedefs = tested.getTypeDefinitions(); ExtendedType type = (ExtendedType) TestUtils.findTypedef(typedefs, "domain-name"); assertTrue(type.getBaseType() instanceof StringTypeDefinition); - List patterns = type.getPatterns(); + List patterns = type.getPatternConstraints(); assertEquals(1, patterns.size()); String expectedPattern = "((([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.)*" + "([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.?)" + "|\\."; assertEquals(expectedPattern, patterns.get(0).getRegularExpression()); - List lengths = type.getLengths(); + List lengths = type.getLengthConstraints(); assertEquals(1, lengths.size()); - LengthConstraint length = type.getLengths().get(0); + LengthConstraint length = type.getLengthConstraints().get(0); assertEquals(1L, length.getMin()); assertEquals(253L, length.getMax()); } @@ -266,7 +266,7 @@ public class TypesResolutionTest { Set> typedefs = tested.getTypeDefinitions(); ExtendedType testedType = (ExtendedType) TestUtils.findTypedef(typedefs, "object-identifier-128"); - List patterns = testedType.getPatterns(); + List patterns = testedType.getPatternConstraints(); assertEquals(1, patterns.size()); PatternConstraint pattern = patterns.get(0); assertEquals("\\d*(\\.\\d*){1,127}", pattern.getRegularExpression()); @@ -278,7 +278,7 @@ public class TypesResolutionTest { assertEquals("object-identifier-128", testedTypeQName.getLocalName()); ExtendedType testedTypeBase = (ExtendedType) testedType.getBaseType(); - patterns = testedTypeBase.getPatterns(); + patterns = testedTypeBase.getPatternConstraints(); assertEquals(1, patterns.size()); pattern = patterns.get(0); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java index 15f6ca805f..d946e07356 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java @@ -238,9 +238,9 @@ public class YangParserTest { assertEquals(nodesRev, leafTypeQName.getRevision()); assertNull(leafType.getUnits()); assertNull(leafType.getDefaultValue()); - assertTrue(leafType.getLengths().isEmpty()); - assertTrue(leafType.getPatterns().isEmpty()); - List ranges = leafType.getRanges(); + assertTrue(leafType.getLengthConstraints().isEmpty()); + assertTrue(leafType.getPatternConstraints().isEmpty()); + List ranges = leafType.getRangeConstraints(); assertEquals(1, ranges.size()); RangeConstraint range = ranges.get(0); assertEquals(12L, range.getMin()); @@ -254,9 +254,9 @@ public class YangParserTest { assertEquals(typesRev, baseTypeQName.getRevision()); assertEquals("mile", baseType.getUnits()); assertEquals("11", baseType.getDefaultValue()); - assertTrue(leafType.getLengths().isEmpty()); - assertTrue(leafType.getPatterns().isEmpty()); - List baseTypeRanges = baseType.getRanges(); + assertTrue(leafType.getLengthConstraints().isEmpty()); + assertTrue(leafType.getPatternConstraints().isEmpty()); + List baseTypeRanges = baseType.getRangeConstraints(); assertEquals(2, baseTypeRanges.size()); RangeConstraint baseTypeRange1 = baseTypeRanges.get(0); assertEquals(3L, baseTypeRange1.getMin()); @@ -273,9 +273,9 @@ public class YangParserTest { assertEquals(typesRev, baseQName.getRevision()); assertNull(base.getUnits()); assertNull(base.getDefaultValue()); - assertTrue(leafType.getLengths().isEmpty()); - assertTrue(leafType.getPatterns().isEmpty()); - List baseRanges = base.getRanges(); + assertTrue(leafType.getLengthConstraints().isEmpty()); + assertTrue(leafType.getPatternConstraints().isEmpty()); + List baseRanges = base.getRangeConstraints(); assertEquals(1, baseRanges.size()); RangeConstraint baseRange = baseRanges.get(0); assertEquals(2L, baseRange.getMin()); @@ -297,12 +297,12 @@ public class YangParserTest { assertEquals(typesRev, typeQName.getRevision()); assertNull(type.getUnits()); assertNull(type.getDefaultValue()); - List patterns = type.getPatterns(); + List patterns = type.getPatternConstraints(); assertEquals(1, patterns.size()); PatternConstraint pattern = patterns.iterator().next(); assertEquals("[e-z]*", pattern.getRegularExpression()); - assertTrue(type.getLengths().isEmpty()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getLengthConstraints().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); ExtendedType baseType1 = (ExtendedType) type.getBaseType(); QName baseType1QName = baseType1.getQName(); @@ -312,12 +312,12 @@ public class YangParserTest { assertEquals(typesRev, baseType1QName.getRevision()); assertNull(baseType1.getUnits()); assertNull(baseType1.getDefaultValue()); - patterns = baseType1.getPatterns(); + patterns = baseType1.getPatternConstraints(); assertEquals(1, patterns.size()); pattern = patterns.iterator().next(); assertEquals("[b-u]*", pattern.getRegularExpression()); - assertTrue(baseType1.getLengths().isEmpty()); - assertTrue(baseType1.getRanges().isEmpty()); + assertTrue(baseType1.getLengthConstraints().isEmpty()); + assertTrue(baseType1.getRangeConstraints().isEmpty()); ExtendedType baseType2 = (ExtendedType) baseType1.getBaseType(); QName baseType2QName = baseType2.getQName(); @@ -327,13 +327,13 @@ public class YangParserTest { assertEquals(typesRev, baseType2QName.getRevision()); assertNull(baseType2.getUnits()); assertNull(baseType2.getDefaultValue()); - assertTrue(baseType2.getPatterns().isEmpty()); - List baseType2Lengths = baseType2.getLengths(); + assertTrue(baseType2.getPatternConstraints().isEmpty()); + List baseType2Lengths = baseType2.getLengthConstraints(); assertEquals(1, baseType2Lengths.size()); LengthConstraint length = baseType2Lengths.get(0); assertEquals(6L, length.getMin()); assertEquals(10L, length.getMax()); - assertTrue(baseType2.getRanges().isEmpty()); + assertTrue(baseType2.getRangeConstraints().isEmpty()); ExtendedType baseType3 = (ExtendedType) baseType2.getBaseType(); QName baseType3QName = baseType3.getQName(); @@ -343,16 +343,16 @@ public class YangParserTest { assertEquals(typesRev, baseType3QName.getRevision()); assertNull(baseType3.getUnits()); assertNull(baseType3.getDefaultValue()); - patterns = baseType3.getPatterns(); + patterns = baseType3.getPatternConstraints(); assertEquals(1, patterns.size()); pattern = patterns.iterator().next(); assertEquals("[a-k]*", pattern.getRegularExpression()); - List baseType3Lengths = baseType3.getLengths(); + List baseType3Lengths = baseType3.getLengthConstraints(); assertEquals(1, baseType3Lengths.size()); length = baseType3Lengths.get(0); assertEquals(5L, length.getMin()); assertEquals(11L, length.getMax()); - assertTrue(baseType3.getRanges().isEmpty()); + assertTrue(baseType3.getRangeConstraints().isEmpty()); assertTrue(baseType3.getBaseType() instanceof StringType); } @@ -371,13 +371,13 @@ public class YangParserTest { assertEquals(nodesRev, typeQName.getRevision()); assertNull(type.getUnits()); assertNull(type.getDefaultValue()); - assertTrue(type.getPatterns().isEmpty()); - List typeLengths = type.getLengths(); + assertTrue(type.getPatternConstraints().isEmpty()); + List typeLengths = type.getLengthConstraints(); assertEquals(1, typeLengths.size()); LengthConstraint length = typeLengths.get(0); assertEquals(7L, length.getMin()); assertEquals(10L, length.getMax()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); ExtendedType baseType1 = (ExtendedType) type.getBaseType(); QName baseType1QName = baseType1.getQName(); @@ -387,13 +387,13 @@ public class YangParserTest { assertEquals(typesRev, baseType1QName.getRevision()); assertNull(baseType1.getUnits()); assertNull(baseType1.getDefaultValue()); - assertTrue(baseType1.getPatterns().isEmpty()); - List baseType2Lengths = baseType1.getLengths(); + assertTrue(baseType1.getPatternConstraints().isEmpty()); + List baseType2Lengths = baseType1.getLengthConstraints(); assertEquals(1, baseType2Lengths.size()); length = baseType2Lengths.get(0); assertEquals(6L, length.getMin()); assertEquals(10L, length.getMax()); - assertTrue(baseType1.getRanges().isEmpty()); + assertTrue(baseType1.getRangeConstraints().isEmpty()); ExtendedType baseType2 = (ExtendedType) baseType1.getBaseType(); QName baseType2QName = baseType2.getQName(); @@ -403,16 +403,16 @@ public class YangParserTest { assertEquals(typesRev, baseType2QName.getRevision()); assertNull(baseType2.getUnits()); assertNull(baseType2.getDefaultValue()); - List patterns = baseType2.getPatterns(); + List patterns = baseType2.getPatternConstraints(); assertEquals(1, patterns.size()); PatternConstraint pattern = patterns.iterator().next(); assertEquals("[a-k]*", pattern.getRegularExpression()); - List baseType3Lengths = baseType2.getLengths(); + List baseType3Lengths = baseType2.getLengthConstraints(); assertEquals(1, baseType3Lengths.size()); length = baseType3Lengths.get(0); assertEquals(5L, length.getMin()); assertEquals(11L, length.getMax()); - assertTrue(baseType2.getRanges().isEmpty()); + assertTrue(baseType2.getRangeConstraints().isEmpty()); assertTrue(baseType2.getBaseType() instanceof StringType); } @@ -431,9 +431,9 @@ public class YangParserTest { assertNull(type.getUnits()); assertNull(type.getDefaultValue()); assertEquals(4, (int) type.getFractionDigits()); - assertTrue(type.getLengths().isEmpty()); - assertTrue(type.getPatterns().isEmpty()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getLengthConstraints().isEmpty()); + assertTrue(type.getPatternConstraints().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); ExtendedType typeBase = (ExtendedType) type.getBaseType(); QName typeBaseQName = typeBase.getQName(); @@ -444,9 +444,9 @@ public class YangParserTest { assertNull(typeBase.getUnits()); assertNull(typeBase.getDefaultValue()); assertNull(typeBase.getFractionDigits()); - assertTrue(typeBase.getLengths().isEmpty()); - assertTrue(typeBase.getPatterns().isEmpty()); - assertTrue(typeBase.getRanges().isEmpty()); + assertTrue(typeBase.getLengthConstraints().isEmpty()); + assertTrue(typeBase.getPatternConstraints().isEmpty()); + assertTrue(typeBase.getRangeConstraints().isEmpty()); Decimal64 decimal = (Decimal64) typeBase.getBaseType(); assertEquals(6, (int) decimal.getFractionDigits()); @@ -466,9 +466,9 @@ public class YangParserTest { assertNull(type.getUnits()); assertNull(type.getDefaultValue()); assertNull(type.getFractionDigits()); - assertTrue(type.getLengths().isEmpty()); - assertTrue(type.getPatterns().isEmpty()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getLengthConstraints().isEmpty()); + assertTrue(type.getPatternConstraints().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); Decimal64 baseTypeDecimal = (Decimal64) type.getBaseType(); assertEquals(6, (int) baseTypeDecimal.getFractionDigits()); @@ -488,9 +488,9 @@ public class YangParserTest { assertNull(type.getUnits()); assertNull(type.getDefaultValue()); assertNull(type.getFractionDigits()); - assertTrue(type.getLengths().isEmpty()); - assertTrue(type.getPatterns().isEmpty()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getLengthConstraints().isEmpty()); + assertTrue(type.getPatternConstraints().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); ExtendedType baseType = (ExtendedType) type.getBaseType(); QName baseTypeQName = baseType.getQName(); @@ -501,9 +501,9 @@ public class YangParserTest { assertNull(baseType.getUnits()); assertNull(baseType.getDefaultValue()); assertNull(baseType.getFractionDigits()); - assertTrue(baseType.getLengths().isEmpty()); - assertTrue(baseType.getPatterns().isEmpty()); - assertTrue(baseType.getRanges().isEmpty()); + assertTrue(baseType.getLengthConstraints().isEmpty()); + assertTrue(baseType.getPatternConstraints().isEmpty()); + assertTrue(baseType.getRangeConstraints().isEmpty()); UnionType unionType = (UnionType) baseType.getBaseType(); List> unionTypes = unionType.getTypes(); @@ -518,9 +518,9 @@ public class YangParserTest { assertNull(unionType1.getUnits()); assertNull(unionType1.getDefaultValue()); assertNull(unionType1.getFractionDigits()); - assertTrue(unionType1.getLengths().isEmpty()); - assertTrue(unionType1.getPatterns().isEmpty()); - List ranges = unionType1.getRanges(); + assertTrue(unionType1.getLengthConstraints().isEmpty()); + assertTrue(unionType1.getPatternConstraints().isEmpty()); + List ranges = unionType1.getRangeConstraints(); assertEquals(1, ranges.size()); RangeConstraint range = ranges.get(0); assertEquals(1L, range.getMin()); @@ -544,9 +544,9 @@ public class YangParserTest { assertNull(type.getUnits()); assertNull(type.getDefaultValue()); assertNull(type.getFractionDigits()); - assertTrue(type.getLengths().isEmpty()); - assertTrue(type.getPatterns().isEmpty()); - assertTrue(type.getRanges().isEmpty()); + assertTrue(type.getLengthConstraints().isEmpty()); + assertTrue(type.getPatternConstraints().isEmpty()); + assertTrue(type.getRangeConstraints().isEmpty()); ExtendedType typeBase = (ExtendedType) type.getBaseType(); QName typeBaseQName = typeBase.getQName(); @@ -557,9 +557,9 @@ public class YangParserTest { assertNull(typeBase.getUnits()); assertNull(typeBase.getDefaultValue()); assertNull(typeBase.getFractionDigits()); - assertTrue(typeBase.getLengths().isEmpty()); - assertTrue(typeBase.getPatterns().isEmpty()); - assertTrue(typeBase.getRanges().isEmpty()); + assertTrue(typeBase.getLengthConstraints().isEmpty()); + assertTrue(typeBase.getPatternConstraints().isEmpty()); + assertTrue(typeBase.getRangeConstraints().isEmpty()); UnionType union = (UnionType) typeBase.getBaseType(); List> unionTypes = union.getTypes(); @@ -576,9 +576,9 @@ public class YangParserTest { assertNull(unionType1.getUnits()); assertNull(unionType1.getDefaultValue()); assertNull(unionType1.getFractionDigits()); - assertTrue(unionType1.getLengths().isEmpty()); - assertTrue(unionType1.getPatterns().isEmpty()); - assertTrue(unionType1.getRanges().isEmpty()); + assertTrue(unionType1.getLengthConstraints().isEmpty()); + assertTrue(unionType1.getPatternConstraints().isEmpty()); + assertTrue(unionType1.getRangeConstraints().isEmpty()); UnionType nestedUnion = (UnionType) unionType1.getBaseType(); List> nestedUnion2Types = nestedUnion.getTypes(); @@ -595,9 +595,9 @@ public class YangParserTest { assertNull(myUnionExt.getUnits()); assertNull(myUnionExt.getDefaultValue()); assertNull(myUnionExt.getFractionDigits()); - assertTrue(myUnionExt.getLengths().isEmpty()); - assertTrue(myUnionExt.getPatterns().isEmpty()); - assertTrue(myUnionExt.getRanges().isEmpty()); + assertTrue(myUnionExt.getLengthConstraints().isEmpty()); + assertTrue(myUnionExt.getPatternConstraints().isEmpty()); + assertTrue(myUnionExt.getRangeConstraints().isEmpty()); ExtendedType myUnion = (ExtendedType) myUnionExt.getBaseType(); QName myUnionQName = myUnion.getQName(); @@ -608,9 +608,9 @@ public class YangParserTest { assertNull(myUnion.getUnits()); assertNull(myUnion.getDefaultValue()); assertNull(myUnion.getFractionDigits()); - assertTrue(myUnion.getLengths().isEmpty()); - assertTrue(myUnion.getPatterns().isEmpty()); - assertTrue(myUnion.getRanges().isEmpty()); + assertTrue(myUnion.getLengthConstraints().isEmpty()); + assertTrue(myUnion.getPatternConstraints().isEmpty()); + assertTrue(myUnion.getRangeConstraints().isEmpty()); UnionType myUnionBase = (UnionType) myUnion.getBaseType(); List> myUnionBaseTypes = myUnionBase.getTypes(); @@ -627,9 +627,9 @@ public class YangParserTest { assertNull(int16Ext.getUnits()); assertNull(int16Ext.getDefaultValue()); assertNull(int16Ext.getFractionDigits()); - assertTrue(int16Ext.getLengths().isEmpty()); - assertTrue(int16Ext.getPatterns().isEmpty()); - List ranges = int16Ext.getRanges(); + assertTrue(int16Ext.getLengthConstraints().isEmpty()); + assertTrue(int16Ext.getPatternConstraints().isEmpty()); + List ranges = int16Ext.getRangeConstraints(); assertEquals(1, ranges.size()); RangeConstraint range = ranges.get(0); assertEquals(1L, range.getMin()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java index 338b400d0f..59e3c8d5a2 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java @@ -82,7 +82,7 @@ public class YangParserWithContextTest { assertEquals("port-number", qname.getLocalName()); ExtendedType dscpExt = (ExtendedType) TestUtils.findTypedef(module.getTypeDefinitions(), "dscp-ext"); - List ranges = dscpExt.getRanges(); + List ranges = dscpExt.getRangeConstraints(); assertEquals(1, ranges.size()); RangeConstraint range = ranges.get(0); assertEquals(0L, range.getMin());