From 7d1461b8704a4fa5f8865f6abd0fa5830bbdf980 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Jan 2021 12:09:45 +0100 Subject: [PATCH] Remove SchemaPath from TypeDefinition implementations This necessitates disabling string-based PathExpression evaluation, which is going away anyway. JIRA: YANGTOOLS-1216 JIRA: YANGTOOLS-1127 Change-Id: Ic033019dfa44b633e23d3a5b90eadc131adb0904 Signed-off-by: Robert Varga --- .../parser/AnnotationStatementSupport.java | 13 +- .../data/impl/codec/BitsCodecStringTest.java | 4 +- .../impl/codec/DecimalCodecStringTest.java | 5 +- .../TypeDefinitionAwareCodecTestHelper.java | 4 +- .../data/impl/codec/UnionCodecStringTest.java | 5 +- .../model/util/type/AbstractBaseType.java | 7 +- .../model/util/type/AbstractDerivedType.java | 8 +- .../AbstractLengthRestrictedBaseType.java | 1 - .../AbstractLengthRestrictedDerivedType.java | 7 +- .../type/AbstractLengthRestrictedType.java | 6 +- .../type/AbstractRangeRestrictedBaseType.java | 8 +- .../AbstractRangeRestrictedDerivedType.java | 6 +- .../type/AbstractRangeRestrictedType.java | 6 +- .../util/type/AbstractRestrictedType.java | 6 +- .../type/AbstractRestrictedTypeBuilder.java | 6 +- .../util/type/AbstractTypeDefinition.java | 19 +- .../yang/model/util/type/BaseBitsType.java | 6 +- .../yang/model/util/type/BaseDecimalType.java | 6 +- .../model/util/type/BaseEnumerationType.java | 6 +- .../model/util/type/BaseIdentityrefType.java | 6 +- .../yang/model/util/type/BaseLeafrefType.java | 6 +- .../yang/model/util/type/BaseTypes.java | 26 +-- .../yang/model/util/type/BaseUnionType.java | 6 +- .../yang/model/util/type/BitsTypeBuilder.java | 17 +- .../model/util/type/ConcreteTypeBuilder.java | 6 +- .../yang/model/util/type/ConcreteTypes.java | 156 ++++++++--------- .../model/util/type/DecimalTypeBuilder.java | 13 +- .../model/util/type/DerivedBinaryType.java | 6 +- .../yang/model/util/type/DerivedBitsType.java | 10 +- .../model/util/type/DerivedBooleanType.java | 6 +- .../model/util/type/DerivedDecimalType.java | 6 +- .../model/util/type/DerivedEmptyType.java | 6 +- .../util/type/DerivedEnumerationType.java | 10 +- .../util/type/DerivedIdentityrefType.java | 6 +- .../type/DerivedInstanceIdentifierType.java | 6 +- .../model/util/type/DerivedInt16Type.java | 6 +- .../model/util/type/DerivedInt32Type.java | 6 +- .../model/util/type/DerivedInt64Type.java | 6 +- .../yang/model/util/type/DerivedInt8Type.java | 6 +- .../model/util/type/DerivedLeafrefType.java | 7 +- .../model/util/type/DerivedStringType.java | 6 +- .../model/util/type/DerivedTypeBuilder.java | 8 +- .../yang/model/util/type/DerivedTypes.java | 157 +++++++++-------- .../model/util/type/DerivedUint16Type.java | 11 +- .../model/util/type/DerivedUint32Type.java | 11 +- .../model/util/type/DerivedUint64Type.java | 10 +- .../model/util/type/DerivedUint8Type.java | 10 +- .../model/util/type/DerivedUnionType.java | 10 +- .../util/type/EnumerationTypeBuilder.java | 14 +- .../util/type/IdentityrefTypeBuilder.java | 10 +- .../type/InstanceIdentifierTypeBuilder.java | 10 +- .../model/util/type/LeafrefTypeBuilder.java | 8 +- .../type/LengthRestrictedTypeBuilder.java | 6 +- .../util/type/RangeRestrictedTypeBuilder.java | 6 +- .../RangeRestrictedTypeBuilderWithBase.java | 7 +- .../RequireInstanceRestrictedTypeBuilder.java | 6 +- .../model/util/type/RestrictedBinaryType.java | 6 +- .../model/util/type/RestrictedBitsType.java | 6 +- .../util/type/RestrictedBooleanType.java | 6 +- .../util/type/RestrictedDecimalType.java | 6 +- .../model/util/type/RestrictedEmptyType.java | 6 +- .../util/type/RestrictedEnumerationType.java | 6 +- .../util/type/RestrictedIdentityrefType.java | 6 +- .../RestrictedInstanceIdentifierType.java | 6 +- .../model/util/type/RestrictedInt16Type.java | 6 +- .../model/util/type/RestrictedInt32Type.java | 6 +- .../model/util/type/RestrictedInt64Type.java | 6 +- .../model/util/type/RestrictedInt8Type.java | 6 +- .../util/type/RestrictedLeafrefType.java | 8 +- .../model/util/type/RestrictedStringType.java | 6 +- .../yang/model/util/type/RestrictedTypes.java | 117 +++++++------ .../model/util/type/RestrictedUint16Type.java | 6 +- .../model/util/type/RestrictedUint32Type.java | 6 +- .../model/util/type/RestrictedUint64Type.java | 6 +- .../model/util/type/RestrictedUint8Type.java | 6 +- .../model/util/type/RestrictedUnionType.java | 6 +- .../model/util/type/StringTypeBuilder.java | 8 +- .../yang/model/util/type/TypeBuilder.java | 16 +- .../model/util/type/UnionTypeBuilder.java | 8 +- .../yang/model/util/BinaryTypeTest.java | 5 - .../yang/model/util/BitsTypeTest.java | 5 +- .../yang/model/util/BooleanTypeTest.java | 2 - .../yang/model/util/EmptyTypeTest.java | 3 - .../yang/model/util/LeafrefTest.java | 26 +-- .../model/util/SchemaContextUtilTest.java | 12 +- .../yang/model/util/type/TypeTest.java | 164 +++++++++--------- .../leaf/AbstractLeafEffectiveStatement.java | 2 +- .../AbstractLeafListEffectiveStatement.java | 2 +- ...stractIdentityRefSpecificationSupport.java | 2 +- .../AbstractLeafrefSpecificationSupport.java | 2 +- .../type/AbstractTypeStatementSupport.java | 45 ++--- .../stmt/type/BitsSpecificationSupport.java | 2 +- .../type/Decimal64SpecificationSupport.java | 2 +- .../stmt/type/EnumSpecificationSupport.java | 2 +- ...nstanceIdentifierSpecificationSupport.java | 2 +- .../stmt/type/UnionSpecificationSupport.java | 2 +- .../TypedefEffectiveStatementImpl.java | 2 +- .../yangtools/yang/stmt/AugmentTest.java | 5 +- .../yangtools/yang/stmt/Bug7440Test.java | 7 +- .../yang/stmt/EffectiveStatementTypeTest.java | 16 +- .../yangtools/yang/stmt/UsesAugmentTest.java | 15 +- .../yang/stmt/YangParserSimpleTest.java | 8 +- .../yangtools/yang/stmt/YangParserTest.java | 25 +-- .../parser/spi/meta/EffectiveStmtCtx.java | 7 + 104 files changed, 643 insertions(+), 729 deletions(-) diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java index c786ce6cf6..2191b18561 100644 --- a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java +++ b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java @@ -7,6 +7,8 @@ */ package org.opendaylight.yangtools.rfc7952.parser; +import static com.google.common.base.Verify.verifyNotNull; + import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -55,24 +57,27 @@ public final class AnnotationStatementSupport Effective(final Current stmt, final ImmutableList> substatements) { super(stmt, substatements); - path = SchemaPathSupport.wrap(stmt.getEffectiveParent().getSchemaPath().createChild(argument())); + final QName qname = stmt.getArgument(); + // FIXME: move this into onFullDefinitionDeclared() final TypeEffectiveStatement typeStmt = SourceException.throwIfNull( firstSubstatementOfType(TypeEffectiveStatement.class), stmt, - "AnnotationStatementSupport %s is missing a 'type' statement", argument()); + "AnnotationStatementSupport %s is missing a 'type' statement", qname); final ConcreteTypeBuilder builder = ConcreteTypes.concreteTypeBuilder(typeStmt.getTypeDefinition(), - path); + qname); final UnitsEffectiveStatement unitsStmt = firstSubstatementOfType(UnitsEffectiveStatement.class); if (unitsStmt != null) { builder.setUnits(unitsStmt.argument()); } type = builder.build(); + + path = SchemaPathSupport.wrap(stmt.getEffectiveParent().getSchemaPath().createChild(qname)); } @Override public QName getQName() { - return path.getLastComponent(); + return verifyNotNull(argument()); } @Override diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java index 52474eebbf..fe1e5dbae8 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java @@ -16,9 +16,9 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableSet; import java.util.Collections; import org.junit.Test; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.codec.BitsCodec; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder; @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder; */ public class BitsCodecStringTest { private static BitsTypeDefinition toBitsTypeDefinition(final String... bits) { - final BitsTypeBuilder b = BaseTypes.bitsTypeBuilder(mock(SchemaPath.class)); + final BitsTypeBuilder b = BaseTypes.bitsTypeBuilder(QName.create("foo", "foo")); long pos = 0; for (String bit : bits) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java index eed4f776e5..ba6a39810b 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java @@ -8,12 +8,11 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; import java.math.BigDecimal; import org.junit.Test; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.codec.DecimalCodec; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @@ -42,6 +41,6 @@ public class DecimalCodecStringTest { } private static DecimalTypeDefinition getType() { - return BaseTypes.decimalTypeBuilder(mock(SchemaPath.class)).setFractionDigits(2).build(); + return BaseTypes.decimalTypeBuilder(QName.create("foo", "foo")).setFractionDigits(2).build(); } } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java index 72464e1bce..757ecd0d3d 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.mock; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Codec; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; @@ -44,7 +44,7 @@ public final class TypeDefinitionAwareCodecTestHelper { } public static EnumTypeDefinition toEnumTypeDefinition(final String... enums) { - final EnumerationTypeBuilder b = BaseTypes.enumerationTypeBuilder(mock(SchemaPath.class)); + final EnumerationTypeBuilder b = BaseTypes.enumerationTypeBuilder(QName.create("foo", "foo")); int val = 0; for (String en : enums) { EnumTypeDefinition.EnumPair mockEnum = mock(EnumPair.class); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java index fe0b14ebf2..7e5fe62a9a 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java @@ -8,15 +8,14 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodecTestHelper.deserializeWithExpectedIllegalArgEx; import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodecTestHelper.getCodec; import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodecTestHelper.toEnumTypeDefinition; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Empty; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @@ -29,7 +28,7 @@ import org.opendaylight.yangtools.yang.model.util.type.UnionTypeBuilder; */ public class UnionCodecStringTest { private static UnionTypeDefinition toUnionTypeDefinition(final TypeDefinition... types) { - final UnionTypeBuilder builder = BaseTypes.unionTypeBuilder(mock(SchemaPath.class)); + final UnionTypeBuilder builder = BaseTypes.unionTypeBuilder(QName.create("foo", "foo")); for (TypeDefinition t : types) { builder.addType(t); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java index c882b12da4..457cb645a4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java @@ -11,18 +11,17 @@ import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; abstract class AbstractBaseType> extends AbstractTypeDefinition { AbstractBaseType(final QName qname) { - this(SchemaPath.ROOT.createChild(qname), ImmutableList.of()); + this(qname, ImmutableList.of()); } - AbstractBaseType(final SchemaPath path, final Collection unknownSchemaNodes) { - super(path, unknownSchemaNodes); + AbstractBaseType(final QName qname, final Collection unknownSchemaNodes) { + super(qname, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java index 2aa80afce3..e8fa0dcb87 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java @@ -13,7 +13,7 @@ import com.google.common.base.MoreObjects; import java.util.Collection; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -26,10 +26,10 @@ abstract class AbstractDerivedType> extends Abstract private final @NonNull Status status; private final String units; - AbstractDerivedType(final T baseType, final SchemaPath path, final Object defaultValue, final String description, + AbstractDerivedType(final T baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemNodes) { - super(path, unknownSchemNodes); + super(qname, unknownSchemNodes); this.baseType = requireNonNull(baseType); this.status = requireNonNull(status); this.defaultValue = defaultValue; @@ -81,7 +81,7 @@ abstract class AbstractDerivedType> extends Abstract .add("baseType", baseType) .add("default", defaultValue) .add("description", description) - .add("path", getPath()) + .add("qname", getQName()) .add("reference", reference) .add("status", status) .add("units", units).toString(); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java index 537d56b97e..dd38bca403 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthRestrictedTypeDefini abstract class AbstractLengthRestrictedBaseType> extends AbstractBaseType implements LengthRestrictedTypeDefinition { - AbstractLengthRestrictedBaseType(final QName qname) { super(qname); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java index b8ee620e75..8e6928155e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Optional; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; @@ -17,11 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthRestrictedTypeDefini abstract class AbstractLengthRestrictedDerivedType> extends AbstractDerivedType implements LengthRestrictedTypeDefinition { - - AbstractLengthRestrictedDerivedType(final T baseType, final SchemaPath path, + AbstractLengthRestrictedDerivedType(final T baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java index 6ea7d3a1ac..ee1015f2e1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Optional; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.LengthRestrictedTypeDefinition; @@ -19,10 +19,10 @@ abstract class AbstractLengthRestrictedType implements LengthRestrictedTypeDefinition { private final @Nullable LengthConstraint lengthConstraint; - AbstractLengthRestrictedType(final T baseType, final SchemaPath path, + AbstractLengthRestrictedType(final T baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable LengthConstraint lengthConstraint) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); this.lengthConstraint = lengthConstraint; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java index 71df284e74..3c93afe68a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java @@ -15,13 +15,12 @@ import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeRestrictedTypeDefinition; abstract class AbstractRangeRestrictedBaseType, - N extends Number & Comparable> extends AbstractBaseType implements RangeRestrictedTypeDefinition { + N extends Number & Comparable> extends AbstractBaseType implements RangeRestrictedTypeDefinition { private static final ConstraintMetaDefinition BUILTIN_CONSTRAINT = new ConstraintMetaDefinition() { @Override @@ -53,10 +52,9 @@ abstract class AbstractRangeRestrictedBaseType unknownSchemaNodes, + AbstractRangeRestrictedBaseType(final QName qname, final Collection unknownSchemaNodes, final RangeConstraint rangeConstraint) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.rangeConstraint = requireNonNull(rangeConstraint); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java index fe8113c1df..15780ba1b0 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Optional; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; @@ -19,10 +19,10 @@ abstract class AbstractRangeRestrictedDerivedType> extends AbstractDerivedType implements RangeRestrictedTypeDefinition { - AbstractRangeRestrictedDerivedType(final T baseType, final SchemaPath path, + AbstractRangeRestrictedDerivedType(final T baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java index cc7c57aaf4..3ee5fb40a1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Optional; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeRestrictedTypeDefinition; @@ -20,10 +20,10 @@ abstract class AbstractRangeRestrictedType { private final @Nullable RangeConstraint rangeConstraint; - AbstractRangeRestrictedType(final T baseType, final SchemaPath path, + AbstractRangeRestrictedType(final T baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); this.rangeConstraint = rangeConstraint; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java index c0198f4206..fa98721a74 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.Collection; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -20,9 +20,9 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; abstract class AbstractRestrictedType> extends AbstractTypeDefinition { private final @NonNull T baseType; - AbstractRestrictedType(final T baseType, final SchemaPath path, + AbstractRestrictedType(final T baseType, final QName qname, final Collection unknownSchemaNodes) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.baseType = requireNonNull(baseType); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java index cd172c8598..cba537a1e5 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java @@ -11,14 +11,14 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verifyNotNull; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; abstract class AbstractRestrictedTypeBuilder> extends TypeBuilder { private boolean touched; - AbstractRestrictedTypeBuilder(final T baseType, final SchemaPath path) { - super(baseType, path); + AbstractRestrictedTypeBuilder(final T baseType, final QName qname) { + super(baseType, qname); if (baseType != null) { checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType, "Restricted type has to be based on either a base or derived type, not %s", baseType); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java index f4dd594939..b4ab82da8e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java @@ -7,35 +7,28 @@ */ package org.opendaylight.yangtools.yang.model.util.type; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableList; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.SchemaNodeDefaults; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; abstract class AbstractTypeDefinition> implements Immutable, TypeDefinition { private final @NonNull ImmutableList unknownSchemaNodes; - private final @Nullable SchemaPath path; + private final @NonNull QName qname; - AbstractTypeDefinition(final SchemaPath path, final Collection unknownSchemaNodes) { - this.path = path; + AbstractTypeDefinition(final QName qname, final Collection unknownSchemaNodes) { + this.qname = requireNonNull(qname); this.unknownSchemaNodes = ImmutableList.copyOf(unknownSchemaNodes); } @Override public final QName getQName() { - return path.getLastComponent(); - } - - @Override - @Deprecated - public final SchemaPath getPath() { - return SchemaNodeDefaults.throwUnsupportedIfNull(this, path); + return qname; } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java index e51da228f8..bbf0298654 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java @@ -10,16 +10,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; final class BaseBitsType extends AbstractBaseType implements BitsTypeDefinition { private final @NonNull ImmutableList bits; - BaseBitsType(final SchemaPath path, final Collection unknownSchemaNodes, + BaseBitsType(final QName qname, final Collection unknownSchemaNodes, final Collection bits) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.bits = ImmutableList.copyOf(bits); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java index 046f1fdc9b..14cabbe0b0 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java @@ -15,8 +15,8 @@ import com.google.common.collect.Range; import java.math.BigDecimal; import java.util.Collection; import java.util.Optional; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; @@ -77,9 +77,9 @@ final class BaseDecimalType extends AbstractRangeRestrictedBaseType unknownSchemaNodes, + BaseDecimalType(final QName qname, final Collection unknownSchemaNodes, final int fractionDigits, final RangeConstraint rangeConstraint) { - super(path, unknownSchemaNodes, rangeConstraint); + super(qname, unknownSchemaNodes, rangeConstraint); this.fractionDigits = fractionDigits; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java index f1d98c08e4..451b89becf 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java @@ -11,16 +11,16 @@ import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; final class BaseEnumerationType extends AbstractBaseType implements EnumTypeDefinition { private final @NonNull ImmutableList values; - BaseEnumerationType(final SchemaPath path, final Collection unknownSchemaNodes, + BaseEnumerationType(final QName qname, final Collection unknownSchemaNodes, final Collection values) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.values = ImmutableList.copyOf(values); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java index 7ef27d9057..a9bd92a4e6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java @@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull; import java.util.Collection; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; @@ -21,9 +21,9 @@ final class BaseIdentityrefType extends AbstractBaseType identities; - BaseIdentityrefType(final SchemaPath path, final Collection unknownSchemaNodes, + BaseIdentityrefType(final QName qname, final Collection unknownSchemaNodes, final Set identities) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.identities = requireNonNull(identities); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java index a5785dffd3..7235927cd6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; @@ -19,9 +19,9 @@ final class BaseLeafrefType extends AbstractBaseType impl private final PathExpression pathStatement; private final boolean requireInstance; - BaseLeafrefType(final SchemaPath path, final PathExpression pathStatement, final boolean requireInstance, + BaseLeafrefType(final QName qname, final PathExpression pathStatement, final boolean requireInstance, final Collection unknownSchemaNodes) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.pathStatement = requireNonNull(pathStatement); this.requireInstance = requireInstance; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java index 7960f2e7aa..f349944d46 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; @@ -63,28 +63,28 @@ public final class BaseTypes { return BaseBinaryType.INSTANCE; } - public static @NonNull BitsTypeBuilder bitsTypeBuilder(final SchemaPath path) { - return new BitsTypeBuilder(path); + public static @NonNull BitsTypeBuilder bitsTypeBuilder(final QName qname) { + return new BitsTypeBuilder(qname); } public static @NonNull BooleanTypeDefinition booleanType() { return BaseBooleanType.INSTANCE; } - public static @NonNull DecimalTypeBuilder decimalTypeBuilder(final SchemaPath path) { - return new DecimalTypeBuilder(path); + public static @NonNull DecimalTypeBuilder decimalTypeBuilder(final QName qname) { + return new DecimalTypeBuilder(qname); } public static @NonNull EmptyTypeDefinition emptyType() { return BaseEmptyType.INSTANCE; } - public static @NonNull EnumerationTypeBuilder enumerationTypeBuilder(final SchemaPath path) { - return new EnumerationTypeBuilder(path); + public static @NonNull EnumerationTypeBuilder enumerationTypeBuilder(final QName qname) { + return new EnumerationTypeBuilder(qname); } - public static @NonNull IdentityrefTypeBuilder identityrefTypeBuilder(final SchemaPath path) { - return new IdentityrefTypeBuilder(path); + public static @NonNull IdentityrefTypeBuilder identityrefTypeBuilder(final QName qname) { + return new IdentityrefTypeBuilder(qname); } public static @NonNull InstanceIdentifierTypeDefinition instanceIdentifierType() { @@ -107,16 +107,16 @@ public final class BaseTypes { return BaseInt64Type.INSTANCE; } - public static @NonNull LeafrefTypeBuilder leafrefTypeBuilder(final SchemaPath path) { - return new LeafrefTypeBuilder(path); + public static @NonNull LeafrefTypeBuilder leafrefTypeBuilder(final QName qname) { + return new LeafrefTypeBuilder(qname); } public static @NonNull StringTypeDefinition stringType() { return BaseStringType.INSTANCE; } - public static UnionTypeBuilder unionTypeBuilder(final SchemaPath path) { - return new UnionTypeBuilder(path); + public static UnionTypeBuilder unionTypeBuilder(final QName qname) { + return new UnionTypeBuilder(qname); } public static @NonNull Uint8TypeDefinition uint8Type() { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java index d1d0339afe..b3dd99fea1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; @@ -18,9 +18,9 @@ import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class BaseUnionType extends AbstractBaseType implements UnionTypeDefinition { private final ImmutableList> types; - BaseUnionType(final SchemaPath path, final Collection unknownSchemaNodes, + BaseUnionType(final QName qname, final Collection unknownSchemaNodes, final Collection> types) { - super(path, unknownSchemaNodes); + super(qname, unknownSchemaNodes); this.types = ImmutableList.copyOf(types); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java index 9cfd85470a..33edeefe2f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java @@ -8,24 +8,23 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import java.util.Map; import java.util.TreeMap; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; public final class BitsTypeBuilder extends AbstractRestrictedTypeBuilder { - private final Builder builder = ImmutableMap.builder(); + private final ImmutableMap.Builder builder = ImmutableMap.builder(); - BitsTypeBuilder(final SchemaPath path) { - super(null, path); + BitsTypeBuilder(final QName qname) { + super(null, qname); } - BitsTypeBuilder(final BitsTypeDefinition baseType, final SchemaPath path) { - super(baseType, path); + BitsTypeBuilder(final BitsTypeDefinition baseType, final QName qname) { + super(baseType, qname); } public BitsTypeBuilder addBit(final @NonNull Bit item) { @@ -71,7 +70,7 @@ public final class BitsTypeBuilder extends AbstractRestrictedTypeBuilder> extends DerivedTypeBuilder { - ConcreteTypeBuilder(final T baseType, final SchemaPath path) { - super(baseType, path); + ConcreteTypeBuilder(final T baseType, final QName qname) { + super(baseType, qname); setStatus(baseType.getStatus()); baseType.getDescription().ifPresent(this::setDescription); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java index 039b2b9d71..44bd9b49dc 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; @@ -41,254 +41,254 @@ public final class ConcreteTypes { // Hidden on purpose } - public static ConcreteTypeBuilder concreteTypeBuilder(final TypeDefinition baseType, final SchemaPath path) { + public static ConcreteTypeBuilder concreteTypeBuilder(final TypeDefinition baseType, final QName qname) { if (baseType instanceof BinaryTypeDefinition) { - return concreteBinaryBuilder((BinaryTypeDefinition) baseType, path); + return concreteBinaryBuilder((BinaryTypeDefinition) baseType, qname); } else if (baseType instanceof BitsTypeDefinition) { - return concreteBitsBuilder((BitsTypeDefinition) baseType, path); + return concreteBitsBuilder((BitsTypeDefinition) baseType, qname); } else if (baseType instanceof BooleanTypeDefinition) { - return concreteBooleanBuilder((BooleanTypeDefinition) baseType, path); + return concreteBooleanBuilder((BooleanTypeDefinition) baseType, qname); } else if (baseType instanceof DecimalTypeDefinition) { - return concreteDecimalBuilder((DecimalTypeDefinition) baseType, path); + return concreteDecimalBuilder((DecimalTypeDefinition) baseType, qname); } else if (baseType instanceof EmptyTypeDefinition) { - return concreteEmptyBuilder((EmptyTypeDefinition) baseType, path); + return concreteEmptyBuilder((EmptyTypeDefinition) baseType, qname); } else if (baseType instanceof EnumTypeDefinition) { - return concreteEnumerationBuilder((EnumTypeDefinition) baseType, path); + return concreteEnumerationBuilder((EnumTypeDefinition) baseType, qname); } else if (baseType instanceof IdentityrefTypeDefinition) { - return concreteIdentityrefBuilder((IdentityrefTypeDefinition) baseType, path); + return concreteIdentityrefBuilder((IdentityrefTypeDefinition) baseType, qname); } else if (baseType instanceof InstanceIdentifierTypeDefinition) { - return concreteInstanceIdentifierBuilder((InstanceIdentifierTypeDefinition) baseType, path); + return concreteInstanceIdentifierBuilder((InstanceIdentifierTypeDefinition) baseType, qname); } else if (baseType instanceof Int8TypeDefinition) { - return concreteInt8Builder((Int8TypeDefinition) baseType, path); + return concreteInt8Builder((Int8TypeDefinition) baseType, qname); } else if (baseType instanceof Int16TypeDefinition) { - return concreteInt16Builder((Int16TypeDefinition) baseType, path); + return concreteInt16Builder((Int16TypeDefinition) baseType, qname); } else if (baseType instanceof Int32TypeDefinition) { - return concreteInt32Builder((Int32TypeDefinition) baseType, path); + return concreteInt32Builder((Int32TypeDefinition) baseType, qname); } else if (baseType instanceof Int64TypeDefinition) { - return concreteInt64Builder((Int64TypeDefinition) baseType, path); + return concreteInt64Builder((Int64TypeDefinition) baseType, qname); } else if (baseType instanceof LeafrefTypeDefinition) { - return concreteLeafrefBuilder((LeafrefTypeDefinition) baseType, path); + return concreteLeafrefBuilder((LeafrefTypeDefinition) baseType, qname); } else if (baseType instanceof StringTypeDefinition) { - return concreteStringBuilder((StringTypeDefinition) baseType, path); + return concreteStringBuilder((StringTypeDefinition) baseType, qname); } else if (baseType instanceof UnionTypeDefinition) { - return concreteUnionBuilder((UnionTypeDefinition) baseType, path); + return concreteUnionBuilder((UnionTypeDefinition) baseType, qname); } else if (baseType instanceof Uint8TypeDefinition) { - return concreteUint8Builder((Uint8TypeDefinition) baseType, path); + return concreteUint8Builder((Uint8TypeDefinition) baseType, qname); } else if (baseType instanceof Uint16TypeDefinition) { - return concreteUint16Builder((Uint16TypeDefinition) baseType, path); + return concreteUint16Builder((Uint16TypeDefinition) baseType, qname); } else if (baseType instanceof Uint32TypeDefinition) { - return concreteUint32Builder((Uint32TypeDefinition) baseType, path); + return concreteUint32Builder((Uint32TypeDefinition) baseType, qname); } else if (baseType instanceof Uint64TypeDefinition) { - return concreteUint64Builder((Uint64TypeDefinition) baseType, path); + return concreteUint64Builder((Uint64TypeDefinition) baseType, qname); } else { throw new IllegalArgumentException("Unhandled type definition class " + baseType.getClass()); } } private static ConcreteTypeBuilder concreteBinaryBuilder( - final BinaryTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final BinaryTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public BinaryTypeDefinition buildType() { - return new DerivedBinaryType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBinaryType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteBitsBuilder(final BitsTypeDefinition baseType, - final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public BitsTypeDefinition buildType() { - return new DerivedBitsType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBitsType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteBooleanBuilder( - final BooleanTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final BooleanTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public BooleanTypeDefinition buildType() { - return new DerivedBooleanType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBooleanType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteDecimalBuilder( - final DecimalTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final DecimalTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public DecimalTypeDefinition buildType() { - return new DerivedDecimalType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedDecimalType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteEmptyBuilder(final EmptyTypeDefinition baseType, - final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public EmptyTypeDefinition buildType() { - return new DerivedEmptyType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedEmptyType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteEnumerationBuilder( - final EnumTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final EnumTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public EnumTypeDefinition buildType() { - return new DerivedEnumerationType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedEnumerationType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteIdentityrefBuilder( - final IdentityrefTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final IdentityrefTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public IdentityrefTypeDefinition buildType() { - return new DerivedIdentityrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedIdentityrefType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteInstanceIdentifierBuilder( - final InstanceIdentifierTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final InstanceIdentifierTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public InstanceIdentifierTypeDefinition buildType() { - return new DerivedInstanceIdentifierType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInstanceIdentifierType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes(), baseType.requireInstance()); } }; } private static ConcreteTypeBuilder concreteInt8Builder( - final Int8TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Int8TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Int8TypeDefinition buildType() { - return new DerivedInt8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt8Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteInt16Builder( - final Int16TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Int16TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Int16TypeDefinition buildType() { - return new DerivedInt16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt16Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteInt32Builder( - final Int32TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Int32TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Int32TypeDefinition buildType() { - return new DerivedInt32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt32Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteInt64Builder( - final Int64TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Int64TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Int64TypeDefinition buildType() { - return new DerivedInt64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt64Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteLeafrefBuilder( - final LeafrefTypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final LeafrefTypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public LeafrefTypeDefinition buildType() { - return new DerivedLeafrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedLeafrefType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteStringBuilder(final StringTypeDefinition baseType, - final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public StringTypeDefinition buildType() { - return new DerivedStringType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedStringType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteUnionBuilder(final UnionTypeDefinition baseType, - final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public DerivedUnionType buildType() { - return new DerivedUnionType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUnionType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteUint8Builder( - final Uint8TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Uint8TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Uint8TypeDefinition buildType() { - return new DerivedUint8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint8Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteUint16Builder( - final Uint16TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Uint16TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Uint16TypeDefinition buildType() { - return new DerivedUint16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint16Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteUint32Builder( - final Uint32TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Uint32TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Uint32TypeDefinition buildType() { - return new DerivedUint32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint32Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static ConcreteTypeBuilder concreteUint64Builder( - final Uint64TypeDefinition baseType, final SchemaPath path) { - return new ConcreteTypeBuilder<>(baseType, path) { + final Uint64TypeDefinition baseType, final QName qname) { + return new ConcreteTypeBuilder<>(baseType, qname) { @Override public Uint64TypeDefinition buildType() { - return new DerivedUint64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint64Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java index fbb7ca60d4..3651735215 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java @@ -7,21 +7,22 @@ */ package org.opendaylight.yangtools.yang.model.util.type; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.base.Preconditions; import java.math.BigDecimal; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; public final class DecimalTypeBuilder extends RangeRestrictedTypeBuilder { private Integer fractionDigits; - DecimalTypeBuilder(final SchemaPath path) { - super(null, path); + DecimalTypeBuilder(final QName qname) { + super(null, qname); } public DecimalTypeBuilder setFractionDigits(final int fractionDigits) { - Preconditions.checkState(this.fractionDigits == null, "Fraction digits already defined to %s", - this.fractionDigits); + checkState(this.fractionDigits == null, "Fraction digits already defined to %s", this.fractionDigits); this.fractionDigits = fractionDigits; return this; } @@ -30,7 +31,7 @@ public final class DecimalTypeBuilder extends RangeRestrictedTypeBuilder implements BinaryTypeDefinition { - DerivedBinaryType(final BinaryTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedBinaryType(final BinaryTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java index fbc6fd854c..d0f534aa90 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java @@ -8,16 +8,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; final class DerivedBitsType extends AbstractDerivedType implements BitsTypeDefinition { - DerivedBitsType(final BitsTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + DerivedBitsType(final BitsTypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java index 1a347611c6..0cbe1fae16 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java @@ -8,16 +8,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; final class DerivedBooleanType extends AbstractDerivedType implements BooleanTypeDefinition { - DerivedBooleanType(final BooleanTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedBooleanType(final BooleanTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java index 27981bb8b6..030194ac98 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.math.BigDecimal; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; final class DerivedDecimalType extends AbstractRangeRestrictedDerivedType implements DecimalTypeDefinition { - DerivedDecimalType(final DecimalTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedDecimalType(final DecimalTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java index 6f8e157dd4..71763ec7f3 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java @@ -8,16 +8,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; final class DerivedEmptyType extends AbstractDerivedType implements EmptyTypeDefinition { - DerivedEmptyType(final EmptyTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedEmptyType(final EmptyTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java index 9a96e94e6a..d257ec6ae3 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java @@ -9,16 +9,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; final class DerivedEnumerationType extends AbstractDerivedType implements EnumTypeDefinition { - DerivedEnumerationType(final EnumTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemNodes); + DerivedEnumerationType(final EnumTypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java index c9505655bb..be40a9859b 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java @@ -9,18 +9,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Set; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class DerivedIdentityrefType extends AbstractDerivedType implements IdentityrefTypeDefinition { - DerivedIdentityrefType(final IdentityrefTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedIdentityrefType(final IdentityrefTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java index cc2926aa57..572178ac06 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition; @@ -17,11 +17,11 @@ final class DerivedInstanceIdentifierType extends AbstractDerivedType unknownSchemaNodes, final boolean requireInstance) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); this.requireInstance = requireInstance; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java index 130150dcf7..922f5df7a8 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java @@ -8,17 +8,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition; final class DerivedInt16Type extends AbstractRangeRestrictedDerivedType implements Int16TypeDefinition { - DerivedInt16Type(final Int16TypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedInt16Type(final Int16TypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java index 2b597fc2c3..7a8c22ad12 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java @@ -8,17 +8,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition; final class DerivedInt32Type extends AbstractRangeRestrictedDerivedType implements Int32TypeDefinition { - DerivedInt32Type(final Int32TypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedInt32Type(final Int32TypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java index acd7ef00f2..bb54d1dda6 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java @@ -8,17 +8,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition; final class DerivedInt64Type extends AbstractRangeRestrictedDerivedType implements Int64TypeDefinition { - DerivedInt64Type(final Int64TypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedInt64Type(final Int64TypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java index ba2d4d7b66..ceb9982618 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java @@ -8,17 +8,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition; final class DerivedInt8Type extends AbstractRangeRestrictedDerivedType implements Int8TypeDefinition { - DerivedInt8Type(final Int8TypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedInt8Type(final Int8TypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java index 598a193047..b0fb713e8b 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java @@ -8,18 +8,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; final class DerivedLeafrefType extends AbstractDerivedType implements LeafrefTypeDefinition { - - DerivedLeafrefType(final LeafrefTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedLeafrefType(final LeafrefTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java index fc8bd4096a..7104a02190 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; @@ -17,10 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; final class DerivedStringType extends AbstractLengthRestrictedDerivedType implements StringTypeDefinition { - DerivedStringType(final StringTypeDefinition baseType, final SchemaPath path, final Object defaultValue, + DerivedStringType(final StringTypeDefinition baseType, final QName qname, final Object defaultValue, final String description, final String reference, final Status status, final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java index 811c6ae316..07a8a9a1c8 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.slf4j.Logger; @@ -31,8 +31,8 @@ public abstract class DerivedTypeBuilder> extends Ty private Status status = Status.CURRENT; private String units; - DerivedTypeBuilder(final T baseType, final SchemaPath path) { - super(requireNonNull(baseType), path); + DerivedTypeBuilder(final T baseType, final QName qname) { + super(requireNonNull(baseType), qname); checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType || baseType instanceof AbstractRestrictedType, @@ -66,7 +66,7 @@ public abstract class DerivedTypeBuilder> extends Ty final Optional baseUnits = getBaseType().getUnits(); if (baseUnits.isPresent() && !units.equals(baseUnits.get())) { - LOG.warn("Type {} uverrides 'units' of type {} to \"{}\"", getPath(), getBaseType(), units); + LOG.warn("Type {} uverrides 'units' of type {} to \"{}\"", getQName(), getBaseType(), units); } this.units = units; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java index a6e73d5d90..1863b32f7a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java @@ -9,8 +9,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; @@ -49,254 +48,254 @@ public final class DerivedTypes { } public static @NonNull DerivedTypeBuilder derivedTypeBuilder(final @NonNull TypeDefinition baseType, - final @Nullable SchemaPath path) { + final @NonNull QName qname) { if (baseType instanceof BinaryTypeDefinition) { - return derivedBinaryBuilder((BinaryTypeDefinition) baseType, path); + return derivedBinaryBuilder((BinaryTypeDefinition) baseType, qname); } else if (baseType instanceof BitsTypeDefinition) { - return derivedBitsBuilder((BitsTypeDefinition) baseType, path); + return derivedBitsBuilder((BitsTypeDefinition) baseType, qname); } else if (baseType instanceof BooleanTypeDefinition) { - return derivedBooleanBuilder((BooleanTypeDefinition) baseType, path); + return derivedBooleanBuilder((BooleanTypeDefinition) baseType, qname); } else if (baseType instanceof DecimalTypeDefinition) { - return derivedDecimalBuilder((DecimalTypeDefinition) baseType, path); + return derivedDecimalBuilder((DecimalTypeDefinition) baseType, qname); } else if (baseType instanceof EmptyTypeDefinition) { - return derivedEmptyBuilder((EmptyTypeDefinition) baseType, path); + return derivedEmptyBuilder((EmptyTypeDefinition) baseType, qname); } else if (baseType instanceof EnumTypeDefinition) { - return derivedEnumerationBuilder((EnumTypeDefinition) baseType, path); + return derivedEnumerationBuilder((EnumTypeDefinition) baseType, qname); } else if (baseType instanceof IdentityrefTypeDefinition) { - return derivedIdentityrefBuilder((IdentityrefTypeDefinition) baseType, path); + return derivedIdentityrefBuilder((IdentityrefTypeDefinition) baseType, qname); } else if (baseType instanceof InstanceIdentifierTypeDefinition) { - return derivedInstanceIdentifierBuilder((InstanceIdentifierTypeDefinition) baseType, path); + return derivedInstanceIdentifierBuilder((InstanceIdentifierTypeDefinition) baseType, qname); } else if (baseType instanceof Int8TypeDefinition) { - return derivedInt8Builder((Int8TypeDefinition) baseType, path); + return derivedInt8Builder((Int8TypeDefinition) baseType, qname); } else if (baseType instanceof Int16TypeDefinition) { - return derivedInt16Builder((Int16TypeDefinition) baseType, path); + return derivedInt16Builder((Int16TypeDefinition) baseType, qname); } else if (baseType instanceof Int32TypeDefinition) { - return derivedInt32Builder((Int32TypeDefinition) baseType, path); + return derivedInt32Builder((Int32TypeDefinition) baseType, qname); } else if (baseType instanceof Int64TypeDefinition) { - return derivedInt64Builder((Int64TypeDefinition) baseType, path); + return derivedInt64Builder((Int64TypeDefinition) baseType, qname); } else if (baseType instanceof LeafrefTypeDefinition) { - return derivedLeafrefBuilder((LeafrefTypeDefinition) baseType, path); + return derivedLeafrefBuilder((LeafrefTypeDefinition) baseType, qname); } else if (baseType instanceof StringTypeDefinition) { - return derivedStringBuilder((StringTypeDefinition) baseType, path); + return derivedStringBuilder((StringTypeDefinition) baseType, qname); } else if (baseType instanceof UnionTypeDefinition) { - return derivedUnionBuilder((UnionTypeDefinition) baseType, path); + return derivedUnionBuilder((UnionTypeDefinition) baseType, qname); } else if (baseType instanceof Uint8TypeDefinition) { - return derivedUint8Builder((Uint8TypeDefinition) baseType, path); + return derivedUint8Builder((Uint8TypeDefinition) baseType, qname); } else if (baseType instanceof Uint16TypeDefinition) { - return derivedUint16Builder((Uint16TypeDefinition) baseType, path); + return derivedUint16Builder((Uint16TypeDefinition) baseType, qname); } else if (baseType instanceof Uint32TypeDefinition) { - return derivedUint32Builder((Uint32TypeDefinition) baseType, path); + return derivedUint32Builder((Uint32TypeDefinition) baseType, qname); } else if (baseType instanceof Uint64TypeDefinition) { - return derivedUint64Builder((Uint64TypeDefinition) baseType, path); + return derivedUint64Builder((Uint64TypeDefinition) baseType, qname); } else { throw new IllegalArgumentException("Unhandled type definition class " + baseType.getClass()); } } public static @NonNull DerivedTypeBuilder derivedBinaryBuilder( - final @NonNull BinaryTypeDefinition baseType, final @Nullable SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final @NonNull BinaryTypeDefinition baseType, final @NonNull QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public BinaryTypeDefinition build() { - return new DerivedBinaryType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBinaryType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedBitsBuilder(final BitsTypeDefinition baseType, - final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public BitsTypeDefinition build() { - return new DerivedBitsType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBitsType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedBooleanBuilder( - final @NonNull BooleanTypeDefinition baseType, final @Nullable SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final @NonNull BooleanTypeDefinition baseType, final @NonNull QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public BooleanTypeDefinition build() { - return new DerivedBooleanType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedBooleanType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedDecimalBuilder( - final DecimalTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final DecimalTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public DecimalTypeDefinition build() { - return new DerivedDecimalType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedDecimalType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedEmptyBuilder( - final EmptyTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final EmptyTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public EmptyTypeDefinition build() { - return new DerivedEmptyType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedEmptyType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedEnumerationBuilder( - final EnumTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final EnumTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public EnumTypeDefinition build() { - return new DerivedEnumerationType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedEnumerationType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedIdentityrefBuilder( - final IdentityrefTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final IdentityrefTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public IdentityrefTypeDefinition build() { - return new DerivedIdentityrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedIdentityrefType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedInstanceIdentifierBuilder( - final InstanceIdentifierTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final InstanceIdentifierTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public InstanceIdentifierTypeDefinition build() { - return new DerivedInstanceIdentifierType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInstanceIdentifierType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes(), baseType.requireInstance()); } }; } private static @NonNull DerivedTypeBuilder derivedInt8Builder(final Int8TypeDefinition baseType, - final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Int8TypeDefinition build() { - return new DerivedInt8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt8Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedInt16Builder( - final Int16TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Int16TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Int16TypeDefinition build() { - return new DerivedInt16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt16Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedInt32Builder( - final Int32TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Int32TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Int32TypeDefinition build() { - return new DerivedInt32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt32Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedInt64Builder( - final Int64TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Int64TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Int64TypeDefinition build() { - return new DerivedInt64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedInt64Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedLeafrefBuilder( - final LeafrefTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final LeafrefTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public LeafrefTypeDefinition build() { - return new DerivedLeafrefType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedLeafrefType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedStringBuilder( - final StringTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final StringTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public StringTypeDefinition build() { - return new DerivedStringType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedStringType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedUnionBuilder( - final UnionTypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final UnionTypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public DerivedUnionType build() { - return new DerivedUnionType(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUnionType(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedUint8Builder( - final Uint8TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Uint8TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Uint8TypeDefinition build() { - return new DerivedUint8Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint8Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } private static @NonNull DerivedTypeBuilder derivedUint16Builder( - final Uint16TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Uint16TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Uint16TypeDefinition build() { - return new DerivedUint16Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint16Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedUint32Builder( - final Uint32TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Uint32TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Uint32TypeDefinition build() { - return new DerivedUint32Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint32Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; } public static @NonNull DerivedTypeBuilder derivedUint64Builder( - final Uint64TypeDefinition baseType, final SchemaPath path) { - return new DerivedTypeBuilder(baseType, path) { + final Uint64TypeDefinition baseType, final QName qname) { + return new DerivedTypeBuilder<>(baseType, qname) { @Override public Uint64TypeDefinition build() { - return new DerivedUint64Type(getBaseType(), getPath(), getDefaultValue(), getDescription(), + return new DerivedUint64Type(getBaseType(), getQName(), getDefaultValue(), getDescription(), getReference(), getStatus(), getUnits(), getUnknownSchemaNodes()); } }; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java index 444cd1fa73..1c4a5fb305 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java @@ -8,19 +8,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint16; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition; final class DerivedUint16Type extends AbstractRangeRestrictedDerivedType implements Uint16TypeDefinition { - - DerivedUint16Type(final Uint16TypeDefinition baseType, final SchemaPath path, - final Object defaultValue, final String description, final String reference, final Status status, - final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + DerivedUint16Type(final Uint16TypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java index 281f1c2765..84845a8f94 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java @@ -8,19 +8,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; final class DerivedUint32Type extends AbstractRangeRestrictedDerivedType implements Uint32TypeDefinition { - - DerivedUint32Type(final Uint32TypeDefinition baseType, final SchemaPath path, - final Object defaultValue, final String description, final String reference, final Status status, - final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + DerivedUint32Type(final Uint32TypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java index 7dcccaf905..4e42313fc0 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java @@ -8,18 +8,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint64; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition; final class DerivedUint64Type extends AbstractRangeRestrictedDerivedType implements Uint64TypeDefinition { - DerivedUint64Type(final Uint64TypeDefinition baseType, final SchemaPath path, - final Object defaultValue, final String description, final String reference, final Status status, - final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + DerivedUint64Type(final Uint64TypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java index e3d55e548f..c3edc77905 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java @@ -8,18 +8,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint8; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; final class DerivedUint8Type extends AbstractRangeRestrictedDerivedType implements Uint8TypeDefinition { - DerivedUint8Type(final Uint8TypeDefinition baseType, final SchemaPath path, - final Object defaultValue, final String description, final String reference, final Status status, - final String units, final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + DerivedUint8Type(final Uint8TypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java index 70944de595..57e549c625 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class DerivedUnionType extends AbstractDerivedType implements UnionTypeDefinition { - DerivedUnionType(final UnionTypeDefinition baseType, final SchemaPath path, final Object defaultValue, - final String description, final String reference, final Status status, final String units, - final Collection unknownSchemaNodes) { - super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes); + DerivedUnionType(final UnionTypeDefinition baseType, final QName qname, final Object defaultValue, + final String description, final String reference, final Status status, final String units, + final Collection unknownSchemaNodes) { + super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java index bb95d6ed66..3680e4bc2a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java @@ -12,19 +12,19 @@ import com.google.common.collect.ImmutableMap.Builder; import java.util.HashMap; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; public final class EnumerationTypeBuilder extends AbstractRestrictedTypeBuilder { private final Builder builder = ImmutableMap.builder(); - EnumerationTypeBuilder(final SchemaPath path) { - super(null, path); + EnumerationTypeBuilder(final QName qname) { + super(null, qname); } - EnumerationTypeBuilder(final EnumTypeDefinition baseType, final SchemaPath path) { - super(baseType, path); + EnumerationTypeBuilder(final EnumTypeDefinition baseType, final QName qname) { + super(baseType, qname); } public EnumerationTypeBuilder addEnum(final @NonNull EnumPair item) { @@ -71,7 +71,7 @@ public final class EnumerationTypeBuilder extends AbstractRestrictedTypeBuilder< } } - return getBaseType() == null ? new BaseEnumerationType(getPath(), getUnknownSchemaNodes(), map.values()) - : new RestrictedEnumerationType(getBaseType(), getPath(), getUnknownSchemaNodes(), map.values()); + return getBaseType() == null ? new BaseEnumerationType(getQName(), getUnknownSchemaNodes(), map.values()) + : new RestrictedEnumerationType(getBaseType(), getQName(), getUnknownSchemaNodes(), map.values()); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java index 23d63bda4b..d9fe09dfff 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java @@ -13,15 +13,15 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; public final class IdentityrefTypeBuilder extends TypeBuilder { private final Builder builder = ImmutableSet.builder(); - IdentityrefTypeBuilder(final SchemaPath path) { - super(null, path); + IdentityrefTypeBuilder(final QName qname) { + super(null, qname); } public IdentityrefTypeBuilder addIdentity(final @NonNull IdentitySchemaNode identity) { @@ -32,7 +32,7 @@ public final class IdentityrefTypeBuilder extends TypeBuilder identities = builder.build(); - checkState(!identities.isEmpty(), "No identities specified in %s, at least one is required", getPath()); - return new BaseIdentityrefType(getPath(), getUnknownSchemaNodes(), identities); + checkState(!identities.isEmpty(), "No identities specified in %s, at least one is required", getQName()); + return new BaseIdentityrefType(getQName(), getUnknownSchemaNodes(), identities); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java index 5c99a0675e..d42c065ddb 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java @@ -9,15 +9,13 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition; public final class InstanceIdentifierTypeBuilder extends RequireInstanceRestrictedTypeBuilder { - - InstanceIdentifierTypeBuilder(final InstanceIdentifierTypeDefinition baseType, - final SchemaPath path) { - super(requireNonNull(baseType), path); + InstanceIdentifierTypeBuilder(final InstanceIdentifierTypeDefinition baseType, final QName qname) { + super(requireNonNull(baseType), qname); } @Override @@ -27,6 +25,6 @@ public final class InstanceIdentifierTypeBuilder return base; } - return new RestrictedInstanceIdentifierType(base, getPath(), getUnknownSchemaNodes(), getRequireInstance()); + return new RestrictedInstanceIdentifierType(base, getQName(), getUnknownSchemaNodes(), getRequireInstance()); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java index 77a3c3a92f..b268fadb93 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java @@ -11,15 +11,15 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; public final class LeafrefTypeBuilder extends RequireInstanceRestrictedTypeBuilder { private PathExpression pathStatement; - LeafrefTypeBuilder(final SchemaPath path) { - super(null, path); + LeafrefTypeBuilder(final QName qname) { + super(null, qname); } public LeafrefTypeBuilder setPathStatement(final @NonNull PathExpression pathStatement) { @@ -30,6 +30,6 @@ public final class LeafrefTypeBuilder extends RequireInstanceRestrictedTypeBuild @Override LeafrefTypeDefinition buildType() { - return new BaseLeafrefType(getPath(), pathStatement, getRequireInstance(), getUnknownSchemaNodes()); + return new BaseLeafrefType(getQName(), pathStatement, getRequireInstance(), getUnknownSchemaNodes()); } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java index e7056dfccf..8378773f92 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java @@ -18,8 +18,8 @@ import com.google.common.collect.RangeSet; import java.util.List; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; @@ -29,8 +29,8 @@ public abstract class LengthRestrictedTypeBuilder { private LengthConstraint lengthConstraint; - LengthRestrictedTypeBuilder(final T baseType, final SchemaPath path) { - super(requireNonNull(baseType), path); + LengthRestrictedTypeBuilder(final T baseType, final QName qname) { + super(requireNonNull(baseType), qname); } /** diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java index b60e5c746f..a728640043 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; @@ -33,8 +33,8 @@ public abstract class RangeRestrictedTypeBuilder ranges; - RangeRestrictedTypeBuilder(final T baseType, final SchemaPath path) { - super(baseType, path); + RangeRestrictedTypeBuilder(final T baseType, final QName qname) { + super(baseType, qname); } @SuppressWarnings("checkstyle:hiddenField") diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java index 9045b0a39e..1713cc183e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java @@ -10,15 +10,14 @@ package org.opendaylight.yangtools.yang.model.util.type; import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeRestrictedTypeDefinition; abstract class RangeRestrictedTypeBuilderWithBase, N extends Number & Comparable> extends RangeRestrictedTypeBuilder { - - RangeRestrictedTypeBuilderWithBase(final T baseType, final SchemaPath path) { - super(requireNonNull(baseType), path); + RangeRestrictedTypeBuilderWithBase(final T baseType, final QName qname) { + super(requireNonNull(baseType), qname); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java index c65e4acf82..24c1489462 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.annotations.Beta; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.RequireInstanceRestrictedTypeDefinition; @Beta @@ -16,8 +16,8 @@ public abstract class RequireInstanceRestrictedTypeBuilder { private boolean requireInstance; - RequireInstanceRestrictedTypeBuilder(final T baseType, final SchemaPath path) { - super(baseType, path); + RequireInstanceRestrictedTypeBuilder(final T baseType, final QName qname) { + super(baseType, qname); requireInstance = baseType == null || baseType.requireInstance(); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java index 004992a3cc..9b162bf893 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; final class RestrictedBinaryType extends AbstractLengthRestrictedType implements BinaryTypeDefinition { - RestrictedBinaryType(final BinaryTypeDefinition baseType, final SchemaPath path, + RestrictedBinaryType(final BinaryTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable LengthConstraint lengthConstraint) { - super(baseType, path, unknownSchemaNodes, lengthConstraint); + super(baseType, qname, unknownSchemaNodes, lengthConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java index b89fd2e580..ef650b2b17 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java @@ -10,16 +10,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; final class RestrictedBitsType extends AbstractRestrictedType implements BitsTypeDefinition { private final @NonNull ImmutableList bits; - RestrictedBitsType(final BitsTypeDefinition baseType, final SchemaPath path, + RestrictedBitsType(final BitsTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final Collection bits) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); this.bits = ImmutableList.copyOf(bits); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java index 186554a123..8327be9987 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java @@ -8,15 +8,15 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; final class RestrictedBooleanType extends AbstractRestrictedType implements BooleanTypeDefinition { - RestrictedBooleanType(final BooleanTypeDefinition baseType, final SchemaPath path, + RestrictedBooleanType(final BooleanTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java index 94c0761395..83f5a15063 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java @@ -10,17 +10,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.math.BigDecimal; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedDecimalType extends AbstractRangeRestrictedType implements DecimalTypeDefinition { - RestrictedDecimalType(final DecimalTypeDefinition baseType, final SchemaPath path, + RestrictedDecimalType(final DecimalTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java index 840bbcb7e0..3757992fae 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; final class RestrictedEmptyType extends AbstractRestrictedType implements EmptyTypeDefinition { - RestrictedEmptyType(final EmptyTypeDefinition baseType, final SchemaPath path, + RestrictedEmptyType(final EmptyTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java index 1058cb9b9a..aa728517d9 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java @@ -11,16 +11,16 @@ import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; final class RestrictedEnumerationType extends AbstractRestrictedType implements EnumTypeDefinition { private final @NonNull ImmutableList values; - RestrictedEnumerationType(final EnumTypeDefinition baseType, final SchemaPath path, + RestrictedEnumerationType(final EnumTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final Collection values) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); this.values = ImmutableList.copyOf(values); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java index 7429c45eed..e67a678770 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java @@ -9,16 +9,16 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.Set; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; final class RestrictedIdentityrefType extends AbstractRestrictedType implements IdentityrefTypeDefinition { - RestrictedIdentityrefType(final IdentityrefTypeDefinition baseType, final SchemaPath path, + RestrictedIdentityrefType(final IdentityrefTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java index a6f1fb5d8e..62f135c725 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition; @@ -16,9 +16,9 @@ final class RestrictedInstanceIdentifierType extends AbstractRestrictedType unknownSchemaNodes, final boolean requireInstance) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); this.requireInstance = requireInstance; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java index 2311cdb8f2..61cd9f9cfa 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt16Type extends AbstractRangeRestrictedType implements Int16TypeDefinition { - RestrictedInt16Type(final Int16TypeDefinition baseType, final SchemaPath path, + RestrictedInt16Type(final Int16TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java index a4ca9e9cff..61e79a1588 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt32Type extends AbstractRangeRestrictedType implements Int32TypeDefinition { - RestrictedInt32Type(final Int32TypeDefinition baseType, final SchemaPath path, + RestrictedInt32Type(final Int32TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java index 5774fdc2f7..686fa8a6dd 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt64Type extends AbstractRangeRestrictedType implements Int64TypeDefinition { - RestrictedInt64Type(final Int64TypeDefinition baseType, final SchemaPath path, + RestrictedInt64Type(final Int64TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java index 6ebd7f56ba..c61d5a5fca 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java @@ -9,17 +9,17 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; final class RestrictedInt8Type extends AbstractRangeRestrictedType implements Int8TypeDefinition { - RestrictedInt8Type(final Int8TypeDefinition baseType, final SchemaPath path, + RestrictedInt8Type(final Int8TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java index 3c37ca4ab9..b4340ba383 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java @@ -8,20 +8,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; final class RestrictedLeafrefType extends AbstractRestrictedType implements LeafrefTypeDefinition { - private final boolean requireInstance; - RestrictedLeafrefType(final LeafrefTypeDefinition baseType, final SchemaPath path, + RestrictedLeafrefType(final LeafrefTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final boolean requireInstance) { - super(baseType, path, unknownSchemaNodes); - + super(baseType, qname, unknownSchemaNodes); this.requireInstance = requireInstance; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java index 2edee42d9d..a1a6acbf69 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; @@ -22,11 +22,11 @@ final class RestrictedStringType extends AbstractLengthRestrictedType patternConstraints; - RestrictedStringType(final StringTypeDefinition baseType, final SchemaPath path, + RestrictedStringType(final StringTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable LengthConstraint lengthConstraints, final List patternConstraints) { - super(baseType, path, unknownSchemaNodes, lengthConstraints); + super(baseType, qname, unknownSchemaNodes, lengthConstraints); this.patternConstraints = ImmutableList.copyOf(patternConstraints); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java index 86a2dfaba3..7cc226a538 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java @@ -11,6 +11,7 @@ import com.google.common.annotations.Beta; import java.math.BigDecimal; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; @@ -78,11 +79,11 @@ public final class RestrictedTypes { } public static @NonNull LengthRestrictedTypeBuilder newBinaryBuilder( - final @NonNull BinaryTypeDefinition baseType, final @Nullable SchemaPath path) { - return new LengthRestrictedTypeBuilder<>(baseType, path) { + final @NonNull BinaryTypeDefinition baseType, final @NonNull QName qname) { + return new LengthRestrictedTypeBuilder<>(baseType, qname) { @Override BinaryTypeDefinition buildType(final @Nullable LengthConstraint constraint) { - return new RestrictedBinaryType(getBaseType(), getPath(), getUnknownSchemaNodes(), constraint); + return new RestrictedBinaryType(getBaseType(), getQName(), getUnknownSchemaNodes(), constraint); } @Override @@ -96,167 +97,165 @@ public final class RestrictedTypes { }; } - public static @NonNull BitsTypeBuilder newBitsBuilder(final BitsTypeDefinition baseType, - final SchemaPath path) { - return new BitsTypeBuilder(baseType, path); + public static @NonNull BitsTypeBuilder newBitsBuilder(final BitsTypeDefinition baseType, final QName qname) { + return new BitsTypeBuilder(baseType, qname); } public static @NonNull TypeBuilder newBooleanBuilder( - final @NonNull BooleanTypeDefinition baseType, final @Nullable SchemaPath path) { - return new AbstractRestrictedTypeBuilder<>(baseType, path) { + final @NonNull BooleanTypeDefinition baseType, final @NonNull QName qname) { + return new AbstractRestrictedTypeBuilder<>(baseType, qname) { @Override BooleanTypeDefinition buildType() { - return new RestrictedBooleanType(getBaseType(), getPath(), getUnknownSchemaNodes()); + return new RestrictedBooleanType(getBaseType(), getQName(), getUnknownSchemaNodes()); } }; } public static @NonNull RangeRestrictedTypeBuilder newDecima64Builder( - final DecimalTypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase<>(baseType, path) { + final DecimalTypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override DecimalTypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedDecimalType(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + return new RestrictedDecimalType(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull TypeBuilder newEmptyBuilder(final EmptyTypeDefinition baseType, - final SchemaPath path) { - return new AbstractRestrictedTypeBuilder<>(baseType, path) { + final QName qname) { + return new AbstractRestrictedTypeBuilder<>(baseType, qname) { @Override EmptyTypeDefinition buildType() { - return new RestrictedEmptyType(getBaseType(), getPath(), getUnknownSchemaNodes()); + return new RestrictedEmptyType(getBaseType(), getQName(), getUnknownSchemaNodes()); } }; } public static @NonNull EnumerationTypeBuilder newEnumerationBuilder(final EnumTypeDefinition baseType, - final SchemaPath path) { - return new EnumerationTypeBuilder(baseType, path); + final QName qname) { + return new EnumerationTypeBuilder(baseType, qname); } public static @NonNull TypeBuilder newIdentityrefBuilder( - final IdentityrefTypeDefinition baseType, final SchemaPath path) { - return new AbstractRestrictedTypeBuilder<>(baseType, path) { + final IdentityrefTypeDefinition baseType, final QName qname) { + return new AbstractRestrictedTypeBuilder<>(baseType, qname) { @Override IdentityrefTypeDefinition buildType() { - return new RestrictedIdentityrefType(getBaseType(), getPath(), getUnknownSchemaNodes()); + return new RestrictedIdentityrefType(getBaseType(), getQName(), getUnknownSchemaNodes()); } }; } public static @NonNull InstanceIdentifierTypeBuilder newInstanceIdentifierBuilder( - final InstanceIdentifierTypeDefinition baseType, final SchemaPath path) { - return new InstanceIdentifierTypeBuilder(baseType, path); + final InstanceIdentifierTypeDefinition baseType, final QName qname) { + return new InstanceIdentifierTypeBuilder(baseType, qname); } public static @NonNull RequireInstanceRestrictedTypeBuilder newLeafrefBuilder( - final LeafrefTypeDefinition baseType, final SchemaPath path) { - return new RequireInstanceRestrictedTypeBuilder<>(baseType, path) { + final LeafrefTypeDefinition baseType, final QName qname) { + return new RequireInstanceRestrictedTypeBuilder<>(baseType, qname) { @Override LeafrefTypeDefinition buildType() { final LeafrefTypeDefinition base = getBaseType(); if (getRequireInstance() == base.requireInstance()) { return base; } - return new RestrictedLeafrefType(getBaseType(), getPath(), getUnknownSchemaNodes(), + return new RestrictedLeafrefType(getBaseType(), getQName(), getUnknownSchemaNodes(), getRequireInstance()); } }; } public static @NonNull RangeRestrictedTypeBuilder newInt8Builder( - final Int8TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase<>(baseType, path) { + final Int8TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override Int8TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedInt8Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + return new RestrictedInt8Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newInt16Builder( - final Int16TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase<>(baseType, path) { + final Int16TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override Int16TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedInt16Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + return new RestrictedInt16Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newInt32Builder( - final Int32TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase<>(baseType, path) { + final Int32TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override Int32TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedInt32Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + return new RestrictedInt32Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newInt64Builder( - final Int64TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase<>(baseType, path) { + final Int64TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override Int64TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedInt64Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + return new RestrictedInt64Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } - public static @NonNull StringTypeBuilder newStringBuilder(final StringTypeDefinition baseType, - final SchemaPath path) { - return new StringTypeBuilder(baseType, path); + public static @NonNull StringTypeBuilder newStringBuilder(final StringTypeDefinition baseType, final QName qname) { + return new StringTypeBuilder(baseType, qname); } public static @NonNull TypeBuilder newUnionBuilder(final UnionTypeDefinition baseType, - final SchemaPath path) { - return new AbstractRestrictedTypeBuilder<>(baseType, path) { + final QName qname) { + return new AbstractRestrictedTypeBuilder<>(baseType, qname) { @Override UnionTypeDefinition buildType() { - return new RestrictedUnionType(getBaseType(), getPath(), getUnknownSchemaNodes()); + return new RestrictedUnionType(getBaseType(), getQName(), getUnknownSchemaNodes()); } }; } public static @NonNull RangeRestrictedTypeBuilder newUint8Builder( - final Uint8TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase(baseType, path) { + final Uint8TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override - Uint8TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedUint8Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + Uint8TypeDefinition buildType(final RangeConstraint<@NonNull Uint8> rangeConstraint) { + return new RestrictedUint8Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newUint16Builder( - final Uint16TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase(baseType, path) { + final Uint16TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override - Uint16TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedUint16Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + Uint16TypeDefinition buildType(final RangeConstraint<@NonNull Uint16> rangeConstraint) { + return new RestrictedUint16Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newUint32Builder( - final Uint32TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase(baseType, path) { + final Uint32TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override - Uint32TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedUint32Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + Uint32TypeDefinition buildType(final RangeConstraint<@NonNull Uint32> rangeConstraint) { + return new RestrictedUint32Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } public static @NonNull RangeRestrictedTypeBuilder newUint64Builder( - final Uint64TypeDefinition baseType, final SchemaPath path) { - return new RangeRestrictedTypeBuilderWithBase(baseType, path) { + final Uint64TypeDefinition baseType, final QName qname) { + return new RangeRestrictedTypeBuilderWithBase<>(baseType, qname) { @Override - Uint64TypeDefinition buildType(final RangeConstraint rangeConstraint) { - return new RestrictedUint64Type(getBaseType(), getPath(), getUnknownSchemaNodes(), rangeConstraint); + Uint64TypeDefinition buildType(final RangeConstraint<@NonNull Uint64> rangeConstraint) { + return new RestrictedUint64Type(getBaseType(), getQName(), getUnknownSchemaNodes(), rangeConstraint); } }; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java index 97b0b49d4f..68ae8a2807 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java @@ -9,18 +9,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint16; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition; final class RestrictedUint16Type extends AbstractRangeRestrictedType implements Uint16TypeDefinition { - RestrictedUint16Type(final Uint16TypeDefinition baseType, final SchemaPath path, + RestrictedUint16Type(final Uint16TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java index be0b34eb38..ead97f4d90 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java @@ -9,18 +9,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; final class RestrictedUint32Type extends AbstractRangeRestrictedType implements Uint32TypeDefinition { - RestrictedUint32Type(final Uint32TypeDefinition baseType, final SchemaPath path, + RestrictedUint32Type(final Uint32TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java index 0bec7890f8..6a5b4d571a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java @@ -9,18 +9,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint64; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition; final class RestrictedUint64Type extends AbstractRangeRestrictedType implements Uint64TypeDefinition { - RestrictedUint64Type(final Uint64TypeDefinition baseType, final SchemaPath path, + RestrictedUint64Type(final Uint64TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java index e7b251314e..423bffd62e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java @@ -9,18 +9,18 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint8; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; final class RestrictedUint8Type extends AbstractRangeRestrictedType implements Uint8TypeDefinition { - RestrictedUint8Type(final Uint8TypeDefinition baseType, final SchemaPath path, + RestrictedUint8Type(final Uint8TypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes, final @Nullable RangeConstraint rangeConstraint) { - super(baseType, path, unknownSchemaNodes, rangeConstraint); + super(baseType, qname, unknownSchemaNodes, rangeConstraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java index 7a9b1e35ba..dd8e59256f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java @@ -9,15 +9,15 @@ package org.opendaylight.yangtools.yang.model.util.type; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; final class RestrictedUnionType extends AbstractRestrictedType implements UnionTypeDefinition { - RestrictedUnionType(final UnionTypeDefinition baseType, final SchemaPath path, + RestrictedUnionType(final UnionTypeDefinition baseType, final QName qname, final Collection unknownSchemaNodes) { - super(baseType, path, unknownSchemaNodes); + super(baseType, qname, unknownSchemaNodes); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java index 34b524c1b3..6757965b22 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.ArrayList; import java.util.List; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; @@ -20,8 +20,8 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; public final class StringTypeBuilder extends LengthRestrictedTypeBuilder { private final List patternConstraints = new ArrayList<>(0); - StringTypeBuilder(final StringTypeDefinition baseType, final SchemaPath path) { - super(baseType, path); + StringTypeBuilder(final StringTypeDefinition baseType, final QName qname) { + super(baseType, qname); } public StringTypeBuilder addPatternConstraint(final PatternConstraint constraint) { @@ -46,7 +46,7 @@ public final class StringTypeBuilder extends LengthRestrictedTypeBuilder> implements Builder { private final ImmutableList.Builder unknownSchemaNodes = ImmutableList.builder(); - private final @Nullable SchemaPath path; + private final @NonNull QName qname; private final T baseType; - TypeBuilder(final T baseType, final SchemaPath path) { - this.path = path; + TypeBuilder(final T baseType, final QName qname) { + this.qname = requireNonNull(qname); this.baseType = baseType; } @@ -31,8 +31,8 @@ public abstract class TypeBuilder> implements Builde return baseType; } - final @Nullable SchemaPath getPath() { - return SchemaNodeDefaults.throwUnsupportedIfNull(this, path); + final @NonNull QName getQName() { + return qname; } final @NonNull Collection getUnknownSchemaNodes() { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java index 18923aefc0..1eb0e71e30 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java @@ -10,15 +10,15 @@ package org.opendaylight.yangtools.yang.model.util.type; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; public final class UnionTypeBuilder extends TypeBuilder { private final Builder> builder = ImmutableList.builder(); - UnionTypeBuilder(final SchemaPath path) { - super(null, path); + UnionTypeBuilder(final QName qname) { + super(null, qname); } public UnionTypeBuilder addType(final @NonNull TypeDefinition type) { @@ -28,6 +28,6 @@ public final class UnionTypeBuilder extends TypeBuilder { @Override public UnionTypeDefinition build() { - return new BaseUnionType(getPath(), getUnknownSchemaNodes(), builder.build()); + return new BaseUnionType(getQName(), getUnknownSchemaNodes(), builder.build()); } } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java index 8cf01ae3e3..a5283e97cb 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java @@ -12,14 +12,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.model.util.type.BaseTypes.binaryType; -import java.util.Collections; import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; public class BinaryTypeTest { - @Test public void canCreateBinaryType() { final BinaryTypeDefinition binType = binaryType(); @@ -31,8 +29,6 @@ public class BinaryTypeTest { assertEquals("Base type is null", null, binType.getBaseType()); assertEquals("getQName gives BINARY_QNAME", BaseTypes.BINARY_QNAME, binType.getQName()); assertEquals(Optional.empty(), binType.getUnits()); - assertEquals("getPath gives List of BINARY_QNAME", Collections.singletonList(BaseTypes.BINARY_QNAME), - binType.getPath().getPathFromRoot()); assertTrue("binType1 should equal to binType", binType.equals(binType1) && binType1.equals(binType)); assertTrue("Hash code of binType and binType1 should be equal", @@ -41,5 +37,4 @@ public class BinaryTypeTest { assertFalse("binType shouldn't equal to null", binType.equals(null)); assertFalse("binType shouldn't equal to object of other type", binType.equals("str")); } - } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java index c51434c2b4..c468fe5e73 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java @@ -21,7 +21,6 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @@ -38,9 +37,8 @@ public class BitsTypeTest { doReturn("toString").when(bit).toString(); QName qname = QName.create("namespace", "localname"); - SchemaPath schemaPath = SchemaPath.create(true, qname); - BitsTypeDefinition bitsType = BaseTypes.bitsTypeBuilder(schemaPath).addBit(bit).build(); + BitsTypeDefinition bitsType = BaseTypes.bitsTypeBuilder(qname).addBit(bit).build(); assertFalse(bitsType.getDescription().isPresent()); assertEquals("QName", qname, bitsType.getQName()); @@ -49,7 +47,6 @@ public class BitsTypeTest { assertFalse(bitsType.getReference().isPresent()); assertNull("BaseType should be null", bitsType.getBaseType()); assertEquals(Optional.empty(), bitsType.getDefaultValue()); - assertEquals("getPath should equal schemaPath", schemaPath, bitsType.getPath()); assertEquals("Status should be CURRENT", Status.CURRENT, bitsType.getStatus()); assertEquals("Should be empty list", Collections.emptyList(), bitsType.getUnknownSchemaNodes()); assertEquals("Values should be [enumPair]", Collections.singletonList(bit), bitsType.getBits()); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java index 5e2cdbe16c..dbf9efdda1 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java @@ -24,8 +24,6 @@ public class BooleanTypeTest { public void canCreateBooleanType() { final BooleanTypeDefinition boolType = booleanType(); - assertEquals("getPath gives List of BOOLEAN_QNAME", - Collections.singletonList(BaseTypes.BOOLEAN_QNAME), boolType.getPath().getPathFromRoot()); assertEquals("getQName gives BOOLEAN_QNAME", BaseTypes.BOOLEAN_QNAME, boolType.getQName()); assertFalse(boolType.getDescription().isPresent()); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java index 17bc7bf063..5099330ce4 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java @@ -19,14 +19,11 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; public class EmptyTypeTest { - @Test public void canCreateEmptyType() { EmptyTypeDefinition emptyType = emptyType(); assertEquals("QName", BaseTypes.EMPTY_QNAME, emptyType.getQName()); - assertEquals("Path", Collections.singletonList(BaseTypes.EMPTY_QNAME), - emptyType.getPath().getPathFromRoot()); assertEquals("BaseType", null, emptyType.getBaseType()); assertEquals("DefaultValue", Optional.empty(), emptyType.getDefaultValue()); assertEquals("Status", Status.CURRENT, emptyType.getStatus()); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java index e53cd442e7..7663342738 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java @@ -18,7 +18,6 @@ import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @@ -27,28 +26,22 @@ import org.opendaylight.yangtools.yang.model.util.type.RequireInstanceRestricted import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes; public class LeafrefTest { - @Test public void testMethodsOfLeafrefTest() { - final SchemaPath schemaPath = SchemaPath.create(false, QName.create("test", "Cont1"), - QName.create("test", "List1")); + final QName qname = QName.create("test", "List1"); final PathExpression revision = new PathExpressionImpl("/test:Cont1/test:List1", false); final PathExpression revision2 = new PathExpressionImpl("/test:Cont1/test:List2", false); - final LeafrefTypeDefinition leafref = BaseTypes.leafrefTypeBuilder(schemaPath).setPathStatement(revision) - .build(); - final LeafrefTypeDefinition leafref2 = BaseTypes.leafrefTypeBuilder(schemaPath).setPathStatement(revision2) - .build(); - final LeafrefTypeDefinition leafref3 = BaseTypes.leafrefTypeBuilder(schemaPath).setPathStatement(revision) - .build(); + final LeafrefTypeDefinition leafref = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(revision).build(); + final LeafrefTypeDefinition leafref2 = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(revision2).build(); + final LeafrefTypeDefinition leafref3 = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(revision).build(); final LeafrefTypeDefinition leafref4 = leafref; assertNotNull("Object 'leafref' shouldn't be null.", leafref); assertNull("Base type of 'leafref' should be null.", leafref.getBaseType()); assertEquals(Optional.empty(), leafref.getUnits()); assertEquals(Optional.empty(), leafref.getDefaultValue()); - assertEquals(QName.create("test", "List1"), leafref.getQName()); - assertEquals("SchemaPath of 'leafref' is '/Cont1/List1'.", schemaPath, leafref.getPath()); + assertEquals(qname, leafref.getQName()); assertFalse(leafref.getDescription().isPresent()); assertFalse(leafref.getReference().isPresent()); assertEquals("Status of 'leafref' is current.", Status.CURRENT, leafref.getStatus()); @@ -68,10 +61,9 @@ public class LeafrefTest { @Test public void testRequireInstanceSubstatement() { - final SchemaPath schemaPath = SchemaPath.create(true, QName.create("test", "my-cont"), - QName.create("test", "my-leafref")); + final QName qname = QName.create("test", "my-leafref"); final PathExpression path = new PathExpressionImpl("../my-leaf", false); - final LeafrefTypeBuilder leafrefTypeBuilder = BaseTypes.leafrefTypeBuilder(schemaPath).setPathStatement(path); + final LeafrefTypeBuilder leafrefTypeBuilder = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(path); assertTrue(leafrefTypeBuilder.build().requireInstance()); @@ -84,11 +76,11 @@ public class LeafrefTest { assertTrue(trueLeafref.requireInstance()); final RequireInstanceRestrictedTypeBuilder falseBuilder = - RestrictedTypes.newLeafrefBuilder(falseLeafref, schemaPath); + RestrictedTypes.newLeafrefBuilder(falseLeafref, qname); assertFalse(falseBuilder.build().requireInstance()); final RequireInstanceRestrictedTypeBuilder trueBuilder = - RestrictedTypes.newLeafrefBuilder(trueLeafref, schemaPath); + RestrictedTypes.newLeafrefBuilder(trueLeafref, qname); assertTrue(trueBuilder.build().requireInstance()); } } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java index 8e7ab07580..6c6407d853 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -48,18 +48,16 @@ public class SchemaContextUtilTest { @Mock public SchemaNode schemaNode; - @Before - public void before() { + @Test + @Ignore + // FIXME: YANGTOOLS-1127: rewrite this test in terms of a real PathExpression + public void testFindDummyData() { doReturn(Optional.empty()).when(mockSchemaContext).findModule(any(QNameModule.class)); doReturn(Optional.empty()).when(mockSchemaContext).findDataTreeChild(any(Iterable.class)); doReturn("test").when(mockModule).getName(); doReturn("test").when(mockModule).getPrefix(); doReturn(QNameModule.create(NAMESPACE)).when(mockModule).getQNameModule(); - } - - @Test - public void testFindDummyData() { QName qname = QName.create("namespace", "localname"); SchemaPath schemaPath = SchemaPath.create(Collections.singletonList(qname), true); diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java index 3fdb3e4e86..b2308a8519 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java @@ -29,7 +29,6 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -56,7 +55,6 @@ import org.opendaylight.yangtools.yang.model.util.PathExpressionImpl; public class TypeTest { private static final QName Q_NAME = QName.create("test.namespace", "2016-01-01", "test-name"); - private static final SchemaPath SCHEMA_PATH = SchemaPath.create(true, Q_NAME); private static final PathExpression REVISION_AWARE_XPATH = new PathExpressionImpl("/test", true); private static final Bit BIT_A = BitBuilder.create(Q_NAME.getLocalName(), Uint32.valueOf(55L)) .setDescription("description") @@ -72,19 +70,19 @@ public class TypeTest { assertEquals(baseBinaryType1.getLengthConstraint(), baseBinaryType2.getLengthConstraint()); final DerivedBinaryType derivedBinaryType1 = (DerivedBinaryType)DerivedTypes.derivedTypeBuilder(baseBinaryType1, - SCHEMA_PATH).build(); + Q_NAME).build(); final DerivedBinaryType derivedBinaryType2 = (DerivedBinaryType)DerivedTypes.derivedTypeBuilder(baseBinaryType2, - SCHEMA_PATH).build(); + Q_NAME).build(); hashCodeEqualsToStringTest(derivedBinaryType1, derivedBinaryType2); final RestrictedBinaryType restrictedBinaryType1 = (RestrictedBinaryType)RestrictedTypes.newBinaryBuilder( - baseBinaryType1, SCHEMA_PATH).buildType(); + baseBinaryType1, Q_NAME).buildType(); final RestrictedBinaryType restrictedBinaryType2 = (RestrictedBinaryType)RestrictedTypes.newBinaryBuilder( - baseBinaryType2, SCHEMA_PATH).buildType(); + baseBinaryType2, Q_NAME).buildType(); hashCodeEqualsToStringTest(restrictedBinaryType1, restrictedBinaryType2); final LengthRestrictedTypeBuilder lengthRestrictedTypeBuilder = RestrictedTypes - .newBinaryBuilder(baseBinaryType1, SCHEMA_PATH); + .newBinaryBuilder(baseBinaryType1, Q_NAME); final BaseBinaryType baseBinaryType = (BaseBinaryType)lengthRestrictedTypeBuilder.build(); assertEquals(baseBinaryType, baseBinaryType1); concreteBuilderTest(baseBinaryType1, derivedBinaryType1); @@ -97,60 +95,60 @@ public class TypeTest { hashCodeEqualsToStringTest(baseBooleanType1, baseBooleanType2); final DerivedBooleanType derivedBooleanType1 = (DerivedBooleanType)DerivedTypes.derivedTypeBuilder( - baseBooleanType1, SCHEMA_PATH).build(); + baseBooleanType1, Q_NAME).build(); final DerivedBooleanType derivedBooleanType2 = (DerivedBooleanType)DerivedTypes.derivedTypeBuilder( - baseBooleanType1, SCHEMA_PATH).build(); + baseBooleanType1, Q_NAME).build(); hashCodeEqualsToStringTest(derivedBooleanType1, derivedBooleanType2); - restrictedBuilderTest(RestrictedTypes.newBooleanBuilder(baseBooleanType1, SCHEMA_PATH), RestrictedTypes - .newBooleanBuilder(baseBooleanType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newBooleanBuilder(baseBooleanType1, Q_NAME), RestrictedTypes + .newBooleanBuilder(baseBooleanType2, Q_NAME)); concreteBuilderTest(baseBooleanType1, derivedBooleanType1); } @Test public void identityrefTypeTest() { - final IdentityrefTypeBuilder identityrefTypeBuilder1 = BaseTypes.identityrefTypeBuilder(SCHEMA_PATH); + final IdentityrefTypeBuilder identityrefTypeBuilder1 = BaseTypes.identityrefTypeBuilder(Q_NAME); final IdentitySchemaNode identitySchemaNode = mock(IdentitySchemaNode.class); doReturn("identitySchemaNode").when(identitySchemaNode).toString(); identityrefTypeBuilder1.addIdentity(identitySchemaNode); final IdentityrefTypeDefinition identityrefTypeDefinition1 = identityrefTypeBuilder1.build(); - final IdentityrefTypeBuilder identityrefTypeBuilder2 = BaseTypes.identityrefTypeBuilder(SCHEMA_PATH); + final IdentityrefTypeBuilder identityrefTypeBuilder2 = BaseTypes.identityrefTypeBuilder(Q_NAME); identityrefTypeBuilder2.addIdentity(identitySchemaNode); final IdentityrefTypeDefinition identityrefTypeDefinition2 = identityrefTypeBuilder2.build(); hashCodeEqualsToStringTest(identityrefTypeDefinition1, identityrefTypeDefinition2); final DerivedIdentityrefType derivedIdentityrefType1 = (DerivedIdentityrefType)DerivedTypes.derivedTypeBuilder( - identityrefTypeDefinition1, SCHEMA_PATH).build(); + identityrefTypeDefinition1, Q_NAME).build(); final DerivedIdentityrefType derivedIdentityrefType2 = (DerivedIdentityrefType)DerivedTypes.derivedTypeBuilder( - identityrefTypeDefinition2, SCHEMA_PATH).build(); + identityrefTypeDefinition2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedIdentityrefType1, derivedIdentityrefType2); concreteBuilderTest(identityrefTypeDefinition1, derivedIdentityrefType1); - restrictedBuilderTest(RestrictedTypes.newIdentityrefBuilder(derivedIdentityrefType1, SCHEMA_PATH), - RestrictedTypes.newIdentityrefBuilder(derivedIdentityrefType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newIdentityrefBuilder(derivedIdentityrefType1, Q_NAME), + RestrictedTypes.newIdentityrefBuilder(derivedIdentityrefType2, Q_NAME)); } @Test public void decimalTypeTest() { - final BaseDecimalType baseDecimalType1 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(SCHEMA_PATH) + final BaseDecimalType baseDecimalType1 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(Q_NAME) .setFractionDigits(1) .buildType(); - final BaseDecimalType baseDecimalType2 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(SCHEMA_PATH) + final BaseDecimalType baseDecimalType2 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(Q_NAME) .setFractionDigits(1) .buildType(); hashCodeEqualsToStringTest(baseDecimalType1, baseDecimalType2); assertEquals(baseDecimalType1.getFractionDigits(), baseDecimalType2.getFractionDigits()); final DerivedDecimalType derivedDecimalType1 = (DerivedDecimalType)DerivedTypes - .derivedTypeBuilder(baseDecimalType1, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseDecimalType1, Q_NAME).build(); final DerivedDecimalType derivedDecimalType2 = (DerivedDecimalType)DerivedTypes - .derivedTypeBuilder(baseDecimalType1, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseDecimalType1, Q_NAME).build(); hashCodeEqualsToStringTest(derivedDecimalType1, derivedDecimalType2); final RestrictedDecimalType restrictedDecimalType1 = (RestrictedDecimalType) - RestrictedTypes.newDecima64Builder(baseDecimalType1, SCHEMA_PATH).buildType(); + RestrictedTypes.newDecima64Builder(baseDecimalType1, Q_NAME).buildType(); final RestrictedDecimalType restrictedDecimalType2 = (RestrictedDecimalType) - RestrictedTypes.newDecima64Builder(baseDecimalType2, SCHEMA_PATH).buildType(); + RestrictedTypes.newDecima64Builder(baseDecimalType2, Q_NAME).buildType(); hashCodeEqualsToStringTest(restrictedDecimalType1, restrictedDecimalType2); concreteBuilderTest(baseDecimalType1, derivedDecimalType1); } @@ -162,13 +160,13 @@ public class TypeTest { hashCodeEqualsToStringTest(baseEmptyType1, baseEmptyType2); final DerivedEmptyType derivedEmptyType1 = (DerivedEmptyType)DerivedTypes.derivedTypeBuilder( - baseEmptyType1, SCHEMA_PATH).build(); + baseEmptyType1, Q_NAME).build(); final DerivedEmptyType derivedEmptyType2 = (DerivedEmptyType)DerivedTypes.derivedTypeBuilder( - baseEmptyType2, SCHEMA_PATH).build(); + baseEmptyType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedEmptyType1, derivedEmptyType2); - restrictedBuilderTest(RestrictedTypes.newEmptyBuilder(baseEmptyType1, SCHEMA_PATH), - RestrictedTypes.newEmptyBuilder(baseEmptyType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newEmptyBuilder(baseEmptyType1, Q_NAME), + RestrictedTypes.newEmptyBuilder(baseEmptyType2, Q_NAME)); concreteBuilderTest(baseEmptyType1, derivedEmptyType1); } @@ -181,18 +179,18 @@ public class TypeTest { assertFalse(baseInstanceIdentifierType1.requireInstance()); final DerivedInstanceIdentifierType derivedInstanceIdentifierType1 = (DerivedInstanceIdentifierType) - DerivedTypes.derivedTypeBuilder(baseInstanceIdentifierType1, SCHEMA_PATH).build(); + DerivedTypes.derivedTypeBuilder(baseInstanceIdentifierType1, Q_NAME).build(); final DerivedInstanceIdentifierType derivedInstanceIdentifierType2 = (DerivedInstanceIdentifierType) - DerivedTypes.derivedTypeBuilder(baseInstanceIdentifierType2, SCHEMA_PATH).build(); + DerivedTypes.derivedTypeBuilder(baseInstanceIdentifierType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedInstanceIdentifierType1, derivedInstanceIdentifierType2); final InstanceIdentifierTypeBuilder instanceIdentifierBuilder1 = RestrictedTypes - .newInstanceIdentifierBuilder(baseInstanceIdentifierType1, SCHEMA_PATH); + .newInstanceIdentifierBuilder(baseInstanceIdentifierType1, Q_NAME); instanceIdentifierBuilder1.setRequireInstance(true); final InstanceIdentifierTypeDefinition instanceIdentifierTypeDefinition1 = instanceIdentifierBuilder1 .buildType(); final InstanceIdentifierTypeBuilder instanceIdentifierBuilder2 = RestrictedTypes - .newInstanceIdentifierBuilder(baseInstanceIdentifierType1, SCHEMA_PATH); + .newInstanceIdentifierBuilder(baseInstanceIdentifierType1, Q_NAME); instanceIdentifierBuilder2.setRequireInstance(true); final InstanceIdentifierTypeDefinition instanceIdentifierTypeDefinition2 = instanceIdentifierBuilder2 .buildType(); @@ -212,9 +210,9 @@ public class TypeTest { testInstance(BaseInt64Type.INSTANCE, integerTypeDefinition64); final RestrictedInt8Type restrictedIntegerType1 = (RestrictedInt8Type)RestrictedTypes.newInt8Builder( - integerTypeDefinition8, SCHEMA_PATH).buildType(); + integerTypeDefinition8, Q_NAME).buildType(); final RestrictedInt8Type restrictedIntegerType2 = (RestrictedInt8Type)RestrictedTypes.newInt8Builder( - BaseInt8Type.INSTANCE, SCHEMA_PATH).buildType(); + BaseInt8Type.INSTANCE, Q_NAME).buildType(); hashCodeEqualsToStringTest(restrictedIntegerType1, restrictedIntegerType2); final Uint8TypeDefinition integerTypeDefinitionu8 = BaseTypes.uint8Type(); @@ -227,27 +225,27 @@ public class TypeTest { testInstance(BaseUint64Type.INSTANCE, BaseTypes.baseTypeOf(integerTypeDefinitionu64)); final DerivedInt8Type derivedIntegerType1 = (DerivedInt8Type)DerivedTypes - .derivedTypeBuilder(integerTypeDefinition8, SCHEMA_PATH).build(); + .derivedTypeBuilder(integerTypeDefinition8, Q_NAME).build(); final DerivedInt8Type derivedIntegerType2 = (DerivedInt8Type)DerivedTypes - .derivedTypeBuilder(BaseInt8Type.INSTANCE, SCHEMA_PATH).build(); + .derivedTypeBuilder(BaseInt8Type.INSTANCE, Q_NAME).build(); hashCodeEqualsToStringTest(derivedIntegerType1, derivedIntegerType2); final DerivedUint8Type derivedUnsignedType1 = (DerivedUint8Type)DerivedTypes - .derivedTypeBuilder(integerTypeDefinitionu8, SCHEMA_PATH).build(); + .derivedTypeBuilder(integerTypeDefinitionu8, Q_NAME).build(); final DerivedUint8Type derivedUnsignedType2 = (DerivedUint8Type)DerivedTypes - .derivedTypeBuilder(BaseUint8Type.INSTANCE, SCHEMA_PATH).build(); + .derivedTypeBuilder(BaseUint8Type.INSTANCE, Q_NAME).build(); hashCodeEqualsToStringTest(derivedUnsignedType1, derivedUnsignedType2); final RestrictedUint8Type restrictedUnsignedType1 = (RestrictedUint8Type)RestrictedTypes - .newUint8Builder(integerTypeDefinitionu8, SCHEMA_PATH).buildType(); + .newUint8Builder(integerTypeDefinitionu8, Q_NAME).buildType(); final RestrictedUint8Type restrictedUnsignedType2 = (RestrictedUint8Type)RestrictedTypes - .newUint8Builder(BaseUint8Type.INSTANCE, SCHEMA_PATH).buildType(); + .newUint8Builder(BaseUint8Type.INSTANCE, Q_NAME).buildType(); hashCodeEqualsToStringTest(restrictedUnsignedType1, restrictedUnsignedType2); concreteBuilderTest(integerTypeDefinition8, derivedIntegerType1); concreteBuilderTest(integerTypeDefinitionu8, derivedUnsignedType2); final DerivedTypeBuilder derivedTypeBuilder = DerivedTypes.derivedTypeBuilder(integerTypeDefinition8, - SCHEMA_PATH); + Q_NAME); derivedTypeBuilder.setDefaultValue(1); derivedTypeBuilder.setDescription("test-description"); derivedTypeBuilder.setReference("test-reference"); @@ -268,19 +266,19 @@ public class TypeTest { assertEquals(baseStringType1.getPatternConstraints(), baseStringType2.getPatternConstraints()); final DerivedStringType derivedStringType1 = (DerivedStringType) - DerivedTypes.derivedTypeBuilder(baseStringType1, SCHEMA_PATH).build(); + DerivedTypes.derivedTypeBuilder(baseStringType1, Q_NAME).build(); final DerivedStringType derivedStringType2 = (DerivedStringType) - DerivedTypes.derivedTypeBuilder(baseStringType2, SCHEMA_PATH).build(); + DerivedTypes.derivedTypeBuilder(baseStringType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedStringType1, derivedStringType2); final RestrictedStringType restrictedStringType1 = (RestrictedStringType)RestrictedTypes - .newStringBuilder(baseStringType1, SCHEMA_PATH).buildType(); + .newStringBuilder(baseStringType1, Q_NAME).buildType(); final RestrictedStringType restrictedStringType2 = (RestrictedStringType)RestrictedTypes - .newStringBuilder(baseStringType2, SCHEMA_PATH).buildType(); + .newStringBuilder(baseStringType2, Q_NAME).buildType(); hashCodeEqualsToStringTest(restrictedStringType1, restrictedStringType2); concreteBuilderTest(baseStringType1, derivedStringType1); - final StringTypeBuilder stringTypeBuilder = new StringTypeBuilder(baseStringType1, SCHEMA_PATH); + final StringTypeBuilder stringTypeBuilder = new StringTypeBuilder(baseStringType1, Q_NAME); final PatternConstraint patternConstraint = BaseConstraints.newPatternConstraint("pattern", ABSENT, ABSENT); stringTypeBuilder.addPatternConstraint(patternConstraint); final StringTypeDefinition stringTypeDefinition = stringTypeBuilder.buildType(); @@ -289,7 +287,7 @@ public class TypeTest { @Test public void bitsTypeTest() { - final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(SCHEMA_PATH); + final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(Q_NAME); bitsTypeBuilder.addBit(BIT_A); final BitsTypeDefinition bitsTypeDefinition1 = bitsTypeBuilder.build(); final BitsTypeDefinition bitsTypeDefinition2 = bitsTypeBuilder.build(); @@ -297,40 +295,40 @@ public class TypeTest { assertEquals(bitsTypeDefinition1.getBits(), bitsTypeDefinition1.getBits()); final DerivedBitsType derivedBitsType1 = (DerivedBitsType)DerivedTypes - .derivedTypeBuilder(bitsTypeDefinition1, SCHEMA_PATH).build(); + .derivedTypeBuilder(bitsTypeDefinition1, Q_NAME).build(); final DerivedBitsType derivedBitsType2 = (DerivedBitsType)DerivedTypes - .derivedTypeBuilder(bitsTypeDefinition2, SCHEMA_PATH).build(); + .derivedTypeBuilder(bitsTypeDefinition2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedBitsType1, derivedBitsType2); - restrictedBuilderTest(RestrictedTypes.newBitsBuilder(bitsTypeDefinition1, SCHEMA_PATH), - RestrictedTypes.newBitsBuilder(bitsTypeDefinition2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newBitsBuilder(bitsTypeDefinition1, Q_NAME), + RestrictedTypes.newBitsBuilder(bitsTypeDefinition2, Q_NAME)); concreteBuilderTest(bitsTypeDefinition1, derivedBitsType1); } @Test public void enumerationTypeTest() { - final BaseEnumerationType baseEnumerationType1 = (BaseEnumerationType)BaseTypes.enumerationTypeBuilder( - SCHEMA_PATH).build(); - final BaseEnumerationType baseEnumerationType2 = (BaseEnumerationType)BaseTypes.enumerationTypeBuilder( - SCHEMA_PATH).build(); + final BaseEnumerationType baseEnumerationType1 = (BaseEnumerationType)BaseTypes.enumerationTypeBuilder(Q_NAME) + .build(); + final BaseEnumerationType baseEnumerationType2 = (BaseEnumerationType)BaseTypes.enumerationTypeBuilder(Q_NAME) + .build(); hashCodeEqualsToStringTest(baseEnumerationType1, baseEnumerationType2); assertEquals(baseEnumerationType1.getValues(), baseEnumerationType2.getValues()); final DerivedEnumerationType derivedEnumerationType1 = (DerivedEnumerationType)DerivedTypes - .derivedTypeBuilder(baseEnumerationType1, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseEnumerationType1, Q_NAME).build(); final DerivedEnumerationType derivedEnumerationType2 = (DerivedEnumerationType)DerivedTypes - .derivedTypeBuilder(baseEnumerationType2, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseEnumerationType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedEnumerationType1, derivedEnumerationType2); - restrictedBuilderTest(RestrictedTypes.newEnumerationBuilder(baseEnumerationType1, SCHEMA_PATH), - RestrictedTypes.newEnumerationBuilder(baseEnumerationType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newEnumerationBuilder(baseEnumerationType1, Q_NAME), + RestrictedTypes.newEnumerationBuilder(baseEnumerationType2, Q_NAME)); concreteBuilderTest(baseEnumerationType1, derivedEnumerationType1); } @Test public void leafrefTypeTest() { - final LeafrefTypeBuilder leafrefTypeBuilder1 = BaseTypes.leafrefTypeBuilder(SCHEMA_PATH); - final LeafrefTypeBuilder leafrefTypeBuilder2 = BaseTypes.leafrefTypeBuilder(SCHEMA_PATH); + final LeafrefTypeBuilder leafrefTypeBuilder1 = BaseTypes.leafrefTypeBuilder(Q_NAME); + final LeafrefTypeBuilder leafrefTypeBuilder2 = BaseTypes.leafrefTypeBuilder(Q_NAME); leafrefTypeBuilder1.setPathStatement(REVISION_AWARE_XPATH); leafrefTypeBuilder2.setPathStatement(REVISION_AWARE_XPATH); final BaseLeafrefType baseLeafrefType1 = (BaseLeafrefType)leafrefTypeBuilder1.build(); @@ -339,26 +337,26 @@ public class TypeTest { assertEquals(baseLeafrefType1.getPathStatement(), REVISION_AWARE_XPATH); final DerivedLeafrefType derivedLeafrefType1 = (DerivedLeafrefType)DerivedTypes - .derivedTypeBuilder(baseLeafrefType1, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseLeafrefType1, Q_NAME).build(); final DerivedLeafrefType derivedLeafrefType2 = (DerivedLeafrefType)DerivedTypes - .derivedTypeBuilder(baseLeafrefType2, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseLeafrefType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedLeafrefType1, derivedLeafrefType2); - restrictedBuilderTest(RestrictedTypes.newLeafrefBuilder(baseLeafrefType1, SCHEMA_PATH), - RestrictedTypes.newLeafrefBuilder(baseLeafrefType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newLeafrefBuilder(baseLeafrefType1, Q_NAME), + RestrictedTypes.newLeafrefBuilder(baseLeafrefType2, Q_NAME)); concreteBuilderTest(baseLeafrefType1, derivedLeafrefType1); } @Test public void unionTypeTest() throws IllegalAccessException, InstantiationException { - final BaseDecimalType baseDecimalType1 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(SCHEMA_PATH) + final BaseDecimalType baseDecimalType1 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(Q_NAME) .setFractionDigits(1) .buildType(); - final BaseDecimalType baseDecimalType2 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(SCHEMA_PATH) + final BaseDecimalType baseDecimalType2 = (BaseDecimalType)BaseTypes.decimalTypeBuilder(Q_NAME) .setFractionDigits(1) .buildType(); - final UnionTypeBuilder unionTypeBuilder1 = BaseTypes.unionTypeBuilder(SCHEMA_PATH); - final UnionTypeBuilder unionTypeBuilder2 = BaseTypes.unionTypeBuilder(SCHEMA_PATH); + final UnionTypeBuilder unionTypeBuilder1 = BaseTypes.unionTypeBuilder(Q_NAME); + final UnionTypeBuilder unionTypeBuilder2 = BaseTypes.unionTypeBuilder(Q_NAME); unionTypeBuilder1.addType(baseDecimalType1); unionTypeBuilder2.addType(baseDecimalType2); final BaseUnionType baseUnionType1 = (BaseUnionType)unionTypeBuilder1.build(); @@ -367,20 +365,20 @@ public class TypeTest { assertEquals(baseUnionType1.getTypes(), baseUnionType2.getTypes()); final DerivedUnionType derivedUnionType1 = (DerivedUnionType)DerivedTypes - .derivedTypeBuilder(baseUnionType1, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseUnionType1, Q_NAME).build(); final DerivedUnionType derivedUnionType2 = (DerivedUnionType)DerivedTypes - .derivedTypeBuilder(baseUnionType2, SCHEMA_PATH).build(); + .derivedTypeBuilder(baseUnionType2, Q_NAME).build(); hashCodeEqualsToStringTest(derivedUnionType1, derivedUnionType2); - restrictedBuilderTest(RestrictedTypes.newUnionBuilder(baseUnionType1, SCHEMA_PATH), - RestrictedTypes.newUnionBuilder(baseUnionType2, SCHEMA_PATH)); + restrictedBuilderTest(RestrictedTypes.newUnionBuilder(baseUnionType1, Q_NAME), + RestrictedTypes.newUnionBuilder(baseUnionType2, Q_NAME)); concreteBuilderTest(baseUnionType1, derivedUnionType1); } @Test public void abstractTypeDefinitionQnameTest() { final AbstractTypeDefinition abstractTypeDefinition = (AbstractTypeDefinition) - BaseTypes.decimalTypeBuilder(SCHEMA_PATH).setFractionDigits(1).buildType(); + BaseTypes.decimalTypeBuilder(Q_NAME).setFractionDigits(1).buildType(); assertEquals(abstractTypeDefinition.getQName(), Q_NAME); } @@ -388,7 +386,7 @@ public class TypeTest { public void abstractDerivedTypeTest() { final BaseBinaryType baseBinaryType1 = BaseBinaryType.INSTANCE; final AbstractDerivedType abstractDerivedType = (AbstractDerivedType) - DerivedTypes.derivedTypeBuilder(baseBinaryType1, SCHEMA_PATH).build(); + DerivedTypes.derivedTypeBuilder(baseBinaryType1, Q_NAME).build(); assertEquals(Optional.empty(), abstractDerivedType.getDescription()); assertEquals(Optional.empty(), abstractDerivedType.getReference()); assertEquals(Status.CURRENT, abstractDerivedType.getStatus()); @@ -397,9 +395,9 @@ public class TypeTest { @Test public void concreteTypeBuilderBuildTest() { final BaseEnumerationType baseEnumerationType1 = (BaseEnumerationType) - BaseTypes.enumerationTypeBuilder(SCHEMA_PATH).build(); + BaseTypes.enumerationTypeBuilder(Q_NAME).build(); final ConcreteTypeBuilder concreteTypeBuilder = ConcreteTypes.concreteTypeBuilder( - baseEnumerationType1, SCHEMA_PATH); + baseEnumerationType1, Q_NAME); final TypeDefinition typeDefinition = concreteTypeBuilder.build(); assertNotNull(typeDefinition); } @@ -408,8 +406,8 @@ public class TypeTest { public void constraintTypeBuilderTest() throws InvalidLengthConstraintException { final BaseBinaryType baseBinaryType = (BaseBinaryType)BaseTypes.binaryType(); final LengthRestrictedTypeBuilder lengthRestrictedTypeBuilder = RestrictedTypes - .newBinaryBuilder(baseBinaryType, SCHEMA_PATH); - final Long min = Long.valueOf(0); + .newBinaryBuilder(baseBinaryType, Q_NAME); + final Long min = (long) 0; final UnresolvedNumber max = UnresolvedNumber.max(); final List lengthArrayList = ImmutableList.of(ValueRange.of(min, max)); lengthRestrictedTypeBuilder.setLengthConstraint(mock(ConstraintMetaDefinition.class), lengthArrayList); @@ -418,7 +416,7 @@ public class TypeTest { final Int8TypeDefinition integerTypeDefinition8 = BaseTypes.int8Type(); final RangeRestrictedTypeBuilder rangeRestrictedTypeBuilder = RestrictedTypes.newInt8Builder( - integerTypeDefinition8, SCHEMA_PATH); + integerTypeDefinition8, Q_NAME); rangeRestrictedTypeBuilder.setRangeConstraint(mock(ConstraintMetaDefinition.class), lengthArrayList); final TypeDefinition typeDefinition1 = rangeRestrictedTypeBuilder.buildType(); assertNotNull(typeDefinition1); @@ -447,13 +445,13 @@ public class TypeTest { @Test public void identityrefTypeBuilderException() { - final IdentityrefTypeBuilder builder = BaseTypes.identityrefTypeBuilder(SCHEMA_PATH); + final IdentityrefTypeBuilder builder = BaseTypes.identityrefTypeBuilder(Q_NAME); assertThrows(IllegalStateException.class, () -> builder.build()); } @Test public void invalidBitDefinitionExceptionTest() { - final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(SCHEMA_PATH) + final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(Q_NAME) .addBit(BIT_A) .addBit(BitBuilder.create("test-name-1", Uint32.valueOf(55)).build()); @@ -467,7 +465,7 @@ public class TypeTest { .setReference("reference").setUnknownSchemaNodes(unknown).build(); final EnumPair enumPair2 = EnumPairBuilder.create("enum", 1).setDescription("description") .setReference("reference").setUnknownSchemaNodes(unknown).build(); - final EnumerationTypeBuilder enumerationTypeBuilder = BaseTypes.enumerationTypeBuilder(SCHEMA_PATH); + final EnumerationTypeBuilder enumerationTypeBuilder = BaseTypes.enumerationTypeBuilder(Q_NAME); enumerationTypeBuilder.addEnum(enumPair1); enumerationTypeBuilder.addEnum(enumPair2); @@ -492,7 +490,7 @@ public class TypeTest { private static void concreteBuilderTest(final TypeDefinition baseTypeDef, final TypeDefinition derivedTypeDef) { - final ConcreteTypeBuilder concreteTypeBuilder = ConcreteTypes.concreteTypeBuilder(baseTypeDef, SCHEMA_PATH); + final ConcreteTypeBuilder concreteTypeBuilder = ConcreteTypes.concreteTypeBuilder(baseTypeDef, Q_NAME); final TypeDefinition typeDefinition = concreteTypeBuilder.buildType(); assertEquals(typeDefinition.getBaseType(), derivedTypeDef.getBaseType()); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java index 0fdcd6e94c..d06399a3d8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java @@ -85,7 +85,7 @@ abstract class AbstractLeafEffectiveStatement extends AbstractDeclaredEffectiveS private TypeDefinition buildType() { final TypeEffectiveStatement typeStmt = findFirstEffectiveSubstatement(TypeEffectiveStatement.class).get(); final ConcreteTypeBuilder builder = ConcreteTypes.concreteTypeBuilder(typeStmt.getTypeDefinition(), - getPath()); + getQName()); for (final EffectiveStatement stmt : effectiveSubstatements()) { if (stmt instanceof DefaultEffectiveStatement) { builder.setDefaultValue(((DefaultEffectiveStatement)stmt).argument()); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java index c8357f54ae..778139d26d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java @@ -95,7 +95,7 @@ abstract class AbstractLeafListEffectiveStatement private TypeDefinition buildType() { final TypeEffectiveStatement typeStmt = findFirstEffectiveSubstatement(TypeEffectiveStatement.class).get(); final ConcreteTypeBuilder builder = ConcreteTypes.concreteTypeBuilder(typeStmt.getTypeDefinition(), - getPath()); + getQName()); for (final EffectiveStatement stmt : effectiveSubstatements()) { // NOTE: 'default' is ommitted here on purpose if (stmt instanceof DescriptionEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java index a6dfe7c843..6307407e3f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java @@ -79,7 +79,7 @@ abstract class AbstractIdentityRefSpecificationSupport throw noBase(stmt); } - final IdentityrefTypeBuilder builder = BaseTypes.identityrefTypeBuilder(stmt.wrapSchemaPath()); + final IdentityrefTypeBuilder builder = BaseTypes.identityrefTypeBuilder(stmt.argumentAsTypeQName()); for (final EffectiveStatement subStmt : substatements) { if (subStmt instanceof BaseEffectiveStatement) { final QName identityQName = ((BaseEffectiveStatement) subStmt).argument(); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java index fc9c79a6fd..1a2c910644 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java @@ -52,7 +52,7 @@ abstract class AbstractLeafrefSpecificationSupport extends AbstractStatementSupp throw noPath(stmt); } - final LeafrefTypeBuilder builder = BaseTypes.leafrefTypeBuilder(stmt.wrapSchemaPath()); + final LeafrefTypeBuilder builder = BaseTypes.leafrefTypeBuilder(stmt.argumentAsTypeQName()); for (final EffectiveStatement subStmt : substatements) { if (subStmt instanceof PathEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java index cc8059af9e..a0cdae8123 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java @@ -262,32 +262,32 @@ abstract class AbstractTypeStatementSupport return createInstanceIdentifier(stmt, (InstanceIdentifierTypeDefinition) baseType, declared, substatements); } else if (baseType instanceof Int8TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newInt8Builder((Int8TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newInt8Builder((Int8TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Int16TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newInt16Builder((Int16TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newInt16Builder((Int16TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Int32TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newInt32Builder((Int32TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newInt32Builder((Int32TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Int64TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newInt64Builder((Int64TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newInt64Builder((Int64TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof LeafrefTypeDefinition) { return createLeafref(stmt, (LeafrefTypeDefinition) baseType, declared, substatements); } else if (baseType instanceof StringTypeDefinition) { return createString(stmt, (StringTypeDefinition) baseType, declared, substatements); } else if (baseType instanceof Uint8TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newUint8Builder((Uint8TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newUint8Builder((Uint8TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Uint16TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newUint16Builder((Uint16TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newUint16Builder((Uint16TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Uint32TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newUint32Builder((Uint32TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newUint32Builder((Uint32TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof Uint64TypeDefinition) { return createIntegral(stmt, declared, substatements, - RestrictedTypes.newUint64Builder((Uint64TypeDefinition) baseType, typeEffectiveSchemaPath(stmt))); + RestrictedTypes.newUint64Builder((Uint64TypeDefinition) baseType, typeEffectiveQName(stmt))); } else if (baseType instanceof UnionTypeDefinition) { return createUnion(stmt, (UnionTypeDefinition) baseType, declared, substatements); } else { @@ -295,7 +295,8 @@ abstract class AbstractTypeStatementSupport } } - static final SchemaPath typeEffectiveSchemaPath(final Current stmt) { + static final QName typeEffectiveQName(final Current stmt) { + // FIXME: this ain't right final SchemaPath path = stmt.wrapSchemaPath(); if (path == null) { // SchemaPath is forbidden with a system property @@ -305,8 +306,7 @@ abstract class AbstractTypeStatementSupport final QName parentQName = parent.getLastComponent(); checkArgument(parentQName != null, "Path %s has an empty parent", path); - final QName qname = path.getLastComponent().bindTo(parentQName.getModule()).intern(); - return parent.createChild(qname); + return path.getLastComponent().bindTo(parentQName.getModule()).intern(); } /** @@ -359,7 +359,7 @@ abstract class AbstractTypeStatementSupport final BinaryTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { final LengthRestrictedTypeBuilder builder = - RestrictedTypes.newBinaryBuilder(baseType, typeEffectiveSchemaPath(ctx)); + RestrictedTypes.newBinaryBuilder(baseType, typeEffectiveQName(ctx)); for (EffectiveStatement stmt : substatements) { if (stmt instanceof LengthEffectiveStatement) { @@ -381,7 +381,7 @@ abstract class AbstractTypeStatementSupport private @NonNull TypeEffectiveStatement createBits(final Current ctx, final BitsTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { - final BitsTypeBuilder builder = RestrictedTypes.newBitsBuilder(baseType, ctx.wrapSchemaPath()); + final BitsTypeBuilder builder = RestrictedTypes.newBitsBuilder(baseType, ctx.argumentAsTypeQName()); for (final EffectiveStatement stmt : substatements) { if (stmt instanceof BitEffectiveStatement) { @@ -399,14 +399,14 @@ abstract class AbstractTypeStatementSupport final BooleanTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newBooleanBuilder(baseType, - typeEffectiveSchemaPath(ctx))); + typeEffectiveQName(ctx))); } private static @NonNull TypeEffectiveStatement createDecimal(final Current ctx, final DecimalTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { final RangeRestrictedTypeBuilder builder = - RestrictedTypes.newDecima64Builder(baseType, typeEffectiveSchemaPath(ctx)); + RestrictedTypes.newDecima64Builder(baseType, typeEffectiveQName(ctx)); for (EffectiveStatement stmt : substatements) { if (stmt instanceof RangeEffectiveStatement) { @@ -427,13 +427,14 @@ abstract class AbstractTypeStatementSupport final EmptyTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newEmptyBuilder(baseType, - typeEffectiveSchemaPath(ctx))); + typeEffectiveQName(ctx))); } private @NonNull TypeEffectiveStatement createEnum(final Current ctx, final EnumTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { - final EnumerationTypeBuilder builder = RestrictedTypes.newEnumerationBuilder(baseType, ctx.wrapSchemaPath()); + final EnumerationTypeBuilder builder = RestrictedTypes.newEnumerationBuilder(baseType, + ctx.argumentAsTypeQName()); for (final EffectiveStatement stmt : substatements) { if (stmt instanceof EnumEffectiveStatement) { @@ -451,14 +452,14 @@ abstract class AbstractTypeStatementSupport final IdentityrefTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newIdentityrefBuilder(baseType, - typeEffectiveSchemaPath(ctx))); + typeEffectiveQName(ctx))); } private static @NonNull TypeEffectiveStatement createInstanceIdentifier( final Current ctx, final InstanceIdentifierTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { final InstanceIdentifierTypeBuilder builder = RestrictedTypes.newInstanceIdentifierBuilder(baseType, - typeEffectiveSchemaPath(ctx)); + typeEffectiveQName(ctx)); for (EffectiveStatement stmt : substatements) { if (stmt instanceof RequireInstanceEffectiveStatement) { @@ -491,7 +492,7 @@ abstract class AbstractTypeStatementSupport final LeafrefTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { final RequireInstanceRestrictedTypeBuilder builder = - RestrictedTypes.newLeafrefBuilder(baseType, AbstractTypeStatementSupport.typeEffectiveSchemaPath(ctx)); + RestrictedTypes.newLeafrefBuilder(baseType, AbstractTypeStatementSupport.typeEffectiveQName(ctx)); for (final EffectiveStatement stmt : substatements) { if (stmt instanceof RequireInstanceEffectiveStatement) { @@ -505,7 +506,7 @@ abstract class AbstractTypeStatementSupport final StringTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { final StringTypeBuilder builder = RestrictedTypes.newStringBuilder(baseType, - AbstractTypeStatementSupport.typeEffectiveSchemaPath(ctx)); + AbstractTypeStatementSupport.typeEffectiveQName(ctx)); for (EffectiveStatement stmt : substatements) { if (stmt instanceof LengthEffectiveStatement) { @@ -531,6 +532,6 @@ abstract class AbstractTypeStatementSupport final UnionTypeDefinition baseType, final TypeStatement declared, final ImmutableList> substatements) { return new TypeEffectiveStatementImpl<>(declared, substatements, RestrictedTypes.newUnionBuilder(baseType, - typeEffectiveSchemaPath(ctx))); + typeEffectiveQName(ctx))); } } \ No newline at end of file diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java index 182d247d3d..1c69abff5a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java @@ -65,7 +65,7 @@ final class BitsSpecificationSupport throw noBits(stmt); } - final BitsTypeBuilder builder = BaseTypes.bitsTypeBuilder(stmt.wrapSchemaPath()); + final BitsTypeBuilder builder = BaseTypes.bitsTypeBuilder(stmt.argumentAsTypeQName()); Uint32 highestPosition = null; for (final EffectiveStatement subStmt : substatements) { if (subStmt instanceof BitEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java index 3280daf210..6075243965 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java @@ -64,7 +64,7 @@ final class Decimal64SpecificationSupport extends AbstractStatementSupport subStmt : substatements) { if (subStmt instanceof FractionDigitsEffectiveStatement) { builder.setFractionDigits(((FractionDigitsEffectiveStatement) subStmt).argument()); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java index 7267e0590a..ff6638933d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java @@ -63,7 +63,7 @@ final class EnumSpecificationSupport throw noEnum(stmt); } - final EnumerationTypeBuilder builder = BaseTypes.enumerationTypeBuilder(stmt.wrapSchemaPath()); + final EnumerationTypeBuilder builder = BaseTypes.enumerationTypeBuilder(stmt.argumentAsTypeQName()); Integer highestValue = null; for (final EffectiveStatement subStmt : substatements) { if (subStmt instanceof EnumEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java index faf68b70da..fa0d47572d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java @@ -60,7 +60,7 @@ final class InstanceIdentifierSpecificationSupport extends AbstractStatementSupp final Current stmt, final ImmutableList> substatements) { final InstanceIdentifierTypeBuilder builder = RestrictedTypes.newInstanceIdentifierBuilder( - BaseTypes.instanceIdentifierType(), stmt.wrapSchemaPath()); + BaseTypes.instanceIdentifierType(), stmt.argumentAsTypeQName()); // TODO: we could do better here for empty substatements, but its really splitting hairs for (EffectiveStatement subStmt : substatements) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java index a28d9e7943..f8bc0fbc89 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java @@ -63,7 +63,7 @@ final class UnionSpecificationSupport throw noType(stmt); } - final UnionTypeBuilder builder = BaseTypes.unionTypeBuilder(stmt.wrapSchemaPath()); + final UnionTypeBuilder builder = BaseTypes.unionTypeBuilder(stmt.argumentAsTypeQName()); for (final EffectiveStatement subStmt : substatements) { if (subStmt instanceof TypeEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java index da966ac627..ae33edb17a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java @@ -113,7 +113,7 @@ final class TypedefEffectiveStatementImpl extends Default loadTypeDefinition() { final TypeEffectiveStatement type = findFirstEffectiveSubstatement(TypeEffectiveStatement.class).get(); - final DerivedTypeBuilder builder = DerivedTypes.derivedTypeBuilder(type.getTypeDefinition(), path); + final DerivedTypeBuilder builder = DerivedTypes.derivedTypeBuilder(type.getTypeDefinition(), getQName()); for (final EffectiveStatement stmt : effectiveSubstatements()) { if (stmt instanceof DefaultEffectiveStatement) { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java index 03361a8f36..41cdb529d0 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java @@ -15,7 +15,6 @@ import static org.junit.Assert.assertTrue; import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -95,9 +94,7 @@ public class AugmentTest { assertEquals(expectedSchemaPath, ds0ChannelNumber.getPath()); assertFalse(ds0ChannelNumber.isAugmenting()); // type of leaf ds0ChannelNumber - final List typePath = Collections.singletonList(BaseTypes.STRING_QNAME); - expectedSchemaPath = SchemaPath.create(typePath, true); - assertEquals(expectedSchemaPath, ds0ChannelNumber.getType().getPath()); + assertEquals(BaseTypes.STRING_QNAME, ds0ChannelNumber.getType().getQName()); // leaf interface-id qname = QName.create(FOO, "interface-id"); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java index 92c4970957..77cc6559cd 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java @@ -18,11 +18,9 @@ import org.opendaylight.yangtools.yang.model.api.DeviateDefinition; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public class Bug7440Test { - @Test public void testRestrictedTypeParentSchemaPathInDeviate() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug7440"); @@ -40,10 +38,7 @@ public class Bug7440Test { assertEquals(1, deviates.size()); final DeviateDefinition deviateReplace = deviates.iterator().next(); - final SchemaPath deviatedTypePath = SchemaPath.create(true, QName.create(bar.getQNameModule(), "test-leaf"), - QName.create(bar.getQNameModule(), "uint32")); - final TypeDefinition deviatedType = deviateReplace.getDeviatedType(); - assertEquals(deviatedTypePath, deviatedType.getPath()); + assertEquals(QName.create(bar.getQNameModule(), "uint32"), deviatedType.getQName()); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java index e303a05b2a..13499c4de1 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java @@ -84,7 +84,6 @@ public class EffectiveStatementTypeTest { assertEquals("binary", binaryEff.getQName().getLocalName()); assertFalse(binaryEff.getLengthConstraint().isPresent()); assertEquals(Status.CURRENT, binaryEff.getStatus()); - assertEquals("binary", binaryEff.getPath().getPathFromRoot().iterator().next().getLocalName()); assertNotNull(binaryEff.getUnknownSchemaNodes()); assertFalse(binaryEff.getDescription().isPresent()); assertFalse(binaryEff.getReference().isPresent()); @@ -106,7 +105,6 @@ public class EffectiveStatementTypeTest { assertNull(bitsEff.getBaseType()); assertNotNull(bitsEff.getQName()); assertEquals("bits", bitsEff.getQName().getLocalName()); - assertEquals("bits", bitsEff.getPath().getLastComponent().getLocalName()); assertNotNull(bitsEff.getUnknownSchemaNodes()); assertFalse(bitsEff.getDescription().isPresent()); assertFalse(bitsEff.getReference().isPresent()); @@ -145,7 +143,6 @@ public class EffectiveStatementTypeTest { assertEquals(Optional.empty(), booleanEff.getUnits()); assertEquals(Optional.empty(), booleanEff.getDefaultValue()); assertEquals("boolean", booleanEff.getQName().getLocalName()); - assertNull(booleanEff.getPath().getParent().getParent()); assertNotNull(booleanEff.getUnknownSchemaNodes()); assertFalse(booleanEff.getDescription().isPresent()); assertFalse(booleanEff.getReference().isPresent()); @@ -181,7 +178,6 @@ public class EffectiveStatementTypeTest { assertFalse(decimal64Eff.equals(null)); assertFalse(decimal64Eff.equals("test")); assertTrue(decimal64Eff.equals(decimal64Eff)); - assertEquals("decimal64", decimal64Eff.getPath().getLastComponent().getLocalName()); } @Test @@ -196,10 +192,9 @@ public class EffectiveStatementTypeTest { assertEquals(Optional.empty(), emptyEff.getDefaultValue()); assertNull(emptyEff.getBaseType()); assertEquals("empty", emptyEff.getQName().getLocalName()); - assertNull(emptyEff.getPath().getParent().getParent()); assertNotNull(emptyEff.getUnknownSchemaNodes()); - assertFalse(emptyEff.getDescription().isPresent()); - assertFalse(emptyEff.getReference().isPresent()); + assertEquals(Optional.empty(), emptyEff.getDescription()); + assertEquals(Optional.empty(), emptyEff.getReference()); assertEquals("CURRENT", emptyEff.getStatus().toString()); assertNotNull(emptyEff.toString()); } @@ -216,7 +211,6 @@ public class EffectiveStatementTypeTest { .getTypeDefinition(); assertEquals("enumeration", enumSpecEff.getQName().getLocalName()); - assertEquals("enumeration", enumSpecEff.getPath().getLastComponent().getLocalName()); assertEquals(Optional.empty(), enumSpecEff.getDefaultValue()); assertEquals(3, enumSpecEff.getValues().size()); assertNull(enumSpecEff.getBaseType()); @@ -250,7 +244,6 @@ public class EffectiveStatementTypeTest { assertEquals(Optional.empty(), identityRefEff.getDefaultValue()); assertEquals("identityref", identityRefEff.getQName().getLocalName()); - assertEquals("identityref", identityRefEff.getPath().getLastComponent().getLocalName()); assertNull(identityRefEff.getBaseType()); assertNotNull(identityRefEff.getUnknownSchemaNodes()); assertEquals(Status.CURRENT, identityRefEff.getStatus()); @@ -275,7 +268,6 @@ public class EffectiveStatementTypeTest { assertFalse(instanceIdentEff.requireInstance()); assertEquals("instance-identifier", instanceIdentEff.getQName().getLocalName()); - assertEquals("instance-identifier", instanceIdentEff.getPath().getLastComponent().getLocalName()); assertNull(instanceIdentEff.getBaseType()); assertEquals(Optional.empty(), instanceIdentEff.getDefaultValue()); assertNotNull(instanceIdentEff.getUnknownSchemaNodes()); @@ -306,7 +298,6 @@ public class EffectiveStatementTypeTest { assertEquals("leafref", leafrefEff.getQName().getLocalName()); assertEquals(Status.CURRENT, leafrefEff.getStatus()); assertNotNull(leafrefEff.getUnknownSchemaNodes()); - assertEquals("leafref", leafrefEff.getPath().getLastComponent().getLocalName()); assertFalse(leafrefEff.getDescription().isPresent()); assertFalse(leafrefEff.getReference().isPresent()); assertNotNull(leafrefEff.hashCode()); @@ -334,7 +325,6 @@ public class EffectiveStatementTypeTest { assertEquals("leafref", leafrefEff.getQName().getLocalName()); assertEquals(Status.CURRENT, leafrefEff.getStatus()); assertNotNull(leafrefEff.getUnknownSchemaNodes()); - assertEquals("leafref", leafrefEff.getPath().getLastComponent().getLocalName()); assertFalse(leafrefEff.getDescription().isPresent()); assertFalse(leafrefEff.getReference().isPresent()); assertNotNull(leafrefEff.hashCode()); @@ -416,7 +406,6 @@ public class EffectiveStatementTypeTest { assertFalse(unionEff.equals(null)); assertFalse(unionEff.equals("test")); assertTrue(unionEff.equals(unionEff)); - assertEquals("union", unionEff.getPath().getLastComponent().getLocalName()); } @Test @@ -497,7 +486,6 @@ public class EffectiveStatementTypeTest { assertFalse(stringEff.equals(null)); assertFalse(stringEff.equals("test")); assertTrue(stringEff.equals(stringEff)); - assertEquals("string", stringEff.getPath().getLastComponent().getLocalName()); assertFalse(stringEff.getLengthConstraint().isPresent()); assertNotNull(stringEff.getPatternConstraints()); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java index 2888a67a3a..106244a0c0 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java @@ -136,8 +136,7 @@ public class UsesAugmentTest { assertEquals(expectedPath, version.getPath()); expectedQName = QName.create(UG, "version"); path.offer(expectedQName); - expectedPath = SchemaPath.create(true, pcreq.getQName(), expectedQName); - assertEquals(expectedPath, version.getType().getPath()); + assertEquals(expectedQName, version.getType().getQName()); assertEquals(BaseTypes.uint8Type(), version.getType().getBaseType().getBaseType()); assertTrue(version.isAddedByUses()); // * |-- leaf type @@ -153,10 +152,9 @@ public class UsesAugmentTest { assertEquals(expectedPath, type.getPath()); expectedQName = QName.create(GD, "int-ext"); path.offer(expectedQName); - expectedPath = SchemaPath.create(true, expectedQName); - assertEquals(expectedPath, type.getType().getPath()); + assertEquals(expectedQName, type.getType().getQName()); final UnionTypeDefinition union = (UnionTypeDefinition) type.getType().getBaseType(); - assertEquals(SchemaPath.create(true, expectedQName, QName.create(expectedQName, "union")), union.getPath()); + assertEquals(QName.create(expectedQName, "union"), union.getQName()); assertEquals(2, union.getTypes().size()); // * |-- list requests final ListSchemaNode requests = (ListSchemaNode) pcreq.getDataChildByName(QName.create( @@ -651,8 +649,7 @@ public class UsesAugmentTest { } assertNotNull(intExt); - SchemaPath expectedPath = SchemaPath.create(true, QName.create(GD, "int-ext")); - assertEquals(expectedPath, intExt.getPath()); + assertEquals(QName.create(GD, "int-ext"), intExt.getQName()); final UnionTypeDefinition union = (UnionTypeDefinition) intExt.getBaseType(); @@ -667,9 +664,7 @@ public class UsesAugmentTest { } assertNotNull(uint8); assertNotNull(pv); - - expectedPath = SchemaPath.create(true, QName.create(GD, "int-ext"), QName.create(GD, "union")); - assertEquals(expectedPath, union.getPath()); + assertEquals(QName.create(GD, "union"), union.getQName()); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java index 5f38ca5f7c..f042691e31 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java @@ -193,7 +193,6 @@ public class YangParserSimpleTest { final TypeDefinition nodesType = typedefs.iterator().next(); final QName typedefQName = QName.create(SN, "nodes-type"); assertEquals(typedefQName, nodesType.getQName()); - assertEquals(SN_NODES_PATH.createChild(QName.create(SN, "nodes-type")), nodesType.getPath()); assertFalse(nodesType.getDescription().isPresent()); assertFalse(nodesType.getReference().isPresent()); assertEquals(Status.CURRENT, nodesType.getStatus()); @@ -205,7 +204,7 @@ public class YangParserSimpleTest { final LeafListSchemaNode added = (LeafListSchemaNode)nodes.getDataChildByName(QName.create( testModule.getQNameModule(), "added")); assertEquals(createPath("nodes", "added"), added.getPath()); - assertEquals(createPath("mytype"), added.getType().getPath()); + assertEquals(createPath("mytype").getLastComponent(), added.getType().getQName()); final ListSchemaNode links = (ListSchemaNode) nodes.getDataChildByName(QName.create( testModule.getQNameModule(), "links")); @@ -214,10 +213,7 @@ public class YangParserSimpleTest { final Collection groupings = nodes.getGroupings(); assertEquals(1, groupings.size()); final GroupingDefinition nodeGroup = groupings.iterator().next(); - final QName groupQName = QName.create(SN, "node-group"); - assertEquals(groupQName, nodeGroup.getQName()); - final SchemaPath nodeGroupPath = SN_NODES_PATH.createChild(groupQName); - assertEquals(nodeGroupPath, nodeGroup.getPath()); + assertEquals(QName.create(SN, "node-group"), nodeGroup.getQName()); final Collection uses = nodes.getUses(); assertEquals(1, uses.size()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java index fbde7a5684..0c42f1e5ee 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java @@ -595,18 +595,10 @@ public class YangParserTest { // int32-ext1 final Int32TypeDefinition int32ext1 = (Int32TypeDefinition) TestUtils.findTypedef(types, "int32-ext1"); - final QName int32TypedefQName = QName.create(BAR, "int32-ext1"); - assertEquals(int32TypedefQName, int32ext1.getQName()); - - final SchemaPath typeSchemaPath = int32ext1.getPath(); - final Iterable typePath = typeSchemaPath.getPathFromRoot(); - final Iterator typePathIt = typePath.iterator(); - assertEquals(int32TypedefQName, typePathIt.next()); - assertFalse(typePathIt.hasNext()); + assertEquals(QName.create(BAR, "int32-ext1"), int32ext1.getQName()); // int32-ext1/int32 - final Int32TypeDefinition int32 = int32ext1.getBaseType(); - assertEquals(BaseTypes.int32Type(), int32); + assertEquals(BaseTypes.int32Type(), int32ext1.getBaseType()); } @Test @@ -620,25 +612,12 @@ public class YangParserTest { assertEquals(BAR, myDecTypeQName.getModule()); assertEquals("my-decimal-type", myDecTypeQName.getLocalName()); - final SchemaPath typeSchemaPath = myDecType.getPath(); - final Iterable typePath = typeSchemaPath.getPathFromRoot(); - final Iterator typePathIt = typePath.iterator(); - assertEquals(myDecTypeQName, typePathIt.next()); - assertFalse(typePathIt.hasNext()); - // my-base-int32-type/int32 final DecimalTypeDefinition dec64 = myDecType.getBaseType(); final QName dec64QName = dec64.getQName(); assertEquals(BAR, dec64QName.getModule()); assertEquals("decimal64", dec64QName.getLocalName()); - - final SchemaPath dec64SchemaPath = dec64.getPath(); - final Iterable dec64Path = dec64SchemaPath.getPathFromRoot(); - final Iterator dec64PathIt = dec64Path.iterator(); - assertEquals(myDecTypeQName, dec64PathIt.next()); - assertEquals(dec64QName, dec64PathIt.next()); - assertFalse(dec64PathIt.hasNext()); } private static void checkOrder(final Collection modules) { diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java index f389280535..69ad374a27 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java @@ -133,6 +133,13 @@ public interface EffectiveStmtCtx extends CommonStmtCtx, StmtContextCompat, Immu @Nullable EffectiveStatement original(); + // FIXME: YANGTOOLS-1216: implement near ReactorStmtCtx.createSchemaPath(), this should always be a 'String' + // sub-case as implied by all callers in stmt.type + // FIXME: 7.0.0: this method should be moved to stmt.type in some shape or form + default @NonNull QName argumentAsTypeQName() { + return verifyNotNull(getSchemaPath().getLastComponent()); + } + /** * Summon the Rabbit of Caerbannog. * -- 2.36.6