Replaced 'controller' with 'yangtools' in all package names. 44/744/1
authorMartin Vitez <mvitez@cisco.com>
Tue, 30 Jul 2013 15:55:25 +0000 (17:55 +0200)
committerMartin Vitez <mvitez@cisco.com>
Tue, 30 Jul 2013 16:03:29 +0000 (18:03 +0200)
Changed groupId in poms from org.opendaylight.yang to org.opendaylight.yangtools.
Added more tests.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
167 files changed:
pom.xml
yang-binding/pom.xml
yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentable.java [deleted file]
yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentation.java [deleted file]
yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java [deleted file]
yang-binding/src/main/java/org/opendaylight/controller/yang/binding/InstanceIdentifier.java [deleted file]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java [new file with mode: 0644]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java [new file with mode: 0644]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/BaseIdentity.java with 87% similarity]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java [new file with mode: 0644]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataRoot.java with 80% similarity]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java [new file with mode: 0644]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Notification.java with 84% similarity]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/NotificationListener.java with 84% similarity]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/RpcService.java with 85% similarity]
yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java [moved from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/package-info.java with 84% similarity]
yang-common/pom.xml
yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java [moved from yang-common/src/main/java/org/opendaylight/controller/yang/common/QName.java with 96% similarity]
yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java [moved from yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcError.java with 90% similarity]
yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java [moved from yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcResult.java with 87% similarity]
yang-data-api/pom.xml
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/CompositeNode.java with 87% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/ModifyAction.java with 85% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableCompositeNode.java with 88% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableNode.java with 90% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableSimpleNode.java with 88% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/Node.java with 83% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModification.java with 86% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModificationBuilder.java with 92% similarity]
yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java [moved from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/SimpleNode.java with 92% similarity]
yang-data-impl/pom.xml
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/AbstractNodeTO.java with 86% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeModificationTOImpl.java with 70% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeTOImpl.java with 84% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMap.java with 83% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableCompositeNodeTOImpl.java with 78% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableSimpleNodeTOImpl.java with 74% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeFactory.java with 82% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImpl.java with 87% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeUtils.java with 92% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeModificationTOImpl.java with 71% similarity]
yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java [moved from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeTOImpl.java with 72% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/IgnoreWhiteCharsDiffListener.java with 96% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMapTest.java with 83% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MemoryConsumption.java with 96% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MyNodeBuilder.java with 89% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeFactoryTest.java with 83% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeHelper.java with 96% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImplTest.java with 93% similarity]
yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java [moved from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeUtilsTest.java with 92% similarity]
yang-data-impl/src/test/resources/MyXmlGenerator.groovy
yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml [moved from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02-shadow.xml with 100% similarity]
yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy [moved from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02.groovy with 100% similarity]
yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml [moved from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02g-shadow.xml with 100% similarity]
yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml [moved from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/mutableNodesConfig.xml with 100% similarity]
yang-data-util/pom.xml
yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java [moved from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractContainerNode.java with 92% similarity]
yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java [moved from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractNode.java with 76% similarity]
yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java [moved from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/Nodes.java with 85% similarity]
yang-ext/pom.xml
yang-maven-plugin-it/pom.xml
yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java [moved from yang-maven-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java with 99% similarity]
yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
yang-maven-plugin-it/src/test/resources/Correct/pom.xml
yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
yang-maven-plugin-it/src/test/resources/Generator/pom.xml
yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
yang-maven-plugin-spi/pom.xml
yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java [moved from yang-maven-plugin-spi/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java with 97% similarity]
yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java [moved from yang-maven-plugin-spi/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java with 97% similarity]
yang-maven-plugin/pom.xml
yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java [moved from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java with 98% similarity]
yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java [moved from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/Util.java with 99% similarity]
yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java [moved from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java with 95% similarity]
yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java [moved from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java with 96% similarity]
yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java [moved from yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java with 92% similarity]
yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java [moved from yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/UtilTest.java with 93% similarity]
yang-model-api/pom.xml
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java
yang-model-util/pom.xml
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java [deleted file]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractSignedInteger.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseConstraints.java with 99% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseTypes.java with 92% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BinaryType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BitsType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BooleanType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/DataNodeIterator.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Decimal64.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EmptyType.java with 94% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EnumerationType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/ExtendedType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/IdentityrefType.java with 92% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/InstanceIdentifier.java with 97% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int16.java with 95% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int32.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int64.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int8.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Leafref.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/RevisionAwareXPathImpl.java with 97% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java [new file with mode: 0644]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/StringType.java with 98% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint16.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint32.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint64.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint8.java with 96% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnionType.java with 97% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnknownType.java with 99% similarity]
yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java [moved from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/YangTypesConverter.java with 94% similarity]
yang-parser-api/pom.xml
yang-parser-impl/pom.xml
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java [new file with mode: 0644]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang [new file with mode: 0644]

diff --git a/pom.xml b/pom.xml
index 73998a9703d72e7767913194b6a077f3d458f5db..aa3b8cd87d0ef221e6f53a9d989c76b050aa08a9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yangtools</artifactId>
-    <groupId>org.opendaylight.yang</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl
                 </artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
index a1fb6e3cec870d67a956401afef7f917c4abf14b..fe684de944dd70b0d84bc05924d46eceb401149b 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentable.java b/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentable.java
deleted file mode 100644 (file)
index 297e5bc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.opendaylight.controller.yang.binding;
-
-public interface Augmentable<T> {
-
-    <E extends Augmentation<T>> E getAugmentation(Class<E> augmentationType);
-}
diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentation.java b/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentation.java
deleted file mode 100644 (file)
index 42574c9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.opendaylight.controller.yang.binding;
-
-public interface Augmentation<T> {
-    
-}
diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java b/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java
deleted file mode 100644 (file)
index 02a013e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.opendaylight.controller.yang.binding;
-
-public interface DataObject {
-
-}
diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/InstanceIdentifier.java b/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/InstanceIdentifier.java
deleted file mode 100644 (file)
index 7d13655..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.opendaylight.controller.yang.binding;
-
-/**
- * Created with IntelliJ IDEA.
- * User: lsedlak
- * Date: 27.6.2013
- * Time: 11:44
- * To change this template use File | Settings | File Templates.
- */
-public class InstanceIdentifier <T extends DataObject> {
-
-}
diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java
new file mode 100644 (file)
index 0000000..c7e109d
--- /dev/null
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.binding;
+
+public interface Augmentable<T> {
+
+    <E extends Augmentation<T>> E getAugmentation(Class<E> augmentationType);
+}
diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java
new file mode 100644 (file)
index 0000000..65ca94c
--- /dev/null
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.binding;
+
+public interface Augmentation<T> {
+
+}
similarity index 87%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/BaseIdentity.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java
index 004287aebc7febeb3d216521e365d7769a18b6c6..94c03117d087dfd6ff6f3fcc390e8df57918564b 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.binding;
+package org.opendaylight.yangtools.yang.binding;
 
 public abstract class BaseIdentity {
-    
+
     protected BaseIdentity() {
     }
 
diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java
new file mode 100644 (file)
index 0000000..31d547f
--- /dev/null
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.binding;
+
+public interface DataObject {
+
+}
similarity index 80%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataRoot.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java
index 2f194b2bbea9ba19a03710011e63c9509e83ebda..81d19657c8b03f36696496142b36885bc5f9eec2 100644 (file)
@@ -5,12 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.binding;\r
+package org.opendaylight.yangtools.yang.binding;\r
 \r
-/**\r
- * \r
- * \r
- */\r
 public interface DataRoot {\r
 \r
 }\r
diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
new file mode 100644 (file)
index 0000000..42cc11a
--- /dev/null
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.binding;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: lsedlak
+ * Date: 27.6.2013
+ * Time: 11:44
+ * To change this template use File | Settings | File Templates.
+ */
+public class InstanceIdentifier <T extends DataObject> {
+
+}
similarity index 84%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Notification.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java
index ae568baa43753c2bf71423965b78982fa1d9ed4b..d551b44b3d2eb9ceaf9a6b5e06bf293769d3fee4 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.binding;\r
+package org.opendaylight.yangtools.yang.binding;\r
 \r
 /**\r
  * Marker interface for YANG-defined notifications\r
- * \r
- * \r
+ *\r
+ *\r
  */\r
 public interface Notification extends DataObject {\r
 \r
similarity index 84%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/NotificationListener.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java
index a60d2f34f9b133b64130d5d1275441fecb35de89..8c87adb578887395ed13c99ec550bbf513840db9 100644 (file)
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.binding;\r
+package org.opendaylight.yangtools.yang.binding;\r
 \r
 /**\r
  * Marker interface for generated notification listener interfaces\r
- * \r
- * \r
- * \r
+ *\r
+ *\r
+ *\r
  */\r
 public interface NotificationListener {\r
 \r
similarity index 85%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/RpcService.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java
index 20f7e78aece9d6533469373c72bbf05a6d320661..6e6a46d0ee4cf35867b3abdb7187c0f5392ec729 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.binding;\r
+package org.opendaylight.yangtools.yang.binding;\r
 \r
 /**\r
  * Marker interface for tagging generated YANG Modules\r
- * \r
+ *\r
  */\r
 public interface RpcService {\r
 \r
similarity index 84%
rename from yang-binding/src/main/java/org/opendaylight/controller/yang/binding/package-info.java
rename to yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
index 5ed5649c78d28c1a13f61807457cb0d34e268a2f..ace08d625e558ea2aafd045d86e2ced374b0c517 100644 (file)
@@ -5,4 +5,4 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.binding;
\ No newline at end of file
+package org.opendaylight.yangtools.yang.binding;
\ No newline at end of file
index d30e71be233ec8f3aef13a6668dbdbdf0dd7a1bd..9e3494d4138adf72f50d6357e7cff13b85392143 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
similarity index 96%
rename from yang-common/src/main/java/org/opendaylight/controller/yang/common/QName.java
rename to yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
index 004a2a49523a5ad7dd643b9b48173dc777337e19..0d17c76eb9d6184a7343c850c50d43ef81dafa26 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.common;\r
+package org.opendaylight.yangtools.yang.common;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
similarity index 90%
rename from yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcError.java
rename to yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java
index cb819297a048346fee0cf2705e142263d3603d22..8b6ef47beb037f9862457423e882a31ffd9c697b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.common;\r
+package org.opendaylight.yangtools.yang.common;\r
 \r
 //import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;\r
 \r
similarity index 87%
rename from yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcResult.java
rename to yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java
index d754cb710b9027886676706d0f0b1cf06898d333..b04cc31179356899b49d4abd001536d1a90b87f5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.common;\r
+package org.opendaylight.yangtools.yang.common;\r
 \r
 import java.util.Collection;\r
 \r
index 7dafc26d1d1444911106c4ac5ddc25d7789eed50..297ccca43df029a233b22cd70caaa05623844dbf 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
similarity index 87%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/CompositeNode.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
index e8ef4067641ac65f37c663a304bcc8dca7027eb5..9800da60e807eb90713ade3762be6f027ae5d691 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 /**\r
  * Composite node represents a branch in the data tree, which could contain\r
@@ -17,7 +17,7 @@ import org.opendaylight.controller.yang.common.QName;
  * is element which does not text data directly (CDATA or PCDATA), only other\r
  * nodes. The composite node is the manifestation of the following data schema\r
  * constructs in the YANG:\r
- * \r
+ *\r
  * <ul>\r
  * <li><b>container</b> - the composite node represents the YANG container and\r
  * could contain all children schema nodes of that container</li>\r
@@ -26,8 +26,8 @@ import org.opendaylight.controller.yang.common.QName;
  * item.</li>\r
  * <li><b>anyxml</b></li>\r
  * </ul>\r
- * \r
- * \r
+ *\r
+ *\r
  */\r
 public interface CompositeNode extends Node<List<Node<?>>>, NodeModification {\r
 \r
@@ -46,7 +46,7 @@ public interface CompositeNode extends Node<List<Node<?>>>, NodeModification {
     SimpleNode<?> getFirstSimpleByName(QName leaf);\r
 \r
     /**\r
-     * @return cast self to mutable, if possible \r
+     * @return cast self to mutable, if possible\r
      */\r
     MutableCompositeNode asMutable();\r
 }\r
similarity index 85%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/ModifyAction.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java
index fa170433871472258f09e776caea0ae30ff36d2d..1ae847200cf14a21dc47df4b06c99e1546547115 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 public enum ModifyAction {\r
     MERGE, REPLACE, CREATE, DELETE, REMOVE\r
similarity index 88%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableCompositeNode.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
index 4f11adbc174c9b2220c1464b41fbf6a997373cfa..f9f5a030aaa8237d7b93bc4b21b0d0d4d0b9de19 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 import java.util.List;\r
 \r
similarity index 90%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableNode.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
index 3eddbe5bec3f02d9f3f6b648047a338097d48af7..5ee3486170d25c0d8dd06b0a0443db2edff83b8b 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 \r
 /**\r
similarity index 88%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableSimpleNode.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
index ad25f8f380d3eed5ee115d79ce1713bd6b0dc89d..9341f293ee0a854b835800d059b7c57fa01be64d 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 \r
 /**\r
similarity index 83%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/Node.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java
index f107dd89640b0f832f655dea35ced8d3724eda88..bf32dfe9bd30e9c4cc7689578fb3c94d0071e8cf 100644 (file)
@@ -5,29 +5,29 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 /**\r
  * Base representation of node in the data tree, defines basic parameters of\r
  * node such as a QName.\r
- * \r
- * \r
+ *\r
+ *\r
  * @param <T>\r
  */\r
 public interface Node<T> {\r
 \r
     /**\r
      * Returns the name of the Node\r
-     * \r
+     *\r
      * @return qName of node\r
      */\r
     QName getNodeType();\r
 \r
     /**\r
      * Returns parent node\r
-     * \r
+     *\r
      * @return parent node\r
      */\r
     CompositeNode getParent();\r
@@ -35,7 +35,7 @@ public interface Node<T> {
     /**\r
      * Returns the value that holds current node, if no value is defined method\r
      * can return <code>null</code>\r
-     * \r
+     *\r
      * @return Returns the value that holds current node.\r
      */\r
     T getValue();\r
similarity index 86%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModification.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java
index c6b64f3add357189785f54066b8a8c3c872049c1..0dc5d6ac03f0811028fcaafb7c2998b7f75d4d1e 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 /**\r
  * @author michal.rehak\r
similarity index 92%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModificationBuilder.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
index 4e4af9bae57773c6b702f80113a2102d8cdc1d36..13ad7a953c6187e761492a2e059842901903dfe7 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 \r
 /**\r
similarity index 92%
rename from yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/SimpleNode.java
rename to yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
index 3f75da5203c84fe39e0bf07c6fb68e97ee47ef48..b1a3cc4919be27647c8f4fafc44f1bda76ab61a2 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.api;\r
+package org.opendaylight.yangtools.yang.data.api;\r
 \r
 /**\r
  * Simple node represents a leaf in the data tree, which does not contain any\r
index eb5a12c1476bcd8d02452936fc2a93f610d0f1cb..e3e59f46ba182bb048fad39fb530b50f46e41bd9 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
similarity index 86%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/AbstractNodeTO.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
index 3385700c46b0041f1b017d7fd6e837c1d2e49e42..679530e90ac36fa28167bd24a9842819e3c0ab92 100644 (file)
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModification;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModification;\r
 \r
 /**\r
  * @author michal.rehak\r
  * @param <T>\r
  *            type of node value\r
- * \r
+ *\r
  */\r
 public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {\r
 \r
@@ -25,7 +25,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
     private CompositeNode parent;\r
     private T value;\r
     private ModifyAction modifyAction;\r
-    \r
+\r
     /**\r
      * @param qname\r
      * @param parent\r
@@ -36,12 +36,12 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
         this.parent = parent;\r
         this.value = value;\r
     }\r
-    \r
+\r
     /**\r
      * @param qname\r
      * @param parent\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      */\r
     public AbstractNodeTO(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) {\r
         this.qName = qname;\r
@@ -66,14 +66,14 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
     public CompositeNode getParent() {\r
         return parent;\r
     }\r
-    \r
+\r
     /**\r
      * @param parent the parent to set\r
      */\r
     public void setParent(CompositeNode parent) {\r
         this.parent = parent;\r
     }\r
-    \r
+\r
     /**\r
      * @param value the value to set\r
      */\r
@@ -102,11 +102,11 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
     protected void setModificationAction(ModifyAction modifyAction) {\r
         this.modifyAction = modifyAction;\r
     }\r
-    \r
+\r
     @Override\r
     public String toString() {\r
         StringBuffer out = new StringBuffer();\r
-        out.append(String.format("Node[%s], qName[%s], modify[%s]", \r
+        out.append(String.format("Node[%s], qName[%s], modify[%s]",\r
                 getClass().getSimpleName(), getQName().getLocalName(),\r
                 getModificationAction() == null ? "n/a" : getModificationAction()));\r
         return out.toString();\r
@@ -142,7 +142,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
                 return false;\r
         } else if (other.parent == null) {\r
             return false;\r
-        } \r
+        }\r
         if (qName == null) {\r
             if (other.qName != null)\r
                 return false;\r
@@ -156,5 +156,5 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
         return true;\r
     }\r
     /* */\r
-    \r
+\r
 }\r
similarity index 70%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeModificationTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
index 44c8c852f5a49d4361b5d2552f6bf1ce32a8588c..9a609a59831d06ccb237d3f4decc33716482e24e 100755 (executable)
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public class CompositeNodeModificationTOImpl extends CompositeNodeTOImpl {\r
 \r
similarity index 84%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
index 605b99c296ef0975998202740625cac4489b7e2b..1fdf28e12a79800cfe8d79ea1da428957a6abac7 100644 (file)
@@ -5,22 +5,22 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>>\r
         implements CompositeNode {\r
@@ -45,14 +45,14 @@ public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>>
      * @param qname\r
      * @param parent use null to create top composite node (without parent)\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      */\r
     public CompositeNodeTOImpl(QName qname, CompositeNode parent,\r
             List<Node<?>> value, ModifyAction modifyAction) {\r
         super(qname, parent, value, modifyAction);\r
         init();\r
     }\r
-    \r
+\r
 \r
     /**\r
      * @return the nodeMap\r
@@ -60,7 +60,7 @@ public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>>
     protected Map<QName, List<Node<?>>> getNodeMap() {\r
         return nodeMap;\r
     }\r
-    \r
+\r
     @Override\r
     public List<Node<?>> getChildren() {\r
         return getValue();\r
@@ -122,7 +122,7 @@ public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>>
     public List<CompositeNode> getCompositesByName(String children) {\r
         return getCompositesByName(new QName(getNodeType(), children));\r
     }\r
-    \r
+\r
     @Override\r
     public List<SimpleNode<?>> getSimpleNodesByName(String children) {\r
         return getSimpleNodesByName(new QName(getNodeType(), children));\r
@@ -136,18 +136,18 @@ public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>>
             nodeMap = NodeUtils.buildNodeMap(getValue());\r
         }\r
     }\r
-    \r
+\r
     @Override\r
     public MutableCompositeNode asMutable() {\r
         throw new IllegalAccessError("cast to mutable is not supported - "+getClass().getSimpleName());\r
     }\r
-    \r
+\r
     @Override\r
     public String toString() {\r
-        return super.toString() + ", children.size = " \r
+        return super.toString() + ", children.size = "\r
                 + (getChildren() != null ? getChildren().size() : "n/a");\r
     }\r
-    \r
-    \r
+\r
+\r
 \r
 }\r
similarity index 83%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMap.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
index 81dd86e7e8c74d3cc67c99861aa3a558944b4aef..d46fdad8f9d3a126e6f4920ea0d87533cb326e3c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
@@ -13,24 +13,24 @@ import java.util.Map;
 import java.util.Set;\r
 import java.util.Stack;\r
 \r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableNode;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModification;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModification;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 \r
 /**\r
  * @author michal.rehak\r
  *\r
  */\r
 public class LazyNodeToNodeMap {\r
-    \r
+\r
     private Map<Node<?>, Node<?>> node2node = new HashMap<>();\r
     private CompositeNode originalRoot;\r
     private MutableCompositeNode mutableRoot;\r
-    \r
+\r
     /**\r
      * @param originalNode\r
      * @return mutable twin\r
@@ -41,15 +41,15 @@ public class LazyNodeToNodeMap {
             addPathMembers(originalNode);\r
             mutableNode = node2node.get(originalNode);\r
         }\r
-        \r
+\r
         return mutableNode;\r
     }\r
-    \r
+\r
     /**\r
      * @param originalNode\r
      */\r
     private void addPathMembers(Node<?> originalNode) {\r
-        Stack<Node<?>> jobQueue = new Stack<>(); \r
+        Stack<Node<?>> jobQueue = new Stack<>();\r
         jobQueue.push(originalNode);\r
         while (!jobQueue.isEmpty()) {\r
             Node<?> node2add = jobQueue.pop();\r
@@ -60,14 +60,14 @@ public class LazyNodeToNodeMap {
                 }\r
                 fixChildrenRefOnly = true;\r
             }\r
-            \r
+\r
             CompositeNode nextParent = node2add.getParent();\r
             MutableNode<?> mutableEquivalent = null;\r
-            \r
+\r
             if (node2add instanceof SimpleNode<?>) {\r
                 SimpleNode<?> node2addSimple = (SimpleNode<?>) node2add;\r
                 MutableSimpleNode<?> nodeMutant = NodeFactory.createMutableSimpleNode(\r
-                        node2add.getNodeType(), null, node2addSimple.getValue(), \r
+                        node2add.getNodeType(), null, node2addSimple.getValue(),\r
                         node2addSimple.getModificationAction(), node2addSimple);\r
                 mutableEquivalent = nodeMutant;\r
             } else if (node2add instanceof CompositeNode) {\r
@@ -76,11 +76,11 @@ public class LazyNodeToNodeMap {
                     nodeMutant = (MutableCompositeNode) node2node.get(node2add);\r
                 } else {\r
                     CompositeNode node2addComposite = (CompositeNode) node2add;\r
-                    nodeMutant = NodeFactory.createMutableCompositeNode(node2add.getNodeType(), \r
-                        null, null, \r
+                    nodeMutant = NodeFactory.createMutableCompositeNode(node2add.getNodeType(),\r
+                        null, null,\r
                         ((NodeModification) node2add).getModificationAction(), node2addComposite);\r
                 }\r
-                \r
+\r
                 mutableEquivalent = nodeMutant;\r
 \r
                 // tidy up children\r
@@ -91,7 +91,7 @@ public class LazyNodeToNodeMap {
                     MutableNode<?> mutableChild = (MutableNode<?>) node2node.get(originalChildNode);\r
                     fixChildrenRef(nodeMutant, mutableChild);\r
                 }\r
-                \r
+\r
                 if (nodeMutant.getChildren() != null && !nodeMutant.getChildren().isEmpty()) {\r
                     nodeMutant.init();\r
                 }\r
@@ -109,12 +109,12 @@ public class LazyNodeToNodeMap {
                     }\r
                 }\r
             }\r
-            \r
+\r
             // feed jobQueue\r
             node2node.put(node2add, mutableEquivalent);\r
             if (nextParent != null) {\r
                 jobQueue.push(nextParent);\r
-            } \r
+            }\r
         }\r
     }\r
 \r
@@ -146,9 +146,9 @@ public class LazyNodeToNodeMap {
     public MutableCompositeNode getMutableRoot() {\r
         return mutableRoot;\r
     }\r
-    \r
+\r
     /**\r
-     * @return set of original nodes, registered in map as keys \r
+     * @return set of original nodes, registered in map as keys\r
      */\r
     public Set<Node<?>> getKeyNodes() {\r
         return node2node.keySet();\r
similarity index 78%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableCompositeNodeTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
index c29ecc4a0cdd19fb6485352b8d380f6391be55d6..75c98715c982c50acd7e0eb3f9e74dc5726fa6e5 100644 (file)
@@ -5,20 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl\r
         implements MutableCompositeNode {\r
@@ -36,7 +36,7 @@ public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl
             List<Node<?>> value, ModifyAction modifyAction) {\r
         super(qname, parent, value, modifyAction);\r
     }\r
-    \r
+\r
     /**\r
      * update nodeMap\r
      */\r
@@ -51,27 +51,27 @@ public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl
     public void setValue(List<Node<?>> value) {\r
         super.setValue(value);\r
     }\r
-    \r
+\r
     @Override\r
     public void setModifyAction(ModifyAction action) {\r
         super.setModificationAction(action);\r
     }\r
-    \r
+\r
     @Override\r
     protected Map<QName, List<Node<?>>> getNodeMap() {\r
         return nodeMap;\r
     }\r
-    \r
+\r
     @Override\r
     public MutableCompositeNode asMutable() {\r
         return this;\r
     }\r
-    \r
+\r
     @Override\r
     public CompositeNode getOriginal() {\r
         return original;\r
     }\r
-    \r
+\r
     /**\r
      * @param original the original to set\r
      */\r
similarity index 74%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableSimpleNodeTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
index a3b73b1c64456fab6c773c300a147cdaafce9e27..62f45beea1a689e297ae61af40c4a5430233e5f3 100644 (file)
@@ -5,20 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 \r
 /**\r
  * @author michal.rehak\r
  * @param <T> type of simple node value\r
- * \r
+ *\r
  */\r
-public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T> \r
+public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T>\r
         implements MutableSimpleNode<T> {\r
 \r
     private SimpleNode<T> original;\r
@@ -38,22 +38,22 @@ public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T>
     public void setValue(T value) {\r
         super.setValue(value);\r
     }\r
-    \r
+\r
     @Override\r
     public void setModifyAction(ModifyAction action) {\r
         super.setModificationAction(action);\r
     }\r
-    \r
+\r
     @Override\r
     public MutableSimpleNode<T> asMutable() {\r
         return this;\r
     }\r
-    \r
+\r
     @Override\r
     public SimpleNode<T> getOriginal() {\r
         return original;\r
     }\r
-    \r
+\r
     /**\r
      * @param original the original to set\r
      */\r
similarity index 82%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeFactory.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
index 8e6e77498baec6a607957d07984df37339059e01..5e944577628fc778b809221817b5e0405e203f48 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.AbstractMap.SimpleEntry;\r
 import java.util.ArrayList;\r
@@ -15,18 +15,18 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Stack;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModification;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModification;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public abstract class NodeFactory {\r
 \r
@@ -40,24 +40,24 @@ public abstract class NodeFactory {
             CompositeNode parent, T value) {\r
         return createImmutableSimpleNode(qName, parent, value, null);\r
     }\r
-    \r
+\r
     /**\r
      * @param qName\r
      * @param parent\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      * @param original originating node, if available\r
      * @return simple node modification, based on given qname, value and parent\r
      */\r
     public static <T> MutableSimpleNode<T> createMutableSimpleNode(QName qName,\r
             CompositeNode parent, Object value, ModifyAction modifyAction, SimpleNode<T> original) {\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNodeTOImpl<T> simpleNodeTOImpl = \r
+        MutableSimpleNodeTOImpl<T> simpleNodeTOImpl =\r
                 new MutableSimpleNodeTOImpl<T>(qName, parent, (T) value, modifyAction);\r
         simpleNodeTOImpl.setOriginal(original);\r
         return simpleNodeTOImpl;\r
     }\r
-    \r
+\r
     /**\r
      * @param qName\r
      * @param parent\r
@@ -68,12 +68,12 @@ public abstract class NodeFactory {
             CompositeNode parent, List<Node<?>> value) {\r
         return createImmutableCompositeNode(qName, parent, value, null);\r
     }\r
-    \r
+\r
     /**\r
      * @param qName\r
      * @param parent\r
-     * @param valueArg \r
-     * @param modifyAction \r
+     * @param valueArg\r
+     * @param modifyAction\r
      * @param original originating node, if available\r
      * @return composite node modification, based on given qName, value (children), parent and modifyAction\r
      */\r
@@ -83,13 +83,13 @@ public abstract class NodeFactory {
         if (value == null) {\r
             value = new ArrayList<>();\r
         }\r
-        MutableCompositeNodeTOImpl compositeNodeTOImpl = \r
+        MutableCompositeNodeTOImpl compositeNodeTOImpl =\r
                 new MutableCompositeNodeTOImpl(qName, parent, value, modifyAction);\r
         compositeNodeTOImpl.setOriginal(original);\r
         return compositeNodeTOImpl;\r
     }\r
-    \r
-    \r
+\r
+\r
     /**\r
      * @param qName\r
      * @param parent\r
@@ -99,7 +99,7 @@ public abstract class NodeFactory {
      */\r
     public static <T> SimpleNode<T> createImmutableSimpleNode(QName qName,\r
             CompositeNode parent, T value, ModifyAction modifyAction) {\r
-        SimpleNodeTOImpl<T> simpleNodeModTOImpl = \r
+        SimpleNodeTOImpl<T> simpleNodeModTOImpl =\r
                 new SimpleNodeTOImpl<T>(qName, parent, value, modifyAction);\r
         return simpleNodeModTOImpl;\r
     }\r
@@ -108,43 +108,43 @@ public abstract class NodeFactory {
      * @param qName\r
      * @param parent\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      * @return composite node modification, based on given qname, value (children), parent and modifyAction\r
      */\r
     public static CompositeNode createImmutableCompositeNode(QName qName,\r
             CompositeNode parent, List<Node<?>> value, ModifyAction modifyAction) {\r
-        CompositeNodeTOImpl compositeNodeModTOImpl = \r
+        CompositeNodeTOImpl compositeNodeModTOImpl =\r
                 new CompositeNodeTOImpl(qName, parent, value, modifyAction);\r
         return compositeNodeModTOImpl;\r
     }\r
 \r
     /**\r
      * @param node\r
-     * @return copy of given node, parent and value are the same, but parent \r
-     * has no reference to this copy \r
+     * @return copy of given node, parent and value are the same, but parent\r
+     * has no reference to this copy\r
      */\r
     public static <T> SimpleNode<T> copyNode(SimpleNode<T> node) {\r
         SimpleNode<T> twinNode = createImmutableSimpleNode(\r
                     node.getNodeType(), node.getParent(), node.getValue());\r
         return twinNode;\r
     }\r
-    \r
+\r
     /**\r
      * @param node\r
-     * @return copy of given node, parent and value are the same, but parent \r
-     * has no reference to this copy \r
+     * @return copy of given node, parent and value are the same, but parent\r
+     * has no reference to this copy\r
      */\r
     public static <T> MutableSimpleNode<T> copyNodeAsMutable(SimpleNode<T> node) {\r
         MutableSimpleNode<T> twinNode = createMutableSimpleNode(\r
-                    node.getNodeType(), node.getParent(), node.getValue(), \r
+                    node.getNodeType(), node.getParent(), node.getValue(),\r
                     node.getModificationAction(), null);\r
         return twinNode;\r
     }\r
-    \r
+\r
     /**\r
      * @param node\r
-     * @param children \r
-     * @return copy of given node, parent and children are the same, but parent and children \r
+     * @param children\r
+     * @return copy of given node, parent and children are the same, but parent and children\r
      * have no reference to this copy\r
      */\r
     public static CompositeNode copyNode(CompositeNode node, Node<?>... children) {\r
@@ -152,31 +152,31 @@ public abstract class NodeFactory {
                 node.getNodeType(), node.getParent(), Arrays.asList(children), node.getModificationAction());\r
         return twinNode;\r
     }\r
-    \r
+\r
     /**\r
      * @param node\r
-     * @return copy of given node, parent and children are the same, but parent and children \r
+     * @return copy of given node, parent and children are the same, but parent and children\r
      * have no reference to this copy\r
      */\r
     public static CompositeNode copyNode(CompositeNode node) {\r
        return copyNode(node, node.getChildren().toArray(new Node<?>[0]));\r
     }\r
-    \r
+\r
     /**\r
      * @param node root of original tree\r
-     * @param originalToCopyArg (optional) empty map, where binding between original and copy \r
+     * @param originalToCopyArg (optional) empty map, where binding between original and copy\r
      * will be stored\r
      * @return copy of given node and all subnodes recursively\r
      */\r
-    public static MutableCompositeNode copyDeepAsMutable(CompositeNode node, \r
+    public static MutableCompositeNode copyDeepAsMutable(CompositeNode node,\r
             Map<Node<?>, Node<?>> originalToCopyArg) {\r
-        \r
+\r
         Map<Node<?>, Node<?>> originalToCopy = originalToCopyArg;\r
         if (originalToCopy == null) {\r
             originalToCopy = new HashMap<>();\r
         }\r
 \r
-        MutableCompositeNode mutableRoot = createMutableCompositeNode(node.getNodeType(), null, null, \r
+        MutableCompositeNode mutableRoot = createMutableCompositeNode(node.getNodeType(), null, null,\r
                 node.getModificationAction(), null);\r
         Stack<SimpleEntry<CompositeNode, MutableCompositeNode>> jobQueue = new Stack<>();\r
         jobQueue.push(new SimpleEntry<CompositeNode, MutableCompositeNode>(node, mutableRoot));\r
@@ -191,16 +191,16 @@ public abstract class NodeFactory {
             for (Node<?> child : originalNode.getChildren()) {\r
                 Node<?> mutableAscendant = null;\r
                 if (child instanceof CompositeNode) {\r
-                    MutableCompositeNode newMutable = \r
-                            createMutableCompositeNode(child.getNodeType(), mutableNode, null, \r
+                    MutableCompositeNode newMutable =\r
+                            createMutableCompositeNode(child.getNodeType(), mutableNode, null,\r
                                     ((NodeModification) child).getModificationAction(), null);\r
                     jobQueue.push(new SimpleEntry<CompositeNode, MutableCompositeNode>(\r
                             (CompositeNode) child, newMutable));\r
                     mutableAscendant = newMutable;\r
                 } else if (child instanceof SimpleNode<?>) {\r
-                    mutableAscendant = \r
-                            createMutableSimpleNode(child.getNodeType(), mutableNode, \r
-                                    child.getValue(), \r
+                    mutableAscendant =\r
+                            createMutableSimpleNode(child.getNodeType(), mutableNode,\r
+                                    child.getValue(),\r
                                     ((NodeModification) child).getModificationAction(), null);\r
                 } else {\r
                     throw new IllegalStateException("Node class deep copy not supported: "\r
@@ -215,30 +215,30 @@ public abstract class NodeFactory {
 \r
         return mutableRoot;\r
     }\r
-    \r
+\r
     /**\r
      * @param node root of original tree\r
-     * @param originalToCopyArg (optional) empty map, where binding between original and copy \r
+     * @param originalToCopyArg (optional) empty map, where binding between original and copy\r
      * will be stored\r
      * @return copy of given node and all subnodes recursively\r
      */\r
-    public static CompositeNode copyDeepAsImmutable(CompositeNode node, \r
+    public static CompositeNode copyDeepAsImmutable(CompositeNode node,\r
             Map<Node<?>, Node<?>> originalToCopyArg) {\r
         Stack<CompositeNode> jobQueue = new Stack<>();\r
         jobQueue.push(node);\r
-        \r
+\r
         Map<Node<?>, Node<?>> originalToCopy = originalToCopyArg;\r
         if (originalToCopy == null) {\r
             originalToCopy = new HashMap<>();\r
         }\r
-        \r
+\r
         while (!jobQueue.isEmpty()) {\r
             CompositeNode jobNode = jobQueue.peek();\r
-            if (!originalToCopy.isEmpty() \r
+            if (!originalToCopy.isEmpty()\r
                     && originalToCopy.keySet().containsAll(jobNode.getChildren())) {\r
                 jobQueue.pop();\r
                 List<Node<?>> newChildren = NodeUtils.collectMapValues(jobNode.getChildren(), originalToCopy);\r
-                CompositeNode nodeCopy = createImmutableCompositeNode(jobNode.getNodeType(), null, \r
+                CompositeNode nodeCopy = createImmutableCompositeNode(jobNode.getNodeType(), null,\r
                         newChildren, jobNode.getModificationAction());\r
                 NodeUtils.fixChildrenRelation(nodeCopy);\r
                 originalToCopy.put(jobNode, nodeCopy);\r
@@ -246,7 +246,7 @@ public abstract class NodeFactory {
                 for (Node<?> child : jobNode.getChildren()) {\r
                     if (child instanceof SimpleNode<?>) {\r
                         originalToCopy.put(child, createImmutableSimpleNode(\r
-                                child.getNodeType(), null, child.getValue(), \r
+                                child.getNodeType(), null, child.getValue(),\r
                                 ((NodeModification) child).getModificationAction()));\r
                     } else if (child instanceof CompositeNode) {\r
                         jobQueue.push((CompositeNode) child);\r
@@ -254,8 +254,8 @@ public abstract class NodeFactory {
                 }\r
             }\r
         }\r
-       \r
+\r
         return (CompositeNode) originalToCopy.get(node);\r
     }\r
-    \r
+\r
 }\r
similarity index 87%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
index c9d39348a47ef4e8dd7c1210d54fec1917559631..503b07fc63c77a4fdf9df0e2490b78b63fb4ff1c 100644 (file)
@@ -5,21 +5,21 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableNode;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModificationBuilder;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModificationBuilder;\r
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 \r
similarity index 92%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeUtils.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
index 39033523c127d2075cf3e9cd5df7654047c667b5..df7960ddb86ebf91f69f95930daa7042a4bde3f3 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.util.AbstractMap.SimpleEntry;\r
 import java.util.ArrayList;\r
@@ -24,12 +24,12 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;\r
 import javax.xml.xpath.XPathFactory;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModification;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModification;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;\r
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;\r
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
similarity index 71%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeModificationTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
index eaee3730a7979a91a3ba6bcba1409917aee2c188..bc8016c271aec34198713ab78c7ffb10612ebf68 100755 (executable)
@@ -5,16 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
 \r
 /**\r
  * @author michal.rehak\r
  * @param <T> type of node value\r
- * \r
+ *\r
  */\r
 public class SimpleNodeModificationTOImpl<T> extends SimpleNodeTOImpl<T> {\r
 \r
@@ -22,7 +22,7 @@ public class SimpleNodeModificationTOImpl<T> extends SimpleNodeTOImpl<T> {
      * @param qname\r
      * @param parent\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      */\r
     public SimpleNodeModificationTOImpl(QName qname, CompositeNode parent,\r
             T value, ModifyAction modifyAction) {\r
similarity index 72%
rename from yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeTOImpl.java
rename to yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
index 466cea53031397beeaaed85afd35218034f1380e..c51a41a12437de6f17a2c17078523fbd9c96ec93 100644 (file)
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 \r
 /**\r
  * @author michal.rehak\r
  * @param <T> type of simple node value\r
- * \r
+ *\r
  */\r
 public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements\r
         SimpleNode<T> {\r
@@ -29,23 +29,23 @@ public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
     public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value) {\r
         super(qname, parent, value);\r
     }\r
-    \r
+\r
     /**\r
      * @param qname\r
      * @param parent\r
      * @param value\r
-     * @param modifyAction \r
+     * @param modifyAction\r
      */\r
     public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) {\r
         super(qname, parent, value, modifyAction);\r
     }\r
 \r
-    \r
+\r
     @Override\r
     public MutableSimpleNode<T> asMutable() {\r
         throw new IllegalAccessError("cast to mutable is not supported - "+getClass().getSimpleName());\r
     }\r
-    \r
+\r
     @Override\r
     public String toString() {\r
         return super.toString() + ", value = "+getValue();\r
similarity index 96%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/IgnoreWhiteCharsDiffListener.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java
index bf6b292c23d3b4256407be553d53e3ef8c2dfd42..bf92b663f759e1c002dc582416c3d56b673cc4f7 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.data.impl;
+package org.opendaylight.yangtools.yang.data.impl;
 
 import org.custommonkey.xmlunit.Difference;
 import org.custommonkey.xmlunit.DifferenceConstants;
similarity index 83%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMapTest.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
index c4dc672c121ed08f5eb620776bf3fd1a60e5ff3d..35fa18a02c7a4650d7f196fbc7cb99305834f435 100755 (executable)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.net.URI;\r
 import java.util.Date;\r
@@ -13,32 +13,33 @@ import java.util.Date;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.impl.LazyNodeToNodeMap;\r
 \r
 /**\r
  * @author michal.rehak\r
  *\r
  */\r
 public class LazyNodeToNodeMapTest {\r
-    \r
+\r
     private LazyNodeToNodeMap lazyN2N;\r
     private CompositeNode tree;\r
 \r
     /**\r
      * prepare test values\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Before\r
     public void setUp() throws Exception {\r
         lazyN2N = new LazyNodeToNodeMap();\r
-        \r
+\r
         QName qName = new QName(\r
-                new URI("urn:ietf:params:xml:ns:netconf:base:1.0"), \r
+                new URI("urn:ietf:params:xml:ns:netconf:base:1.0"),\r
                 new Date(42), "yang-data-impl-mutableTest");\r
-        \r
+\r
         tree = NodeHelper.buildTestConfigTree(qName);\r
     }\r
 \r
@@ -48,18 +49,18 @@ public class LazyNodeToNodeMapTest {
     @Test\r
     public void testGetMutableEquivalent() {\r
         MutableCompositeNode mutableTree = (MutableCompositeNode) lazyN2N.getMutableEquivalent(tree);\r
-        \r
+\r
         Assert.assertNull(mutableTree.getParent());\r
         Assert.assertEquals(tree.getNodeType(), mutableTree.getNodeType());\r
         Assert.assertEquals(1, lazyN2N.getKeyNodes().size());\r
-        \r
+\r
         Node<?> subNode = tree.getCompositesByName("topologies").iterator().next();\r
         Node<?> subMutant = lazyN2N.getMutableEquivalent(subNode);\r
-        \r
+\r
         Assert.assertNotNull(subMutant.getParent());\r
         Assert.assertEquals(subNode.getNodeType(), subMutant.getNodeType());\r
         Assert.assertEquals(2, lazyN2N.getKeyNodes().size());\r
-        \r
+\r
         Assert.assertEquals(mutableTree, subMutant.getParent());\r
         Assert.assertEquals(mutableTree.getChildren().size(), 1);\r
         Assert.assertEquals(mutableTree.getChildren().iterator().next(), subMutant);\r
@@ -72,7 +73,7 @@ public class LazyNodeToNodeMapTest {
     public void testGetMutableRoot() {\r
         Node<?> subNode = tree.getCompositesByName("topologies").iterator().next();\r
         Node<?> subMutant = lazyN2N.getMutableEquivalent(subNode);\r
-        \r
+\r
         Assert.assertNotNull(subMutant.getParent());\r
         Assert.assertEquals(subMutant.getParent(), lazyN2N.getMutableRoot());\r
     }\r
similarity index 96%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MemoryConsumption.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java
index e53307d25fca25051ba98baec7685034ce78b220..189a16386be2c5528a373d7a81269074dc6f8ca2 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.yang.data.impl;
+package org.opendaylight.yangtools.yang.data.impl;
 
 /**
  * Provides memory consumption and elapsed time between 2 points 
similarity index 89%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MyNodeBuilder.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
index 26cee745146e3ab69ea583fae446df0fdaebf848..90d75c0b82f0e472cef9e9087dce047b55a8993e 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import groovy.util.BuilderSupport;\r
 \r
@@ -15,12 +15,12 @@ import java.util.Date;
 import java.util.Map;\r
 import java.util.Map.Entry;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -29,14 +29,14 @@ import org.slf4j.LoggerFactory;
  *\r
  */\r
 public class MyNodeBuilder extends BuilderSupport {\r
-    \r
+\r
     private static final Logger LOG = LoggerFactory\r
             .getLogger(MyNodeBuilder.class);\r
 \r
     private URI qnNamespace;\r
     private String qnPrefix;\r
     private Date qnRevision;\r
-    \r
+\r
     private CompositeNode rootNode;\r
 \r
        /**\r
@@ -55,7 +55,7 @@ public class MyNodeBuilder extends BuilderSupport {
        QName qName = null;\r
        try {\r
                        qName = new QName(\r
-                       new URI("urn:opendaylight:controller:network"), \r
+                       new URI("urn:opendaylight:controller:network"),\r
                        new Date(42), "yang-data-impl-groovyTest_", null);\r
         } catch (URISyntaxException e) {\r
                LOG.error(e.getMessage(), e);\r
@@ -99,15 +99,15 @@ public class MyNodeBuilder extends BuilderSupport {
         NodeUtils.fixParentRelation(newNode);\r
         return newNode;\r
     }\r
-    \r
+\r
     /**\r
      * @param attributes\r
-     * @return \r
+     * @return\r
      */\r
     private ModifyAction processAttributes(@SuppressWarnings("rawtypes") Map attributes) {\r
         LOG.debug("attributes:" + attributes);\r
         ModifyAction modAction = null;\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
         Map<String, String> attributesSane = attributes;\r
         for (Entry<String, String> attr : attributesSane.entrySet()) {\r
@@ -122,7 +122,7 @@ public class MyNodeBuilder extends BuilderSupport {
             case "modifyAction":\r
                 modAction = ModifyAction.valueOf(attr.getValue());\r
                 break;\r
-                \r
+\r
             default:\r
                 throw new IllegalArgumentException("Attribute not supported: "+attr.getKey());\r
             }\r
@@ -146,16 +146,16 @@ public class MyNodeBuilder extends BuilderSupport {
            if (getCurrent() != null) {\r
                if (getCurrent() instanceof CompositeNode) {\r
                    return (CompositeNode) getCurrent();\r
-                   \r
+\r
                } else {\r
                    throw new IllegalAccessError("current node is not of type CompositeNode, but: "\r
                        +getCurrent().getClass().getSimpleName());\r
                }\r
            }\r
-           \r
+\r
            return null;\r
     }\r
-       \r
+\r
        @Override\r
        protected Object postNodeCompletion(Object parent, Object node) {\r
            Node<?> nodeRevisited = (Node<?>) node;\r
@@ -176,11 +176,11 @@ public class MyNodeBuilder extends BuilderSupport {
                    nodeRevisited.getParent().getChildren().remove(mutant);\r
                }\r
            }\r
-           \r
-           \r
+\r
+\r
            return nodeRevisited;\r
        }\r
-       \r
+\r
        /**\r
         * @return tree root\r
         */\r
similarity index 83%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeFactoryTest.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
index cafbfa391d5f3f76c32a11225047d4e20db9c4c3..22fbe76c23e216648e92bda7dee9e89dc9335ec0 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.net.URI;\r
 import java.util.ArrayList;\r
@@ -17,21 +17,21 @@ import java.util.Map;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.ModifyAction;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.NodeModification;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.NodeModification;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 import org.w3c.dom.Document;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public class NodeFactoryTest {\r
-    \r
+\r
     private QName qName;\r
     private CompositeNode network;\r
 \r
@@ -46,7 +46,7 @@ public class NodeFactoryTest {
     public void setUp() throws Exception {\r
         ns = "urn:ietf:params:xml:ns:netconf:base:1.0";\r
         qName = new QName(\r
-                new URI(ns), \r
+                new URI(ns),\r
                 new Date(42), null);\r
         network = NodeHelper.buildTestConfigTree(qName);\r
         networkShadow = NodeUtils.buildShadowDomTree(network);\r
@@ -56,16 +56,16 @@ public class NodeFactoryTest {
     /**\r
      * Test method for methods creating immutable nodes in\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeFactory}.\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testImmutableNodes() throws Exception {\r
         Assert.assertEquals(2, network.getChildren().size());\r
-        CompositeNode tpList = NodeUtils.findNodeByXpath(networkShadow, \r
+        CompositeNode tpList = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                         "//{0}node[{0}node-id/text()='nodeId_19']/{0}termination-points", ns));\r
-        \r
-        \r
+\r
+\r
         Assert.assertEquals(2, tpList.getCompositesByName("termination-point").size());\r
     }\r
 \r
@@ -73,7 +73,7 @@ public class NodeFactoryTest {
      * Test method for methods creating immutable and mutable nodes:\r
      * {@link NodeFactory#createMutableCompositeNode(QName, CompositeNode, List, ModifyAction, CompositeNode)},\r
      * {@link NodeFactory#createMutableSimpleNode(QName, CompositeNode, Object, ModifyAction, SimpleNode)}\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testMutableNodes() throws Exception {\r
@@ -89,37 +89,37 @@ public class NodeFactoryTest {
         //     </interface>\r
         //   </top>\r
         // </config>\r
-        \r
-        \r
-        List<Node<?>> value = new ArrayList<Node<?>>(); \r
+\r
+\r
+        List<Node<?>> value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "name"), null, "Ethernet0/0"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "mtu"), null, 1500));\r
-        \r
+\r
         MutableCompositeNode ifNode = NodeFactory.createMutableCompositeNode(\r
                 new QName(qName, "interface"), null, value, ModifyAction.DELETE, null);\r
         ifNode.init();\r
         NodeHelper.assignParentToChildren(ifNode);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "name"), null, "Ethernet1/0"));\r
         value.add(NodeFactory.createMutableSimpleNode(new QName(qName, "mtu"), null, 1501, ModifyAction.REMOVE, null));\r
-        \r
+\r
         CompositeNode ifNode2 = NodeFactory.createImmutableCompositeNode(new QName(qName, "interface"), null, value);\r
         NodeHelper.assignParentToChildren(ifNode2);\r
 \r
-        value = new ArrayList<Node<?>>(); \r
+        value = new ArrayList<Node<?>>();\r
         value.add(ifNode);\r
         value.add(ifNode2);\r
-        \r
+\r
         CompositeNode topNode = NodeFactory.createImmutableCompositeNode(new QName(qName, "top"), null, value);\r
         NodeHelper.assignParentToChildren(topNode);\r
-        value = new ArrayList<Node<?>>(); \r
+        value = new ArrayList<Node<?>>();\r
         value.add(topNode);\r
-        \r
+\r
         CompositeNode root = NodeFactory.createImmutableCompositeNode(new QName(qName, "config"), null, value);\r
         Document shadowConfig = NodeUtils.buildShadowDomTree(root);\r
         NodeHelper.compareXmlTree(shadowConfig, "./mutableNodesConfig.xml", getClass());\r
-        \r
+\r
         Assert.assertEquals(1, root.getChildren().size());\r
         Assert.assertEquals(1, ifNode.getSimpleNodesByName("name").size());\r
         Assert.assertEquals(1, ifNode.getSimpleNodesByName("mtu").size());\r
@@ -130,7 +130,7 @@ public class NodeFactoryTest {
 \r
     /**\r
      * test of {@link NodeFactory#copyDeepAsMutable(CompositeNode, Map)}\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testCopyDeepAsMutable() throws Exception {\r
@@ -138,26 +138,26 @@ public class NodeFactoryTest {
         CompositeNode mutableNetwork = NodeFactory.copyDeepAsMutable(network, mutableToOrig);\r
 \r
         Document mutableNetworkShadow = NodeUtils.buildShadowDomTree(mutableNetwork);\r
-        \r
+\r
         NodeHelper.compareXmlTree(mutableNetworkShadow, "./config02-shadow.xml", getClass());\r
-        \r
+\r
         CompositeNode immutableNetwork = NodeFactory.copyDeepAsImmutable(mutableNetwork, null);\r
         Assert.assertEquals(network, immutableNetwork);\r
     }\r
-    \r
-    \r
+\r
+\r
     /**\r
      * test of {@link NodeFactory#copyDeepAsImmutable(CompositeNode, Map)}\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testCopyDeepAsImmutable() throws Exception {\r
         Map<Node<?>, Node<?>> mutableToOrig = new HashMap<>();\r
         CompositeNode immutableNetwork = NodeFactory.copyDeepAsImmutable(network, mutableToOrig);\r
-        \r
+\r
         Document mutableNetworkShadow = NodeUtils.buildShadowDomTree(immutableNetwork);\r
         NodeHelper.compareXmlTree(mutableNetworkShadow, "./config02-shadow.xml", getClass());\r
-        \r
+\r
         Assert.assertEquals(network, immutableNetwork);\r
     }\r
 \r
similarity index 96%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeHelper.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
index 8fec8817fc1249bf15639ddc63a88af62250f5c9..0a0848665ef3dbad824d9db1518467dfe6aad56c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import groovy.lang.Binding;\r
 import groovy.lang.GroovyShell;\r
@@ -33,9 +33,9 @@ import javax.xml.transform.stream.StreamResult;
 \r
 import org.custommonkey.xmlunit.Diff;\r
 import org.junit.Assert;\r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
 import org.opendaylight.yangtools.yang.model.api.Module;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;\r
similarity index 93%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImplTest.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
index 47c090cbd5fac207e93ea350ec64248535b7aa07..2a92197248c4fc074024b4333e6829af29292859 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.net.URI;\r
 import java.util.Date;\r
@@ -14,12 +14,12 @@ import junit.framework.Assert;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;\r
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
similarity index 92%
rename from yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeUtilsTest.java
rename to yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
index ab4b6bf645d38ca46583433a635d0b5fcb671b71..994eac665202b5e4f928bc2cb9d1d0a1dbc3dce5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.data.impl;\r
+package org.opendaylight.yangtools.yang.data.impl;\r
 \r
 import java.io.IOException;\r
 import java.net.URI;\r
@@ -17,10 +17,10 @@ import java.util.Stack;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.data.api.CompositeNode;\r
-import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.data.api.SimpleNode;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;\r
+import org.opendaylight.yangtools.yang.data.api.Node;\r
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;\r
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.slf4j.Logger;\r
index f22da0c78ab5ee4455b4193cc59fd76210ea18a7..59cc9e1e8d47d4b6e29b5e5c552f089d27b92a48 100644 (file)
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 import groovy.xml.MarkupBuilder
-import org.opendaylight.controller.yang.data.impl.MyNodeBuilder
+import org.opendaylight.yangtools.yang.data.impl.MyNodeBuilder
 
 /**
  * wrapper class - applies hardcoded builder on given data closure
index c4e0c53a335bebeb104f70cf3fdd8cf325cf2633..28ea136aed4bff3e1881d393b9f6731fceca4c68 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
similarity index 92%
rename from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractContainerNode.java
rename to yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
index a8daca1c51b6d60e7c5405e0aa5aa29cbbde0049..7b3649a504ec7a597906f9f214823374f3455977 100644 (file)
@@ -5,17 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.data.api.CompositeNode;
-import org.opendaylight.controller.yang.data.api.Node;
-import org.opendaylight.controller.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 
 public abstract class AbstractContainerNode extends AbstractNode<List<Node<?>>>
         implements CompositeNode {
similarity index 76%
rename from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractNode.java
rename to yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
index e6297f55b2ecef2db772bb2f40d59eae0d82289b..86195af68cee3b1fd490f2ff221a962fb1e1e3c7 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
-import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.data.api.CompositeNode;
-import org.opendaylight.controller.yang.data.api.ModifyAction;
-import org.opendaylight.controller.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;
+import org.opendaylight.yangtools.yang.data.api.Node;
 
 public abstract class AbstractNode<T> implements Node<T> {
 
@@ -29,7 +29,7 @@ public abstract class AbstractNode<T> implements Node<T> {
     public CompositeNode getParent() {
         return parent;
     }
-    
+
     /* (non-Javadoc)
      */
     /**
similarity index 85%
rename from yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/Nodes.java
rename to yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
index fca835f4585200eb1c5b0f53f0b233f77c3dc4ce..d9c2b45135426e9818be203a7c3088b168516918 100644 (file)
@@ -5,20 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.data.api.CompositeNode;
-import org.opendaylight.controller.yang.data.api.ModifyAction;
-import org.opendaylight.controller.yang.data.api.MutableCompositeNode;
-import org.opendaylight.controller.yang.data.api.MutableSimpleNode;
-import org.opendaylight.controller.yang.data.api.Node;
-import org.opendaylight.controller.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
+import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
+import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 
 public class Nodes {
 
index 1becb19ba1692558d9778ce8fa3614bfeb9901af..8724d3dbe82d0c440d18dceff89883c814e41d73 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yang</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
@@ -16,7 +16,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.yang</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -76,7 +76,7 @@
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
-                                            org.opendaylight.yang
+                                            org.opendaylight.yangtools
                                         </groupId>
                                         <artifactId>
                                             yang-maven-plugin
index 5210553cced5f9568bca381651d5a1ec0b563a32..1bfc1c83b9e251a091a0948c8f45bd2b7bc53453 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yang</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin.it;
+package org.opendaylight.yangtools.yang2sources.plugin.it;
 
 import static org.junit.Assert.*;
 import static org.junit.matchers.JUnitMatchers.containsString;
index c871bb13345145357fd0b6654def0ec21bc1ced2..80b7c165d2963f98ea62ad222297da311420d41d 100644 (file)
@@ -2,13 +2,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
             <version>0.5.4-SNAPSHOT</version>
         </dependency>
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -31,7 +31,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <additionalConfiguration>
                                         <nm1>abcd=a.b.c.d</nm1>
@@ -41,7 +41,7 @@
                                 </generator>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <additionalConfiguration>
                                         <c1>config</c1>
@@ -54,7 +54,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index 1deb2020a9cad2604e5eb0754bdf601e25576d92..fb8f67d4f74165e3eb9273a0f54fc8cf2a2e1de7 100644 (file)
@@ -2,13 +2,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
             <version>0.5.4-SNAPSHOT</version>
         </dependency>
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -31,7 +31,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                 </generator>
                             </codeGenerators>
@@ -41,7 +41,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index 5842b0bdaa331ecb0e334c084245d77e056d7c03..260ec39829a9ffb20b4335529b211a45c916674a 100644 (file)
@@ -2,14 +2,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>generator-test1</artifactId>
     <version>0.5.4-SNAPSHOT</version>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -23,7 +23,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                 </generator>
                             </codeGenerators>
@@ -33,7 +33,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index 501fd1d90395e2a13647dc09951822c5a69fbb34..ca209d935bcb09bf4c79ebe7b791490c5de23507 100644 (file)
@@ -2,14 +2,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <artifactId>generator-test2</artifactId>
 
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>generator-test1</artifactId>
             <version>0.5.4-SNAPSHOT</version>
             <scope>system</scope>
@@ -20,7 +20,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -34,7 +34,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         outDir/
@@ -47,7 +47,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index b33abb3ed0f7b38edc0d5d889b83e3b4bfb767d6..d76ac2d51b400e33e4ed2ba5cedc9f63872597ca 100644 (file)
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>binding-generator</artifactId>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
     <artifactId>test</artifactId>
@@ -11,7 +11,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -25,7 +25,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         outDir/
@@ -38,7 +38,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index 6e25e48958a13433ad800cc9f521ad4e0f39f74c..a9f5b513049ebad4fbf4bfb019387360866d3c3a 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <artifactId>generator-test2</artifactId>
 
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -24,7 +24,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         outDir/
@@ -34,7 +34,7 @@
                             <resourceProviders>
                                 <provider>
                                     <resourceProviderClass>
-                                        org.opendaylight.controller.yang2sources.spi.ResourceProviderTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.ResourceProviderTestImpl
                                     </resourceProviderClass>
                                     <outputBaseDir>
                                         outDir/
@@ -47,7 +47,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index 5349154f2b12d6c76574cc13f7794e0ce37c9a34..f98e6a5d903d926f925c7999759595272ad2a2d4 100644 (file)
@@ -2,14 +2,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <version>0.5.4-SNAPSHOT</version>
     <artifactId>test</artifactId>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -25,7 +25,7 @@
                             <resourceProviders>
                                 <provider>
                                     <resourceProviderClass>
-                                        org.opendaylight.controller.yang2sources.spi.ResourceProviderTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.ResourceProviderTestImpl
                                     </resourceProviderClass>
                                     <outputBaseDir>
                                         outDir/
@@ -37,7 +37,7 @@
                 </executions>
                                <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index b73a53e30c6b9638e7b6e250186593b23a9d2f6c..fe95c07a2f70c0702b78923c1abd2eb360286dd5 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -24,7 +24,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                 </generator>
                             </codeGenerators>
@@ -34,7 +34,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index df7519ece744135dfc39cb1afd4e3a4449fd4866..d16fca072301382e26c5a708b7382fa1dc72425f 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -24,7 +24,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         /outDir/
@@ -37,7 +37,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index e8b6ecac6e600776ecaa8290f9afa0ee24411bd4..3ac4e5c73504afb4259d5e915ea00c9286420582 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -24,7 +24,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         /outDir/
@@ -45,7 +45,7 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
+                        <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                         <version>0.5.4-SNAPSHOT</version>
                         <type>test-jar</type>
index af11a69f10bf88832e5e500fc771b0c1c5eecd32..d11c857d157e3e36294ad9780acbf055466865fd 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.yangtools</groupId>
     <version>0.5.4-SNAPSHOT</version>
 
     <artifactId>test</artifactId>
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
@@ -24,7 +24,7 @@
                             <codeGenerators>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl
+                                        org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
                                         /outDir/
index 8d6ddb95089112d5b76dfbae5ae677b919c6502c..150eeaef74a8ad26fed1a77b9607ea3e261f95d8 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yang</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yang</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
 
similarity index 97%
rename from yang-maven-plugin-spi/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java
rename to yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java
index c454a262c43db8650e8bf4b4c7b710877e8295ed..d996c96b65eafe60ebe27e032eeaa2cb5c2d8f66 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.spi;
+package org.opendaylight.yangtools.yang2sources.spi;
 
 import java.io.File;
 import java.io.IOException;
similarity index 97%
rename from yang-maven-plugin-spi/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java
rename to yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java
index 82fb1d213c50ec2a68340ea04e68f686d7cb5cf5..7bfae12b3a6ebc4c5de78d8d3ab13973386b091b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.spi;
+package org.opendaylight.yangtools.yang2sources.spi;
 
 import java.io.File;
 import java.util.Collection;
index abb5eeff1c01f4d8851245f0bdb54c141221101c..a64ad1ed8b52ace1d70a1b7156fc1216be729ac6 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yang</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
similarity index 98%
rename from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java
rename to yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
index 88f4dde31a538a567cfe7ed5199a4fae5776a8e8..68343083f7a8c2b6a4eba26febd6f0ec3ed6e18e 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import java.io.File;
 import java.util.Map;
similarity index 99%
rename from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/Util.java
rename to yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
index ce7929f930364f0a3d8bc02c731b3205ccc4b25d..e40be9789335527a7a2379160bb9e95483bd53d7 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import java.io.Closeable;
 import java.io.File;
similarity index 95%
rename from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java
rename to yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
index 27fb6b836f677b6df50d9ddd562173c84128fad7..49d9ef62d37aa868526c9785317661d53347c921 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import java.io.File;
 import java.util.Arrays;
@@ -20,9 +20,8 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
-import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
-import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
 
 import com.google.common.annotations.VisibleForTesting;
 
similarity index 96%
rename from yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java
rename to yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
index 39770788c308cf8081b0115049c8d86758cd088d..ca972bf993035dca8c73d7023cb10eb11ffe6727 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import java.io.Closeable;
 import java.io.File;
@@ -25,13 +25,13 @@ import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
-import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
-import org.opendaylight.controller.yang2sources.plugin.Util.ContextHolder;
-import org.opendaylight.controller.yang2sources.plugin.Util.YangsInZipsResult;
-import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
+import org.opendaylight.yangtools.yang2sources.plugin.Util.ContextHolder;
+import org.opendaylight.yangtools.yang2sources.plugin.Util.YangsInZipsResult;
+import org.opendaylight.yangtools.yang2sources.spi.CodeGenerator;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
similarity index 92%
rename from yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java
rename to yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
index 5c3155e32b6b5f794b8161645f3ec6d14d8da7bb..ef20864fa3447660678e1d3621480222e16d889f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
@@ -26,11 +26,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
-import org.opendaylight.controller.yang2sources.plugin.YangToSourcesProcessor.YangProvider;
-import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
+import org.opendaylight.yangtools.yang2sources.plugin.YangToSourcesProcessor.YangProvider;
+import org.opendaylight.yangtools.yang2sources.spi.CodeGenerator;
 
 import com.google.common.collect.Lists;
 
similarity index 93%
rename from yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/UtilTest.java
rename to yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
index 240825409fcc8459209c1d3a407aea4a0acd6e1a..b6477603401be200f4b885e6f6f785ab8750eb80 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang2sources.plugin;
+package org.opendaylight.yangtools.yang2sources.plugin;
 
 import static org.junit.Assert.*;
 
index ed86c2859820a397204089f49bfbdbbedabc22e5..e11c89e5f4f00c2677c1643740dd418c10b734d4 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
index a411580c22f1daa93a169f3412d8d9895b23d3dd..ac658a57fca595cee6a9c6eda7fb7f624795a75d 100644 (file)
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.model.api;
 
-import org.opendaylight.controller.yang.common.QName;
-
 import java.util.Set;
 
+import org.opendaylight.yangtools.yang.common.QName;
+
 /**
  * The ChoiceNode defines a set of alternatives. It consists of a number of
  * branches defined as ChoiceCaseNode objects.
index 8e6d7898b5220cb21a2546a7d325bb8efb834b5f..20b9ea4d48f7f5ba8383edc2ccce30eab4caf040 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api;
 \r
 import java.util.Set;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 /**\r
  * Node which can contains other nodes.\r
index c9a475a7304c3888d4e6a82e0d6756ff3e76f220..c36528adbbce85dca399a258d3cac92d566ad45a 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api;
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 /**\r
  * Interface describing YANG 'list' statement.\r
index ebd29633273e887bdc86dd9c726fc45e1add7441..53c025c6e50d4de6a06beebf7b2b8b0c6a27e70b 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api;
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 /**\r
  * SchemaNode represents a node in schema tree.\r
index e7000e3b2ca96310aac225f8971080ac6b8c7682..6bcb009afef7866d18bc4b7b10769a6fca914cc1 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;\r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 \r
 public class SchemaPath {\r
 \r
index f8dfd8beeab3d9e8f9a8db45ae2e7476e346ac14..b279c5c3125bc3068305deb2066ddb1aef6e11e0 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.model.api;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 
 public interface UnknownSchemaNode extends SchemaNode {
 
index 9380ebf9802137ea1325a3827b7001498427a96b..26551ad9957b79cd96f43ab322afa501c784ebd0 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface IdentityTypeDefinition extends
index 0c32f71d6e354701f62bda6e81a894d7f8a6b628..27c9ac175e36b52b38110dbbfb224e24dd5a2e66 100644 (file)
@@ -7,7 +7,7 @@
  */\r
 package org.opendaylight.yangtools.yang.model.api.type;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
 \r
 public interface IdentityrefTypeDefinition extends\r
index bc08b8afd74e145e2dc0f13a3c8de100c6f71dbf..36212fa8d95e574f64809d35f86a28ee5f074802 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java b/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java
deleted file mode 100644 (file)
index 72fd112..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. 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
- */
-package org.opendaylight.controller.yang.model.util;
-
-import java.net.URI;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-
-import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.*;
-
-public final class SchemaContextUtil {
-
-    private SchemaContextUtil() {
-    }
-
-    public static DataSchemaNode findDataSchemaNode(final SchemaContext context, final SchemaPath schemaPath) {
-        if (schemaPath != null) {
-            final Module module = resolveModuleFromSchemaPath(context, schemaPath);
-            final Queue<QName> prefixedPath = new LinkedList<>(schemaPath.getPath());
-
-            if ((module != null) && (prefixedPath != null)) {
-                return findSchemaNodeForGivenPath(context, module, prefixedPath);
-            }
-        }
-        return null;
-    }
-
-    public static DataSchemaNode findDataSchemaNode(final SchemaContext context, final Module module,
-            final RevisionAwareXPath nonCondXPath) {
-        if (nonCondXPath != null) {
-            final String strXPath = nonCondXPath.toString();
-
-            if (strXPath != null) {
-                if (strXPath.matches(".*//[.* | .*//].*")) {
-                    // TODO: function to escape conditions in path
-                }
-                if (nonCondXPath.isAbsolute()) {
-                    final Queue<QName> qnamedPath = xpathToQNamePath(context, module, strXPath);
-                    if (qnamedPath != null) {
-                        final DataSchemaNode dataNode = findSchemaNodeForGivenPath(context, module, qnamedPath);
-                        return dataNode;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public static DataSchemaNode findDataSchemaNodeForRelativeXPath(final SchemaContext context, final Module module,
-            final SchemaNode actualSchemaNode, final RevisionAwareXPath relativeXPath) {
-        if ((actualSchemaNode != null) && (relativeXPath != null) && !relativeXPath.isAbsolute()) {
-
-            final SchemaPath actualNodePath = actualSchemaNode.getPath();
-            if (actualNodePath != null) {
-                final Queue<QName> qnamePath = resolveRelativeXPath(context, module, relativeXPath, actualNodePath);
-
-                if (qnamePath != null) {
-                    final DataSchemaNode dataNode = findSchemaNodeForGivenPath(context, module, qnamePath);
-                    return dataNode;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static Module resolveModuleFromSchemaPath(final SchemaContext context, final SchemaPath schemaPath) {
-        if ((schemaPath != null) && (schemaPath.getPath() != null)) {
-            final List<QName> path = schemaPath.getPath();
-            if (!path.isEmpty()) {
-                final QName qname = path.get(path.size() - 1);
-
-                if ((qname != null) && (qname.getNamespace() != null)) {
-                    return context.findModuleByNamespace(qname.getNamespace());
-                }
-            }
-        }
-        return null;
-    }
-
-    public static Module findParentModuleForTypeDefinition(final SchemaContext context, final TypeDefinition<?> type) {
-        final SchemaPath schemaPath = type.getPath();
-        if ((schemaPath != null) && (schemaPath.getPath() != null)) {
-            if (type instanceof ExtendedType) {
-                List<QName> path = schemaPath.getPath();
-                final QName qname = path.get(path.size() - 1);
-
-                if ((qname != null) && (qname.getNamespace() != null)) {
-                    return context.findModuleByNamespace(qname.getNamespace());
-                }
-            } else {
-                List<QName> path = schemaPath.getPath();
-                final QName qname = path.get(path.size() - 2);
-
-                if ((qname != null) && (qname.getNamespace() != null)) {
-                    return context.findModuleByNamespace(qname.getNamespace());
-                }
-            }
-
-        }
-        return null;
-    }
-
-    public static Module findParentModule(final SchemaContext context, final SchemaNode schemaNode) {
-        if (context == null) {
-            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
-        }
-        if (schemaNode == null) {
-            throw new IllegalArgumentException("Schema Node cannot be NULL!");
-        }
-
-        final SchemaPath schemaPath = schemaNode.getPath();
-        if (schemaPath == null) {
-            throw new IllegalStateException("Schema Path for Schema Node is not "
-                    + "set properly (Schema Path is NULL)");
-        }
-        final List<QName> qnamedPath = schemaPath.getPath();
-        if (qnamedPath == null || qnamedPath.isEmpty()) {
-            throw new IllegalStateException("Schema Path contains invalid state of path parts."
-                    + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name"
-                    + "of path.");
-        }
-        final QName qname = qnamedPath.get(qnamedPath.size() - 1);
-        return context.findModuleByNamespace(qname.getNamespace());
-    }
-
-    private static DataSchemaNode findSchemaNodeForGivenPath(final SchemaContext context, final Module module,
-            final Queue<QName> qnamedPath) {
-        if ((module != null) && (module.getNamespace() != null) && (qnamedPath != null)) {
-            DataNodeContainer nextNode = module;
-            final URI moduleNamespace = module.getNamespace();
-
-            QName childNodeQName;
-            DataSchemaNode schemaNode = null;
-            while ((nextNode != null) && !qnamedPath.isEmpty()) {
-                childNodeQName = qnamedPath.peek();
-                if (childNodeQName != null) {
-                    final URI childNodeNamespace = childNodeQName.getNamespace();
-
-                    schemaNode = nextNode.getDataChildByName(childNodeQName);
-                    if (schemaNode != null) {
-                        if (schemaNode instanceof ContainerSchemaNode) {
-                            nextNode = (ContainerSchemaNode) schemaNode;
-                        } else if (schemaNode instanceof ListSchemaNode) {
-                            nextNode = (ListSchemaNode) schemaNode;
-                        } else if (schemaNode instanceof ChoiceNode) {
-                            final ChoiceNode choice = (ChoiceNode) schemaNode;
-                            qnamedPath.poll();
-                            if (!qnamedPath.isEmpty()) {
-                                childNodeQName = qnamedPath.peek();
-                                nextNode = choice.getCaseNodeByName(childNodeQName);
-                                schemaNode = (DataSchemaNode)nextNode;
-                            }
-                        } else {
-                            nextNode = null;
-                        }
-                    } else if (!childNodeNamespace.equals(moduleNamespace)) {
-                        final Module nextModule = context.findModuleByNamespace(childNodeNamespace);
-                        schemaNode = findSchemaNodeForGivenPath(context, nextModule, qnamedPath);
-                        return schemaNode;
-                    }
-                    qnamedPath.poll();
-                }
-            }
-            return schemaNode;
-        }
-        return null;
-    }
-
-    private static Queue<QName> xpathToQNamePath(final SchemaContext context, final Module parentModule,
-            final String xpath) {
-        final Queue<QName> path = new LinkedList<>();
-        if (xpath != null) {
-            final String[] prefixedPath = xpath.split("/");
-
-            for (int i = 0; i < prefixedPath.length; ++i) {
-                if (!prefixedPath[i].isEmpty()) {
-                    path.add(stringPathPartToQName(context, parentModule, prefixedPath[i]));
-                }
-            }
-        }
-        return path;
-    }
-
-    private static QName stringPathPartToQName(final SchemaContext context, final Module parentModule,
-            final String prefixedPathPart) {
-        if (parentModule != null && prefixedPathPart != null) {
-            if (prefixedPathPart.contains(":")) {
-                final String[] prefixedName = prefixedPathPart.split(":");
-                final Module module = resolveModuleForPrefix(context, parentModule, prefixedName[0]);
-                if (module != null) {
-                    return new QName(module.getNamespace(), module.getRevision(), prefixedName[1]);
-                }
-            } else {
-                return new QName(parentModule.getNamespace(), parentModule.getRevision(), prefixedPathPart);
-            }
-        }
-        return null;
-    }
-
-    private static Module resolveModuleForPrefix(final SchemaContext context, final Module module, final String prefix) {
-        if ((module != null) && (prefix != null)) {
-            if (prefix.equals(module.getPrefix())) {
-                return module;
-            }
-
-            final Set<ModuleImport> imports = module.getImports();
-
-            for (final ModuleImport mi : imports) {
-                if (prefix.equals(mi.getPrefix())) {
-                    return context.findModuleByName(mi.getModuleName(), mi.getRevision());
-                }
-            }
-        }
-        return null;
-    }
-
-    private static Queue<QName> resolveRelativeXPath(final SchemaContext context, final Module module,
-            final RevisionAwareXPath relativeXPath, final SchemaPath leafrefSchemaPath) {
-        final Queue<QName> absolutePath = new LinkedList<>();
-
-        if ((module != null) && (relativeXPath != null) && !relativeXPath.isAbsolute() && (leafrefSchemaPath != null)) {
-            final String strXPath = relativeXPath.toString();
-            if (strXPath != null) {
-                final String[] xpaths = strXPath.split("/");
-
-                if (xpaths != null) {
-                    int colCount = 0;
-                    while (xpaths[colCount].contains("..")) {
-                        ++colCount;
-                    }
-                    final List<QName> path = leafrefSchemaPath.getPath();
-                    if (path != null) {
-                        int lenght = path.size() - colCount - 1;
-                        for (int i = 0; i < lenght; ++i) {
-                            absolutePath.add(path.get(i));
-                        }
-                        for (int i = colCount; i < xpaths.length; ++i) {
-                            absolutePath.add(stringPathPartToQName(context, module, xpaths[i]));
-                        }
-                    }
-                }
-            }
-        }
-        return absolutePath;
-    }
-}
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractSignedInteger.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java
index 62fb5d441cfedb9f634fad961cff2d15bcae901a..1d841848de6914f362aac2ea38d8b46a39a56fd3 100644 (file)
@@ -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.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java
index 38513899ea8737f671244fbff86db1f256af2d78..e93053c8021ca6094a59d3785008f0592fbff253 100644 (file)
@@ -1,13 +1,13 @@
 /**
  *
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 99%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseConstraints.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
index b728e3fc618b021c4b61d3dc46dbb06306d44634..5a3622a89ec6702bae513bc8beb778f9b3f56c38 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
similarity index 92%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseTypes.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
index 946f007fcc8e9b3a36cf79c24069e39e3887dabc..f08e012b2577578110631dbb761b36c218516123 100644 (file)
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.util;\r
+package org.opendaylight.yangtools.yang.model.util;\r
 \r
 import java.net.URI;\r
 import java.util.ArrayList;\r
 import java.util.Date;\r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 \r
 public final class BaseTypes {\r
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BinaryType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
index ab383d078067d185092d8a8e22e42c857724dc1b..9b03a96f4e107f7ac989e1e7915480280e75b842 100644 (file)
@@ -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.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BitsType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
index 5d82e536138cc13ef837af5d6ac61cecf81c83fd..bab21964081084ac70d644cf28fe416be2fd18dc 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BooleanType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
index 5f584f8cde535b6747fe4f95d91bb1459e9c7d1e..58b5b96c7661c2d96f35f369d9bb31b422f238bf 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/DataNodeIterator.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java
index fbf5c41a760d069e208787b7cb4295775cb890b3..ed77d35d9245911b4dfc231aec4f7e5d300b4bcd 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Decimal64.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java
index 86b770ad17a0707e04605a1e60a4f4024a0e210d..cbb45b6744467e6acb344bc371a14a1b582dac9f 100644 (file)
@@ -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.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 94%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EmptyType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java
index afb043b2317e1293ee8b9b6d72c4b83ccef527cf..3648a179be34c8e26eac2a1c93e6c4d3da3de981 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EnumerationType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
index 767b91a13dd080c9073b99dc315d6e9664f83990..e6b5f1cb3b4473afe4890ae00c0e3fd3fe40fa02 100644 (file)
@@ -5,12 +5,12 @@
   * terms of the Eclipse Public License v1.0 which accompanies this distribution,
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/ExtendedType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java
index 6bcfdf71bd531c60d576cc8e0b5ae9d5c8359649..6e5229d4cb9d712552b47c4f31f254bbd8a7b80b 100644 (file)
@@ -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.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.net.URI;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
similarity index 92%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/IdentityrefType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
index 03cde1a50a95fef7070ca89f7a41ef2d0adfa5a2..a1b399e295ea7b7b569b2351c6ef171c30f24ef7 100644 (file)
@@ -5,12 +5,12 @@
   * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
   * and is available at http://www.eclipse.org/legal/epl-v10.html\r
   */\r
-package org.opendaylight.controller.yang.model.util;\r
+package org.opendaylight.yangtools.yang.model.util;\r
 \r
 import java.util.Collections;\r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 import org.opendaylight.yangtools.yang.model.api.Status;\r
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
similarity index 97%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/InstanceIdentifier.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
index 3b97cda23e9edc901e77a0a3490c97306bffb47e..47405ebff87d97d3e963453cad09fd80cf03c372 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
similarity index 95%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int16.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
index 60b93ff9ab1c12bb49ecd905084fbbaa0273534b..e24a07038d427646d4daac66909dcdfd58c9117d 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int32.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
index dff380045b97121954b7a4bc181af8597fab6125..05dbaf956e5312cfd4f38701dd4ee991c092d7d1 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int64.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
index 30decdc44c4bc0fccb511e1d17a31e27ee55200e..fc10b94068fbd22468abb7923c54242dd6c426b4 100644 (file)
@@ -5,9 +5,9 @@
   * terms of the Eclipse Public License v1.0 which accompanies this distribution,
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int8.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
index 5d7ab6871e506be547a59fddbcce3ac9d9e9bf14..08e5423b67b96daa0a9ee4b6865f90eaeb20314f 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Leafref.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
index 42cc96c13dad4f5ba2f1417fcc0172fb577fb672..9136a944782d5fbde96949b1cedaf26f3cc149c6 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
similarity index 97%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/RevisionAwareXPathImpl.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
index 59abe6699debad1b8d01e036e380f88fd7111696..a3577ba0aec07db8b3bfecf2f406d2600ca225ac 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
new file mode 100644 (file)
index 0000000..ed8fbd1
--- /dev/null
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.model.util;
+
+import java.net.URI;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+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.api.TypeDefinition;
+
+/**
+ * The Schema Context Util contains support methods for searching through Schema Context modules for specified schema
+ * nodes via Schema Path or Revision Aware XPath. The Schema Context Util is designed as mixin,
+ * so it is not instantiable.
+ *
+ * @author Lukas Sedlak <lsedlak@cisco.com>
+ */
+public final class SchemaContextUtil {
+
+    private SchemaContextUtil() {
+    }
+
+    /**
+     * Method attempts to find DataSchemaNode in Schema Context via specified Schema Path. The returned
+     * DataSchemaNode from method will be the node at the end of the SchemaPath. If the DataSchemaNode is not present
+     * in the Schema Context the method will return <code>null</code>.
+     * <br>
+     * In case that Schema Context or Schema Path are not specified correctly (i.e. contains <code>null</code>
+     * values) the method will return IllegalArgumentException.
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context
+     *            Schema Context
+     * @param schemaPath
+     *            Schema Path to search for
+     * @return DataSchemaNode from the end of the Schema Path or
+     *         <code>null</code> if the Node is not present.
+     */
+    public static DataSchemaNode findDataSchemaNode(final SchemaContext context, final SchemaPath schemaPath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (schemaPath == null) {
+            throw new IllegalArgumentException("Schema Path reference cannot be NULL");
+        }
+
+        final Module module = resolveModuleFromSchemaPath(context, schemaPath);
+        final Queue<QName> prefixedPath = new LinkedList<>(schemaPath.getPath());
+
+        if ((module != null) && (prefixedPath != null)) {
+            return findSchemaNodeForGivenPath(context, module, prefixedPath);
+        }
+        return null;
+    }
+
+    /**
+     * Method attempts to find DataSchemaNode inside of provided Schema Context and Yang Module accordingly to
+     * Non-conditional Revision Aware XPath. The specified Module MUST be present in Schema Context otherwise the
+     * operation would fail and return <code>null</code>.
+     * <br>
+     * The Revision Aware XPath MUST be specified WITHOUT the conditional statement (i.e. without [cond]) in path,
+     * because in this state the Schema Context is completely unaware of data state and will be not able to properly
+     * resolve XPath. If the XPath contains condition the method will return IllegalArgumentException.
+     * <br>
+     * In case that Schema Context or Module or Revision Aware XPath contains <code>null</code> references the method
+     * will throw IllegalArgumentException
+     * <br>
+     * If the Revision Aware XPath is correct and desired Data Schema Node is present in Yang module or in depending
+     * module in Schema Context the method will return specified Data Schema Node, otherwise the operation will fail
+     * and method will return <code>null</code>.
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param module Yang Module
+     * @param nonCondXPath Non Conditional Revision Aware XPath
+     * @return Returns Data Schema Node for specified Schema Context for given Non-conditional Revision Aware XPath,
+     * or <code>null</code> if the DataSchemaNode is not present in Schema Context.
+     */
+    public static DataSchemaNode findDataSchemaNode(final SchemaContext context, final Module module,
+            final RevisionAwareXPath nonCondXPath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (module == null) {
+            throw new IllegalArgumentException("Module reference cannot be NULL!");
+        }
+        if (nonCondXPath == null) {
+            throw new IllegalArgumentException("Non Conditional Revision Aware XPath cannot be NULL!");
+        }
+
+        final String strXPath = nonCondXPath.toString();
+        if (strXPath != null) {
+            if (strXPath.contains("[")) {
+                throw new IllegalArgumentException("Revision Aware XPath cannot contains condition!");
+            }
+            if (nonCondXPath.isAbsolute()) {
+                final Queue<QName> qnamedPath = xpathToQNamePath(context, module, strXPath);
+                if (qnamedPath != null) {
+                    final DataSchemaNode dataNode = findSchemaNodeForGivenPath(context, module, qnamedPath);
+                    return dataNode;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Method attempts to find DataSchemaNode inside of provided Schema Context and Yang Module accordingly to
+     * Non-conditional relative Revision Aware XPath. The specified Module MUST be present in Schema Context otherwise
+     * the operation would fail and return <code>null</code>.
+     * <br>
+     * The relative Revision Aware XPath MUST be specified WITHOUT the conditional statement (i.e. without [cond]) in
+     * path, because in this state the Schema Context is completely unaware of data state and will be not able to
+     * properly resolve XPath. If the XPath contains condition the method will return IllegalArgumentException.
+     * <br>
+     * The Actual Schema Node MUST be specified correctly because from this Schema Node will search starts. If the
+     * Actual Schema Node is not correct the operation will simply fail, because it will be unable to find desired
+     * DataSchemaNode.
+     * <br>
+     * In case that Schema Context or Module or Actual Schema Node or relative Revision Aware XPath contains
+     * <code>null</code> references the method will throw IllegalArgumentException
+     * <br>
+     * If the Revision Aware XPath doesn't have flag <code>isAbsolute == false</code> the method will
+     * throw IllegalArgumentException.
+     * <br>
+     * If the relative Revision Aware XPath is correct and desired Data Schema Node is present in Yang module or in
+     * depending module in Schema Context the method will return specified Data Schema Node,
+     * otherwise the operation will fail
+     * and method will return <code>null</code>.
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param module Yang Module
+     * @param actualSchemaNode Actual Schema Node
+     * @param relativeXPath Relative Non Conditional Revision Aware XPath
+     * @return DataSchemaNode if is present in specified Schema Context for given relative Revision Aware XPath,
+     * otherwise will return <code>null</code>.
+     */
+    public static DataSchemaNode findDataSchemaNodeForRelativeXPath(final SchemaContext context, final Module module,
+            final SchemaNode actualSchemaNode, final RevisionAwareXPath relativeXPath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (module == null) {
+            throw new IllegalArgumentException("Module reference cannot be NULL!");
+        }
+        if (actualSchemaNode == null) {
+            throw new IllegalArgumentException("Actual Schema Node reference cannot be NULL!");
+        }
+        if (relativeXPath == null) {
+            throw new IllegalArgumentException("Non Conditional Revision Aware XPath cannot be NULL!");
+        }
+        if (relativeXPath.isAbsolute()) {
+            throw new IllegalArgumentException("Revision Aware XPath MUST be relative i.e. MUST contains ../, "
+                    + "for non relative Revision Aware XPath use findDataSchemaNode method!");
+        }
+
+        final SchemaPath actualNodePath = actualSchemaNode.getPath();
+        if (actualNodePath != null) {
+            final Queue<QName> qnamePath = resolveRelativeXPath(context, module, relativeXPath, actualNodePath);
+
+            if (qnamePath != null) {
+                final DataSchemaNode dataNode = findSchemaNodeForGivenPath(context, module, qnamePath);
+                return dataNode;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Retrieve information from Schema Path and returns the module reference to which Schema Node belongs. The
+     * search for correct Module is based on namespace within the last item in Schema Path. If schema context
+     * contains module with namespace specified in last item of Schema Path, then operation will returns Module
+     * reference, otherwise returns <code>null</code>
+     * <br>
+     * If Schema Context or Schema Node contains <code>null</code> references the method will throw IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param schemaPath Schema Path
+     * @return Module reference for given Schema Path if module is present in Schema Context,
+     * otherwise returns <code>null</code>
+     */
+    private static Module resolveModuleFromSchemaPath(final SchemaContext context, final SchemaPath schemaPath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (schemaPath == null) {
+            throw new IllegalArgumentException("Schema Path reference cannot be NULL");
+        }
+
+        final List<QName> path = schemaPath.getPath();
+        if (!path.isEmpty()) {
+            final QName qname = path.get(path.size() - 1);
+
+            if ((qname != null) && (qname.getNamespace() != null)) {
+                return context.findModuleByNamespace(qname.getNamespace());
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the Yang Module from specified Schema Context in which the TypeDefinition is declared. If the
+     * TypeDefinition si not present in Schema Context then the method will return <code>null</code>
+     *
+     * If Schema Context or TypeDefinition contains <code>null</code> references the method will throw IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param type Type Definition
+     * @return Yang Module in which the TypeDefinition is declared, if is not present, returns <code>null</code>.
+     */
+    public static Module findParentModuleForTypeDefinition(final SchemaContext context, final TypeDefinition<?> type) {
+        final SchemaPath schemaPath = type.getPath();
+        if (schemaPath == null) {
+            throw new IllegalArgumentException("Schema Path reference cannot be NULL");
+        }
+        final List<QName> qnamedPath = schemaPath.getPath();
+        if (qnamedPath == null || qnamedPath.isEmpty()) {
+            throw new IllegalStateException("Schema Path contains invalid state of path parts."
+                    + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name"
+                    + "of path.");
+        }
+
+        if (type instanceof ExtendedType) {
+            final QName qname = qnamedPath.get(qnamedPath.size() - 1);
+            if ((qname != null) && (qname.getNamespace() != null)) {
+                return context.findModuleByNamespace(qname.getNamespace());
+            }
+        } else {
+            final QName qname = qnamedPath.get(qnamedPath.size() - 2);
+            if ((qname != null) && (qname.getNamespace() != null)) {
+                return context.findModuleByNamespace(qname.getNamespace());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns parent Yang Module for specified Schema Context in which Schema Node is declared. If the Schema Node
+     * is not present in Schema Context the operation will return <code>null</code>.
+     * <br>
+     * If Schema Context or Schema Node contains <code>null</code> references the method will throw IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param schemaNode Schema Node
+     * @return Yang Module for specified Schema Context and Schema Node, if Schema Node is NOT present,
+     * the method will returns <code>null</code>
+     */
+    public static Module findParentModule(final SchemaContext context, final SchemaNode schemaNode) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (schemaNode == null) {
+            throw new IllegalArgumentException("Schema Node cannot be NULL!");
+        }
+
+        final SchemaPath schemaPath = schemaNode.getPath();
+        if (schemaPath == null) {
+            throw new IllegalStateException("Schema Path for Schema Node is not "
+                    + "set properly (Schema Path is NULL)");
+        }
+        final List<QName> qnamedPath = schemaPath.getPath();
+        if (qnamedPath == null || qnamedPath.isEmpty()) {
+            throw new IllegalStateException("Schema Path contains invalid state of path parts."
+                    + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name"
+                    + "of path.");
+        }
+        final QName qname = qnamedPath.get(qnamedPath.size() - 1);
+        return context.findModuleByNamespace(qname.getNamespace());
+    }
+
+    /**
+     * Method will attempt to find DataSchemaNode from specified Module and Queue of QNames through the Schema
+     * Context. The QNamed path could be defined across multiple modules in Schema Context so the method is called
+     * recursively. If the QNamed path contains QNames that are not part of any Module or Schema Context Path the
+     * operation will fail and returns <code>null</code>
+     * <br>
+     * If Schema Context, Module or Queue of QNames refers to <code>null</code> values,
+     * the method will throws IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param module Yang Module
+     * @param qnamedPath Queue of QNames
+     * @return DataSchemaNode if is present in Module(s) for specified Schema Context and given QNamed Path,
+     * otherwise will return <code>null</code>.
+     */
+    private static DataSchemaNode findSchemaNodeForGivenPath(final SchemaContext context, final Module module,
+            final Queue<QName> qnamedPath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (module == null) {
+            throw new IllegalArgumentException("Module reference cannot be NULL!");
+        }
+        if (module.getNamespace() == null) {
+            throw new IllegalArgumentException("Namespace for Module cannot contains NULL reference!");
+        }
+        if (qnamedPath == null || qnamedPath.isEmpty()) {
+            throw new IllegalStateException("Schema Path contains invalid state of path parts."
+                    + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name"
+                    + "of path.");
+        }
+
+        DataNodeContainer nextNode = module;
+        final URI moduleNamespace = module.getNamespace();
+
+        QName childNodeQName;
+        DataSchemaNode schemaNode = null;
+        while ((nextNode != null) && !qnamedPath.isEmpty()) {
+            childNodeQName = qnamedPath.peek();
+            if (childNodeQName != null) {
+                final URI childNodeNamespace = childNodeQName.getNamespace();
+
+                schemaNode = nextNode.getDataChildByName(childNodeQName);
+                if (schemaNode != null) {
+                    if (schemaNode instanceof ContainerSchemaNode) {
+                        nextNode = (ContainerSchemaNode) schemaNode;
+                    } else if (schemaNode instanceof ListSchemaNode) {
+                        nextNode = (ListSchemaNode) schemaNode;
+                    } else if (schemaNode instanceof ChoiceNode) {
+                        final ChoiceNode choice = (ChoiceNode) schemaNode;
+                        qnamedPath.poll();
+                        if (!qnamedPath.isEmpty()) {
+                            childNodeQName = qnamedPath.peek();
+                            nextNode = choice.getCaseNodeByName(childNodeQName);
+                            schemaNode = (DataSchemaNode) nextNode;
+                        }
+                    } else {
+                        nextNode = null;
+                    }
+                } else if (!childNodeNamespace.equals(moduleNamespace)) {
+                    final Module nextModule = context.findModuleByNamespace(childNodeNamespace);
+                    schemaNode = findSchemaNodeForGivenPath(context, nextModule, qnamedPath);
+                    return schemaNode;
+                }
+                qnamedPath.poll();
+            }
+        }
+        return schemaNode;
+    }
+
+    /**
+     * Transforms string representation of XPath to Queue of QNames. The XPath is split by "/" and for each part of
+     * XPath is assigned correct module in Schema Path.
+     * <br>
+     * If Schema Context, Parent Module or XPath string contains <code>null</code> values,
+     * the method will throws IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param parentModule Parent Module
+     * @param xpath XPath String
+     * @return
+     */
+    private static Queue<QName> xpathToQNamePath(final SchemaContext context, final Module parentModule,
+            final String xpath) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (parentModule == null) {
+            throw new IllegalArgumentException("Parent Module reference cannot be NULL!");
+        }
+        if (xpath == null) {
+            throw new IllegalArgumentException("XPath string reference cannot be NULL!");
+        }
+
+        final Queue<QName> path = new LinkedList<>();
+        final String[] prefixedPath = xpath.split("/");
+        for (int i = 0; i < prefixedPath.length; ++i) {
+            if (!prefixedPath[i].isEmpty()) {
+                path.add(stringPathPartToQName(context, parentModule, prefixedPath[i]));
+            }
+        }
+        return path;
+    }
+
+    /**
+     * Transforms part of Prefixed Path as java String to QName.
+     * <br>
+     * If the string contains module prefix separated by ":" (i.e. mod:container) this module is provided from from
+     * Parent Module list of imports. If the Prefixed module is present in Schema Context the QName can be
+     * constructed.
+     * <br>
+     * If the Prefixed Path Part does not contains prefix the Parent's Module namespace is taken for construction of
+     * QName.
+     * <br>
+     * If Schema Context, Parent Module or Prefixed Path Part refers to <code>null</code> the method will throw
+     * IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param parentModule Parent Module
+     * @param prefixedPathPart Prefixed Path Part string
+     * @return QName from prefixed Path Part String.
+     */
+    private static QName stringPathPartToQName(final SchemaContext context, final Module parentModule,
+            final String prefixedPathPart) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (parentModule == null) {
+            throw new IllegalArgumentException("Parent Module reference cannot be NULL!");
+        }
+        if (prefixedPathPart == null) {
+            throw new IllegalArgumentException("Prefixed Path Part cannot be NULL!");
+        }
+
+        if (prefixedPathPart.contains(":")) {
+            final String[] prefixedName = prefixedPathPart.split(":");
+            final Module module = resolveModuleForPrefix(context, parentModule, prefixedName[0]);
+            if (module != null) {
+                return new QName(module.getNamespace(), module.getRevision(), prefixedName[1]);
+            }
+        } else {
+            return new QName(parentModule.getNamespace(), parentModule.getRevision(), prefixedPathPart);
+        }
+        return null;
+    }
+
+    /**
+     * Method will attempt to resolve and provide Module reference for specified module prefix. Each Yang module
+     * could contains multiple imports which MUST be associated with corresponding module prefix. The method simply
+     * looks into module imports and returns the module that is bounded with specified prefix. If the prefix is not
+     * present in module or the prefixed module is not present in specified Schema Context,
+     * the method will return <code>null</code>.
+     * <br>
+     * If String prefix is the same as prefix of the specified Module the reference to this module is returned.
+     * <br>
+     * If Schema Context, Module or Prefix are referring to <code>null</code> the method will return
+     * IllegalArgumentException
+     *
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param module Yang Module
+     * @param prefix Module Prefix
+     * @return Module for given prefix in specified Schema Context if is present, otherwise returns <code>null</code>
+     */
+    private static Module resolveModuleForPrefix(final SchemaContext context, final Module module, final String prefix) {
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (module == null) {
+            throw new IllegalArgumentException("Module reference cannot be NULL!");
+        }
+        if (prefix == null) {
+            throw new IllegalArgumentException("Prefix string cannot be NULL!");
+        }
+
+        if (prefix.equals(module.getPrefix())) {
+            return module;
+        }
+
+        final Set<ModuleImport> imports = module.getImports();
+        for (final ModuleImport mi : imports) {
+            if (prefix.equals(mi.getPrefix())) {
+                return context.findModuleByName(mi.getModuleName(), mi.getRevision());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @throws IllegalArgumentException
+     *
+     * @param context Schema Context
+     * @param module Yang Module
+     * @param relativeXPath Non conditional Revision Aware Relative XPath
+     * @param leafrefSchemaPath Schema Path for Leafref
+     * @return
+     */
+    private static Queue<QName> resolveRelativeXPath(final SchemaContext context, final Module module,
+            final RevisionAwareXPath relativeXPath, final SchemaPath leafrefSchemaPath) {
+        final Queue<QName> absolutePath = new LinkedList<>();
+        if (context == null) {
+            throw new IllegalArgumentException("Schema Context reference cannot be NULL!");
+        }
+        if (module == null) {
+            throw new IllegalArgumentException("Module reference cannot be NULL!");
+        }
+        if (relativeXPath == null) {
+            throw new IllegalArgumentException("Non Conditional Revision Aware XPath cannot be NULL!");
+        }
+        if (relativeXPath.isAbsolute()) {
+            throw new IllegalArgumentException("Revision Aware XPath MUST be relative i.e. MUST contains ../, "
+                    + "for non relative Revision Aware XPath use findDataSchemaNode method!");
+        }
+        if (leafrefSchemaPath == null) {
+            throw new IllegalArgumentException("Schema Path reference for Leafref cannot be NULL!");
+        }
+
+        final String strXPath = relativeXPath.toString();
+        if (strXPath != null) {
+            final String[] xpaths = strXPath.split("/");
+            if (xpaths != null) {
+                int colCount = 0;
+                while (xpaths[colCount].contains("..")) {
+                    ++colCount;
+                }
+                final List<QName> path = leafrefSchemaPath.getPath();
+                if (path != null) {
+                    int lenght = path.size() - colCount - 1;
+                    for (int i = 0; i < lenght; ++i) {
+                        absolutePath.add(path.get(i));
+                    }
+                    for (int i = colCount; i < xpaths.length; ++i) {
+                        absolutePath.add(stringPathPartToQName(context, module, xpaths[i]));
+                    }
+                }
+            }
+        }
+        return absolutePath;
+    }
+}
similarity index 98%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/StringType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
index 7fb391e88d1486a15af186d7af3c92cb549dca5f..a3f98d962e03ae3242a547220c6a8d62baff3a94 100644 (file)
@@ -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.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint16.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
index c76c8edb217db8d3b38be9c058b99f637f7b1015..6187d4d1f2662e8c5b9a34670d5a9cf9b92903f0 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint32.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
index 6c8817f5994b4d79f42d16a2db0bbc253ddb7509..f13d395d166df2ca69db9cbda36972e34ae19833 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint64.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
index 66e0ccaa61adb2146d9c1cecc290809c999782a6..c0de51cf7a215a4c8b592f6669269e504d2f05d4 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.math.BigInteger;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
similarity index 96%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint8.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
index 4f2cbad0b93017d9ab11c0916b064a7943fe581f..0516e8819680418266ea237fdda634885a96cee5 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
similarity index 97%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnionType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java
index c6f88dbc31ce626843dec2b561bb7d767393096f..470e904b9d4e5d7f07e438c7bccc036d7fbce1c7 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
similarity index 99%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnknownType.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
index 110ddb8148e8cef4ebb0e6ed56e63fa0c6610f2f..5a6de305bfabb19f257ae30e18ff1a1db817f332 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.util;
+package org.opendaylight.yangtools.yang.model.util;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
similarity index 94%
rename from yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/YangTypesConverter.java
rename to yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java
index 5d1c8b34476f1774593a5666a611bffb0dd54a17..cf486fd91b447e852fb8058425d814de96fc2618 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.util;\r
+package org.opendaylight.yangtools.yang.model.util;\r
 \r
 import java.net.URI;\r
 import java.util.ArrayList;\r
@@ -14,7 +14,7 @@ import java.util.HashSet;
 import java.util.List;\r
 import java.util.Set;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
 \r
index afe200cd4345e579d4ddc775b4975d6fd6d5a4de..054f0561bfc1610c4cb5c1f3df6192eca973b2a4 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.yang</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
index 17f54a22f8cf5603f826c9c7255f8439758b82b9..145807a6a794f1160cac19851c7c0069f8bcbddb 100644 (file)
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
     <parent>\r
-        <groupId>org.opendaylight.yang</groupId>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
         <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
index b502c2571b15f92a63b41ff3233edb02003d9f0d..033fd352f1a58d7ae702493ee2054c6003daf4ce 100644 (file)
@@ -11,7 +11,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
index e49c88569269a79060db3ddb46a57795e7045817..3f07ddd050a8142d8796de4736bad99c5abc0797 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.api;
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 import org.opendaylight.yangtools.yang.model.api.Status;\r
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
index 365f7c5c6b2af4e8800eb4e7e5c25d247ec3ab68..da0278d7229448e33dc200fdb76e93c04f8fa8a9 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.api;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
index 150c276a3ee76c76fcacf64c7df7c2012bf9b43f..0f94b8609f2e11b53e4da5bc296db746574997fa 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.Set;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
index 8debaf4c2fb8050c82c00b8086d58d41f7c4b169..102e6a74adcedf84c0b7782fe35454b7417d0420 100644 (file)
@@ -7,7 +7,7 @@
  */\r
 package org.opendaylight.yangtools.yang.parser.builder.api;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
+import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 import org.opendaylight.yangtools.yang.model.api.Status;\r
index 0db47b755ed861fb30e045f5e2e5ffcfd80f4854..c181fe1a66b4a2544d0c673fc14ea79b8e70f1e0 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.api;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
index 3762175b60215f8f05ac821dae549f6e7f5b6671..248e094926a76edf6af477c2b17b0e95c423dd8f 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
index df0e6084b6e53bada18b3ea8841ea8de7649daae..a7a9d2b4667ad3bbbbd3a26dfb428d0b70865583 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
+import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
index 766404d8e79a329e50682930a12933e2821166e5..0677d1f3c1cb06b9025c425ba200dced3ac57fd4 100644 (file)
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
index bd2c2f381b644f24b04fabff65fb1938b193b3b1..d702fa236e7c7182330a7dae8caee81cd67dd244 100644 (file)
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
index e72b62ed333ead3cf4ab6273804ce2081712c273..2174c895d91eba6ac02abe963809813598de9d2f 100644 (file)
@@ -15,7 +15,7 @@ import java.util.Set;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
+import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
index a17138aa2da166556c2d86d8d2a55ceec484d587..d074b374b4a6a958b38089125e8fd1e6c2f5d5b7 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
index 564268baf375ce5aa2be6bacc1228591b01f2625..f010d2ee1e5c180105a71bfc18ddcc6d28e18450 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
index 0b50f102a25587cd8f5f6e53f79ce67b06bfabb5..5a4da1edf00bb275f81039084078e860c25190e3 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
index 4791eb6ba41d600da23f33b71628d01ea1193311..b7d712ad9fbf8053a9a2974ff778e2383f88444f 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
index fd6e85ad7bc04c29143195bc9da5bf935035adb0..aa8bbea613d88e264c002cd2eb6c2b596b6da9fc 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
index 9b324a5a6f887f8034988eb6aaa74560257a466d..9e578d6c03820ad0da79ee5a7cb2e45c67cd8aaa 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.IdentityrefType;
+import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
index 1f51653d38803e249ea8fc34e22e3b117ee09b07..0cc0e89d3d8f4bb2a1f409571f5ef62d9206441b 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
index aca4e9de9f83a65d7bd0d0f3bd9a07089348d9b2..e832d72bbf3693ac7fe45b8c582a71d470a915d5 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
index 81987d78b201236452ef5ad59eee50319ee07d02..f5c21219af44bf6077c343acf4e20c24135f2ca8 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
index 6ceef764736e890149e2d9618b3b5425db4c2bf9..d934437a51449f6fd1c07a3c9c1ce1c14b9a0ae6 100644 (file)
@@ -20,7 +20,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Deviation;
index 4a32c1b53f60ec9a3231e0f29420eedb29c2522d..41856413a6e7135aa5030cd54d0a4a201d8f2e0c 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
index ff30884d1b0068656fd1c474cf2f764f199ef181..da752b0c6984b5011fb3519093251113329f4d10 100644 (file)
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
index 31aa5658f67c3b021f5181b5f0e89a7dd22c3092..58878a6db3f78d95ebbc5a49731659eff66f7318 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.UnknownType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.util.Comparators;
index 1569e98c0a4f1f92fe0bb3176497618f6c2b7aac..7e6ff2ad058c343028836748aeb79e13e43c4cb5 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.UnionType;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
 import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
index 781805f7870477eed1a007fffc21a1295e46a6cb..9f360bed647e056c7c11a544aeea76f7498815ec 100644 (file)
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
index c5f1870b350efe47a09b0e4daca169b184304e34..be0d4ee0faa414808ced52df1244ff40bccd9751 100644 (file)
@@ -36,7 +36,7 @@ import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.opendaylight.controller.antlrv4.code.gen.YangLexer;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
@@ -54,10 +54,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.IdentityrefType;
-import org.opendaylight.controller.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
+import org.opendaylight.yangtools.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
 import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuilder;
index c6086ee884654eb85522aa5c7604712d2907b9d6..96682ef6cd32d2003030838b3e1f7558b7fc1eeb 100644 (file)
@@ -49,10 +49,10 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_body_stmtsCo
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Units_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.util.YangTypesConverter;
+import org.opendaylight.yangtools.yang.model.util.YangTypesConverter;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
index 5cdb6c39180eb4aac652c6a9ab9c43a06784cf7f..efcdcab442f75a95a0ec2e2b67c9dc11012333fd 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.util;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
index 9cf0c62421665d4835a89d8fc4e2daf3fb427c9f..7183d0c82cf5637a6e5176bad5bc72abdf8e7f9d 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.Comparator;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 
 public class Comparators {
index ca057d4e322b2bba03e39c628b201e7b3dadd843..2e4972232aa42748b942437aefd68fde3ab47902 100644 (file)
@@ -70,7 +70,7 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Value_stmtContext
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_argContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_stmtContext;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -88,26 +88,26 @@ import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 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.UnsignedIntegerTypeDefinition;
-import org.opendaylight.controller.yang.model.util.BaseConstraints;
-import org.opendaylight.controller.yang.model.util.BaseTypes;
-import org.opendaylight.controller.yang.model.util.BinaryType;
-import org.opendaylight.controller.yang.model.util.BitsType;
-import org.opendaylight.controller.yang.model.util.Decimal64;
-import org.opendaylight.controller.yang.model.util.EnumerationType;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.InstanceIdentifier;
-import org.opendaylight.controller.yang.model.util.Int16;
-import org.opendaylight.controller.yang.model.util.Int32;
-import org.opendaylight.controller.yang.model.util.Int64;
-import org.opendaylight.controller.yang.model.util.Int8;
-import org.opendaylight.controller.yang.model.util.Leafref;
-import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
-import org.opendaylight.controller.yang.model.util.StringType;
-import org.opendaylight.controller.yang.model.util.Uint16;
-import org.opendaylight.controller.yang.model.util.Uint32;
-import org.opendaylight.controller.yang.model.util.Uint64;
-import org.opendaylight.controller.yang.model.util.Uint8;
-import org.opendaylight.controller.yang.model.util.UnknownType;
+import org.opendaylight.yangtools.yang.model.util.BaseConstraints;
+import org.opendaylight.yangtools.yang.model.util.BaseTypes;
+import org.opendaylight.yangtools.yang.model.util.BinaryType;
+import org.opendaylight.yangtools.yang.model.util.BitsType;
+import org.opendaylight.yangtools.yang.model.util.Decimal64;
+import org.opendaylight.yangtools.yang.model.util.EnumerationType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.Int16;
+import org.opendaylight.yangtools.yang.model.util.Int32;
+import org.opendaylight.yangtools.yang.model.util.Int64;
+import org.opendaylight.yangtools.yang.model.util.Int8;
+import org.opendaylight.yangtools.yang.model.util.Leafref;
+import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl;
+import org.opendaylight.yangtools.yang.model.util.StringType;
+import org.opendaylight.yangtools.yang.model.util.Uint16;
+import org.opendaylight.yangtools.yang.model.util.Uint32;
+import org.opendaylight.yangtools.yang.model.util.Uint64;
+import org.opendaylight.yangtools.yang.model.util.Uint8;
+import org.opendaylight.yangtools.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
 import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
@@ -1397,7 +1397,7 @@ public final class ParserListenerUtils {
                 constraints.addMustDefinition(must);
             } else if (childNode instanceof Mandatory_stmtContext) {
                 for (int j = 0; j < childNode.getChildCount(); j++) {
-                    ParseTree mandatoryTree = ctx.getChild(j);
+                    ParseTree mandatoryTree = childNode.getChild(j);
                     if (mandatoryTree instanceof Mandatory_argContext) {
                         Boolean mandatory = Boolean.valueOf(stringFromNode(mandatoryTree));
                         constraints.setMandatory(mandatory);
index 3164ed8263bced89b4dfe34948e7f3456e34d5a5..5933e96673176a8dea1abdecd00cce6f3361f04e 100644 (file)
@@ -15,7 +15,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
@@ -53,27 +53,27 @@ 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.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
-import org.opendaylight.controller.yang.model.util.BinaryType;
-import org.opendaylight.controller.yang.model.util.BitsType;
-import org.opendaylight.controller.yang.model.util.BooleanType;
-import org.opendaylight.controller.yang.model.util.Decimal64;
-import org.opendaylight.controller.yang.model.util.EmptyType;
-import org.opendaylight.controller.yang.model.util.EnumerationType;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.IdentityrefType;
-import org.opendaylight.controller.yang.model.util.InstanceIdentifier;
-import org.opendaylight.controller.yang.model.util.Int16;
-import org.opendaylight.controller.yang.model.util.Int32;
-import org.opendaylight.controller.yang.model.util.Int64;
-import org.opendaylight.controller.yang.model.util.Int8;
-import org.opendaylight.controller.yang.model.util.Leafref;
-import org.opendaylight.controller.yang.model.util.StringType;
-import org.opendaylight.controller.yang.model.util.Uint16;
-import org.opendaylight.controller.yang.model.util.Uint32;
-import org.opendaylight.controller.yang.model.util.Uint64;
-import org.opendaylight.controller.yang.model.util.Uint8;
-import org.opendaylight.controller.yang.model.util.UnionType;
-import org.opendaylight.controller.yang.model.util.UnknownType;
+import org.opendaylight.yangtools.yang.model.util.BinaryType;
+import org.opendaylight.yangtools.yang.model.util.BitsType;
+import org.opendaylight.yangtools.yang.model.util.BooleanType;
+import org.opendaylight.yangtools.yang.model.util.Decimal64;
+import org.opendaylight.yangtools.yang.model.util.EmptyType;
+import org.opendaylight.yangtools.yang.model.util.EnumerationType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
+import org.opendaylight.yangtools.yang.model.util.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.Int16;
+import org.opendaylight.yangtools.yang.model.util.Int32;
+import org.opendaylight.yangtools.yang.model.util.Int64;
+import org.opendaylight.yangtools.yang.model.util.Int8;
+import org.opendaylight.yangtools.yang.model.util.Leafref;
+import org.opendaylight.yangtools.yang.model.util.StringType;
+import org.opendaylight.yangtools.yang.model.util.Uint16;
+import org.opendaylight.yangtools.yang.model.util.Uint32;
+import org.opendaylight.yangtools.yang.model.util.Uint64;
+import org.opendaylight.yangtools.yang.model.util.Uint8;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
+import org.opendaylight.yangtools.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
index 5432fa6a0d1c26e2aa1a44efd3a653b7ee1ef914..87aa68215abfe699e7de863692d43bbc994bb926 100644 (file)
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
 import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
index bb1d1ed6052796f923b96795466ef032e713f493..8575c4ec2ed797b95093d5d940b55337f5f54b63 100644 (file)
@@ -14,7 +14,7 @@ import java.util.List;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.BaseConstraints;
+import org.opendaylight.yangtools.yang.model.util.BaseConstraints;
 
 /**
  * Holder object for holding YANG type constraints.
index 9b86db341753f61df932bbe3be23a0bc3d6ac002..6f93917a29bd9a3350a7ea69330ac2d1ee457767 100644 (file)
@@ -21,7 +21,7 @@ import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
@@ -32,8 +32,8 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.Leafref;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.Leafref;
 
 import com.google.common.collect.Lists;
 
index cf150d72bdaa06ef65a9612dfa39c7d77ac9ad63..effc312cfc0b050da1a4633c4f7050c76b9f47b8 100644 (file)
@@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 
 public class GroupingTest {
     private Set<Module> modules;
index 00a6b70b3a81a337b6c8b250b993bf462dae1739..ffa64d273338229a274b2c8023e2a881f8394004 100644 (file)
@@ -22,7 +22,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
index 98c05102c5acf9fd6c5b4745665788b1bdbf496f..1520dc514e3fb3fd3cc2091ac9728b468fdc8386 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
@@ -27,12 +27,12 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPai
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
-import org.opendaylight.controller.yang.model.util.BitsType;
-import org.opendaylight.controller.yang.model.util.EnumerationType;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.IdentityrefType;
-import org.opendaylight.controller.yang.model.util.InstanceIdentifier;
-import org.opendaylight.controller.yang.model.util.UnionType;
+import org.opendaylight.yangtools.yang.model.util.BitsType;
+import org.opendaylight.yangtools.yang.model.util.EnumerationType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
+import org.opendaylight.yangtools.yang.model.util.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
 
 public class TypesResolutionTest {
     private Set<Module> testedModules;
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
new file mode 100644 (file)
index 0000000..8a08639
--- /dev/null
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. 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
+ */
+package org.opendaylight.yangtools.yang.parser.impl;
+
+import static org.junit.Assert.*;
+
+import java.io.FileNotFoundException;
+import java.net.URI;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.Status;
+
+public class YangParserSimpleTest {
+
+    private final URI snNS = URI.create("urn:opendaylight:simple-nodes");
+    private Date snRev;
+
+    private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private Set<Module> modules;
+
+    @Before
+    public void init() throws FileNotFoundException, ParseException {
+        snRev = simpleDateFormat.parse("2013-07-30");
+        modules = TestUtils.loadModules(getClass().getResource("/simple-test").getPath());
+    }
+
+    @Test
+    public void testAnyXml() {
+        Module testModule = TestUtils.findModule(modules, "simple-nodes");
+        AnyXmlSchemaNode data = (AnyXmlSchemaNode) testModule.getDataChildByName("data");
+        assertNotNull("'anyxml data not found'", data);
+
+        // test SchemaNode args
+        QName qname = data.getQName();
+        assertEquals("data", qname.getLocalName());
+        assertEquals("sn", qname.getPrefix());
+        assertEquals(snNS, qname.getNamespace());
+        assertEquals(snRev, qname.getRevision());
+        assertEquals("anyxml desc", data.getDescription());
+        assertEquals("data ref", data.getReference());
+        assertEquals(Status.OBSOLETE, data.getStatus());
+        assertEquals(0, data.getUnknownSchemaNodes().size());
+        // test DataSchemaNode args
+        assertFalse(data.isAugmenting());
+        assertFalse(data.isConfiguration());
+        ConstraintDefinition constraints = data.getConstraints();
+        assertEquals("class != 'wheel'", constraints.getWhenCondition().toString());
+        Set<MustDefinition> mustConstraints = constraints.getMustConstraints();
+        assertEquals(2, constraints.getMustConstraints().size());
+
+        String must1 = "\"ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)\"";
+        String errMsg1 = "An ethernet MTU must be 1500";
+        String must2 = "\"ifType != 'atm' or (ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)\"";
+        String errMsg2 = "An atm MTU must be  64 .. 17966";
+
+        boolean found1 = false;
+        boolean found2 = false;
+
+        for (MustDefinition must : mustConstraints) {
+            System.out.println(must);
+            if (must1.equals(must.toString())) {
+                found1 = true;
+                assertEquals(errMsg1, must.getErrorMessage());
+            } else if (must2.equals(must.toString())) {
+                found2 = true;
+                assertEquals(errMsg2, must.getErrorMessage());
+                assertEquals("anyxml data error-app-tag", must.getErrorAppTag());
+                assertEquals("an error occured in data", must.getDescription());
+                assertEquals("data must ref", must.getReference());
+            }
+        }
+        assertTrue(found1);
+        assertTrue(found2);
+
+        assertTrue(constraints.isMandatory());
+        assertNull(constraints.getMinElements());
+        assertNull(constraints.getMaxElements());
+    }
+
+}
index 90d86c9b6b01eecda4accdca09bd1ad1e70d0ab9..c7af385f9999edaa7f1904652fc99c5c5a1f8bb6 100644 (file)
@@ -21,7 +21,7 @@ import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
@@ -47,13 +47,13 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.Decimal64;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.model.util.Int16;
-import org.opendaylight.controller.yang.model.util.Int32;
-import org.opendaylight.controller.yang.model.util.StringType;
-import org.opendaylight.controller.yang.model.util.Uint32;
-import org.opendaylight.controller.yang.model.util.UnionType;
+import org.opendaylight.yangtools.yang.model.util.Decimal64;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.Int16;
+import org.opendaylight.yangtools.yang.model.util.Int32;
+import org.opendaylight.yangtools.yang.model.util.StringType;
+import org.opendaylight.yangtools.yang.model.util.Uint32;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
 
 public class YangParserTest {
 
index 412319b0a8c76d35f639a7fc005fe2acbafef5fd..cb8f1a13e3789be6b954e17d54498ac5c4abde9e 100644 (file)
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.junit.Test;
-import org.opendaylight.controller.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
@@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 
 import com.google.common.collect.Lists;
 
diff --git a/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang b/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
new file mode 100644 (file)
index 0000000..f0dedd4
--- /dev/null
@@ -0,0 +1,40 @@
+module simple-nodes {
+    yang-version 1;
+    namespace "urn:opendaylight:simple-nodes";
+    prefix "sn";
+
+    organization "opendaylight";
+
+    description
+        "test file containing yang data nodes";   
+
+    revision "2013-07-30" {
+        description
+            "Initial revision.";
+        reference "will be defined";
+    }
+
+    // NOTE: simple comment
+
+    anyxml data {
+        config false;
+        description "anyxml desc";
+        if-feature has-name;
+        mandatory true;
+        must "ifType != 'ethernet' or " +
+              "(ifType = 'ethernet' and ifMTU = 1500)" {
+             error-message "An ethernet MTU must be 1500";
+        }
+        must "ifType != 'atm' or " +
+              "(ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)" {
+             error-app-tag "anyxml data error-app-tag";
+             error-message "An atm MTU must be  64 .. 17966";
+             description "an error occured in data";
+             reference "data must ref";
+        }     
+        reference "data ref";
+        status obsolete;
+        when "class != 'wheel'";
+    }
+
+}