From 453db353d783f1d9afb25df719838d51c01099c4 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Tue, 30 Jul 2013 17:55:25 +0200 Subject: [PATCH] Replaced 'controller' with 'yangtools' in all package names. Changed groupId in poms from org.opendaylight.yang to org.opendaylight.yangtools. Added more tests. Signed-off-by: Martin Vitez --- pom.xml | 22 +- yang-binding/pom.xml | 2 +- .../controller/yang/binding/Augmentable.java | 6 - .../controller/yang/binding/Augmentation.java | 5 - .../controller/yang/binding/DataObject.java | 5 - .../yang/binding/InstanceIdentifier.java | 12 - .../yangtools/yang/binding/Augmentable.java | 13 + .../yangtools/yang/binding/Augmentation.java | 12 + .../yang/binding/BaseIdentity.java | 4 +- .../yangtools/yang/binding/DataObject.java | 12 + .../yang/binding/DataRoot.java | 6 +- .../yang/binding/InstanceIdentifier.java | 19 + .../yang/binding/Notification.java | 6 +- .../yang/binding/NotificationListener.java | 8 +- .../yang/binding/RpcService.java | 4 +- .../yang/binding/package-info.java | 2 +- yang-common/pom.xml | 2 +- .../yang/common/QName.java | 2 +- .../yang/common/RpcError.java | 2 +- .../yang/common/RpcResult.java | 2 +- yang-data-api/pom.xml | 2 +- .../yang/data/api/CompositeNode.java | 12 +- .../yang/data/api/ModifyAction.java | 2 +- .../yang/data/api/MutableCompositeNode.java | 2 +- .../yang/data/api/MutableNode.java | 2 +- .../yang/data/api/MutableSimpleNode.java | 2 +- .../yang/data/api/Node.java | 14 +- .../yang/data/api/NodeModification.java | 2 +- .../data/api/NodeModificationBuilder.java | 2 +- .../yang/data/api/SimpleNode.java | 2 +- yang-data-impl/pom.xml | 2 +- .../yang/data/impl/AbstractNodeTO.java | 32 +- .../impl/CompositeNodeModificationTOImpl.java | 12 +- .../yang/data/impl/CompositeNodeTOImpl.java | 34 +- .../yang/data/impl/LazyNodeToNodeMap.java | 48 +- .../data/impl/MutableCompositeNodeTOImpl.java | 26 +- .../data/impl/MutableSimpleNodeTOImpl.java | 24 +- .../yang/data/impl/NodeFactory.java | 108 ++-- .../impl/NodeModificationBuilderImpl.java | 18 +- .../yang/data/impl/NodeUtils.java | 14 +- .../impl/SimpleNodeModificationTOImpl.java | 12 +- .../yang/data/impl/SimpleNodeTOImpl.java | 22 +- .../impl/IgnoreWhiteCharsDiffListener.java | 2 +- .../yang/data/impl/LazyNodeToNodeMapTest.java | 31 +- .../yang/data/impl/MemoryConsumption.java | 2 +- .../yang/data/impl/MyNodeBuilder.java | 40 +- .../yang/data/impl/NodeFactoryTest.java | 72 +-- .../yang/data/impl/NodeHelper.java | 8 +- .../impl/NodeModificationBuilderImplTest.java | 14 +- .../yang/data/impl/NodeUtilsTest.java | 10 +- .../src/test/resources/MyXmlGenerator.groovy | 2 +- .../yang/data/impl/config02-shadow.xml | 0 .../yang/data/impl/config02.groovy | 0 .../yang/data/impl/config02g-shadow.xml | 0 .../yang/data/impl/mutableNodesConfig.xml | 0 yang-data-util/pom.xml | 2 +- .../yang/data/util/AbstractContainerNode.java | 10 +- .../yang/data/util/AbstractNode.java | 12 +- .../yang/data/util/Nodes.java | 15 +- yang-ext/pom.xml | 6 +- yang-maven-plugin-it/pom.xml | 2 +- .../plugin/it/YangToSourcesPluginTestIT.java | 2 +- .../test/resources/AdditionalConfig/pom.xml | 12 +- .../src/test/resources/Correct/pom.xml | 10 +- .../src/test/resources/GenerateTest1/pom.xml | 8 +- .../src/test/resources/GenerateTest2/pom.xml | 10 +- .../src/test/resources/Generator/pom.xml | 8 +- .../test/resources/MissingYangInDep/pom.xml | 10 +- .../src/test/resources/NoGenerators/pom.xml | 8 +- .../src/test/resources/NoOutputDir/pom.xml | 8 +- .../src/test/resources/NoYangFiles/pom.xml | 8 +- .../test/resources/UnknownGenerator/pom.xml | 8 +- .../test/resources/YangRootNotExist/pom.xml | 6 +- yang-maven-plugin-spi/pom.xml | 4 +- .../yang2sources/spi/CodeGenerator.java | 2 +- .../spi/CodeGeneratorTestImpl.java | 2 +- yang-maven-plugin/pom.xml | 2 +- .../yang2sources/plugin/ConfigArg.java | 2 +- .../yang2sources/plugin/Util.java | 2 +- .../plugin/YangToSourcesMojo.java | 5 +- .../plugin/YangToSourcesProcessor.java | 10 +- .../plugin/GenerateSourcesTest.java | 8 +- .../yang2sources/plugin/UtilTest.java | 2 +- yang-model-api/pom.xml | 2 +- .../yangtools/yang/model/api/ChoiceNode.java | 4 +- .../yang/model/api/DataNodeContainer.java | 2 +- .../yang/model/api/ListSchemaNode.java | 2 +- .../yangtools/yang/model/api/SchemaNode.java | 2 +- .../yangtools/yang/model/api/SchemaPath.java | 2 +- .../yang/model/api/UnknownSchemaNode.java | 2 +- .../api/type/IdentityTypeDefinition.java | 2 +- .../api/type/IdentityrefTypeDefinition.java | 2 +- yang-model-util/pom.xml | 2 +- .../yang/model/util/SchemaContextUtil.java | 255 -------- .../model/util/AbstractSignedInteger.java | 4 +- .../model/util/AbstractUnsignedInteger.java | 4 +- .../yang/model/util/BaseConstraints.java | 2 +- .../yang/model/util/BaseTypes.java | 4 +- .../yang/model/util/BinaryType.java | 4 +- .../yang/model/util/BitsType.java | 4 +- .../yang/model/util/BooleanType.java | 4 +- .../yang/model/util/DataNodeIterator.java | 2 +- .../yang/model/util/Decimal64.java | 4 +- .../yang/model/util/EmptyType.java | 4 +- .../yang/model/util/EnumerationType.java | 4 +- .../yang/model/util/ExtendedType.java | 4 +- .../yang/model/util/IdentityrefType.java | 4 +- .../yang/model/util/InstanceIdentifier.java | 4 +- .../yang/model/util/Int16.java | 4 +- .../yang/model/util/Int32.java | 4 +- .../yang/model/util/Int64.java | 4 +- .../yang/model/util/Int8.java | 4 +- .../yang/model/util/Leafref.java | 4 +- .../model/util/RevisionAwareXPathImpl.java | 2 +- .../yang/model/util/SchemaContextUtil.java | 547 ++++++++++++++++++ .../yang/model/util/StringType.java | 4 +- .../yang/model/util/Uint16.java | 4 +- .../yang/model/util/Uint32.java | 4 +- .../yang/model/util/Uint64.java | 4 +- .../yang/model/util/Uint8.java | 4 +- .../yang/model/util/UnionType.java | 4 +- .../yang/model/util/UnknownType.java | 4 +- .../yang/model/util/YangTypesConverter.java | 4 +- yang-parser-api/pom.xml | 2 +- yang-parser-impl/pom.xml | 2 +- .../api/AbstractDataNodeContainerBuilder.java | 2 +- .../api/AbstractSchemaNodeBuilder.java | 2 +- .../builder/api/AbstractTypeAwareBuilder.java | 2 +- .../builder/api/DataNodeContainerBuilder.java | 2 +- .../parser/builder/api/SchemaNodeBuilder.java | 2 +- .../parser/builder/api/TypeAwareBuilder.java | 2 +- .../parser/builder/impl/AnyXmlBuilder.java | 2 +- .../impl/AugmentationSchemaBuilderImpl.java | 4 +- .../parser/builder/impl/ChoiceBuilder.java | 2 +- .../builder/impl/ChoiceCaseBuilder.java | 2 +- .../builder/impl/ConstraintsBuilder.java | 2 +- .../impl/ContainerSchemaNodeBuilder.java | 2 +- .../parser/builder/impl/ExtensionBuilder.java | 2 +- .../parser/builder/impl/FeatureBuilder.java | 2 +- .../builder/impl/GroupingBuilderImpl.java | 2 +- .../impl/IdentitySchemaNodeBuilder.java | 2 +- .../builder/impl/IdentityrefTypeBuilder.java | 4 +- .../impl/LeafListSchemaNodeBuilder.java | 2 +- .../builder/impl/LeafSchemaNodeBuilder.java | 2 +- .../builder/impl/ListSchemaNodeBuilder.java | 2 +- .../parser/builder/impl/ModuleBuilder.java | 2 +- .../builder/impl/NotificationBuilder.java | 2 +- .../builder/impl/RpcDefinitionBuilder.java | 2 +- .../impl/TypeDefinitionBuilderImpl.java | 6 +- .../parser/builder/impl/UnionTypeBuilder.java | 2 +- .../impl/UnknownSchemaNodeBuilder.java | 2 +- .../yang/parser/impl/YangParserImpl.java | 8 +- .../parser/impl/YangParserListenerImpl.java | 4 +- .../yangtools/yang/parser/util/BitImpl.java | 2 +- .../yang/parser/util/Comparators.java | 2 +- .../yang/parser/util/ParserListenerUtils.java | 44 +- .../yang/parser/util/ParserUtils.java | 44 +- .../yang/parser/util/RefineUtils.java | 2 +- .../yang/parser/util/TypeConstraints.java | 2 +- .../yang/parser/impl/AugmentTest.java | 6 +- .../yang/parser/impl/GroupingTest.java | 2 +- .../yangtools/yang/parser/impl/TestUtils.java | 2 +- .../yang/parser/impl/TypesResolutionTest.java | 14 +- .../parser/impl/YangParserSimpleTest.java | 96 +++ .../yang/parser/impl/YangParserTest.java | 16 +- .../impl/YangParserWithContextTest.java | 4 +- .../resources/simple-test/simple-nodes.yang | 40 ++ 167 files changed, 1319 insertions(+), 868 deletions(-) delete mode 100644 yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentable.java delete mode 100644 yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentation.java delete mode 100644 yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java delete mode 100644 yang-binding/src/main/java/org/opendaylight/controller/yang/binding/InstanceIdentifier.java create mode 100644 yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java create mode 100644 yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/BaseIdentity.java (87%) create mode 100644 yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/DataRoot.java (80%) create mode 100644 yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/Notification.java (84%) rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/NotificationListener.java (84%) rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/RpcService.java (85%) rename yang-binding/src/main/java/org/opendaylight/{controller => yangtools}/yang/binding/package-info.java (84%) rename yang-common/src/main/java/org/opendaylight/{controller => yangtools}/yang/common/QName.java (96%) rename yang-common/src/main/java/org/opendaylight/{controller => yangtools}/yang/common/RpcError.java (90%) rename yang-common/src/main/java/org/opendaylight/{controller => yangtools}/yang/common/RpcResult.java (87%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/CompositeNode.java (87%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/ModifyAction.java (85%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/MutableCompositeNode.java (88%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/MutableNode.java (90%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/MutableSimpleNode.java (88%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/Node.java (83%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/NodeModification.java (86%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/NodeModificationBuilder.java (92%) rename yang-data-api/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/api/SimpleNode.java (92%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/AbstractNodeTO.java (86%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/CompositeNodeModificationTOImpl.java (70%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/CompositeNodeTOImpl.java (84%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/LazyNodeToNodeMap.java (83%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/MutableCompositeNodeTOImpl.java (78%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/MutableSimpleNodeTOImpl.java (74%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeFactory.java (82%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeModificationBuilderImpl.java (87%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeUtils.java (92%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/SimpleNodeModificationTOImpl.java (71%) rename yang-data-impl/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/impl/SimpleNodeTOImpl.java (72%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/IgnoreWhiteCharsDiffListener.java (96%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/LazyNodeToNodeMapTest.java (83%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/MemoryConsumption.java (96%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/MyNodeBuilder.java (89%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeFactoryTest.java (83%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeHelper.java (96%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeModificationBuilderImplTest.java (93%) rename yang-data-impl/src/test/java/org/opendaylight/{controller => yangtools}/yang/data/impl/NodeUtilsTest.java (92%) rename yang-data-impl/src/test/resources/org/opendaylight/{controller => yangtools}/yang/data/impl/config02-shadow.xml (100%) rename yang-data-impl/src/test/resources/org/opendaylight/{controller => yangtools}/yang/data/impl/config02.groovy (100%) rename yang-data-impl/src/test/resources/org/opendaylight/{controller => yangtools}/yang/data/impl/config02g-shadow.xml (100%) rename yang-data-impl/src/test/resources/org/opendaylight/{controller => yangtools}/yang/data/impl/mutableNodesConfig.xml (100%) rename yang-data-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/util/AbstractContainerNode.java (92%) rename yang-data-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/util/AbstractNode.java (76%) rename yang-data-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/data/util/Nodes.java (85%) rename yang-maven-plugin-it/src/test/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/it/YangToSourcesPluginTestIT.java (99%) rename yang-maven-plugin-spi/src/main/java/org/opendaylight/{controller => yangtools}/yang2sources/spi/CodeGenerator.java (97%) rename yang-maven-plugin-spi/src/test/java/org/opendaylight/{controller => yangtools}/yang2sources/spi/CodeGeneratorTestImpl.java (97%) rename yang-maven-plugin/src/main/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/ConfigArg.java (98%) rename yang-maven-plugin/src/main/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/Util.java (99%) rename yang-maven-plugin/src/main/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/YangToSourcesMojo.java (95%) rename yang-maven-plugin/src/main/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/YangToSourcesProcessor.java (96%) rename yang-maven-plugin/src/test/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/GenerateSourcesTest.java (92%) rename yang-maven-plugin/src/test/java/org/opendaylight/{controller => yangtools}/yang2sources/plugin/UtilTest.java (93%) delete mode 100644 yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/AbstractSignedInteger.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/AbstractUnsignedInteger.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/BaseConstraints.java (99%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/BaseTypes.java (92%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/BinaryType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/BitsType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/BooleanType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/DataNodeIterator.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Decimal64.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/EmptyType.java (94%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/EnumerationType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/ExtendedType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/IdentityrefType.java (92%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/InstanceIdentifier.java (97%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Int16.java (95%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Int32.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Int64.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Int8.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Leafref.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/RevisionAwareXPathImpl.java (97%) create mode 100644 yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/StringType.java (98%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Uint16.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Uint32.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Uint64.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/Uint8.java (96%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/UnionType.java (97%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/UnknownType.java (99%) rename yang-model-util/src/main/java/org/opendaylight/{controller => yangtools}/yang/model/util/YangTypesConverter.java (94%) create mode 100644 yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java create mode 100644 yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang diff --git a/pom.xml b/pom.xml index 73998a9703..aa3b8cd87d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 yangtools - org.opendaylight.yang + org.opendaylight.yangtools 0.5.4-SNAPSHOT pom @@ -32,53 +32,53 @@ - org.opendaylight.yang + org.opendaylight.yangtools yang-common ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-data-api ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-data-util ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-model-api ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-model-util ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-binding ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-parser-api ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-parser-impl ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-maven-plugin ${project.version} - org.opendaylight.yang + org.opendaylight.yangtools yang-maven-plugin-spi ${project.version} diff --git a/yang-binding/pom.xml b/yang-binding/pom.xml index a1fb6e3cec..fe684de944 100644 --- a/yang-binding/pom.xml +++ b/yang-binding/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT 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 index 297e5bc56e..0000000000 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentable.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.opendaylight.controller.yang.binding; - -public interface Augmentable { - - > E getAugmentation(Class 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 index 42574c9785..0000000000 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Augmentation.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opendaylight.controller.yang.binding; - -public interface Augmentation { - -} 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 index 02a013ee19..0000000000 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java +++ /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 index 7d13655099..0000000000 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/InstanceIdentifier.java +++ /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 { - -} 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 index 0000000000..c7e109dc0f --- /dev/null +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java @@ -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 { + + > E getAugmentation(Class 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 index 0000000000..65ca94cf7e --- /dev/null +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java @@ -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 { + +} diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/BaseIdentity.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java 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 004287aebc..94c03117d0 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/BaseIdentity.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java @@ -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 index 0000000000..31d547ffb2 --- /dev/null +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java @@ -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 { + +} diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataRoot.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java 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 2f194b2bbe..81d19657c8 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataRoot.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java @@ -5,12 +5,8 @@ * terms of the 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 interface DataRoot { } 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 index 0000000000..42cc11a554 --- /dev/null +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java @@ -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 { + +} diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Notification.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java 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 ae568baa43..d551b44b3d 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/Notification.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java @@ -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.binding; +package org.opendaylight.yangtools.yang.binding; /** * Marker interface for YANG-defined notifications - * - * + * + * */ public interface Notification extends DataObject { diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/NotificationListener.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java 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 a60d2f34f9..8c87adb578 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/NotificationListener.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.yang.binding; +package org.opendaylight.yangtools.yang.binding; /** * Marker interface for generated notification listener interfaces - * - * - * + * + * + * */ public interface NotificationListener { diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/RpcService.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java 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 20f7e78aec..6e6a46d0ee 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/RpcService.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java @@ -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.binding; +package org.opendaylight.yangtools.yang.binding; /** * Marker interface for tagging generated YANG Modules - * + * */ public interface RpcService { diff --git a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/package-info.java b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java 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 5ed5649c78..ace08d625e 100644 --- a/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/package-info.java +++ b/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java @@ -5,4 +5,4 @@ * terms of the 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; \ No newline at end of file +package org.opendaylight.yangtools.yang.binding; \ No newline at end of file diff --git a/yang-common/pom.xml b/yang-common/pom.xml index d30e71be23..9e3494d413 100644 --- a/yang-common/pom.xml +++ b/yang-common/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-common/src/main/java/org/opendaylight/controller/yang/common/QName.java b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java 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 004a2a4952..0d17c76eb9 100644 --- a/yang-common/src/main/java/org/opendaylight/controller/yang/common/QName.java +++ b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -5,7 +5,7 @@ * terms of the 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.common; +package org.opendaylight.yangtools.yang.common; import java.net.URI; import java.net.URISyntaxException; diff --git a/yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcError.java b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java 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 cb819297a0..8b6ef47beb 100644 --- a/yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcError.java +++ b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java @@ -5,7 +5,7 @@ * terms of the 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.common; +package org.opendaylight.yangtools.yang.common; //import org.opendaylight.controller.yang.model.api.RevisionAwareXPath; diff --git a/yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcResult.java b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java 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 d754cb710b..b04cc31179 100644 --- a/yang-common/src/main/java/org/opendaylight/controller/yang/common/RpcResult.java +++ b/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java @@ -5,7 +5,7 @@ * terms of the 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.common; +package org.opendaylight.yangtools.yang.common; import java.util.Collection; diff --git a/yang-data-api/pom.xml b/yang-data-api/pom.xml index 7dafc26d1d..297ccca43d 100644 --- a/yang-data-api/pom.xml +++ b/yang-data-api/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/CompositeNode.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java 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 e8ef406764..9800da60e8 100644 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/CompositeNode.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java @@ -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.data.api; +package org.opendaylight.yangtools.yang.data.api; import java.util.List; -import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QName; /** * Composite node represents a branch in the data tree, which could contain @@ -17,7 +17,7 @@ import org.opendaylight.controller.yang.common.QName; * is element which does not text data directly (CDATA or PCDATA), only other * nodes. The composite node is the manifestation of the following data schema * constructs in the YANG: - * + * *
    *
  • container - the composite node represents the YANG container and * could contain all children schema nodes of that container
    • @@ -26,8 +26,8 @@ import org.opendaylight.controller.yang.common.QName; * item. *
  • anyxml
    • *
- * - * + * + * */ public interface CompositeNode extends Node>>, NodeModification { @@ -46,7 +46,7 @@ public interface CompositeNode extends Node>>, NodeModification { SimpleNode getFirstSimpleByName(QName leaf); /** - * @return cast self to mutable, if possible + * @return cast self to mutable, if possible */ MutableCompositeNode asMutable(); } diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/ModifyAction.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java 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 fa17043387..1ae847200c 100644 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/ModifyAction.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; public enum ModifyAction { MERGE, REPLACE, CREATE, DELETE, REMOVE diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableCompositeNode.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java 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 4f11adbc17..f9f5a030aa 100755 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableCompositeNode.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; import java.util.List; diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableNode.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java 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 3eddbe5bec..5ee3486170 100755 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableNode.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; /** diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableSimpleNode.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java 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 ad25f8f380..9341f293ee 100755 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/MutableSimpleNode.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; /** diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/Node.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java 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 f107dd8964..bf32dfe9bd 100644 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/Node.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java @@ -5,29 +5,29 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; -import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QName; /** * Base representation of node in the data tree, defines basic parameters of * node such as a QName. - * - * + * + * * @param */ public interface Node { /** * Returns the name of the Node - * + * * @return qName of node */ QName getNodeType(); /** * Returns parent node - * + * * @return parent node */ CompositeNode getParent(); @@ -35,7 +35,7 @@ public interface Node { /** * Returns the value that holds current node, if no value is defined method * can return null - * + * * @return Returns the value that holds current node. */ T getValue(); diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModification.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java 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 c6b64f3add..0dc5d6ac03 100755 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModification.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; /** * @author michal.rehak diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModificationBuilder.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java 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 4e4af9bae5..13ad7a953c 100755 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/NodeModificationBuilder.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; /** diff --git a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/SimpleNode.java b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java 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 3f75da5203..b1a3cc4919 100644 --- a/yang-data-api/src/main/java/org/opendaylight/controller/yang/data/api/SimpleNode.java +++ b/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java @@ -5,7 +5,7 @@ * terms of the 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.api; +package org.opendaylight.yangtools.yang.data.api; /** * Simple node represents a leaf in the data tree, which does not contain any diff --git a/yang-data-impl/pom.xml b/yang-data-impl/pom.xml index eb5a12c147..e3e59f46ba 100644 --- a/yang-data-impl/pom.xml +++ b/yang-data-impl/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/AbstractNodeTO.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java 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 3385700c46..679530e90a 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/AbstractNodeTO.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java @@ -5,19 +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.impl; +package org.opendaylight.yangtools.yang.data.impl; -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.controller.yang.data.api.NodeModification; +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; +import org.opendaylight.yangtools.yang.data.api.NodeModification; /** * @author michal.rehak * @param * type of node value - * + * */ public abstract class AbstractNodeTO implements Node, NodeModification { @@ -25,7 +25,7 @@ public abstract class AbstractNodeTO implements Node, NodeModification { private CompositeNode parent; private T value; private ModifyAction modifyAction; - + /** * @param qname * @param parent @@ -36,12 +36,12 @@ public abstract class AbstractNodeTO implements Node, NodeModification { this.parent = parent; this.value = value; } - + /** * @param qname * @param parent * @param value - * @param modifyAction + * @param modifyAction */ public AbstractNodeTO(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) { this.qName = qname; @@ -66,14 +66,14 @@ public abstract class AbstractNodeTO implements Node, NodeModification { public CompositeNode getParent() { return parent; } - + /** * @param parent the parent to set */ public void setParent(CompositeNode parent) { this.parent = parent; } - + /** * @param value the value to set */ @@ -102,11 +102,11 @@ public abstract class AbstractNodeTO implements Node, NodeModification { protected void setModificationAction(ModifyAction modifyAction) { this.modifyAction = modifyAction; } - + @Override public String toString() { StringBuffer out = new StringBuffer(); - out.append(String.format("Node[%s], qName[%s], modify[%s]", + out.append(String.format("Node[%s], qName[%s], modify[%s]", getClass().getSimpleName(), getQName().getLocalName(), getModificationAction() == null ? "n/a" : getModificationAction())); return out.toString(); @@ -142,7 +142,7 @@ public abstract class AbstractNodeTO implements Node, NodeModification { return false; } else if (other.parent == null) { return false; - } + } if (qName == null) { if (other.qName != null) return false; @@ -156,5 +156,5 @@ public abstract class AbstractNodeTO implements Node, NodeModification { return true; } /* */ - + } diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeModificationTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java 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 44c8c852f5..9a609a5983 100755 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeModificationTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java @@ -5,18 +5,18 @@ * terms of the 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 java.util.List; -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; /** * @author michal.rehak - * + * */ public class CompositeNodeModificationTOImpl extends CompositeNodeTOImpl { diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java 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 605b99c296..1fdf28e12a 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/CompositeNodeTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java @@ -5,22 +5,22 @@ * terms of the 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 java.util.ArrayList; 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.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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; /** * @author michal.rehak - * + * */ public class CompositeNodeTOImpl extends AbstractNodeTO>> implements CompositeNode { @@ -45,14 +45,14 @@ public class CompositeNodeTOImpl extends AbstractNodeTO>> * @param qname * @param parent use null to create top composite node (without parent) * @param value - * @param modifyAction + * @param modifyAction */ public CompositeNodeTOImpl(QName qname, CompositeNode parent, List> value, ModifyAction modifyAction) { super(qname, parent, value, modifyAction); init(); } - + /** * @return the nodeMap @@ -60,7 +60,7 @@ public class CompositeNodeTOImpl extends AbstractNodeTO>> protected Map>> getNodeMap() { return nodeMap; } - + @Override public List> getChildren() { return getValue(); @@ -122,7 +122,7 @@ public class CompositeNodeTOImpl extends AbstractNodeTO>> public List getCompositesByName(String children) { return getCompositesByName(new QName(getNodeType(), children)); } - + @Override public List> getSimpleNodesByName(String children) { return getSimpleNodesByName(new QName(getNodeType(), children)); @@ -136,18 +136,18 @@ public class CompositeNodeTOImpl extends AbstractNodeTO>> nodeMap = NodeUtils.buildNodeMap(getValue()); } } - + @Override public MutableCompositeNode asMutable() { throw new IllegalAccessError("cast to mutable is not supported - "+getClass().getSimpleName()); } - + @Override public String toString() { - return super.toString() + ", children.size = " + return super.toString() + ", children.size = " + (getChildren() != null ? getChildren().size() : "n/a"); } - - + + } diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMap.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java 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 81dd86e7e8..d46fdad8f9 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMap.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java @@ -5,7 +5,7 @@ * terms of the 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 java.util.ArrayList; import java.util.HashMap; @@ -13,24 +13,24 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import org.opendaylight.controller.yang.data.api.CompositeNode; -import org.opendaylight.controller.yang.data.api.MutableCompositeNode; -import org.opendaylight.controller.yang.data.api.MutableNode; -import org.opendaylight.controller.yang.data.api.MutableSimpleNode; -import org.opendaylight.controller.yang.data.api.Node; -import org.opendaylight.controller.yang.data.api.NodeModification; -import org.opendaylight.controller.yang.data.api.SimpleNode; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.MutableNode; +import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.NodeModification; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; /** * @author michal.rehak * */ public class LazyNodeToNodeMap { - + private Map, Node> node2node = new HashMap<>(); private CompositeNode originalRoot; private MutableCompositeNode mutableRoot; - + /** * @param originalNode * @return mutable twin @@ -41,15 +41,15 @@ public class LazyNodeToNodeMap { addPathMembers(originalNode); mutableNode = node2node.get(originalNode); } - + return mutableNode; } - + /** * @param originalNode */ private void addPathMembers(Node originalNode) { - Stack> jobQueue = new Stack<>(); + Stack> jobQueue = new Stack<>(); jobQueue.push(originalNode); while (!jobQueue.isEmpty()) { Node node2add = jobQueue.pop(); @@ -60,14 +60,14 @@ public class LazyNodeToNodeMap { } fixChildrenRefOnly = true; } - + CompositeNode nextParent = node2add.getParent(); MutableNode mutableEquivalent = null; - + if (node2add instanceof SimpleNode) { SimpleNode node2addSimple = (SimpleNode) node2add; MutableSimpleNode nodeMutant = NodeFactory.createMutableSimpleNode( - node2add.getNodeType(), null, node2addSimple.getValue(), + node2add.getNodeType(), null, node2addSimple.getValue(), node2addSimple.getModificationAction(), node2addSimple); mutableEquivalent = nodeMutant; } else if (node2add instanceof CompositeNode) { @@ -76,11 +76,11 @@ public class LazyNodeToNodeMap { nodeMutant = (MutableCompositeNode) node2node.get(node2add); } else { CompositeNode node2addComposite = (CompositeNode) node2add; - nodeMutant = NodeFactory.createMutableCompositeNode(node2add.getNodeType(), - null, null, + nodeMutant = NodeFactory.createMutableCompositeNode(node2add.getNodeType(), + null, null, ((NodeModification) node2add).getModificationAction(), node2addComposite); } - + mutableEquivalent = nodeMutant; // tidy up children @@ -91,7 +91,7 @@ public class LazyNodeToNodeMap { MutableNode mutableChild = (MutableNode) node2node.get(originalChildNode); fixChildrenRef(nodeMutant, mutableChild); } - + if (nodeMutant.getChildren() != null && !nodeMutant.getChildren().isEmpty()) { nodeMutant.init(); } @@ -109,12 +109,12 @@ public class LazyNodeToNodeMap { } } } - + // feed jobQueue node2node.put(node2add, mutableEquivalent); if (nextParent != null) { jobQueue.push(nextParent); - } + } } } @@ -146,9 +146,9 @@ public class LazyNodeToNodeMap { public MutableCompositeNode getMutableRoot() { return mutableRoot; } - + /** - * @return set of original nodes, registered in map as keys + * @return set of original nodes, registered in map as keys */ public Set> getKeyNodes() { return node2node.keySet(); diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableCompositeNodeTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java 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 c29ecc4a0c..75c98715c9 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableCompositeNodeTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java @@ -5,20 +5,20 @@ * terms of the 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 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.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.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.Node; /** * @author michal.rehak - * + * */ public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl implements MutableCompositeNode { @@ -36,7 +36,7 @@ public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl List> value, ModifyAction modifyAction) { super(qname, parent, value, modifyAction); } - + /** * update nodeMap */ @@ -51,27 +51,27 @@ public class MutableCompositeNodeTOImpl extends CompositeNodeTOImpl public void setValue(List> value) { super.setValue(value); } - + @Override public void setModifyAction(ModifyAction action) { super.setModificationAction(action); } - + @Override protected Map>> getNodeMap() { return nodeMap; } - + @Override public MutableCompositeNode asMutable() { return this; } - + @Override public CompositeNode getOriginal() { return original; } - + /** * @param original the original to set */ diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableSimpleNodeTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java 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 a3b73b1c64..62f45beea1 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/MutableSimpleNodeTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java @@ -5,20 +5,20 @@ * terms of the 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.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.MutableSimpleNode; -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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; /** * @author michal.rehak * @param type of simple node value - * + * */ -public class MutableSimpleNodeTOImpl extends SimpleNodeTOImpl +public class MutableSimpleNodeTOImpl extends SimpleNodeTOImpl implements MutableSimpleNode { private SimpleNode original; @@ -38,22 +38,22 @@ public class MutableSimpleNodeTOImpl extends SimpleNodeTOImpl public void setValue(T value) { super.setValue(value); } - + @Override public void setModifyAction(ModifyAction action) { super.setModificationAction(action); } - + @Override public MutableSimpleNode asMutable() { return this; } - + @Override public SimpleNode getOriginal() { return original; } - + /** * @param original the original to set */ diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeFactory.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java 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 8e6e77498b..5e94457762 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeFactory.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java @@ -5,7 +5,7 @@ * terms of the 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 java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; @@ -15,18 +15,18 @@ import java.util.List; import java.util.Map; import java.util.Stack; -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.NodeModification; -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.ModifyAction; +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.NodeModification; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; /** * @author michal.rehak - * + * */ public abstract class NodeFactory { @@ -40,24 +40,24 @@ public abstract class NodeFactory { CompositeNode parent, T value) { return createImmutableSimpleNode(qName, parent, value, null); } - + /** * @param qName * @param parent * @param value - * @param modifyAction + * @param modifyAction * @param original originating node, if available * @return simple node modification, based on given qname, value and parent */ public static MutableSimpleNode createMutableSimpleNode(QName qName, CompositeNode parent, Object value, ModifyAction modifyAction, SimpleNode original) { @SuppressWarnings("unchecked") - MutableSimpleNodeTOImpl simpleNodeTOImpl = + MutableSimpleNodeTOImpl simpleNodeTOImpl = new MutableSimpleNodeTOImpl(qName, parent, (T) value, modifyAction); simpleNodeTOImpl.setOriginal(original); return simpleNodeTOImpl; } - + /** * @param qName * @param parent @@ -68,12 +68,12 @@ public abstract class NodeFactory { CompositeNode parent, List> value) { return createImmutableCompositeNode(qName, parent, value, null); } - + /** * @param qName * @param parent - * @param valueArg - * @param modifyAction + * @param valueArg + * @param modifyAction * @param original originating node, if available * @return composite node modification, based on given qName, value (children), parent and modifyAction */ @@ -83,13 +83,13 @@ public abstract class NodeFactory { if (value == null) { value = new ArrayList<>(); } - MutableCompositeNodeTOImpl compositeNodeTOImpl = + MutableCompositeNodeTOImpl compositeNodeTOImpl = new MutableCompositeNodeTOImpl(qName, parent, value, modifyAction); compositeNodeTOImpl.setOriginal(original); return compositeNodeTOImpl; } - - + + /** * @param qName * @param parent @@ -99,7 +99,7 @@ public abstract class NodeFactory { */ public static SimpleNode createImmutableSimpleNode(QName qName, CompositeNode parent, T value, ModifyAction modifyAction) { - SimpleNodeTOImpl simpleNodeModTOImpl = + SimpleNodeTOImpl simpleNodeModTOImpl = new SimpleNodeTOImpl(qName, parent, value, modifyAction); return simpleNodeModTOImpl; } @@ -108,43 +108,43 @@ public abstract class NodeFactory { * @param qName * @param parent * @param value - * @param modifyAction + * @param modifyAction * @return composite node modification, based on given qname, value (children), parent and modifyAction */ public static CompositeNode createImmutableCompositeNode(QName qName, CompositeNode parent, List> value, ModifyAction modifyAction) { - CompositeNodeTOImpl compositeNodeModTOImpl = + CompositeNodeTOImpl compositeNodeModTOImpl = new CompositeNodeTOImpl(qName, parent, value, modifyAction); return compositeNodeModTOImpl; } /** * @param node - * @return copy of given node, parent and value are the same, but parent - * has no reference to this copy + * @return copy of given node, parent and value are the same, but parent + * has no reference to this copy */ public static SimpleNode copyNode(SimpleNode node) { SimpleNode twinNode = createImmutableSimpleNode( node.getNodeType(), node.getParent(), node.getValue()); return twinNode; } - + /** * @param node - * @return copy of given node, parent and value are the same, but parent - * has no reference to this copy + * @return copy of given node, parent and value are the same, but parent + * has no reference to this copy */ public static MutableSimpleNode copyNodeAsMutable(SimpleNode node) { MutableSimpleNode twinNode = createMutableSimpleNode( - node.getNodeType(), node.getParent(), node.getValue(), + node.getNodeType(), node.getParent(), node.getValue(), node.getModificationAction(), null); return twinNode; } - + /** * @param node - * @param children - * @return copy of given node, parent and children are the same, but parent and children + * @param children + * @return copy of given node, parent and children are the same, but parent and children * have no reference to this copy */ public static CompositeNode copyNode(CompositeNode node, Node... children) { @@ -152,31 +152,31 @@ public abstract class NodeFactory { node.getNodeType(), node.getParent(), Arrays.asList(children), node.getModificationAction()); return twinNode; } - + /** * @param node - * @return copy of given node, parent and children are the same, but parent and children + * @return copy of given node, parent and children are the same, but parent and children * have no reference to this copy */ public static CompositeNode copyNode(CompositeNode node) { return copyNode(node, node.getChildren().toArray(new Node[0])); } - + /** * @param node root of original tree - * @param originalToCopyArg (optional) empty map, where binding between original and copy + * @param originalToCopyArg (optional) empty map, where binding between original and copy * will be stored * @return copy of given node and all subnodes recursively */ - public static MutableCompositeNode copyDeepAsMutable(CompositeNode node, + public static MutableCompositeNode copyDeepAsMutable(CompositeNode node, Map, Node> originalToCopyArg) { - + Map, Node> originalToCopy = originalToCopyArg; if (originalToCopy == null) { originalToCopy = new HashMap<>(); } - MutableCompositeNode mutableRoot = createMutableCompositeNode(node.getNodeType(), null, null, + MutableCompositeNode mutableRoot = createMutableCompositeNode(node.getNodeType(), null, null, node.getModificationAction(), null); Stack> jobQueue = new Stack<>(); jobQueue.push(new SimpleEntry(node, mutableRoot)); @@ -191,16 +191,16 @@ public abstract class NodeFactory { for (Node child : originalNode.getChildren()) { Node mutableAscendant = null; if (child instanceof CompositeNode) { - MutableCompositeNode newMutable = - createMutableCompositeNode(child.getNodeType(), mutableNode, null, + MutableCompositeNode newMutable = + createMutableCompositeNode(child.getNodeType(), mutableNode, null, ((NodeModification) child).getModificationAction(), null); jobQueue.push(new SimpleEntry( (CompositeNode) child, newMutable)); mutableAscendant = newMutable; } else if (child instanceof SimpleNode) { - mutableAscendant = - createMutableSimpleNode(child.getNodeType(), mutableNode, - child.getValue(), + mutableAscendant = + createMutableSimpleNode(child.getNodeType(), mutableNode, + child.getValue(), ((NodeModification) child).getModificationAction(), null); } else { throw new IllegalStateException("Node class deep copy not supported: " @@ -215,30 +215,30 @@ public abstract class NodeFactory { return mutableRoot; } - + /** * @param node root of original tree - * @param originalToCopyArg (optional) empty map, where binding between original and copy + * @param originalToCopyArg (optional) empty map, where binding between original and copy * will be stored * @return copy of given node and all subnodes recursively */ - public static CompositeNode copyDeepAsImmutable(CompositeNode node, + public static CompositeNode copyDeepAsImmutable(CompositeNode node, Map, Node> originalToCopyArg) { Stack jobQueue = new Stack<>(); jobQueue.push(node); - + Map, Node> originalToCopy = originalToCopyArg; if (originalToCopy == null) { originalToCopy = new HashMap<>(); } - + while (!jobQueue.isEmpty()) { CompositeNode jobNode = jobQueue.peek(); - if (!originalToCopy.isEmpty() + if (!originalToCopy.isEmpty() && originalToCopy.keySet().containsAll(jobNode.getChildren())) { jobQueue.pop(); List> newChildren = NodeUtils.collectMapValues(jobNode.getChildren(), originalToCopy); - CompositeNode nodeCopy = createImmutableCompositeNode(jobNode.getNodeType(), null, + CompositeNode nodeCopy = createImmutableCompositeNode(jobNode.getNodeType(), null, newChildren, jobNode.getModificationAction()); NodeUtils.fixChildrenRelation(nodeCopy); originalToCopy.put(jobNode, nodeCopy); @@ -246,7 +246,7 @@ public abstract class NodeFactory { for (Node child : jobNode.getChildren()) { if (child instanceof SimpleNode) { originalToCopy.put(child, createImmutableSimpleNode( - child.getNodeType(), null, child.getValue(), + child.getNodeType(), null, child.getValue(), ((NodeModification) child).getModificationAction())); } else if (child instanceof CompositeNode) { jobQueue.push((CompositeNode) child); @@ -254,8 +254,8 @@ public abstract class NodeFactory { } } } - + return (CompositeNode) originalToCopy.get(node); } - + } diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java 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 c9d39348a4..503b07fc63 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java @@ -5,21 +5,21 @@ * terms of the 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 java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -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.MutableNode; -import org.opendaylight.controller.yang.data.api.MutableSimpleNode; -import org.opendaylight.controller.yang.data.api.Node; -import org.opendaylight.controller.yang.data.api.NodeModificationBuilder; +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.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.MutableNode; +import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.NodeModificationBuilder; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeUtils.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java 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 39033523c1..df7960ddb8 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeUtils.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java @@ -5,7 +5,7 @@ * terms of the 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 java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; @@ -24,12 +24,12 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -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.controller.yang.data.api.NodeModification; -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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.NodeModification; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeModificationTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java 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 eaee3730a7..bc8016c271 100755 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeModificationTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java @@ -5,16 +5,16 @@ * terms of the 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.opendaylight.controller.yang.common.QName; -import org.opendaylight.controller.yang.data.api.CompositeNode; -import org.opendaylight.controller.yang.data.api.ModifyAction; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.data.api.ModifyAction; /** * @author michal.rehak * @param type of node value - * + * */ public class SimpleNodeModificationTOImpl extends SimpleNodeTOImpl { @@ -22,7 +22,7 @@ public class SimpleNodeModificationTOImpl extends SimpleNodeTOImpl { * @param qname * @param parent * @param value - * @param modifyAction + * @param modifyAction */ public SimpleNodeModificationTOImpl(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) { diff --git a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeTOImpl.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java 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 466cea5303..c51a41a124 100644 --- a/yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/SimpleNodeTOImpl.java +++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java @@ -5,18 +5,18 @@ * terms of the 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.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.MutableSimpleNode; -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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; /** * @author michal.rehak * @param type of simple node value - * + * */ public class SimpleNodeTOImpl extends AbstractNodeTO implements SimpleNode { @@ -29,23 +29,23 @@ public class SimpleNodeTOImpl extends AbstractNodeTO implements public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value) { super(qname, parent, value); } - + /** * @param qname * @param parent * @param value - * @param modifyAction + * @param modifyAction */ public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) { super(qname, parent, value, modifyAction); } - + @Override public MutableSimpleNode asMutable() { throw new IllegalAccessError("cast to mutable is not supported - "+getClass().getSimpleName()); } - + @Override public String toString() { return super.toString() + ", value = "+getValue(); diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/IgnoreWhiteCharsDiffListener.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java 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 bf6b292c23..bf92b663f7 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/IgnoreWhiteCharsDiffListener.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMapTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java 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 c4dc672c12..35fa18a02c 100755 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/LazyNodeToNodeMapTest.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java @@ -5,7 +5,7 @@ * terms of the 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 java.net.URI; import java.util.Date; @@ -13,32 +13,33 @@ import java.util.Date; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.yang.common.QName; -import org.opendaylight.controller.yang.data.api.CompositeNode; -import org.opendaylight.controller.yang.data.api.MutableCompositeNode; -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.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.impl.LazyNodeToNodeMap; /** * @author michal.rehak * */ public class LazyNodeToNodeMapTest { - + private LazyNodeToNodeMap lazyN2N; private CompositeNode tree; /** * prepare test values - * @throws Exception + * @throws Exception */ @Before public void setUp() throws Exception { lazyN2N = new LazyNodeToNodeMap(); - + QName qName = new QName( - new URI("urn:ietf:params:xml:ns:netconf:base:1.0"), + new URI("urn:ietf:params:xml:ns:netconf:base:1.0"), new Date(42), "yang-data-impl-mutableTest"); - + tree = NodeHelper.buildTestConfigTree(qName); } @@ -48,18 +49,18 @@ public class LazyNodeToNodeMapTest { @Test public void testGetMutableEquivalent() { MutableCompositeNode mutableTree = (MutableCompositeNode) lazyN2N.getMutableEquivalent(tree); - + Assert.assertNull(mutableTree.getParent()); Assert.assertEquals(tree.getNodeType(), mutableTree.getNodeType()); Assert.assertEquals(1, lazyN2N.getKeyNodes().size()); - + Node subNode = tree.getCompositesByName("topologies").iterator().next(); Node subMutant = lazyN2N.getMutableEquivalent(subNode); - + Assert.assertNotNull(subMutant.getParent()); Assert.assertEquals(subNode.getNodeType(), subMutant.getNodeType()); Assert.assertEquals(2, lazyN2N.getKeyNodes().size()); - + Assert.assertEquals(mutableTree, subMutant.getParent()); Assert.assertEquals(mutableTree.getChildren().size(), 1); Assert.assertEquals(mutableTree.getChildren().iterator().next(), subMutant); @@ -72,7 +73,7 @@ public class LazyNodeToNodeMapTest { public void testGetMutableRoot() { Node subNode = tree.getCompositesByName("topologies").iterator().next(); Node subMutant = lazyN2N.getMutableEquivalent(subNode); - + Assert.assertNotNull(subMutant.getParent()); Assert.assertEquals(subMutant.getParent(), lazyN2N.getMutableRoot()); } diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MemoryConsumption.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java 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 e53307d25f..189a16386b 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MemoryConsumption.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java @@ -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 diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MyNodeBuilder.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java 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 26cee74514..90d75c0b82 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/MyNodeBuilder.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java @@ -5,7 +5,7 @@ * terms of the 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 groovy.util.BuilderSupport; @@ -15,12 +15,12 @@ import java.util.Date; import java.util.Map; import java.util.Map.Entry; -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.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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,14 +29,14 @@ import org.slf4j.LoggerFactory; * */ public class MyNodeBuilder extends BuilderSupport { - + private static final Logger LOG = LoggerFactory .getLogger(MyNodeBuilder.class); private URI qnNamespace; private String qnPrefix; private Date qnRevision; - + private CompositeNode rootNode; /** @@ -55,7 +55,7 @@ public class MyNodeBuilder extends BuilderSupport { QName qName = null; try { qName = new QName( - new URI("urn:opendaylight:controller:network"), + new URI("urn:opendaylight:controller:network"), new Date(42), "yang-data-impl-groovyTest_", null); } catch (URISyntaxException e) { LOG.error(e.getMessage(), e); @@ -99,15 +99,15 @@ public class MyNodeBuilder extends BuilderSupport { NodeUtils.fixParentRelation(newNode); return newNode; } - + /** * @param attributes - * @return + * @return */ private ModifyAction processAttributes(@SuppressWarnings("rawtypes") Map attributes) { LOG.debug("attributes:" + attributes); ModifyAction modAction = null; - + @SuppressWarnings("unchecked") Map attributesSane = attributes; for (Entry attr : attributesSane.entrySet()) { @@ -122,7 +122,7 @@ public class MyNodeBuilder extends BuilderSupport { case "modifyAction": modAction = ModifyAction.valueOf(attr.getValue()); break; - + default: throw new IllegalArgumentException("Attribute not supported: "+attr.getKey()); } @@ -146,16 +146,16 @@ public class MyNodeBuilder extends BuilderSupport { if (getCurrent() != null) { if (getCurrent() instanceof CompositeNode) { return (CompositeNode) getCurrent(); - + } else { throw new IllegalAccessError("current node is not of type CompositeNode, but: " +getCurrent().getClass().getSimpleName()); } } - + return null; } - + @Override protected Object postNodeCompletion(Object parent, Object node) { Node nodeRevisited = (Node) node; @@ -176,11 +176,11 @@ public class MyNodeBuilder extends BuilderSupport { nodeRevisited.getParent().getChildren().remove(mutant); } } - - + + return nodeRevisited; } - + /** * @return tree root */ diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeFactoryTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java 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 cafbfa391d..22fbe76c23 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeFactoryTest.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java @@ -5,7 +5,7 @@ * terms of the 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 java.net.URI; import java.util.ArrayList; @@ -17,21 +17,21 @@ import java.util.Map; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -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.Node; -import org.opendaylight.controller.yang.data.api.NodeModification; -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.ModifyAction; +import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode; +import org.opendaylight.yangtools.yang.data.api.Node; +import org.opendaylight.yangtools.yang.data.api.NodeModification; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; import org.w3c.dom.Document; /** * @author michal.rehak - * + * */ public class NodeFactoryTest { - + private QName qName; private CompositeNode network; @@ -46,7 +46,7 @@ public class NodeFactoryTest { public void setUp() throws Exception { ns = "urn:ietf:params:xml:ns:netconf:base:1.0"; qName = new QName( - new URI(ns), + new URI(ns), new Date(42), null); network = NodeHelper.buildTestConfigTree(qName); networkShadow = NodeUtils.buildShadowDomTree(network); @@ -56,16 +56,16 @@ public class NodeFactoryTest { /** * Test method for methods creating immutable nodes in * {@link org.opendaylight.controller.yang.data.impl.NodeFactory}. - * @throws Exception + * @throws Exception */ @Test public void testImmutableNodes() throws Exception { Assert.assertEquals(2, network.getChildren().size()); - CompositeNode tpList = NodeUtils.findNodeByXpath(networkShadow, + CompositeNode tpList = NodeUtils.findNodeByXpath(networkShadow, NodeHelper.AddNamespaceToPattern( "//{0}node[{0}node-id/text()='nodeId_19']/{0}termination-points", ns)); - - + + Assert.assertEquals(2, tpList.getCompositesByName("termination-point").size()); } @@ -73,7 +73,7 @@ public class NodeFactoryTest { * Test method for methods creating immutable and mutable nodes: * {@link NodeFactory#createMutableCompositeNode(QName, CompositeNode, List, ModifyAction, CompositeNode)}, * {@link NodeFactory#createMutableSimpleNode(QName, CompositeNode, Object, ModifyAction, SimpleNode)} - * @throws Exception + * @throws Exception */ @Test public void testMutableNodes() throws Exception { @@ -89,37 +89,37 @@ public class NodeFactoryTest { // // // - - - List> value = new ArrayList>(); + + + List> value = new ArrayList>(); value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "name"), null, "Ethernet0/0")); value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "mtu"), null, 1500)); - + MutableCompositeNode ifNode = NodeFactory.createMutableCompositeNode( new QName(qName, "interface"), null, value, ModifyAction.DELETE, null); ifNode.init(); NodeHelper.assignParentToChildren(ifNode); - - value = new ArrayList>(); + + value = new ArrayList>(); value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "name"), null, "Ethernet1/0")); value.add(NodeFactory.createMutableSimpleNode(new QName(qName, "mtu"), null, 1501, ModifyAction.REMOVE, null)); - + CompositeNode ifNode2 = NodeFactory.createImmutableCompositeNode(new QName(qName, "interface"), null, value); NodeHelper.assignParentToChildren(ifNode2); - value = new ArrayList>(); + value = new ArrayList>(); value.add(ifNode); value.add(ifNode2); - + CompositeNode topNode = NodeFactory.createImmutableCompositeNode(new QName(qName, "top"), null, value); NodeHelper.assignParentToChildren(topNode); - value = new ArrayList>(); + value = new ArrayList>(); value.add(topNode); - + CompositeNode root = NodeFactory.createImmutableCompositeNode(new QName(qName, "config"), null, value); Document shadowConfig = NodeUtils.buildShadowDomTree(root); NodeHelper.compareXmlTree(shadowConfig, "./mutableNodesConfig.xml", getClass()); - + Assert.assertEquals(1, root.getChildren().size()); Assert.assertEquals(1, ifNode.getSimpleNodesByName("name").size()); Assert.assertEquals(1, ifNode.getSimpleNodesByName("mtu").size()); @@ -130,7 +130,7 @@ public class NodeFactoryTest { /** * test of {@link NodeFactory#copyDeepAsMutable(CompositeNode, Map)} - * @throws Exception + * @throws Exception */ @Test public void testCopyDeepAsMutable() throws Exception { @@ -138,26 +138,26 @@ public class NodeFactoryTest { CompositeNode mutableNetwork = NodeFactory.copyDeepAsMutable(network, mutableToOrig); Document mutableNetworkShadow = NodeUtils.buildShadowDomTree(mutableNetwork); - + NodeHelper.compareXmlTree(mutableNetworkShadow, "./config02-shadow.xml", getClass()); - + CompositeNode immutableNetwork = NodeFactory.copyDeepAsImmutable(mutableNetwork, null); Assert.assertEquals(network, immutableNetwork); } - - + + /** * test of {@link NodeFactory#copyDeepAsImmutable(CompositeNode, Map)} - * @throws Exception + * @throws Exception */ @Test public void testCopyDeepAsImmutable() throws Exception { Map, Node> mutableToOrig = new HashMap<>(); CompositeNode immutableNetwork = NodeFactory.copyDeepAsImmutable(network, mutableToOrig); - + Document mutableNetworkShadow = NodeUtils.buildShadowDomTree(immutableNetwork); NodeHelper.compareXmlTree(mutableNetworkShadow, "./config02-shadow.xml", getClass()); - + Assert.assertEquals(network, immutableNetwork); } diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeHelper.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java 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 8fec8817fc..0a0848665e 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeHelper.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java @@ -5,7 +5,7 @@ * terms of the 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 groovy.lang.Binding; import groovy.lang.GroovyShell; @@ -33,9 +33,9 @@ import javax.xml.transform.stream.StreamResult; import org.custommonkey.xmlunit.Diff; import org.junit.Assert; -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.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.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImplTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java 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 47c090cbd5..2a92197248 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImplTest.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java @@ -5,7 +5,7 @@ * terms of the 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 java.net.URI; import java.util.Date; @@ -14,12 +14,12 @@ import junit.framework.Assert; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.yang.common.QName; -import org.opendaylight.controller.yang.data.api.CompositeNode; -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; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeUtilsTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java 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 ab4b6bf645..994eac6652 100644 --- a/yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeUtilsTest.java +++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java @@ -5,7 +5,7 @@ * terms of the 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 java.io.IOException; import java.net.URI; @@ -17,10 +17,10 @@ import java.util.Stack; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -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; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; diff --git a/yang-data-impl/src/test/resources/MyXmlGenerator.groovy b/yang-data-impl/src/test/resources/MyXmlGenerator.groovy index f22da0c78a..59cc9e1e8d 100644 --- a/yang-data-impl/src/test/resources/MyXmlGenerator.groovy +++ b/yang-data-impl/src/test/resources/MyXmlGenerator.groovy @@ -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 diff --git a/yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02-shadow.xml b/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02-shadow.xml rename to yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml diff --git a/yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02.groovy b/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02.groovy rename to yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy diff --git a/yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02g-shadow.xml b/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/config02g-shadow.xml rename to yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml diff --git a/yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/mutableNodesConfig.xml b/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/controller/yang/data/impl/mutableNodesConfig.xml rename to yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml diff --git a/yang-data-util/pom.xml b/yang-data-util/pom.xml index c4e0c53a33..28ea136aed 100644 --- a/yang-data-util/pom.xml +++ b/yang-data-util/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractContainerNode.java b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java 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 a8daca1c51..7b3649a504 100644 --- a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractContainerNode.java +++ b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java @@ -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>> implements CompositeNode { diff --git a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractNode.java b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java 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 e6297f55b2..86195af68c 100644 --- a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/AbstractNode.java +++ b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java @@ -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 implements Node { @@ -29,7 +29,7 @@ public abstract class AbstractNode implements Node { public CompositeNode getParent() { return parent; } - + /* (non-Javadoc) */ /** diff --git a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/Nodes.java b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java 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 fca835f458..d9c2b45135 100644 --- a/yang-data-util/src/main/java/org/opendaylight/controller/yang/data/util/Nodes.java +++ b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java @@ -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 { diff --git a/yang-ext/pom.xml b/yang-ext/pom.xml index 1becb19ba1..8724d3dbe8 100644 --- a/yang-ext/pom.xml +++ b/yang-ext/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT @@ -16,7 +16,7 @@ - org.opendaylight.yang + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -76,7 +76,7 @@ - org.opendaylight.yang + org.opendaylight.yangtools yang-maven-plugin diff --git a/yang-maven-plugin-it/pom.xml b/yang-maven-plugin-it/pom.xml index 5210553cce..1bfc1c83b9 100644 --- a/yang-maven-plugin-it/pom.xml +++ b/yang-maven-plugin-it/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-maven-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java similarity index 99% rename from yang-maven-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java rename to yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java index 01d45aa489..2660a2cd4e 100644 --- a/yang-maven-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java +++ b/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml index c871bb1334..80b7c165d2 100644 --- a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT @@ -17,7 +17,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -31,7 +31,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl abcd=a.b.c.d @@ -41,7 +41,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl config @@ -54,7 +54,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml b/yang-maven-plugin-it/src/test/resources/Correct/pom.xml index 1deb2020a9..fb8f67d4f7 100644 --- a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/Correct/pom.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT @@ -17,7 +17,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -31,7 +31,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl @@ -41,7 +41,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml b/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml index 5842b0bdaa..260ec39829 100644 --- a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools generator-test1 0.5.4-SNAPSHOT - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -23,7 +23,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl @@ -33,7 +33,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml b/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml index 501fd1d903..ca209d935b 100644 --- a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT generator-test2 - org.opendaylight.controller + org.opendaylight.yangtools generator-test1 0.5.4-SNAPSHOT system @@ -20,7 +20,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -34,7 +34,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl outDir/ @@ -47,7 +47,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml b/yang-maven-plugin-it/src/test/resources/Generator/pom.xml index b33abb3ed0..d76ac2d51b 100644 --- a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/Generator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 binding-generator - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test @@ -11,7 +11,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -25,7 +25,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl outDir/ @@ -38,7 +38,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml index 6e25e48958..a9f5b51304 100644 --- a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT generator-test2 @@ -10,7 +10,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -24,7 +24,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl outDir/ @@ -34,7 +34,7 @@ - org.opendaylight.controller.yang2sources.spi.ResourceProviderTestImpl + org.opendaylight.yangtools.yang2sources.spi.ResourceProviderTestImpl outDir/ @@ -47,7 +47,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml b/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml index 5349154f2b..f98e6a5d90 100644 --- a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -25,7 +25,7 @@ - org.opendaylight.controller.yang2sources.spi.ResourceProviderTestImpl + org.opendaylight.yangtools.yang2sources.spi.ResourceProviderTestImpl outDir/ @@ -37,7 +37,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml b/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml index b73a53e30c..fe95c07a2f 100644 --- a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test @@ -10,7 +10,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -24,7 +24,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl @@ -34,7 +34,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml b/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml index df7519ece7..d16fca0723 100644 --- a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test @@ -10,7 +10,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -24,7 +24,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl /outDir/ @@ -37,7 +37,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml index e8b6ecac6e..3ac4e5c735 100644 --- a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test @@ -10,7 +10,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -24,7 +24,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl /outDir/ @@ -45,7 +45,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin-spi 0.5.4-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml index af11a69f10..d11c857d15 100644 --- a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml +++ b/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller + org.opendaylight.yangtools 0.5.4-SNAPSHOT test @@ -10,7 +10,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin 0.5.4-SNAPSHOT @@ -24,7 +24,7 @@ - org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl + org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl /outDir/ diff --git a/yang-maven-plugin-spi/pom.xml b/yang-maven-plugin-spi/pom.xml index 8d6ddb9508..150eeaef74 100644 --- a/yang-maven-plugin-spi/pom.xml +++ b/yang-maven-plugin-spi/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT @@ -14,7 +14,7 @@ - org.opendaylight.yang + org.opendaylight.yangtools yang-model-api diff --git a/yang-maven-plugin-spi/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java b/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java 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 c454a262c4..d996c96b65 100644 --- a/yang-maven-plugin-spi/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java +++ b/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin-spi/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java b/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java 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 82fb1d213c..7bfae12b3a 100644 --- a/yang-maven-plugin-spi/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java +++ b/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/pom.xml b/yang-maven-plugin/pom.xml index abb5eeff1c..a64ad1ed8b 100644 --- a/yang-maven-plugin/pom.xml +++ b/yang-maven-plugin/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java 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 88f4dde31a..68343083f7 100644 --- a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/ConfigArg.java +++ b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/Util.java b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java 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 ce7929f930..e40be97893 100644 --- a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/Util.java +++ b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java 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 27fb6b836f..49d9ef62d3 100644 --- a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java +++ b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java 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 39770788c3..ca972bf993 100644 --- a/yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java +++ b/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java b/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java 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 5c3155e32b..ef20864fa3 100644 --- a/yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java +++ b/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/UtilTest.java b/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java 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 240825409f..b647760340 100644 --- a/yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/UtilTest.java +++ b/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java @@ -5,7 +5,7 @@ * terms of the 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.*; diff --git a/yang-model-api/pom.xml b/yang-model-api/pom.xml index ed86c28598..e11c89e5f4 100644 --- a/yang-model-api/pom.xml +++ b/yang-model-api/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java index a411580c22..ac658a57fc 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java @@ -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. diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java index 8e6d7898b5..20b9ea4d48 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api; import java.util.Set; -import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QName; /** * Node which can contains other nodes. diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java index c9a475a730..c36528adbb 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api; import java.util.List; -import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QName; /** * Interface describing YANG 'list' statement. diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java index ebd2963327..53c025c6e5 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.model.api; import java.util.List; -import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QName; /** * SchemaNode represents a node in schema tree. diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java index e7000e3b2c..6bcb009afe 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java @@ -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; public class SchemaPath { diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java index f8dfd8beea..b279c5c312 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java @@ -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 { diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java index 9380ebf980..26551ad995 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java @@ -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 diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java index 0c32f71d6e..27c9ac175e 100644 --- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java +++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java @@ -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 IdentityrefTypeDefinition extends diff --git a/yang-model-util/pom.xml b/yang-model-util/pom.xml index bc08b8afd7..36212fa8d9 100644 --- a/yang-model-util/pom.xml +++ b/yang-model-util/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT 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 index 72fd11250e..0000000000 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java +++ /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 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 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 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 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 path = schemaPath.getPath(); - final QName qname = path.get(path.size() - 1); - - if ((qname != null) && (qname.getNamespace() != null)) { - return context.findModuleByNamespace(qname.getNamespace()); - } - } else { - List 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 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 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 xpathToQNamePath(final SchemaContext context, final Module parentModule, - final String xpath) { - final Queue 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 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 resolveRelativeXPath(final SchemaContext context, final Module module, - final RevisionAwareXPath relativeXPath, final SchemaPath leafrefSchemaPath) { - final Queue 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 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; - } -} diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractSignedInteger.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java 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 62fb5d441c..1d841848de 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractSignedInteger.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java 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 38513899ea..e93053c802 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseConstraints.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java 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 b728e3fc61..5a3622a89e 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseConstraints.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseTypes.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java 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 946f007fcc..f08e012b25 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseTypes.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.yang.model.util; +package org.opendaylight.yangtools.yang.model.util; import java.net.URI; import java.util.ArrayList; 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; public final class BaseTypes { diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BinaryType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java 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 ab383d0780..9b03a96f4e 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BinaryType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BitsType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java 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 5d82e53613..bab2196408 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BitsType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BooleanType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java 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 5f584f8cde..58b5b96c76 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BooleanType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/DataNodeIterator.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java 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 fbf5c41a76..ed77d35d92 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/DataNodeIterator.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java @@ -5,7 +5,7 @@ * terms of the 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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Decimal64.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java 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 86b770ad17..cbb45b6744 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Decimal64.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EmptyType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java 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 afb043b231..3648a179be 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EmptyType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EnumerationType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java 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 767b91a13d..e6b5f1cb3b 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EnumerationType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/ExtendedType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java 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 6bcfdf71bd..6e5229d4cb 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/ExtendedType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/IdentityrefType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java 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 03cde1a50a..a1b399e295 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/IdentityrefType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/InstanceIdentifier.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java 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 3b97cda23e..47405ebff8 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/InstanceIdentifier.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int16.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java 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 60b93ff9ab..e24a07038d 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int16.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int32.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java 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 dff380045b..05dbaf956e 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int32.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int64.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java 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 30decdc44c..fc10b94068 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int64.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int8.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java 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 5d7ab6871e..08e5423b67 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int8.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Leafref.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java 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 42cc96c13d..9136a94478 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Leafref.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/RevisionAwareXPathImpl.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java 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 59abe6699d..a3577ba0ae 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/RevisionAwareXPathImpl.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java @@ -5,7 +5,7 @@ * terms of the 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 index 0000000000..ed8fbd15e1 --- /dev/null +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -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 + */ +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 null. + *
+ * In case that Schema Context or Schema Path are not specified correctly (i.e. contains null + * 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 + * null 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 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 null. + *
+ * 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. + *
+ * In case that Schema Context or Module or Revision Aware XPath contains null references the method + * will throw IllegalArgumentException + *
+ * 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 null. + * + * @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 null 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 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 null. + *
+ * 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. + *
+ * 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. + *
+ * In case that Schema Context or Module or Actual Schema Node or relative Revision Aware XPath contains + * null references the method will throw IllegalArgumentException + *
+ * If the Revision Aware XPath doesn't have flag isAbsolute == false the method will + * throw IllegalArgumentException. + *
+ * 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 null. + * + * @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 null. + */ + 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 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 null + *
+ * If Schema Context or Schema Node contains null 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 null + */ + 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 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 null + * + * If Schema Context or TypeDefinition contains null 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 null. + */ + 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 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 null. + *
+ * If Schema Context or Schema Node contains null 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 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 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 null + *
+ * If Schema Context, Module or Queue of QNames refers to null 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 null. + */ + private static DataSchemaNode findSchemaNodeForGivenPath(final SchemaContext context, final Module module, + final Queue 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. + *
+ * If Schema Context, Parent Module or XPath string contains null values, + * the method will throws IllegalArgumentException + * + * @throws IllegalArgumentException + * + * @param context Schema Context + * @param parentModule Parent Module + * @param xpath XPath String + * @return + */ + private static Queue 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 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. + *
+ * 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. + *
+ * If the Prefixed Path Part does not contains prefix the Parent's Module namespace is taken for construction of + * QName. + *
+ * If Schema Context, Parent Module or Prefixed Path Part refers to null 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 null. + *
+ * If String prefix is the same as prefix of the specified Module the reference to this module is returned. + *
+ * If Schema Context, Module or Prefix are referring to null 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 null + */ + 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 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 resolveRelativeXPath(final SchemaContext context, final Module module, + final RevisionAwareXPath relativeXPath, final SchemaPath leafrefSchemaPath) { + final Queue 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 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; + } +} diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/StringType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java 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 7fb391e88d..a3f98d962e 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/StringType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint16.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java 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 c76c8edb21..6187d4d1f2 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint16.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint32.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java 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 6c8817f599..f13d395d16 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint32.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint64.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java 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 66e0ccaa61..c0de51cf7a 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint64.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint8.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java 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 4f2cbad0b9..0516e88196 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint8.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnionType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java 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 c6f88dbc31..470e904b9d 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnionType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnknownType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java 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 110ddb8148..5a6de305bf 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnknownType.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java @@ -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; diff --git a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/YangTypesConverter.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java 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 5d1c8b3447..cf486fd91b 100644 --- a/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/YangTypesConverter.java +++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java @@ -5,7 +5,7 @@ * terms of the 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.ArrayList; @@ -14,7 +14,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.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/yang-parser-api/pom.xml b/yang-parser-api/pom.xml index afe200cd43..054f0561bf 100644 --- a/yang-parser-api/pom.xml +++ b/yang-parser-api/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-parser-impl/pom.xml b/yang-parser-impl/pom.xml index 17f54a22f8..145807a6a7 100644 --- a/yang-parser-impl/pom.xml +++ b/yang-parser-impl/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yang + org.opendaylight.yangtools yangtools 0.5.4-SNAPSHOT diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java index b502c2571b..033fd352f1 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java index e49c885692..3f07ddd050 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.api; 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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java index 365f7c5c6b..da0278d722 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java @@ -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; /** diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java index 150c276a3e..0f94b8609f 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java index 8debaf4c2f..102e6a74ad 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java @@ -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.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java index 0db47b755e..c181fe1a66 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java index 3762175b60..248e094926 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index df0e6084b6..a7a9d2b466 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index 766404d8e7..0677d1f3c1 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java index bd2c2f381b..d702fa236e 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java index e72b62ed33..2174c895d9 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java index a17138aa2d..d074b374b4 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java index 564268baf3..f010d2ee1e 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java index 0b50f102a2..5a4da1edf0 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java index 4791eb6ba4..b7d712ad9f 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java index fd6e85ad7b..aa8bbea613 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java index 9b324a5a6f..9e578d6c03 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java index 1f51653d38..0cc0e89d3d 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java index aca4e9de9f..e832d72bbf 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java index 81987d78b2..f5c21219af 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 6ceef76473..d934437a51 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java index 4a32c1b53f..41856413a6 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java index ff30884d1b..da752b0c69 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java index 31aa5658f6..58878a6db3 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java index 1569e98c0a..7e6ff2ad05 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java index 781805f787..9f360bed64 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index c5f1870b35..be0d4ee0fa 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java index c6086ee884..96682ef6cd 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java index 5cdb6c3918..efcdcab442 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java index 9cf0c62421..7183d0c82c 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java @@ -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 { diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java index ca057d4e32..2e4972232a 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java @@ -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); diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java index 3164ed8263..5933e96673 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java index 5432fa6a0d..87aa68215a 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java @@ -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; diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java index bb1d1ed605..8575c4ec2e 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java +++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java @@ -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. diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java index 9b86db3417..6f93917a29 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java @@ -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; diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java index cf150d72bd..effc312cfc 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java @@ -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 modules; diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java index 00a6b70b3a..ffa64d2733 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java @@ -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; diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java index 98c05102c5..1520dc514e 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java @@ -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 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 index 0000000000..8a0863936d --- /dev/null +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java @@ -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 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 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()); + } + +} diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java index 90d86c9b6b..c7af385f99 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java @@ -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 { diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java index 412319b0a8..cb8f1a13e3 100644 --- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java +++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java @@ -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 index 0000000000..f0dedd4d9b --- /dev/null +++ b/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang @@ -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'"; + } + +} -- 2.36.6