From 7fd1abd03d792989653a05052e723b1516a9e554 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 14 Feb 2021 21:43:47 +0100 Subject: [PATCH] Split out yang-model-ri We really mean to expose default implementations from a dedicated artifact, so that -spi is not burdened with actual implementation. JIRA: YANGTOOLS-1226 Change-Id: I8caeb2dd4bfdb969e26d858e40533a2f5f0c9862 Signed-off-by: Robert Varga --- artifacts/pom.xml | 7 +- features/odl-yangtools-parser/pom.xml | 4 + yang/pom.xml | 11 +- yang/rfc7952-parser-support/pom.xml | 4 + .../parser/AnnotationStatementSupport.java | 4 +- .../rfc7952/parser/AnnotationTest.java | 2 +- yang/yang-data-impl/pom.xml | 5 + .../src/main/java/module-info.java | 1 - .../impl/codec/BinaryCodecStringTest.java | 2 +- .../data/impl/codec/BitsCodecStringTest.java | 4 +- .../impl/codec/BooleanCodecStringTest.java | 2 +- .../impl/codec/DecimalCodecStringTest.java | 2 +- .../data/impl/codec/EmptyCodecStringTest.java | 2 +- .../data/impl/codec/Int16CodecStringTest.java | 2 +- .../data/impl/codec/Int32CodecStringTest.java | 2 +- .../data/impl/codec/Int64CodecStringTest.java | 2 +- .../data/impl/codec/Int8CodecStringTest.java | 2 +- .../impl/codec/StringCodecStringTest.java | 3 +- .../TypeDefinitionAwareCodecTestHelper.java | 4 +- .../impl/codec/Uint16CodecStringTest.java | 2 +- .../impl/codec/Uint32CodecStringTest.java | 2 +- .../impl/codec/Uint64CodecStringTest.java | 2 +- .../data/impl/codec/Uint8CodecStringTest.java | 2 +- .../data/impl/codec/UnionCodecStringTest.java | 4 +- yang/yang-model-ri/pom.xml | 34 +++ .../src/main/java/module-info.java | 18 ++ .../model/ri}/stmt/DeclaredStatements.java | 258 +++++++++--------- .../model/ri}/stmt/EffectiveStatements.java | 120 ++++---- .../model/ri}/stmt/ImplicitStatements.java | 10 +- ...bstractDeclaredEffectiveRootStatement.java | 2 +- .../stmt/impl/decl/AbstractKeyStatement.java | 2 +- .../impl/decl/AbstractOrderedByStatement.java | 2 +- .../impl/decl/AbstractStatusStatement.java | 2 +- .../stmt/impl/decl/DeviateStatementImpl.java | 2 +- .../impl/decl/DeviationStatementImpl.java | 2 +- .../stmt/impl/decl/EmptyActionStatement.java | 2 +- .../stmt/impl/decl/EmptyAnydataStatement.java | 2 +- .../stmt/impl/decl/EmptyAnyxmlStatement.java | 2 +- .../impl/decl/EmptyArgumentStatement.java | 2 +- .../stmt/impl/decl/EmptyAugmentStatement.java | 2 +- .../stmt/impl/decl/EmptyBaseStatement.java | 2 +- .../impl/decl/EmptyBelongsToStatement.java | 2 +- .../ri}/stmt/impl/decl/EmptyBitStatement.java | 2 +- .../stmt/impl/decl/EmptyChoiceStatement.java | 2 +- .../stmt/impl/decl/EmptyConfigStatement.java | 2 +- .../stmt/impl/decl/EmptyContactStatement.java | 2 +- .../impl/decl/EmptyContainerStatement.java | 2 +- .../stmt/impl/decl/EmptyDefaultStatement.java | 2 +- .../impl/decl/EmptyDescriptionStatement.java | 2 +- .../stmt/impl/decl/EmptyEnumStatement.java | 2 +- .../impl/decl/EmptyErrorAppTagStatement.java | 2 +- .../impl/decl/EmptyErrorMessageStatement.java | 2 +- .../impl/decl/EmptyExtensionStatement.java | 2 +- .../stmt/impl/decl/EmptyFeatureStatement.java | 2 +- .../decl/EmptyFractionDigitsStatement.java | 2 +- .../impl/decl/EmptyGroupingStatement.java | 2 +- .../impl/decl/EmptyIdentityStatement.java | 2 +- .../impl/decl/EmptyIfFeatureStatement.java | 2 +- .../stmt/impl/decl/EmptyIncludeStatement.java | 2 +- .../stmt/impl/decl/EmptyInputStatement.java | 2 +- .../ri}/stmt/impl/decl/EmptyKeyStatement.java | 2 +- .../impl/decl/EmptyLeafListStatement.java | 2 +- .../stmt/impl/decl/EmptyLeafStatement.java | 2 +- .../stmt/impl/decl/EmptyLengthStatement.java | 2 +- .../stmt/impl/decl/EmptyListStatement.java | 2 +- .../impl/decl/EmptyMandatoryStatement.java | 2 +- .../impl/decl/EmptyMaxElementsStatement.java | 2 +- .../impl/decl/EmptyMinElementsStatement.java | 2 +- .../impl/decl/EmptyModifierStatement.java | 2 +- .../stmt/impl/decl/EmptyMustStatement.java | 2 +- .../impl/decl/EmptyNamespaceStatement.java | 2 +- .../impl/decl/EmptyNotificationStatement.java | 2 +- .../impl/decl/EmptyOrderedByStatement.java | 2 +- .../impl/decl/EmptyOrganizationStatement.java | 2 +- .../stmt/impl/decl/EmptyOutputStatement.java | 2 +- .../stmt/impl/decl/EmptyPathStatement.java | 2 +- .../stmt/impl/decl/EmptyPatternStatement.java | 2 +- .../impl/decl/EmptyPositionStatement.java | 2 +- .../stmt/impl/decl/EmptyPrefixStatement.java | 2 +- .../impl/decl/EmptyPresenceStatement.java | 2 +- .../stmt/impl/decl/EmptyRangeStatement.java | 2 +- .../impl/decl/EmptyReferenceStatement.java | 2 +- .../decl/EmptyRequireInstanceStatement.java | 2 +- .../impl/decl/EmptyRevisionDateStatement.java | 2 +- .../impl/decl/EmptyRevisionStatement.java | 2 +- .../ri}/stmt/impl/decl/EmptyRpcStatement.java | 2 +- .../stmt/impl/decl/EmptyStatusStatement.java | 2 +- .../stmt/impl/decl/EmptyTypeStatement.java | 2 +- .../stmt/impl/decl/EmptyTypedefStatement.java | 2 +- .../decl/EmptyUndeclaredInputStatement.java | 2 +- .../decl/EmptyUndeclaredOutputStatement.java | 2 +- .../stmt/impl/decl/EmptyUniqueStatement.java | 2 +- .../stmt/impl/decl/EmptyUnitsStatement.java | 2 +- .../stmt/impl/decl/EmptyUsesStatement.java | 2 +- .../stmt/impl/decl/EmptyValueStatement.java | 2 +- .../stmt/impl/decl/EmptyWhenStatement.java | 2 +- .../impl/decl/EmptyYangVersionStatement.java | 2 +- .../impl/decl/EmptyYinElementStatement.java | 2 +- .../stmt/impl/decl/ImportStatementImpl.java | 2 +- .../stmt/impl/decl/ModuleStatementImpl.java | 2 +- .../stmt/impl/decl/RefineStatementImpl.java | 2 +- .../impl/decl/RegularActionStatement.java | 2 +- .../impl/decl/RegularAnydataStatement.java | 2 +- .../impl/decl/RegularAnyxmlStatement.java | 2 +- .../impl/decl/RegularArgumentStatement.java | 2 +- .../impl/decl/RegularAugmentStatement.java | 2 +- .../stmt/impl/decl/RegularBaseStatement.java | 2 +- .../impl/decl/RegularBelongsToStatement.java | 2 +- .../stmt/impl/decl/RegularBitStatement.java | 2 +- .../impl/decl/RegularChoiceStatement.java | 2 +- .../impl/decl/RegularConfigStatement.java | 2 +- .../impl/decl/RegularContactStatement.java | 2 +- .../impl/decl/RegularContainerStatement.java | 2 +- .../impl/decl/RegularDefaultStatement.java | 2 +- .../decl/RegularDescriptionStatement.java | 2 +- .../stmt/impl/decl/RegularEnumStatement.java | 2 +- .../decl/RegularErrorAppTagStatement.java | 2 +- .../decl/RegularErrorMessageStatement.java | 2 +- .../impl/decl/RegularExtensionStatement.java | 2 +- .../impl/decl/RegularFeatureStatement.java | 2 +- .../decl/RegularFractionDigitsStatement.java | 2 +- .../impl/decl/RegularGroupingStatement.java | 2 +- .../impl/decl/RegularIdentityStatement.java | 2 +- .../impl/decl/RegularIfFeatureStatement.java | 2 +- .../impl/decl/RegularIncludeStatement.java | 2 +- .../stmt/impl/decl/RegularInputStatement.java | 2 +- .../stmt/impl/decl/RegularKeyStatement.java | 2 +- .../impl/decl/RegularLeafListStatement.java | 2 +- .../stmt/impl/decl/RegularLeafStatement.java | 2 +- .../impl/decl/RegularLengthStatement.java | 2 +- .../stmt/impl/decl/RegularListStatement.java | 2 +- .../impl/decl/RegularMandatoryStatement.java | 2 +- .../decl/RegularMaxElementsStatement.java | 2 +- .../decl/RegularMinElementsStatement.java | 2 +- .../impl/decl/RegularModifierStatement.java | 2 +- .../stmt/impl/decl/RegularMustStatement.java | 2 +- .../impl/decl/RegularNamespaceStatement.java | 2 +- .../decl/RegularNotificationStatement.java | 2 +- .../impl/decl/RegularOrderedByStatement.java | 2 +- .../decl/RegularOrganizationStatement.java | 2 +- .../impl/decl/RegularOutputStatement.java | 2 +- .../stmt/impl/decl/RegularPathStatement.java | 2 +- .../impl/decl/RegularPatternStatement.java | 2 +- .../impl/decl/RegularPositionStatement.java | 2 +- .../impl/decl/RegularPrefixStatement.java | 2 +- .../impl/decl/RegularPresenceStatement.java | 2 +- .../stmt/impl/decl/RegularRangeStatement.java | 2 +- .../impl/decl/RegularReferenceStatement.java | 2 +- .../decl/RegularRequireInstanceStatement.java | 2 +- .../decl/RegularRevisionDateStatement.java | 2 +- .../impl/decl/RegularRevisionStatement.java | 2 +- .../stmt/impl/decl/RegularRpcStatement.java | 2 +- .../impl/decl/RegularStatusStatement.java | 2 +- .../stmt/impl/decl/RegularTypeStatement.java | 2 +- .../impl/decl/RegularTypedefStatement.java | 2 +- .../decl/RegularUndeclaredInputStatement.java | 2 +- .../RegularUndeclaredOutputStatement.java | 2 +- .../impl/decl/RegularUniqueStatement.java | 2 +- .../stmt/impl/decl/RegularUnitsStatement.java | 2 +- .../stmt/impl/decl/RegularUsesStatement.java | 2 +- .../stmt/impl/decl/RegularValueStatement.java | 2 +- .../stmt/impl/decl/RegularWhenStatement.java | 2 +- .../decl/RegularYangVersionStatement.java | 2 +- .../impl/decl/RegularYinElementStatement.java | 2 +- .../impl/decl/SubmoduleStatementImpl.java | 2 +- .../eff/EmptyArgumentEffectiveStatement.java | 2 +- .../impl/eff/EmptyBaseEffectiveStatement.java | 2 +- .../eff/EmptyBelongsToEffectiveStatement.java | 2 +- .../EmptyDescriptionEffectiveStatement.java | 2 +- .../EmptyErrorAppTagEffectiveStatement.java | 2 +- .../EmptyErrorMessageEffectiveStatement.java | 2 +- ...EmptyFractionDigitsEffectiveStatement.java | 2 +- .../eff/EmptyIfFeatureEffectiveStatement.java | 2 +- .../eff/EmptyIncludeEffectiveStatement.java | 2 +- .../eff/EmptyMandatoryEffectiveStatement.java | 2 +- .../EmptyMaxElementsEffectiveStatement.java | 2 +- .../EmptyMinElementsEffectiveStatement.java | 2 +- .../eff/EmptyModifierEffectiveStatement.java | 2 +- .../eff/EmptyNamespaceEffectiveStatement.java | 2 +- .../eff/EmptyOrderedByEffectiveStatement.java | 2 +- .../EmptyOrganizationEffectiveStatement.java | 2 +- .../impl/eff/EmptyPathEffectiveStatement.java | 2 +- .../eff/EmptyPositionEffectiveStatement.java | 2 +- .../eff/EmptyPresenceEffectiveStatement.java | 2 +- .../eff/EmptyReferenceEffectiveStatement.java | 2 +- ...mptyRequireInstanceEffectiveStatement.java | 4 +- .../EmptyRevisionDateEffectiveStatement.java | 2 +- .../eff/EmptyStatusEffectiveStatement.java | 4 +- .../eff/EmptyUnitsEffectiveStatement.java | 2 +- .../eff/EmptyValueEffectiveStatement.java | 2 +- .../impl/eff/EmptyWhenEffectiveStatement.java | 2 +- .../EmptyYangVersionEffectiveStatement.java | 4 +- .../EmptyYinElementEffectiveStatement.java | 2 +- .../RegularArgumentEffectiveStatement.java | 2 +- .../eff/RegularBaseEffectiveStatement.java | 2 +- .../RegularBelongsToEffectiveStatement.java | 2 +- .../RegularDescriptionEffectiveStatement.java | 2 +- .../RegularErrorAppTagEffectiveStatement.java | 2 +- ...RegularErrorMessageEffectiveStatement.java | 2 +- ...gularFractionDigitsEffectiveStatement.java | 2 +- .../RegularIfFeatureEffectiveStatement.java | 2 +- .../eff/RegularIncludeEffectiveStatement.java | 2 +- .../RegularMandatoryEffectiveStatement.java | 2 +- .../RegularMaxElementsEffectiveStatement.java | 2 +- .../RegularMinElementsEffectiveStatement.java | 2 +- .../RegularModifierEffectiveStatement.java | 2 +- .../RegularNamespaceEffectiveStatement.java | 2 +- .../RegularOrderedByEffectiveStatement.java | 2 +- ...RegularOrganizationEffectiveStatement.java | 2 +- .../eff/RegularPathEffectiveStatement.java | 2 +- .../RegularPositionEffectiveStatement.java | 2 +- .../RegularPresenceEffectiveStatement.java | 2 +- .../RegularReferenceEffectiveStatement.java | 2 +- ...ularRequireInstanceEffectiveStatement.java | 2 +- ...RegularRevisionDateEffectiveStatement.java | 2 +- .../eff/RegularStatusEffectiveStatement.java | 2 +- .../eff/RegularUnitsEffectiveStatement.java | 2 +- .../eff/RegularValueEffectiveStatement.java | 2 +- .../eff/RegularWhenEffectiveStatement.java | 2 +- .../RegularYangVersionEffectiveStatement.java | 2 +- .../RegularYinElementEffectiveStatement.java | 2 +- .../yang/model/ri}/type/AbstractBaseType.java | 2 +- .../model/ri}/type/AbstractDerivedType.java | 2 +- .../AbstractLengthRestrictedBaseType.java | 2 +- .../AbstractLengthRestrictedDerivedType.java | 2 +- .../type/AbstractLengthRestrictedType.java | 2 +- .../type/AbstractRangeRestrictedBaseType.java | 2 +- .../AbstractRangeRestrictedDerivedType.java | 2 +- .../ri}/type/AbstractRangeRestrictedType.java | 2 +- .../ri}/type/AbstractRestrictedType.java | 2 +- .../type/AbstractRestrictedTypeBuilder.java | 2 +- .../ri}/type/AbstractTypeDefinition.java | 2 +- .../yang/model/ri}/type/BaseBinaryType.java | 2 +- .../yang/model/ri}/type/BaseBitsType.java | 2 +- .../yang/model/ri}/type/BaseBooleanType.java | 2 +- .../yang/model/ri}/type/BaseDecimalType.java | 2 +- .../yang/model/ri}/type/BaseEmptyType.java | 2 +- .../model/ri}/type/BaseEnumerationType.java | 2 +- .../model/ri}/type/BaseIdentityrefType.java | 2 +- .../ri}/type/BaseInstanceIdentifierType.java | 2 +- .../yang/model/ri}/type/BaseInt16Type.java | 2 +- .../yang/model/ri}/type/BaseInt32Type.java | 2 +- .../yang/model/ri}/type/BaseInt64Type.java | 2 +- .../yang/model/ri}/type/BaseInt8Type.java | 2 +- .../yang/model/ri}/type/BaseLeafrefType.java | 2 +- .../yang/model/ri}/type/BaseStringType.java | 2 +- .../yang/model/ri}/type/BaseTypes.java | 2 +- .../yang/model/ri}/type/BaseUint16Type.java | 2 +- .../yang/model/ri}/type/BaseUint32Type.java | 2 +- .../yang/model/ri}/type/BaseUint64Type.java | 2 +- .../yang/model/ri}/type/BaseUint8Type.java | 2 +- .../yang/model/ri}/type/BaseUnionType.java | 2 +- .../yang/model/ri}/type/BitBuilder.java | 2 +- .../yang/model/ri}/type/BitImpl.java | 2 +- .../yang/model/ri}/type/BitsTypeBuilder.java | 2 +- .../model/ri}/type/ConcreteTypeBuilder.java | 2 +- .../yang/model/ri}/type/ConcreteTypes.java | 2 +- .../model/ri}/type/DecimalTypeBuilder.java | 2 +- .../model/ri}/type/DerivedBinaryType.java | 2 +- .../yang/model/ri}/type/DerivedBitsType.java | 2 +- .../model/ri}/type/DerivedBooleanType.java | 2 +- .../model/ri}/type/DerivedDecimalType.java | 2 +- .../yang/model/ri}/type/DerivedEmptyType.java | 2 +- .../ri}/type/DerivedEnumerationType.java | 2 +- .../ri}/type/DerivedIdentityrefType.java | 2 +- .../type/DerivedInstanceIdentifierType.java | 2 +- .../yang/model/ri}/type/DerivedInt16Type.java | 2 +- .../yang/model/ri}/type/DerivedInt32Type.java | 2 +- .../yang/model/ri}/type/DerivedInt64Type.java | 2 +- .../yang/model/ri}/type/DerivedInt8Type.java | 2 +- .../model/ri}/type/DerivedLeafrefType.java | 2 +- .../model/ri}/type/DerivedStringType.java | 2 +- .../model/ri}/type/DerivedTypeBuilder.java | 2 +- .../yang/model/ri}/type/DerivedTypes.java | 2 +- .../model/ri}/type/DerivedUint16Type.java | 2 +- .../model/ri}/type/DerivedUint32Type.java | 2 +- .../model/ri}/type/DerivedUint64Type.java | 2 +- .../yang/model/ri}/type/DerivedUint8Type.java | 2 +- .../yang/model/ri}/type/DerivedUnionType.java | 2 +- .../yang/model/ri}/type/EnumPairBuilder.java | 2 +- .../yang/model/ri}/type/EnumPairImpl.java | 2 +- .../ri}/type/EnumerationTypeBuilder.java | 2 +- .../ri}/type/IdentityrefTypeBuilder.java | 2 +- .../type/InstanceIdentifierTypeBuilder.java | 2 +- .../type/InvalidBitDefinitionException.java | 2 +- .../type/InvalidEnumDefinitionException.java | 2 +- .../InvalidLengthConstraintException.java | 2 +- .../type/InvalidRangeConstraintException.java | 2 +- .../model/ri}/type/JavaLengthConstraints.java | 2 +- .../model/ri}/type/LeafrefTypeBuilder.java | 2 +- .../ri}/type/LengthRestrictedTypeBuilder.java | 2 +- .../yang/model/ri}/type/NumberUtil.java | 2 +- .../ri}/type/RangeRestrictedTypeBuilder.java | 2 +- .../RangeRestrictedTypeBuilderWithBase.java | 2 +- .../RequireInstanceRestrictedTypeBuilder.java | 2 +- .../ri}/type/ResolvedLengthConstraint.java | 2 +- .../ri}/type/ResolvedRangeConstraint.java | 2 +- .../model/ri}/type/RestrictedBinaryType.java | 2 +- .../model/ri}/type/RestrictedBitsType.java | 2 +- .../model/ri}/type/RestrictedBooleanType.java | 2 +- .../model/ri}/type/RestrictedDecimalType.java | 2 +- .../model/ri}/type/RestrictedEmptyType.java | 2 +- .../ri}/type/RestrictedEnumerationType.java | 2 +- .../ri}/type/RestrictedIdentityrefType.java | 2 +- .../RestrictedInstanceIdentifierType.java | 2 +- .../model/ri}/type/RestrictedInt16Type.java | 2 +- .../model/ri}/type/RestrictedInt32Type.java | 2 +- .../model/ri}/type/RestrictedInt64Type.java | 2 +- .../model/ri}/type/RestrictedInt8Type.java | 2 +- .../model/ri}/type/RestrictedLeafrefType.java | 2 +- .../model/ri}/type/RestrictedStringType.java | 2 +- .../yang/model/ri}/type/RestrictedTypes.java | 2 +- .../model/ri}/type/RestrictedUint16Type.java | 2 +- .../model/ri}/type/RestrictedUint32Type.java | 2 +- .../model/ri}/type/RestrictedUint64Type.java | 2 +- .../model/ri}/type/RestrictedUint8Type.java | 2 +- .../model/ri}/type/RestrictedUnionType.java | 2 +- .../model/ri}/type/StringTypeBuilder.java | 2 +- .../yang/model/ri}/type/TypeBuilder.java | 2 +- .../yang/model/ri}/type/UnionTypeBuilder.java | 2 +- .../yang/model/ri}/type/BinaryTypeTest.java | 2 +- .../yang/model/ri}/type/BitImplTest.java | 2 +- .../yang/model/ri}/type/BitsTypeTest.java | 2 +- .../yang/model/ri}/type/BooleanTypeTest.java | 2 +- .../yang/model/ri}/type/EmptyTypeTest.java | 2 +- .../yang/model/ri}/type/EnumPairImplTest.java | 2 +- .../yang/model/ri}/type/Int8Test.java | 2 +- .../yang/model/ri}/type/LeafrefTest.java | 2 +- .../yang/model/ri}/type/NumberUtilTest.java | 2 +- .../yang/model/ri}/type/TypeTest.java | 2 +- .../src/main/java/module-info.java | 2 - yang/yang-model-util/pom.xml | 5 + .../model/util/SchemaContextUtilTest.java | 2 +- yang/yang-parser-rfc7950/pom.xml | 4 + .../src/main/java/module-info.java | 1 + .../stmt/action/ActionStatementSupport.java | 2 +- .../stmt/anydata/AnydataStatementSupport.java | 2 +- .../stmt/anyxml/AnyxmlStatementSupport.java | 2 +- .../argument/ArgumentStatementSupport.java | 4 +- .../AbstractAugmentStatementSupport.java | 2 +- .../stmt/base/BaseStatementSupport.java | 4 +- .../belongs_to/BelongsToStatementSupport.java | 4 +- .../rfc7950/stmt/bit/BitStatementSupport.java | 2 +- .../stmt/choice/ChoiceStatementSupport.java | 2 +- .../stmt/config/ConfigStatementSupport.java | 2 +- .../stmt/contact/ContactStatementSupport.java | 2 +- .../container/ContainerStatementSupport.java | 2 +- .../default_/DefaultStatementSupport.java | 2 +- .../DescriptionStatementSupport.java | 4 +- .../AbstractDeviateStatementSupport.java | 2 +- .../deviation/DeviationStatementSupport.java | 2 +- .../stmt/enum_/EnumStatementSupport.java | 2 +- .../ErrorAppTagStatementSupport.java | 4 +- .../ErrorMessageStatementSupport.java | 4 +- .../extension/ExtensionStatementSupport.java | 2 +- .../stmt/feature/FeatureStatementSupport.java | 2 +- .../FractionDigitsStatementSupport.java | 4 +- .../grouping/GroupingStatementSupport.java | 2 +- .../identity/IdentityStatementSupport.java | 2 +- .../AbstractIfFeatureStatementSupport.java | 4 +- .../stmt/import_/ImportStatementSupport.java | 2 +- .../stmt/include/IncludeStatementSupport.java | 4 +- .../stmt/input/InputStatementSupport.java | 4 +- .../rfc7950/stmt/key/KeyStatementSupport.java | 2 +- .../leaf/AbstractLeafEffectiveStatement.java | 4 +- .../stmt/leaf/LeafStatementSupport.java | 2 +- .../AbstractLeafListEffectiveStatement.java | 4 +- .../leaf_list/LeafListStatementSupport.java | 2 +- .../stmt/length/LengthStatementSupport.java | 2 +- .../stmt/list/ListStatementSupport.java | 2 +- .../mandatory/MandatoryStatementSupport.java | 4 +- .../MaxElementsStatementSupport.java | 4 +- .../MinElementsStatementSupport.java | 4 +- .../modifier/ModifierStatementSupport.java | 4 +- .../stmt/module/ModuleStatementSupport.java | 2 +- .../stmt/must/MustStatementSupport.java | 2 +- .../namespace/NamespaceStatementSupport.java | 4 +- .../AbstractNotificationStatementSupport.java | 2 +- .../ordered_by/OrderedByStatementSupport.java | 4 +- .../OrganizationStatementSupport.java | 4 +- .../stmt/output/OutputStatementSupport.java | 4 +- .../stmt/path/PathStatementSupport.java | 4 +- .../stmt/pattern/PatternStatementSupport.java | 2 +- .../position/PositionStatementSupport.java | 4 +- .../stmt/prefix/PrefixStatementSupport.java | 2 +- .../presence/PresenceStatementSupport.java | 4 +- .../stmt/range/RangeStatementSupport.java | 2 +- .../reference/ReferenceStatementSupport.java | 4 +- .../stmt/refine/RefineStatementSupport.java | 2 +- .../RequireInstanceStatementSupport.java | 4 +- .../revision/RevisionStatementSupport.java | 2 +- .../RevisionDateStatementSupport.java | 4 +- .../rfc7950/stmt/rpc/RpcStatementSupport.java | 2 +- .../stmt/status/StatusStatementSupport.java | 4 +- .../submodule/SubmoduleStatementSupport.java | 2 +- ...stractIdentityRefSpecificationSupport.java | 4 +- .../AbstractLeafrefSpecificationSupport.java | 4 +- .../type/AbstractTypeStatementSupport.java | 22 +- .../stmt/type/BitsSpecificationSupport.java | 4 +- .../stmt/type/BuiltinEffectiveStatement.java | 2 +- .../type/Decimal64SpecificationSupport.java | 4 +- .../rfc7950/stmt/type/EffectiveTypeUtil.java | 4 +- .../stmt/type/EnumSpecificationSupport.java | 4 +- ...nstanceIdentifierSpecificationSupport.java | 6 +- .../stmt/type/TypeEffectiveStatementImpl.java | 2 +- .../stmt/type/UnionSpecificationSupport.java | 4 +- .../TypedefEffectiveStatementImpl.java | 4 +- .../stmt/typedef/TypedefStatementSupport.java | 2 +- .../stmt/unique/UniqueStatementSupport.java | 2 +- .../stmt/units/UnitsStatementSupport.java | 4 +- .../stmt/uses/UsesStatementSupport.java | 2 +- .../stmt/value/ValueStatementSupport.java | 4 +- .../stmt/when/WhenStatementSupport.java | 4 +- .../YangVersionStatementSupport.java | 4 +- .../YinElementStatementSupport.java | 4 +- .../yang/parser/stmt/rfc7950/Bug6887Test.java | 8 +- .../yangtools/yang/stmt/UsesAugmentTest.java | 2 +- .../yangtools/yang/stmt/YangParserTest.java | 2 +- .../yang/stmt/YangTypes2StmtTest.java | 2 +- .../yang/stmt/yin/YinFileListStmtTest.java | 2 +- 420 files changed, 750 insertions(+), 669 deletions(-) create mode 100644 yang/yang-model-ri/pom.xml create mode 100644 yang/yang-model-ri/src/main/java/module-info.java rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/DeclaredStatements.java (76%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/EffectiveStatements.java (76%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/ImplicitStatements.java (81%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/AbstractKeyStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/AbstractOrderedByStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/AbstractStatusStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/DeviateStatementImpl.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/DeviationStatementImpl.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyActionStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyAnydataStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyAnyxmlStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyArgumentStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyAugmentStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyBaseStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyBelongsToStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyBitStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyChoiceStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyConfigStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyContactStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyContainerStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyDefaultStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyDescriptionStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyEnumStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyErrorAppTagStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyErrorMessageStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyExtensionStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyFeatureStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyFractionDigitsStatement.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyGroupingStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyIdentityStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyIfFeatureStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyIncludeStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyInputStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyKeyStatement.java (90%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyLeafListStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyLeafStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyLengthStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyListStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyMandatoryStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyMaxElementsStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyMinElementsStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyModifierStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyMustStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyNamespaceStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyNotificationStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyOrderedByStatement.java (89%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyOrganizationStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyOutputStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyPathStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyPatternStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyPositionStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyPrefixStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyPresenceStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyRangeStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyReferenceStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyRequireInstanceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyRevisionDateStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyRevisionStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyRpcStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyStatusStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyTypeStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyTypedefStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyUndeclaredInputStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyUndeclaredOutputStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyUniqueStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyUnitsStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyUsesStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyValueStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyWhenStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyYangVersionStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/EmptyYinElementStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/ImportStatementImpl.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/ModuleStatementImpl.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RefineStatementImpl.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularActionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularAnydataStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularAnyxmlStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularArgumentStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularAugmentStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularBaseStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularBelongsToStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularBitStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularChoiceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularConfigStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularContactStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularContainerStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularDefaultStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularDescriptionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularEnumStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularErrorAppTagStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularErrorMessageStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularExtensionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularFeatureStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularFractionDigitsStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularGroupingStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularIdentityStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularIfFeatureStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularIncludeStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularInputStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularKeyStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularLeafListStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularLeafStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularLengthStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularListStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularMandatoryStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularMaxElementsStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularMinElementsStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularModifierStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularMustStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularNamespaceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularNotificationStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularOrderedByStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularOrganizationStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularOutputStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularPathStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularPatternStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularPositionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularPrefixStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularPresenceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularRangeStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularReferenceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularRequireInstanceStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularRevisionDateStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularRevisionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularRpcStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularStatusStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularTypeStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularTypedefStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularUndeclaredInputStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularUndeclaredOutputStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularUniqueStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularUnitsStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularUsesStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularValueStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularWhenStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularYangVersionStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/RegularYinElementStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/decl/SubmoduleStatementImpl.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyArgumentEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyBaseEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyIncludeEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyModifierEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyPathEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyPositionEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyPresenceEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyReferenceEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java (88%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyStatusEffectiveStatement.java (91%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyUnitsEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyValueEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyWhenEffectiveStatement.java (93%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java (89%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/EmptyYinElementEffectiveStatement.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularArgumentEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularBaseEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularBelongsToEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularDescriptionEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularIncludeEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularMandatoryEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularMinElementsEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularModifierEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularNamespaceEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularOrderedByEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularOrganizationEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularPathEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularPositionEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularPresenceEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularReferenceEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularStatusEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularUnitsEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularValueEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularWhenEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularYangVersionEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/stmt/impl/eff/RegularYinElementEffectiveStatement.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractBaseType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractDerivedType.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractLengthRestrictedBaseType.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractLengthRestrictedDerivedType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractLengthRestrictedType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractRangeRestrictedBaseType.java (97%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractRangeRestrictedDerivedType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractRangeRestrictedType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractRestrictedType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractRestrictedTypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/AbstractTypeDefinition.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseBinaryType.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseBitsType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseBooleanType.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseDecimalType.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseEmptyType.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseEnumerationType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseIdentityrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseInstanceIdentifierType.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseInt16Type.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseInt32Type.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseInt64Type.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseInt8Type.java (94%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseLeafrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseStringType.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseTypes.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseUint16Type.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseUint32Type.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseUint64Type.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseUint8Type.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BaseUnionType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BitBuilder.java (97%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BitImpl.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/BitsTypeBuilder.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/ConcreteTypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/ConcreteTypes.java (99%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DecimalTypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedBinaryType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedBitsType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedBooleanType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedDecimalType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedEmptyType.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedEnumerationType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedIdentityrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedInstanceIdentifierType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedInt16Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedInt32Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedInt64Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedInt8Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedLeafrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedStringType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedTypeBuilder.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedTypes.java (99%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedUint16Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedUint32Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedUint64Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedUint8Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/DerivedUnionType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/EnumPairBuilder.java (97%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/EnumPairImpl.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/EnumerationTypeBuilder.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/IdentityrefTypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/InstanceIdentifierTypeBuilder.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/InvalidBitDefinitionException.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/InvalidEnumDefinitionException.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/InvalidLengthConstraintException.java (92%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/InvalidRangeConstraintException.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/JavaLengthConstraints.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/LeafrefTypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/LengthRestrictedTypeBuilder.java (98%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/NumberUtil.java (99%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RangeRestrictedTypeBuilder.java (99%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RangeRestrictedTypeBuilderWithBase.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RequireInstanceRestrictedTypeBuilder.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/ResolvedLengthConstraint.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/ResolvedRangeConstraint.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedBinaryType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedBitsType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedBooleanType.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedDecimalType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedEmptyType.java (95%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedEnumerationType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedIdentityrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedInstanceIdentifierType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedInt16Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedInt32Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedInt64Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedInt8Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedLeafrefType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedStringType.java (97%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedTypes.java (99%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedUint16Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedUint32Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedUint64Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedUint8Type.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/RestrictedUnionType.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/StringTypeBuilder.java (97%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/TypeBuilder.java (96%) rename yang/{yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri}/type/UnionTypeBuilder.java (95%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/BinaryTypeTest.java (96%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/BitImplTest.java (98%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/BitsTypeTest.java (97%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/BooleanTypeTest.java (96%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/EmptyTypeTest.java (96%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/EnumPairImplTest.java (97%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/Int8Test.java (95%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/LeafrefTest.java (98%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/NumberUtilTest.java (99%) rename yang/{yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi => yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri}/type/TypeTest.java (99%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 80f94fcf77..a5e242acb6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -74,6 +74,11 @@ yang-model-api 7.0.0-SNAPSHOT + + org.opendaylight.yangtools + yang-model-export + 7.0.0-SNAPSHOT + org.opendaylight.yangtools yang-model-spi @@ -81,7 +86,7 @@ org.opendaylight.yangtools - yang-model-export + yang-model-ri 7.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 62d7dfb5aa..ab770b85d8 100644 --- a/features/odl-yangtools-parser/pom.xml +++ b/features/odl-yangtools-parser/pom.xml @@ -54,6 +54,10 @@ xml features + + org.opendaylight.yangtools + yang-model-ri + org.opendaylight.yangtools odlext-parser-support diff --git a/yang/pom.xml b/yang/pom.xml index fb209534c8..2a0d1415dd 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -23,6 +23,7 @@ pom + yang-common yang-common-netty yang-data-api @@ -32,16 +33,20 @@ yang-data-codec-binfmt yang-data-codec-gson yang-data-codec-xml - yang-model-api - yang-model-spi yang-model-export - yang-model-util yang-xpath-api yang-xpath-antlr + yang-xpath-impl + + yang-model-api + yang-model-spi + yang-model-ri + yang-model-util + yang-parser-api yang-test-util diff --git a/yang/rfc7952-parser-support/pom.xml b/yang/rfc7952-parser-support/pom.xml index a92e3d8aa7..752e47fbd6 100644 --- a/yang/rfc7952-parser-support/pom.xml +++ b/yang/rfc7952-parser-support/pom.xml @@ -34,6 +34,10 @@ org.opendaylight.yangtools rfc7952-model-api + + org.opendaylight.yangtools + yang-model-ri + org.opendaylight.yangtools yang-parser-rfc7950 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 f9362107f2..a762dfb4a1 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 @@ -26,9 +26,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypes; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.UnknownEffectiveStatementBase; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java index a5e7a9ba7d..218703faa8 100644 --- a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java +++ b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 58fee69916..fe38e70994 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -105,6 +105,11 @@ yang-test-util test + + org.opendaylight.yangtools + yang-model-ri + test + diff --git a/yang/yang-data-impl/src/main/java/module-info.java b/yang/yang-data-impl/src/main/java/module-info.java index d735a407cc..4f174a1c3b 100644 --- a/yang/yang-data-impl/src/main/java/module-info.java +++ b/yang/yang-data-impl/src/main/java/module-info.java @@ -28,7 +28,6 @@ module org.opendaylight.yangtools.yang.data.impl { requires org.opendaylight.yangtools.util; requires org.opendaylight.yangtools.rfc8528.data.util; requires org.opendaylight.yangtools.yang.common; - requires org.opendaylight.yangtools.yang.model.api; requires org.opendaylight.yangtools.yang.model.spi; requires org.slf4j; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java index 4c6230d36c..b147c9b268 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java @@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import java.util.Base64; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for BinaryCodecString. 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 6a5e7621ed..444b21ef3d 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 @@ -20,8 +20,8 @@ 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.type.BitsTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BitsTypeBuilder; /** * Unit tests for BitsCodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java index c4dbf236bc..0223e9e624 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.BooleanCodec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for BooleanCodecString. 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 cda2cbbf3b..4f9d63c811 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 @@ -14,7 +14,7 @@ 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.type.DecimalTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for DecimalCodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java index dc3cba3f7b..24a2b78d37 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.api.codec.EmptyCodec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for EmptyCodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java index 8ef0966aaa..8771d9f418 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java @@ -13,7 +13,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.Int16Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Int8CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java index 190ecffd43..248900e56c 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.Int32Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Int32CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java index 0b668826b4..784e4ba8ef 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java @@ -13,7 +13,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.Int64Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Int64CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java index 3d14ba80df..325a776d50 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.Int8Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Int8CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java index 94eae0ca63..f3164eddb9 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java @@ -5,14 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.yangtools.yang.data.impl.codec; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.StringCodec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for StringCodecString. 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 31ae57b397..df048cff08 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 @@ -19,8 +19,8 @@ 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; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.EnumerationTypeBuilder; public final class TypeDefinitionAwareCodecTestHelper { private TypeDefinitionAwareCodecTestHelper() { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java index 2d60b8de91..b677651609 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java @@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import org.junit.Test; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.data.api.codec.Uint16Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Uint16CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java index 142017fc44..24640fac03 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java @@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import org.junit.Test; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.codec.Uint32Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Uint32CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java index 946f58b627..33318b56ad 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.data.api.codec.Uint64Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Uint64CodecString. diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java index 6b2cfa4031..526c86c0d5 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java @@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar import org.junit.Test; import org.opendaylight.yangtools.yang.common.Uint8; import org.opendaylight.yangtools.yang.data.api.codec.Uint8Codec; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Unit tests for Uint8CodecString. 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 bec571330b..44d8e5f61b 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 @@ -18,8 +18,8 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.UnionTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.UnionTypeBuilder; /** * Unit tests forUnionCodecString. diff --git a/yang/yang-model-ri/pom.xml b/yang/yang-model-ri/pom.xml new file mode 100644 index 0000000000..b88d6de1bf --- /dev/null +++ b/yang/yang-model-ri/pom.xml @@ -0,0 +1,34 @@ + + + + + 4.0.0 + + org.opendaylight.yangtools + bundle-parent + 7.0.0-SNAPSHOT + ../../bundle-parent + + + yang-model-ri + bundle + ${project.artifactId} + Reference Implementation of yang.model.api + + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-spi + + + diff --git a/yang/yang-model-ri/src/main/java/module-info.java b/yang/yang-model-ri/src/main/java/module-info.java new file mode 100644 index 0000000000..5c8fe0b34a --- /dev/null +++ b/yang/yang-model-ri/src/main/java/module-info.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * Reference implementation of {@code org.opendaylight.yangtools.yang.model.api} and related constructs. + */ +module org.opendaylight.yangtools.yang.model.ri { + exports org.opendaylight.yangtools.yang.model.ri.stmt; + exports org.opendaylight.yangtools.yang.model.ri.type; + + requires transitive org.opendaylight.yangtools.yang.model.api; + requires org.opendaylight.yangtools.yang.model.spi; + requires com.google.common; +} diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java index e2ecc308ab..2d01293e54 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.ri.stmt; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; @@ -97,134 +97,134 @@ import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.DeviateStatementImpl; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.DeviationStatementImpl; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyActionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAnydataStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAnyxmlStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyArgumentStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAugmentStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBaseStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBelongsToStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBitStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyChoiceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyConfigStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyContactStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyContainerStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyDefaultStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyDescriptionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyEnumStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyErrorAppTagStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyErrorMessageStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyExtensionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyFeatureStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyFractionDigitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyGroupingStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIdentityStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIfFeatureStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIncludeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyInputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyKeyStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLeafListStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLeafStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLengthStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyListStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMandatoryStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMaxElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMinElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyModifierStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMustStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyNamespaceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyNotificationStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOrderedByStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOrganizationStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOutputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPathStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPatternStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPositionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPrefixStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPresenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRangeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyReferenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRequireInstanceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRevisionDateStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRevisionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRpcStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyStatusStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyTypeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyTypedefStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUniqueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUnitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUsesStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyValueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyWhenStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYangVersionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYinElementStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.ImportStatementImpl; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.ModuleStatementImpl; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RefineStatementImpl; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularActionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAnydataStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAnyxmlStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularArgumentStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAugmentStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBaseStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBelongsToStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBitStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularChoiceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularConfigStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularContactStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularContainerStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularDefaultStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularDescriptionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularEnumStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularErrorAppTagStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularErrorMessageStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularExtensionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularFeatureStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularFractionDigitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularGroupingStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIdentityStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIfFeatureStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIncludeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularInputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularKeyStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLeafListStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLeafStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLengthStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularListStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMandatoryStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMaxElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMinElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularModifierStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMustStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularNamespaceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularNotificationStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOrderedByStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOrganizationStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOutputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPathStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPatternStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPositionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPrefixStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPresenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRangeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularReferenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRequireInstanceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRevisionDateStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRevisionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRpcStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularStatusStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularTypeStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularTypedefStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUniqueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUnitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUsesStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularValueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularWhenStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularYangVersionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularYinElementStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.SubmoduleStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.DeviateStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.DeviationStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyActionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyAnydataStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyAnyxmlStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyArgumentStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyAugmentStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyBaseStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyBelongsToStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyBitStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyChoiceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyConfigStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyContactStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyContainerStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyDefaultStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyDescriptionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyEnumStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyErrorAppTagStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyErrorMessageStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyExtensionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyFeatureStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyFractionDigitsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyGroupingStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyIdentityStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyIfFeatureStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyIncludeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyInputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyKeyStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyLeafListStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyLeafStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyLengthStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyListStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyMandatoryStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyMaxElementsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyMinElementsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyModifierStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyMustStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyNamespaceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyNotificationStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyOrderedByStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyOrganizationStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyOutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyPathStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyPatternStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyPositionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyPrefixStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyPresenceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRangeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyReferenceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRevisionDateStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRevisionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRpcStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyStatusStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyTypeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyTypedefStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyUniqueStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyUnitsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyUsesStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyValueStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyWhenStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyYangVersionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyYinElementStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.ImportStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.ModuleStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RefineStatementImpl; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularActionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularAnydataStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularAnyxmlStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularArgumentStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularAugmentStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularBaseStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularBelongsToStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularBitStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularChoiceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularConfigStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularContactStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularContainerStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularDefaultStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularDescriptionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularEnumStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularErrorAppTagStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularErrorMessageStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularExtensionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularFeatureStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularFractionDigitsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularGroupingStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularIdentityStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularIfFeatureStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularIncludeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularInputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularKeyStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularLeafListStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularLeafStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularLengthStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularListStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularMandatoryStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularMaxElementsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularMinElementsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularModifierStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularMustStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularNamespaceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularNotificationStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularOrderedByStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularOrganizationStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularOutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularPathStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularPatternStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularPositionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularPrefixStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularPresenceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularRangeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularReferenceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularRequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularRevisionDateStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularRevisionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularRpcStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularStatusStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularTypeStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularTypedefStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularUniqueStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularUnitsStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularUsesStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularValueStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularWhenStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularYangVersionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularYinElementStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.SubmoduleStatementImpl; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; /** diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EffectiveStatements.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EffectiveStatements.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java index 59d3b1891d..9c8519b8cb 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EffectiveStatements.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.ri.stmt; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; @@ -67,65 +67,65 @@ import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionEffectiveStatem import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRequireInstanceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyStatusStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYangVersionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyArgumentEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyBaseEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyBelongsToEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyDescriptionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyErrorAppTagEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyErrorMessageEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyFractionDigitsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyIfFeatureEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyIncludeEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyMandatoryEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyMaxElementsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyMinElementsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyModifierEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyNamespaceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyOrderedByEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyOrganizationEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyPathEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyPositionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyPresenceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyReferenceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyRequireInstanceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyRevisionDateEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyStatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyUnitsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyValueEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyWhenEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyYangVersionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.EmptyYinElementEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularArgumentEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularBaseEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularBelongsToEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularDescriptionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularErrorAppTagEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularErrorMessageEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularFractionDigitsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularIfFeatureEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularIncludeEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularMandatoryEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularMaxElementsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularMinElementsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularModifierEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularNamespaceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularOrderedByEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularOrganizationEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularPathEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularPositionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularPresenceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularReferenceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularRequireInstanceEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularRevisionDateEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularStatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularUnitsEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularValueEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularWhenEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularYangVersionEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff.RegularYinElementEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyStatusStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyYangVersionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyArgumentEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyBaseEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyBelongsToEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyDescriptionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyErrorAppTagEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyErrorMessageEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyFractionDigitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyIfFeatureEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyIncludeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyMandatoryEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyMaxElementsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyMinElementsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyModifierEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyNamespaceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyOrderedByEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyOrganizationEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyPathEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyPositionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyPresenceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyReferenceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyRequireInstanceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyRevisionDateEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyStatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyUnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyValueEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyWhenEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyYangVersionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.EmptyYinElementEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularArgumentEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularBaseEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularBelongsToEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularDescriptionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularErrorAppTagEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularErrorMessageEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularFractionDigitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularIfFeatureEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularIncludeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularMandatoryEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularMaxElementsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularMinElementsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularModifierEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularNamespaceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularOrderedByEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularOrganizationEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularPathEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularPositionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularPresenceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularReferenceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularRequireInstanceEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularRevisionDateEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularStatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularUnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularValueEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularWhenEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularYangVersionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff.RegularYinElementEffectiveStatement; /** * Static entry point to instantiating {@link EffectiveStatement} covered in the {@code RFC7950} metamodel. diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java similarity index 81% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java index b0d609e34e..f625cd31ea 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.ri.stmt; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; @@ -14,10 +14,10 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUndeclaredInputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUndeclaredOutputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUndeclaredInputStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUndeclaredOutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyUndeclaredInputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyUndeclaredOutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularUndeclaredInputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.RegularUndeclaredOutputStatement; /** * Static entry point to instantiating {@link DeclaredStatements} covered in the {@code RFC7950} metamodel which are diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java index 093953d5a0..cb5a71d689 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java index e78cc29296..b5deeb1f9b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java index b0062beaea..cb71162cb6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java index ca45c6d093..10c32bcb71 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java index ca6567d736..6137d81a1b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.DeviateKind; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java index 56a46a145f..53b8216b29 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java index d51464304b..82c3b0a4d5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java index e8cdb5dc21..b868f8baba 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java index 365acb760d..07b89d89d4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java index a033096672..f59eb8317d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java index 0a8220d3b6..41b59823fc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java index d7e9f1999f..f26700794e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java index 49004a3387..1e3e1869b1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java index 8343b12bad..2d1f5552f3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java index dbe8cb18b3..b6f32aa4eb 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java index 44ae4b9a76..68d0d782c3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContactStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContactStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java index a2364bb809..d2a66bbd7a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContactStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ContactStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java index 321d50b049..9bda0ac0bf 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java index b0b00811fc..d43d3f6313 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java index 9d025706ff..a5c6bd1b8f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java index 2af445d016..3efcd88951 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java index 326314b949..9f03927820 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java index c4de141a9d..1e499a115b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java index e517e2be6d..7505603137 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java index 692b0f54ed..45157ac6f1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java index b283a88e27..1450e9d925 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java index bdbbaa4317..63084ebfc7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java index f47463046c..f25ccc14a4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java index f3d9a3680c..5353e7a094 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java index a0f101e4f9..bcf6da4769 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java index f03d9de84f..f4e0842360 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java similarity index 90% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java index 447d8f6582..aabce6ebc3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java index da1c6e9473..eb2201424c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java index dba4ac8100..4f13f52b10 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java index 26ffb76508..26bb6e3f96 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import java.util.List; import org.opendaylight.yangtools.yang.model.api.stmt.LengthStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java index ce8994e35c..eeaf809144 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java index b861463bb5..19097082a5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java index 17e63bdd70..72600f8b7f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java index 68f3fcc8af..22a4fc2b56 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java index bf6cea68e3..bbc5e76071 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java index 96950ab56e..045a73eacf 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java index df4e27af5b..bb582c022b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java index a67b4c27ff..51cbd83eb9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java similarity index 89% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java index 800f776128..123114238c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Ordering; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java index e8dbf93537..aaf8b29741 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java index 8f061552ab..4e96f027a6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java index bc9987c852..2ae99b1277 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java index edf59eecdd..c144d7842e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.PatternExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java index c4b1180b7a..4f41d435c7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java index 714968937d..348ce547e2 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java index c940127876..d71ba14665 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java index 7416df0a6a..b93701c8ab 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import java.util.List; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java index bad7bc6e57..01f4d86ba3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java index 97b6814ab2..dfbe0208c5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java index 742c985a67..26916e11a0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java index 4224afa96d..9d0436e056 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java index dceaabdd96..7567340a19 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java index 9e7de9029f..070f772e95 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.Status; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java index 3ef7603898..fcc6bc3165 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java index cca940e76b..5ebd439ee7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java index 98683956bc..ec7d208fcc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java index 5ba532bae2..87aebf7be6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java index 9865953f57..e94a1033f9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import java.util.Set; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java index 07b4e7e686..8610ec4a0f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java index f71f070355..1b4b79cee3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java index 340b723084..fffd21be71 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java index a1b0964853..d77a32b322 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java index 55bb48470e..1dfd1d0677 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.YangVersion; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java index 9607437054..e32a6d89b7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java index 28d8ceb86e..b8c432c63a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java index a75f63f084..a659ab1489 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java index fb91b97bc6..f57724bdea 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java index 4ae39718a7..ac83814d36 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java index f992645ad3..03251ffd3c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java index ac55ef7095..828f2e29a6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java index ca1875869b..df1b4471f6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java index baeeb8db17..a66b4a6d43 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java index 7f92bcde5d..3276a6caaf 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java index b3555b8aa1..863df98353 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java index 5975c2f01a..461f506e8a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java index 5f7bd905d7..d26e15af63 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java index c580bee230..a59f6347d8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContactStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContactStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java index 4f016c3af2..87a7a19f7b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContactStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java index 903cc7b517..fbfe2e4548 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java index 3b887b8a75..a921b299d8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java index 49594ba282..d9846c1177 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java index b4c4b78db9..8d67404883 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java index dcc97b182c..5216606b18 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java index 4395683e98..56db20eaee 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java index c307e6845b..cd19193d74 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java index 3d27a696be..2652cb8103 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java index 6817122237..22b33bf0c6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java index 09eb528e70..24e7e8b36f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java index a49e82f8c3..205e83833c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java index 345e047818..eacc1072bc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java index 78c9c1f263..19e7074845 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java index 538ef728be..62a884aaf4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java index 364a8890c3..d4ebfc7bbc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java index e529cce274..ab5a156d72 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java index db0dc7488a..b68f0dae5a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java index 12973a36ee..1f206b3be9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java index 52890a8123..17dc27c85b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java index f980a142af..04f8b12176 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java index f04dd86467..1b54ffc901 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java index 98266ebed1..4c774beb31 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java index 0ca9903f16..da50962c41 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java index fb3cde4064..f724b6c1ae 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java index 93dbb1b94f..4b7b1aad6b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.XMLNamespace; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java index 5e08d7ce7d..715f1612e1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java index 7b32869a13..a7861703fd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java index f06402333a..a27d8a2fe9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java index 4e75c8027d..86ea4c2c48 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java index 88fdd73e2e..acb924d210 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java index 5313b77cf4..9913a6217c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java index 87495d6a9d..c305cc00bd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java index 2068b88409..0f3985132e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java index 28a3621ae5..1f908d7e76 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java index 138721e06d..86d60dcfb3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java index 98cc10fb96..f60fe5280f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java index 0c9c2fda61..a304f6fdae 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java index 570e21abf0..1fbd896650 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Revision; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java index 71aae5d2ec..3cb2be8ad9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Revision; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java index 05f86fdc1f..ed4f289057 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java index 5220bd4499..e4f5863881 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java index dec24c42ba..7307b5c2a0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java index b5092519b5..508c142b26 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java index 7cbb024cd3..e4db556d62 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java index ca2bc446be..896d901b1f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java index 28ad3f4123..a54c5553c9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Set; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java index 9b806ee348..7e413a74de 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java index ab3d1d24b3..5eb853cad7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java index db7be82dd8..ddb06edb5f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java index 2c186abc23..4277e33d27 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java index c004aa36c1..3f28250d66 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.YangVersion; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java index 5ae54d47d3..984b4b33c6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java index 860cffe6f1..fd319fa425 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyArgumentEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyArgumentEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java index 4540bffb02..7e83e3f0aa 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyArgumentEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBaseEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBaseEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java index dc2d62461f..9aed047b8e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBaseEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java index 1b2886e51a..aaa14acab0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java index 946be09186..2fa76dacf9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java index c811eefc4c..cbd9ac6f18 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java index 9f531ab3b9..55e7b66219 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java index c1c1c4311a..a52adc08ba 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java index ae93545d6e..9656fcd1a5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIncludeEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIncludeEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java index d188c44a74..7d974303a7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyIncludeEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java index 8b4712f9d9..c3d5fa5b9a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java index 77ba843040..7831399004 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java index 601a4597e3..9b9c9cfb66 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyModifierEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyModifierEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java index 2b9a33fb9d..789892fab4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyModifierEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java index cbac674046..da28fd9eb9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java index 13fbc9cdf5..73bccc3596 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.Ordering; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java index 7789b7a8e3..1ff08b27c4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPathEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPathEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java index faf3a05e9f..786f3a65ca 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPathEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPositionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPositionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java index 8f1e6ff4f3..959b2b5852 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPositionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.model.api.stmt.PositionEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPresenceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPresenceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java index 0ad317753f..6eaa959296 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyPresenceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyReferenceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyReferenceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java index c89b1c2a01..fcb2f7cad0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyReferenceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java similarity index 88% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java index b0c7851197..5f1c647dcd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyRequireInstanceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultArgument; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRequireInstanceStatement; public final class EmptyRequireInstanceEffectiveStatement extends DefaultArgument implements RequireInstanceEffectiveStatement { diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java index a0f51effce..fe82816031 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateEffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyStatusEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java similarity index 91% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyStatusEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java index eb904ecccb..de55bba533 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyStatusEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyStatusStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultArgument; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyStatusStatement; public final class EmptyStatusEffectiveStatement extends DefaultArgument implements StatusEffectiveStatement { diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyUnitsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyUnitsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java index 3b671e24a0..327d496a60 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyUnitsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyValueEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyValueEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java index 947b6ae768..c946456fbb 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyValueEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyWhenEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java similarity index 93% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyWhenEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java index 37118b8660..7fc730cc28 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyWhenEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.WhenEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java similarity index 89% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java index c46826d328..5fc1c86db0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl.EmptyYangVersionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultArgument; -import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYangVersionStatement; public final class EmptyYangVersionEffectiveStatement extends DefaultArgument implements YangVersionEffectiveStatement { diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYinElementEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYinElementEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java index 607a214e98..1dc2cba6a8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/EmptyYinElementEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularArgumentEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularArgumentEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java index cfa230bce2..a169f3d6c6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularArgumentEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBaseEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBaseEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java index 4c9c32253d..14ecf77c81 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBaseEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBelongsToEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBelongsToEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java index d5e826205d..90b28adf1e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularBelongsToEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularDescriptionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularDescriptionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java index 0b9391fcf1..f75298f9e9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularDescriptionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java index 89d19d68b4..e9249d646c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java index 51c1c7f062..04e2431713 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java index 3e6e52d3a0..fc238ccd97 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java index 757ec702e3..040c692e40 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIncludeEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIncludeEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java index f097d94633..a4fee625ed 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularIncludeEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMandatoryEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMandatoryEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java index 26dcfced93..7b99969e64 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMandatoryEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java index df51d3148b..79984984c9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMinElementsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMinElementsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java index 25fe2a9c6f..7c6831c989 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularMinElementsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularModifierEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularModifierEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java index 8aa18a56be..2c924290ff 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularModifierEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularNamespaceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularNamespaceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java index cd5a864e8d..648ba52cef 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularNamespaceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.XMLNamespace; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrderedByEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrderedByEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java index c216c9ca8b..dbeaa111a1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrderedByEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Ordering; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrganizationEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrganizationEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java index 2506dbf847..81ab8dc191 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularOrganizationEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPathEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPathEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java index 5d34659493..8a4c7f30a5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPathEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.PathExpression; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPositionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPositionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java index 8d0044dd44..e216009cc0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPositionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPresenceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPresenceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java index b1c3913a94..0c84994eb4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularPresenceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularReferenceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularReferenceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java index 5a9b707131..499f3a32d7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularReferenceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java index 031b810fcc..35ca80b3e0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java index 5c5389a0df..32ffe7bcab 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Revision; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularStatusEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularStatusEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java index 556657e09a..75b57446ec 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularStatusEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.Status; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularUnitsEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularUnitsEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java index 4ca040120d..9aae672be3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularUnitsEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularValueEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularValueEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java index 1b9bb332e9..663ebb659d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularValueEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularWhenEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularWhenEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java index 82e922320f..7913f3f60f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularWhenEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYangVersionEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYangVersionEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java index fb96add4fb..df9066e22c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYangVersionEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.YangVersion; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYinElementEffectiveStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYinElementEffectiveStatement.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java index 2123174675..34f58c1e2a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/eff/RegularYinElementEffectiveStatement.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt.impl.eff; +package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java index bc68652797..2d1f975cf2 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java index 29addb101d..062209f9f3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java index e5daab776e..d5f2df5d5d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java index da72438340..aa47763e23 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Optional; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java index 2d6b9ffd77..5fce9b73e5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Optional; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java similarity index 97% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java index 3cde092fed..12294fa07f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java index b12e0dc177..7141f48d96 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Optional; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java index 96e4096daa..478c9c393a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Optional; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java index f8b0b15828..f084d02b84 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java index 90d8c85fa3..f48228181d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verifyNotNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java index e3745d18c8..6efaec5960 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java index 7cb50017df..93bafc2b7e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java index 65b155faeb..25efb7d54b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java index a8ab41c4d8..5dc0db8508 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java index 0c5d4f7227..04e8a0449d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Verify.verifyNotNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java index 8e7e1f75df..e55f93fc3a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java index 0c9e52edb3..8ef3c5ff35 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java index 44ddc520bb..947e6bd832 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java index 9ae5f0a073..df698c28ac 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java index 2530256450..4f39aca22b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java index d4904eb4cc..dd3af9334f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java index 39e9934c61..c20757be07 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java index ce3a61e126..3f9a1e184a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java index 7608f0e0c9..db9e684e8c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java index dcf5af3b5b..fb07ca9d59 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java index a2ae374562..083c7f37bd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java index 785808dd53..444e87092e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Uint16; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java index 5099025d8f..b95195f08f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java index 4c23e3d493..39888db849 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Uint64; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java index 00b58b84bc..bd11b74f4a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Uint8; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java index 9172971aa8..38f59617b3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java similarity index 97% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java index ea11dbdea1..c58874bb1a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java index 3aac40c29a..d5b5599269 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java index bb0b643c7d..25b876eb47 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java index ebac9e535f..b2eec74224 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Verify.verifyNotNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java similarity index 99% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java index 415292373b..0ebb420633 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java index b4423787a3..d95b7f0df9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkState; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java index ceab0654f2..68a96eba6a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java index 1ef96a1577..b147d42772 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java index 85d6f9ad19..9bbe5c5e84 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java index 2a912b3691..7bc202b480 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.math.BigDecimal; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java index a5c9ad74df..59caba6cd9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java index 212be1206b..afd1492a28 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java index 39092d6124..2d7370c840 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Set; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java index 272aa5c588..c11d1cd800 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java index 81e43a0bfe..8b9f978669 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java index 627c4ca6e3..1f289c5e39 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java index 8d1cef194b..a2a0ad82d1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java index 17056c2113..34b3e848b9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java index 6edcabe1eb..00f9389c61 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java index 58ae421b05..000a649922 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java index 145f53bcd2..fe34016e40 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java similarity index 99% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java index e094197d30..3386643e7c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java index a5a19c6bff..b696c945f2 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java index 84d0619530..49b672990a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java index eba05edefa..f65d71c2a6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java index 588e1335bf..c7ca56c3be 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java index 2dfaa9d83d..97fb90befa 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java similarity index 97% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java index 4d64d6a186..d154f1786c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java index 6c8cb14af0..3de4fe87cc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java index 9325333928..c003cb434e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java index f90189aca8..9d75aacc9f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkState; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java index 838d40029f..e02a81f6bd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java index f73fd16f61..01420d693b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java index 9365163fdc..8023ccb556 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java similarity index 92% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java index 77456aa3a7..59f9089037 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java index 20dbaf887c..381d7f1b66 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java index 039fd1a27f..0cb79eaac6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java index 298fab1ac9..cf0646718a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java similarity index 98% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java index 15b76066aa..4ddc236f12 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java similarity index 99% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java index 5315ddc0e2..9bebead5b6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkArgument; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java similarity index 99% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java index 6c0c91eeb5..0727f648ce 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java index e3caf707ed..e9b7a1f509 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java index b0fa302934..e3e8f428d7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java index 44684a1294..39dbf096f3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java index 87d52f822e..e813d1ec6b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java index 226e6f962e..f323bf6666 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java index 37f1d0aec8..ded4dfd0d7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java index 1e6d824246..8213defc4d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java index b2c3aebcac..870b8749d1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.math.BigDecimal; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java index 0246d22868..0e47a4cb0b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java index 049e43e124..f31eb0fde2 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java index ca7f0f2bf0..e464eeed8d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.Set; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java index c3114c4dff..9516dd65e7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java index 004ea0eab6..98e1af9458 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java index 0dbeeb1edd..2d486ee436 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java index 7a8f8503b2..f6b66186b7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java index 3e51c34ca8..298ce37261 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java index ccec73728a..4061983dad 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java similarity index 97% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java index c4b76b20b2..91a39174e8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java similarity index 99% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java index c923851990..d5fbe61d6a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.annotations.Beta; import java.math.BigDecimal; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java index 3b4dbad49b..9bb7ad1852 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java index 365f761c55..bb4520efb4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java index 9d2729ecee..40ea5aad45 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java index ef4021c2e6..91f14b1d77 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java index 357ec56df3..65f8b53389 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import java.util.Collection; import java.util.List; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java similarity index 97% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java index 07bfbdd483..aa593e64c4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java similarity index 96% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java index 463ee1acd9..c2474f5cf8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.java rename to yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java index 228915e1cb..cbd013541a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.java +++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java similarity index 96% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java index 8676699d8d..ab0225054a 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java similarity index 98% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java index 276208694a..9463b3f276 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static java.util.Collections.emptyList; import static org.junit.Assert.assertEquals; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java similarity index 97% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java index defe99d796..ac711e64e3 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java similarity index 96% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java index 735d1bddb1..435922bea5 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java similarity index 96% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java index 689d84aad3..e34f43d949 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java similarity index 97% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java index 0d9850788b..75f5d38169 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java similarity index 95% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java index e6ff900ab5..0501a5d476 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java similarity index 98% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java index c28d5b711a..5cb73ab45d 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java similarity index 99% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java index fe66a827e1..2c5cf8b9c6 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/TypeTest.java b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java similarity index 99% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/TypeTest.java rename to yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java index 66ef34d153..e5437673da 100644 --- a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/TypeTest.java +++ b/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.type; +package org.opendaylight.yangtools.yang.model.ri.type; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/yang/yang-model-spi/src/main/java/module-info.java b/yang/yang-model-spi/src/main/java/module-info.java index e49089c661..bc31aa3e6a 100644 --- a/yang/yang-model-spi/src/main/java/module-info.java +++ b/yang/yang-model-spi/src/main/java/module-info.java @@ -8,8 +8,6 @@ module org.opendaylight.yangtools.yang.model.spi { exports org.opendaylight.yangtools.yang.model.spi; exports org.opendaylight.yangtools.yang.model.spi.meta; - exports org.opendaylight.yangtools.yang.model.spi.stmt; - exports org.opendaylight.yangtools.yang.model.spi.type; requires transitive org.opendaylight.yangtools.yang.model.api; requires transitive org.opendaylight.yangtools.rfc7952.model.api; diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 4d8f65c61d..bbedc0eeaf 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -40,6 +40,11 @@ org.opendaylight.yangtools yang-test-util + + org.opendaylight.yangtools + yang-model-ri + test + ch.qos.logback logback-classic 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 16806cb05b..be19429bea 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 @@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class SchemaContextUtilTest { diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index 6753a5cb29..fad4c0333c 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -42,6 +42,10 @@ org.opendaylight.yangtools yang-model-spi + + org.opendaylight.yangtools + yang-model-ri + org.opendaylight.yangtools yang-parser-api diff --git a/yang/yang-parser-rfc7950/src/main/java/module-info.java b/yang/yang-parser-rfc7950/src/main/java/module-info.java index 31b7c53837..e4e494489a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/module-info.java +++ b/yang/yang-parser-rfc7950/src/main/java/module-info.java @@ -27,6 +27,7 @@ module org.opendaylight.yangtools.yang.parser.rfc7950 { requires org.opendaylight.yangtools.yang.common; requires org.opendaylight.yangtools.yang.model.api; requires org.opendaylight.yangtools.yang.model.spi; + requires org.opendaylight.yangtools.yang.model.ri; requires org.opendaylight.yangtools.yang.parser.antlr; requires org.opendaylight.yangtools.util; requires org.slf4j; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java index 4890913743..6a6a9819c1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java @@ -20,8 +20,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ActionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementSupport; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java index d2dabc0cbb..2c78f8e199 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.AnydataEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java index 2ac12a6484..c83425beb6 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java index 2cd0731950..576fad827a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index ea7189843f..293534f7bd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -28,8 +28,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absol import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.spi.SchemaTreeNamespace; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java index a446a27b29..b02c89e2c1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java index 267e6858fd..6804edc146 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java @@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitStatementSupport.java index 8bc3f25033..43669740af 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/BitStatementSupport.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementSupport.java index 049d412574..85a940d41e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementSupport.java @@ -27,8 +27,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.YangValidationBundles; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_.CaseStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java index b4133a8fa5..cf74d9f57b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java @@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ConfigEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractBooleanStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java index 1cf2377532..5c2369b36f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java @@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContactEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContactStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementSupport.java index 09ddc47e27..9fb24da4a4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementSupport.java @@ -23,8 +23,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatemen import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java index e84ac87b64..5592ddbae4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java @@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java index d60ec60d82..8238c2b776 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java index 3b394a12a5..0b2d036f44 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.DeviateEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DeviateStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.YangValidationBundles; import org.opendaylight.yangtools.yang.parser.spi.SchemaTreeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java index f492ff90d6..96de0d3f87 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DeviationEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DeviationStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumStatementSupport.java index ddb0c18919..64e74eef8d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumStatementSupport.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java index 701b593114..80e1759410 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java index 1492d0ef64..4edf94189b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java index eceded4c2d..b448a735db 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java index b3a31cd576..925ac01499 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.spi.FeatureNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java index 82954b5250..59f4d736ff 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingStatementSupport.java index 33c3409c9d..da31a71acf 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingStatementSupport.java @@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins; import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityStatementSupport.java index 41db2b5cbb..a5ea103679 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/IdentityStatementSupport.java @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java index 3f056023ca..ff58fca115 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java @@ -22,8 +22,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.FeatureNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java index 4ad8daf265..fc5ab16afa 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ImportEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.PreLinkageModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/IncludeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/IncludeStatementSupport.java index 4130794992..126eb1c099 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/IncludeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/IncludeStatementSupport.java @@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.IncludeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateStatement; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputStatementSupport.java index dc99842092..37bcf11602 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputStatementSupport.java @@ -20,9 +20,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.ImplicitStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.ImplicitStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseOperationContainerStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java index 220f442a29..e7a3f77280 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.KeyStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.antlr.YangStatementLexer; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; 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 8f39ddda7d..eb5ade2aa8 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 @@ -25,9 +25,9 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatemen import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypes; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MandatoryMixin; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MustConstraintMixin; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java index 210deac7d6..b92301b4e9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; 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 64492bd54a..ae06c5eccc 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 @@ -24,9 +24,9 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatemen import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.ConcreteTypes; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MustConstraintMixin; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.UserOrderedMixin; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java index 80327d2f72..b5b7f1231c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java index e06411c2e9..47edc192f4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.LengthEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.LengthStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java index 6ce2467440..24b9e078bd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java @@ -36,8 +36,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java index c001d3a035..5fb06db43c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractBooleanStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java index 9cad9a8457..9800ce06ee 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/min_elements/MinElementsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/min_elements/MinElementsStatementSupport.java index a39a866c7d..f03e342ab3 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/min_elements/MinElementsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/min_elements/MinElementsStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java index 4247c5e596..89a2a386de 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java index c18f7cb4f5..d6e994694b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java @@ -39,8 +39,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.ModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule; import org.opendaylight.yangtools.yang.parser.spi.PreLinkageModuleNamespace; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java index a5a2e37451..7014a246e8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MustEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.XPathSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java index 2aac1cb0d5..74646ae57d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java @@ -15,8 +15,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java index e3803d8ad6..218426022c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java index 7505318b0c..c33f02139c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java @@ -15,8 +15,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java index 621bfd25e5..1bb3e2e74f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java index d58b78ce94..4944490c65 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java @@ -20,9 +20,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.ImplicitStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.ImplicitStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseOperationContainerStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java index 4971c1a313..ed276a453a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java index 39b4de8cf4..540415e9f2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PatternEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PatternExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/position/PositionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/position/PositionStatementSupport.java index e1eda6c603..5de22f6b92 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/position/PositionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/position/PositionStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PositionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java index a965a17fb1..372ec3d069 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java @@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java index 8c3452ef28..c5d558c1b2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java index ccb5a6b0f3..de35566874 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RangeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java index d299d1e987..3828dc3d73 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java index f147121b4b..21e4716b3e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RefineEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RefineStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java index 027d5595f1..ba50322ad8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractBooleanStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java index 6828a70d09..e0450105c1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java @@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java index 8ae2e6593c..fb566441b5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java @@ -15,8 +15,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java index 95fb736650..45ae3d444e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java @@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RpcEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputStatementSupport; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputStatementSupport; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java index 13e1b24bce..7512fff079 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java index 0349d0ef37..fd30a920ec 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java @@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleEffectiveStatemen import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; 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 7cb3b82ede..123b6f16a9 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 @@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.IdentityRefSpecification; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.IdentityrefTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.IdentityrefTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; 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 c7bfd2b16b..b87da19008 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 @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.LeafrefSpecification; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.LeafrefTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.LeafrefTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; 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 350a55de6f..14d98bb86f 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 @@ -55,17 +55,17 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.InstanceIdentifierTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.InvalidLengthConstraintException; -import org.opendaylight.yangtools.yang.model.spi.type.InvalidRangeConstraintException; -import org.opendaylight.yangtools.yang.model.spi.type.LengthRestrictedTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.RangeRestrictedTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.RequireInstanceRestrictedTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.RestrictedTypes; -import org.opendaylight.yangtools.yang.model.spi.type.StringTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.type.BitsTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.EnumerationTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.InstanceIdentifierTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.InvalidLengthConstraintException; +import org.opendaylight.yangtools.yang.model.ri.type.InvalidRangeConstraintException; +import org.opendaylight.yangtools.yang.model.ri.type.LengthRestrictedTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.RangeRestrictedTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.RequireInstanceRestrictedTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.RestrictedTypes; +import org.opendaylight.yangtools.yang.model.ri.type.StringTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx; 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 27c1ee7088..a2f0ec7f1f 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 @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.BitsSpecification; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BitsTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java index d8fc8c9987..7a762e8e26 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; /** * Common shared effective statements for built-in types. 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 6072dabb6e..ade37f0975 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 @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RangeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.Decimal64Specification; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.DecimalTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.DecimalTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java index c8a0047389..b9911deeea 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java @@ -17,8 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; -import org.opendaylight.yangtools.yang.model.spi.type.BitBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.EnumPairBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BitBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.EnumPairBuilder; @Beta final class EffectiveTypeUtil { 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 b1ce4a421d..7cb8792ec0 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 @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.EnumSpecification; import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.EnumerationTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; 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 1c056a40e9..16dfa87c28 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 @@ -13,9 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.InstanceIdentifierSpecification; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.InstanceIdentifierTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.RestrictedTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.InstanceIdentifierTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.RestrictedTypes; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java index c5db020f17..9d1c21326e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.ri.type.TypeBuilder; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.DefaultArgument.WithSubstatements; -import org.opendaylight.yangtools.yang.model.spi.type.TypeBuilder; final class TypeEffectiveStatementImpl, D extends TypeStatement> extends WithSubstatements implements TypeEffectiveStatement { 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 f85aa7477d..44d6fcdf6c 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 @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.UnionSpecification; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; -import org.opendaylight.yangtools.yang.model.spi.type.UnionTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.UnionTypeBuilder; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; 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 a3ee0b0b55..c243097be6 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 @@ -33,9 +33,9 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; +import org.opendaylight.yangtools.yang.model.ri.type.DerivedTypeBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.DerivedTypes; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredEffectiveStatement.Default; -import org.opendaylight.yangtools.yang.model.spi.type.DerivedTypeBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.DerivedTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.SchemaNodeMixin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java index 1106aadd7d..b2db853e0b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java index 787c170334..25eb2a0460 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absol import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; import org.opendaylight.yangtools.yang.model.api.stmt.UniqueEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UniqueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java index a4ef4476f1..2834159c52 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java index 540e04e18d..5d9b8a0b93 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java @@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Desce import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UsesEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.YangValidationBundles; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine.RefineEffectiveStatementImpl; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/value/ValueStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/value/ValueStatementSupport.java index 7e42424f3a..cfef89c6d5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/value/ValueStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/value/ValueStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractInternedStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java index aa25572619..32f22b0527 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.XPathSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java index 893dead40f..f76e918680 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java index 1af5c42c53..8dece89cbb 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; -import org.opendaylight.yangtools.yang.model.spi.stmt.DeclaredStatements; -import org.opendaylight.yangtools.yang.model.spi.stmt.EffectiveStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; +import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractBooleanStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java index 452b623879..ad313a2fef 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java @@ -28,10 +28,10 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; -import org.opendaylight.yangtools.yang.model.spi.type.BitBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.EnumPairBuilder; -import org.opendaylight.yangtools.yang.model.spi.type.InvalidBitDefinitionException; -import org.opendaylight.yangtools.yang.model.spi.type.InvalidEnumDefinitionException; +import org.opendaylight.yangtools.yang.model.ri.type.BitBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.EnumPairBuilder; +import org.opendaylight.yangtools.yang.model.ri.type.InvalidBitDefinitionException; +import org.opendaylight.yangtools.yang.model.ri.type.InvalidEnumDefinitionException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; 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 876b90dc66..7e09d8a6e2 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 @@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class UsesAugmentTest { 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 3a999ee529..80a802af62 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 @@ -63,7 +63,7 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java index 4aaee7a1f5..fa9ee14835 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java index 1bcf9d52c0..f18941743a 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition; -import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes; +import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes; import org.opendaylight.yangtools.yang.stmt.TestUtils; public class YinFileListStmtTest extends AbstractYinModulesTest { -- 2.36.6