From d236fbba845ca58f0fd8070b3afb3c3a749b2efd Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 6 May 2015 09:28:34 +0200 Subject: [PATCH] Revert Merge "Bug 2366: new parser - Types & TypeDefs" Merge was accicendal merge to stable/lithium of patchset which was parented of bumped master branch. This reverts commit 8e74c9eb051ac2a8fba46f4be4244c2fd94bff8d, reversing changes made to e7cc8bba266afa3ce1934f8f2b64e5ae662434d0. Change-Id: If8caf19b5ba8a3de4a1a06843211821d0e7a102d Signed-off-by: Tony Tkacik --- benchmarks/pom.xml | 6 +- code-generator/binding-data-codec/pom.xml | 2 +- code-generator/binding-generator-api/pom.xml | 2 +- code-generator/binding-generator-impl/pom.xml | 2 +- code-generator/binding-generator-spi/pom.xml | 2 +- code-generator/binding-generator-util/pom.xml | 2 +- .../binding-java-api-generator/pom.xml | 2 +- .../java/api/generator/ClassTemplate.xtend | 7 +- code-generator/binding-model-api/pom.xml | 2 +- code-generator/binding-parent/pom.xml | 6 +- code-generator/binding-test-model/pom.xml | 2 +- code-generator/binding-type-provider/pom.xml | 2 +- .../maven-sal-api-gen-plugin/pom.xml | 2 +- code-generator/pom.xml | 2 +- .../samples/maven-code-gen-sample/pom.xml | 2 +- .../samples/modeling-sample/pom.xml | 2 +- common/artifacts/pom.xml | 20 +-- common/checkstyle-logging/pom.xml | 4 +- .../yangtools/checkstyle/CheckstyleTest.java | 22 +-- common/concepts/pom.xml | 2 +- common/features-test/pom.xml | 4 +- common/features/pom.xml | 4 +- common/mockito-configuration/pom.xml | 2 +- common/object-cache-api/pom.xml | 2 +- common/object-cache-guava/pom.xml | 2 +- common/object-cache-noop/pom.xml | 2 +- common/parent/pom.xml | 10 +- common/pom.xml | 2 +- common/util/pom.xml | 2 +- integration-test/bug1196-test-model/pom.xml | 6 +- integration-test/bug527-test-model/pom.xml | 2 +- integration-test/bundle-test/pom.xml | 2 +- integration-test/pom.xml | 2 +- .../regression-test-model/pom.xml | 2 +- integration-test/test-models/pom.xml | 4 +- integration-test/yang-runtime-tests/pom.xml | 2 +- model/iana/iana-afn-safi/pom.xml | 4 +- model/iana/iana-if-type-2014-05-08/pom.xml | 4 +- model/iana/iana-if-type/pom.xml | 4 +- model/iana/pom.xml | 2 +- model/ietf/ietf-inet-types/pom.xml | 4 +- .../inet/types/rev100924/HostBuilderTest.java | 9 +- model/ietf/ietf-interfaces/pom.xml | 4 +- model/ietf/ietf-restconf/pom.xml | 4 +- model/ietf/ietf-ted/pom.xml | 4 +- model/ietf/ietf-topology-isis/pom.xml | 4 +- .../ietf/ietf-topology-l3-unicast-igp/pom.xml | 4 +- model/ietf/ietf-topology-ospf/pom.xml | 4 +- model/ietf/ietf-topology/pom.xml | 4 +- model/ietf/ietf-yang-types-20130715/pom.xml | 4 +- model/ietf/ietf-yang-types/pom.xml | 4 +- model/ietf/pom.xml | 2 +- model/l2-types/pom.xml | 4 +- model/pom.xml | 6 +- model/yang-ext/pom.xml | 4 +- pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/restconf-client-api/pom.xml | 2 +- restconf/restconf-client-impl/pom.xml | 2 +- restconf/restconf-common/pom.xml | 2 +- restconf/restconf-jaxrs-api/pom.xml | 2 +- restconf/restconf-test-service/pom.xml | 2 +- restconf/restconf-util/pom.xml | 2 +- third-party/antlr4-runtime-osgi/pom.xml | 2 +- third-party/pom.xml | 2 +- websocket/pom.xml | 2 +- websocket/websocket-client/pom.xml | 2 +- yang-validation-tool/pom.xml | 2 +- yang/pom.xml | 2 +- yang/yang-binding/pom.xml | 2 +- yang/yang-common/pom.xml | 2 +- yang/yang-data-api/pom.xml | 2 +- yang/yang-data-codec-gson/pom.xml | 2 +- .../yang/data/codec/gson/RpcAsContainer.java | 5 +- yang/yang-data-impl/pom.xml | 2 +- ...bstractImmutableDataContainerAttrNode.java | 23 ++- ...tractImmutableNormalizedValueAttrNode.java | 10 +- yang/yang-data-operations/pom.xml | 2 +- yang/yang-data-util/pom.xml | 2 +- yang/yang-maven-plugin-it/pom.xml | 2 +- yang/yang-maven-plugin-spi/pom.xml | 2 +- yang/yang-maven-plugin/pom.xml | 2 +- yang/yang-model-api/pom.xml | 2 +- .../yang/model/api/Rfc6020Mapping.java | 6 +- .../yang/model/api/stmt/TypeStatement.java | 16 +-- yang/yang-model-export/pom.xml | 2 +- yang/yang-model-parent/pom.xml | 6 +- yang/yang-model-util/pom.xml | 2 +- yang/yang-parser-api/pom.xml | 2 +- yang/yang-parser-impl/pom.xml | 2 +- .../impl/YangStatementParserListenerImpl.java | 33 +---- .../yang/parser/spi/IdentityNamespace.java | 4 +- .../stmt/reactor/BuildGlobalContext.java | 7 +- .../stmt/reactor/SourceSpecificContext.java | 63 ++------- .../stmt/reactor/SubstatementContext.java | 1 + .../stmt/rfc6020/BinarySpecificationImpl.java | 61 -------- .../parser/stmt/rfc6020/BitStatementImpl.java | 6 +- .../stmt/rfc6020/BitsSpecificationImpl.java | 5 +- .../rfc6020/Decimal64SpecificationImpl.java | 8 +- .../stmt/rfc6020/EnumSpecificationImpl.java | 7 +- .../stmt/rfc6020/EnumStatementImpl.java | 2 +- .../stmt/rfc6020/ExtensionStatementImpl.java | 3 +- .../stmt/rfc6020/GroupingStatementImpl.java | 7 +- .../rfc6020/IdentityRefSpecificationImpl.java | 33 +---- .../stmt/rfc6020/IdentityStatementImpl.java | 15 +- .../InstanceIdentifierSpecificationImpl.java | 7 +- .../rfc6020/LeafrefSpecificationImpl.java | 8 +- .../stmt/rfc6020/MustStatementImpl.java | 9 +- .../rfc6020/NumericalRestrictionsImpl.java | 7 +- .../stmt/rfc6020/PathStatementImpl.java | 66 --------- .../rfc6020/RequireInstanceStatementImpl.java | 2 +- .../stmt/rfc6020/StringRestrictionsImpl.java | 5 +- .../stmt/rfc6020/TypeStatementImpl.java | 19 +-- .../stmt/rfc6020/TypedefStatementImpl.java | 14 +- .../stmt/rfc6020/UnionSpecificationImpl.java | 12 +- .../stmt/rfc6020/WhenStatementImpl.java | 4 +- .../stmt/rfc6020/YangInferencePipeline.java | 22 +-- .../effective/BitEffectiveStatementImpl.java | 2 +- ...tsSpecificationEffectiveStatementImpl.java | 18 --- ...64SpecificationEffectiveStatementImpl.java | 18 --- ...umSpecificationEffectiveStatementImpl.java | 18 --- ...efSpecificationEffectiveStatementImpl.java | 18 --- ...erSpecificationEffectiveStatementImpl.java | 18 --- ...efSpecificationEffectiveStatementImpl.java | 18 --- ...calRestrictionsEffectiveStatementImpl.java | 18 --- .../effective/PathEffectiveStatementImpl.java | 23 --- ...RequireInstanceEffectiveStatementImpl.java | 2 +- ...ingRestrictionsEffectiveStatementImpl.java | 18 --- .../TypeDefEffectiveStatementImpl.java | 19 --- .../effective/TypeEffectiveStatementImpl.java | 18 --- ...onSpecificationEffectiveStatementImpl.java | 18 --- .../UnitsEffectiveStatementImpl.java | 2 +- .../effective/WhenEffectiveStatementImpl.java | 2 +- .../yang/stmt/test/YangTypesStmtTest.java | 39 ------ .../simple-types.yang | 103 -------------- .../semantic-statement-parser/types.yang | 132 ------------------ 136 files changed, 281 insertions(+), 999 deletions(-) delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BinarySpecificationImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitsSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/Decimal64SpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EnumSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityRefSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InstanceIdentifierSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafrefSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NumericalRestrictionsEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/PathEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/StringRestrictionsEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeDefEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnionSpecificationEffectiveStatementImpl.java delete mode 100644 yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangTypesStmtTest.java delete mode 100644 yang/yang-parser-impl/src/test/resources/semantic-statement-parser/simple-types.yang delete mode 100644 yang/yang-parser-impl/src/test/resources/semantic-statement-parser/types.yang diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 242a71d2fc..1c5b45ef60 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent 4.0.0 @@ -21,8 +21,8 @@ benchmarks - 0.8.0-SNAPSHOT - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT 1.7 1.7 0.9.7 diff --git a/code-generator/binding-data-codec/pom.xml b/code-generator/binding-data-codec/pom.xml index f6a179fd88..ad611d2d2d 100644 --- a/code-generator/binding-data-codec/pom.xml +++ b/code-generator/binding-data-codec/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml index b475ad3e3f..691f8e5a84 100644 --- a/code-generator/binding-generator-api/pom.xml +++ b/code-generator/binding-generator-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index d446c82c1f..c5ed3cfdb6 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml index 4ed76cc1f7..185fd69143 100644 --- a/code-generator/binding-generator-spi/pom.xml +++ b/code-generator/binding-generator-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index 80e09f2382..367aaff67b 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index 541d2f5859..51aa5c7629 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend index 6699d50200..cc3a78809a 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend @@ -290,10 +290,15 @@ class ClassTemplate extends BaseTemplate { «FOR c : consts» «IF c.name == TypeConstants.PATTERN_CONSTANT_NAME && c.value instanceof List» + boolean valid = false; for (Pattern p : patterns) { - «Preconditions.importedName».checkArgument(p.matcher(_value).matches(), "Supplied value \"%s\" does not match any of the permitted patterns %s", _value, «TypeConstants.PATTERN_CONSTANT_NAME»); + if (p.matcher(_value).matches()) { + valid = true; + break; + } } + «Preconditions.importedName».checkArgument(valid, "Supplied value \"%s\" does not match any of the permitted patterns %s", _value, «TypeConstants.PATTERN_CONSTANT_NAME»); «ENDIF» «ENDFOR» «ENDIF» diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml index 235167ef7d..2403d6e958 100644 --- a/code-generator/binding-model-api/pom.xml +++ b/code-generator/binding-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-parent/pom.xml b/code-generator/binding-parent/pom.xml index cc1013ac8a..c38481e8d4 100644 --- a/code-generator/binding-parent/pom.xml +++ b/code-generator/binding-parent/pom.xml @@ -12,18 +12,18 @@ org.opendaylight.odlparent bundle-parent - 1.6.0-SNAPSHOT + 1.5.0-SNAPSHOT 4.0.0 org.opendaylight.yangtools binding-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT pom - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT src/main/yang-gen-sal diff --git a/code-generator/binding-test-model/pom.xml b/code-generator/binding-test-model/pom.xml index b759f86bdd..c93a84c7c1 100644 --- a/code-generator/binding-test-model/pom.xml +++ b/code-generator/binding-test-model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/binding-type-provider/pom.xml b/code-generator/binding-type-provider/pom.xml index f192464754..f496868a3f 100644 --- a/code-generator/binding-type-provider/pom.xml +++ b/code-generator/binding-type-provider/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index c82c75a8f4..d7d20c1489 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 maven-sal-api-gen-plugin diff --git a/code-generator/pom.xml b/code-generator/pom.xml index 2ce6df0c2a..324088dc7d 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent 4.0.0 diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml index 765ebe2544..52daaac3b8 100644 --- a/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/code-generator/samples/maven-code-gen-sample/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT maven-code-gen-sample diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml index ef68f03e62..4e1adde8af 100644 --- a/code-generator/samples/modeling-sample/pom.xml +++ b/code-generator/samples/modeling-sample/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools binding-generator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT modeling-sample diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index 3f532b469d..6d862f6675 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -12,12 +12,12 @@ 4.0.0 org.opendaylight.yangtools yangtools-artifacts - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT pom - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT @@ -145,32 +145,32 @@ org.opendaylight.yangtools.model iana-if-type-2014-05-08 - 2014.05.08.8-SNAPSHOT + 2014.05.08.7-SNAPSHOT org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.8-SNAPSHOT + 2010.09.24.7-SNAPSHOT org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.8-SNAPSHOT + 2010.09.24.7-SNAPSHOT org.opendaylight.yangtools.model ietf-yang-types-20130715 - 2013.07.15.8-SNAPSHOT + 2013.07.15.7-SNAPSHOT org.opendaylight.yangtools.model ietf-interfaces - 2014.05.08.8-SNAPSHOT + 2014.05.08.7-SNAPSHOT org.opendaylight.yangtools.model ietf-restconf - 2013.10.19.8-SNAPSHOT + 2013.10.19.7-SNAPSHOT org.opendaylight.yangtools.model @@ -275,12 +275,12 @@ org.opendaylight.yangtools.model opendaylight-l2-types - 2013.08.27.8-SNAPSHOT + 2013.08.27.7-SNAPSHOT org.opendaylight.yangtools.model yang-ext - 2013.09.07.8-SNAPSHOT + 2013.09.07.7-SNAPSHOT org.opendaylight.yangtools diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index 238e78c7ea..a29a3fe383 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml checkstyle-logging @@ -21,7 +21,7 @@ com.puppycrawl.tools checkstyle - 6.1.1 + 5.7 org.slf4j diff --git a/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckstyleTest.java b/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckstyleTest.java index bf59c594b4..24e048ad97 100644 --- a/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckstyleTest.java +++ b/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckstyleTest.java @@ -11,6 +11,14 @@ package org.opendaylight.yangtools.checkstyle; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayOutputStream; +import java.io.File; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.xml.sax.InputSource; + import com.google.common.collect.Lists; import com.puppycrawl.tools.checkstyle.Checker; import com.puppycrawl.tools.checkstyle.ConfigurationLoader; @@ -19,12 +27,6 @@ import com.puppycrawl.tools.checkstyle.PropertiesExpander; import com.puppycrawl.tools.checkstyle.api.AuditListener; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.Configuration; -import java.io.ByteArrayOutputStream; -import java.io.File; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.xml.sax.InputSource; public class CheckstyleTest { @@ -34,11 +36,11 @@ public class CheckstyleTest { @Before public void setup() throws CheckstyleException { baos = new ByteArrayOutputStream(); - final AuditListener listener = new DefaultLogger(baos, false); + AuditListener listener = new DefaultLogger(baos, false); - final InputSource inputSource = new InputSource(CheckstyleTest.class.getClassLoader().getResourceAsStream( + InputSource inputSource = new InputSource(CheckstyleTest.class.getClassLoader().getResourceAsStream( "checkstyle-logging.xml")); - final Configuration configuration = ConfigurationLoader.loadConfiguration(inputSource, + Configuration configuration = ConfigurationLoader.loadConfiguration(inputSource, new PropertiesExpander(System.getProperties()), false); checker = new Checker(); @@ -64,7 +66,7 @@ public class CheckstyleTest { @Test public void testCodingChecks() { verify(CheckCodingStyleTestClass.class, false, "9: Line has Windows line delimiter.", "14: Wrong order for", "24:1: Line contains a tab character.", - "22: Line has trailing spaces.", "22: 'ctor def' child have incorrect indentation level 16, expected level should be 8.", "17:8: Unused import", + "22: Line has trailing spaces.", "22: ctor def child at indentation level 16 not at correct indentation, 8", "17:8: Unused import", "23: Line has trailing spaces."); } diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index c702ae1e51..d2b0867d8c 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/common/features-test/pom.xml b/common/features-test/pom.xml index 0e5dbf0973..50ff271503 100644 --- a/common/features-test/pom.xml +++ b/common/features-test/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../parent/pom.xml features-test @@ -27,7 +27,7 @@ org.opendaylight.odlparent features-test - 1.6.0-SNAPSHOT + 1.5.0-SNAPSHOT This artifact has been migrated to odlparent and will be removed in Lithium release diff --git a/common/features/pom.xml b/common/features/pom.xml index d6d1647e40..d59c952d30 100644 --- a/common/features/pom.xml +++ b/common/features/pom.xml @@ -12,13 +12,13 @@ org.opendaylight.odlparent features-parent - 1.6.0-SNAPSHOT + 1.5.0-SNAPSHOT org.opendaylight.yangtools features-yangtools - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT jar diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 7788fe49f1..1637e1f9cb 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index 0fc11fc558..568834cdd8 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml bundle diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index e198df3ecf..ed837d1ace 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/common/object-cache-noop/pom.xml b/common/object-cache-noop/pom.xml index 7e4268c37b..2105738dd6 100644 --- a/common/object-cache-noop/pom.xml +++ b/common/object-cache-noop/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml bundle diff --git a/common/parent/pom.xml b/common/parent/pom.xml index da7b5eacbc..6341f11cfb 100644 --- a/common/parent/pom.xml +++ b/common/parent/pom.xml @@ -13,18 +13,18 @@ org.opendaylight.odlparent odlparent - 1.6.0-SNAPSHOT + 1.5.0-SNAPSHOT 4.0.0 yangtools-parent org.opendaylight.yangtools - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT pom - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 1.2 @@ -310,7 +310,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT @@ -344,7 +344,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT jar diff --git a/common/pom.xml b/common/pom.xml index cff1d1feff..8c0bf84b1b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT parent diff --git a/common/util/pom.xml b/common/util/pom.xml index c32b829dce..9c9ab40246 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml bundle diff --git a/integration-test/bug1196-test-model/pom.xml b/integration-test/bug1196-test-model/pom.xml index 447b1fb2fb..c2d2746263 100644 --- a/integration-test/bug1196-test-model/pom.xml +++ b/integration-test/bug1196-test-model/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml @@ -31,12 +31,12 @@ org.opendaylight.yangtools yang-binding - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT org.opendaylight.yangtools yang-common - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/integration-test/bug527-test-model/pom.xml b/integration-test/bug527-test-model/pom.xml index f65011a002..9a7177229b 100644 --- a/integration-test/bug527-test-model/pom.xml +++ b/integration-test/bug527-test-model/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/integration-test/bundle-test/pom.xml b/integration-test/bundle-test/pom.xml index 7f16ef284b..42235ace5c 100644 --- a/integration-test/bundle-test/pom.xml +++ b/integration-test/bundle-test/pom.xml @@ -10,7 +10,7 @@ yangtools-parent org.opendaylight.yangtools - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 8c1331dc55..0871e056e7 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent diff --git a/integration-test/regression-test-model/pom.xml b/integration-test/regression-test-model/pom.xml index ad25fcc8bb..4b0a4f1d7f 100644 --- a/integration-test/regression-test-model/pom.xml +++ b/integration-test/regression-test-model/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.yangtools - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT yangtools-parent /../../common/parent/pom.xml diff --git a/integration-test/test-models/pom.xml b/integration-test/test-models/pom.xml index 749217dbc4..656ed68187 100644 --- a/integration-test/test-models/pom.xml +++ b/integration-test/test-models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml @@ -60,7 +60,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT jar diff --git a/integration-test/yang-runtime-tests/pom.xml b/integration-test/yang-runtime-tests/pom.xml index 89c0b68fba..c145dc54ff 100644 --- a/integration-test/yang-runtime-tests/pom.xml +++ b/integration-test/yang-runtime-tests/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index de82000313..57bd56c9be 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -12,13 +12,13 @@ model-iana org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../pom.xml 4.0.0 iana-afn-safi - 2013.07.04.8-SNAPSHOT + 2013.07.04.7-SNAPSHOT diff --git a/model/iana/iana-if-type-2014-05-08/pom.xml b/model/iana/iana-if-type-2014-05-08/pom.xml index 3815db3fc5..979dfdf819 100644 --- a/model/iana/iana-if-type-2014-05-08/pom.xml +++ b/model/iana/iana-if-type-2014-05-08/pom.xml @@ -12,12 +12,12 @@ model-iana org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 iana-if-type-2014-05-08 - 2014.05.08.8-SNAPSHOT + 2014.05.08.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index fb011b8145..b354c1c7ca 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -12,13 +12,13 @@ model-iana org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../pom.xml 4.0.0 iana-if-type - 2013.07.04.8-SNAPSHOT + 2013.07.04.7-SNAPSHOT diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 843c084db3..13eb5db290 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -12,7 +12,7 @@ model-parent org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../pom.xml diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index cad8508620..9759f5ce93 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -12,12 +12,12 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-inet-types - 2010.09.24.8-SNAPSHOT + 2010.09.24.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilderTest.java b/model/ietf/ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilderTest.java index d2259d006b..1339fc06cf 100644 --- a/model/ietf/ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilderTest.java +++ b/model/ietf/ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilderTest.java @@ -16,23 +16,24 @@ public class HostBuilderTest { @Test public void testGetDefaultInstanceIpv4() throws Exception { - final Host host = HostBuilder.getDefaultInstance("127.0.0.1"); + Host host = HostBuilder.getDefaultInstance("127.0.0.1"); assertEquals(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))), host); } @Test public void testGetDefaultInstanceIpv6() throws Exception { - testIpv6("1234:5678:9abc:def1:2345:6789:abcd:ef12"); + testIpv6("2001:db8:8s5a3:0:0:8a2e:370:7334"); + testIpv6("2001:db8:85a3::8a2e:370:7334"); } private void testIpv6(final String ivp6string) { - final Host host = HostBuilder.getDefaultInstance(ivp6string); + Host host = HostBuilder.getDefaultInstance(ivp6string); assertEquals(new Host(new IpAddress(new Ipv6Address(ivp6string))), host); } @Test public void testGetDefaultInstanceDomain() throws Exception { - final Host host = HostBuilder.getDefaultInstance("localhost"); + Host host = HostBuilder.getDefaultInstance("localhost"); assertEquals(new Host(new DomainName("localhost")), host); } } \ No newline at end of file diff --git a/model/ietf/ietf-interfaces/pom.xml b/model/ietf/ietf-interfaces/pom.xml index ac561979dc..f1bc48457d 100644 --- a/model/ietf/ietf-interfaces/pom.xml +++ b/model/ietf/ietf-interfaces/pom.xml @@ -12,12 +12,12 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-interfaces - 2014.05.08.8-SNAPSHOT + 2014.05.08.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml index f25ffe7946..e9ce370137 100644 --- a/model/ietf/ietf-restconf/pom.xml +++ b/model/ietf/ietf-restconf/pom.xml @@ -13,13 +13,13 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-restconf - 2013.10.19.8-SNAPSHOT + 2013.10.19.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index f060fe23f5..d8f758d878 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -12,13 +12,13 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-ted - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 9063160570..77c026bf4c 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -12,13 +12,13 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-topology-isis - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index 071d5aadb2..6d00b7814b 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -13,13 +13,13 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-topology-l3-unicast-igp - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index 7344aab89b..64f2eb5dfa 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -12,13 +12,13 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-topology-ospf - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 1954710a68..ea135bbb88 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -12,11 +12,11 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-topology - 2013.10.21.8-SNAPSHOT + 2013.10.21.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-yang-types-20130715/pom.xml b/model/ietf/ietf-yang-types-20130715/pom.xml index 9d6c5eeba4..25df3cebca 100644 --- a/model/ietf/ietf-yang-types-20130715/pom.xml +++ b/model/ietf/ietf-yang-types-20130715/pom.xml @@ -13,12 +13,12 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-yang-types-20130715 - 2013.07.15.8-SNAPSHOT + 2013.07.15.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml index 9c20f89435..685d70daff 100644 --- a/model/ietf/ietf-yang-types/pom.xml +++ b/model/ietf/ietf-yang-types/pom.xml @@ -12,12 +12,12 @@ model-ietf org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 ietf-yang-types - 2010.09.24.8-SNAPSHOT + 2010.09.24.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 0e958f85c2..5677b0c11b 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,7 +12,7 @@ model-parent org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index 0b27bcd067..c47cc0a90e 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -12,13 +12,13 @@ model-parent org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 opendaylight-l2-types - 2013.08.27.8-SNAPSHOT + 2013.08.27.7-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index cc77098d0d..206d1b2886 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,11 +12,11 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent org.opendaylight.yangtools.model - + 4.0.0 model-parent pom @@ -68,7 +68,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT jar diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml index 3cbe1766fd..2bb3db677f 100644 --- a/model/yang-ext/pom.xml +++ b/model/yang-ext/pom.xml @@ -12,13 +12,13 @@ model-parent org.opendaylight.yangtools.model - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT 4.0.0 yang-ext - 2013.09.07.8-SNAPSHOT + 2013.09.07.7-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/pom.xml b/pom.xml index 395da84e1b..e64f5c3bfe 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT common/parent diff --git a/restconf/pom.xml b/restconf/pom.xml index 084719b997..fba0fb7d03 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent 4.0.0 diff --git a/restconf/restconf-client-api/pom.xml b/restconf/restconf-client-api/pom.xml index 2f2f003255..130e7dffbb 100644 --- a/restconf/restconf-client-api/pom.xml +++ b/restconf/restconf-client-api/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/restconf/restconf-client-impl/pom.xml b/restconf/restconf-client-impl/pom.xml index 690c391d25..fe46d36d92 100644 --- a/restconf/restconf-client-impl/pom.xml +++ b/restconf/restconf-client-impl/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT restconf-client-impl diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml index 89926c8af8..dbb4819085 100644 --- a/restconf/restconf-common/pom.xml +++ b/restconf/restconf-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT restconf-common diff --git a/restconf/restconf-jaxrs-api/pom.xml b/restconf/restconf-jaxrs-api/pom.xml index 3ea648c927..aa91bc614b 100644 --- a/restconf/restconf-jaxrs-api/pom.xml +++ b/restconf/restconf-jaxrs-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT restconf-jaxrs-api restconf-jaxrs-api diff --git a/restconf/restconf-test-service/pom.xml b/restconf/restconf-test-service/pom.xml index 9f36d6f935..7c079b9c0f 100644 --- a/restconf/restconf-test-service/pom.xml +++ b/restconf/restconf-test-service/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT restconf-test-service diff --git a/restconf/restconf-util/pom.xml b/restconf/restconf-util/pom.xml index 3110382aca..9ebb9ba3a4 100644 --- a/restconf/restconf-util/pom.xml +++ b/restconf/restconf-util/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools restconf-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT restconf-util diff --git a/third-party/antlr4-runtime-osgi/pom.xml b/third-party/antlr4-runtime-osgi/pom.xml index 95ef64179c..7442f99b3a 100644 --- a/third-party/antlr4-runtime-osgi/pom.xml +++ b/third-party/antlr4-runtime-osgi/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools third-party-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../pom.xml diff --git a/third-party/pom.xml b/third-party/pom.xml index 1727bdba7d..c22c469cc2 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../parent/pom.xml diff --git a/websocket/pom.xml b/websocket/pom.xml index ab7fdff9d4..8acd61daaf 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent diff --git a/websocket/websocket-client/pom.xml b/websocket/websocket-client/pom.xml index 5ed7bf6747..3410999859 100644 --- a/websocket/websocket-client/pom.xml +++ b/websocket/websocket-client/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml index cbbc6ce6ea..8dbaa1df23 100644 --- a/yang-validation-tool/pom.xml +++ b/yang-validation-tool/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.yangtools yangtools-aggregator - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT yang-validation-tool diff --git a/yang/pom.xml b/yang/pom.xml index 546339a2ab..01e71bd547 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT ../common/parent diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index 0d03ad751a..ada7f5a89d 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 19a2656d88..dc732e3dab 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index 73505cd997..688dbb1fdb 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml index f366cc1ebf..fd74811337 100644 --- a/yang/yang-data-codec-gson/pom.xml +++ b/yang/yang-data-codec-gson/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RpcAsContainer.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RpcAsContainer.java index b9fddf3ecf..0b64b22967 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RpcAsContainer.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RpcAsContainer.java @@ -93,9 +93,8 @@ final class RpcAsContainer implements ContainerSchemaNode { return delegate.getInput(); case "output": return delegate.getOutput(); - default: - return null; } + return null; } @Override @@ -115,7 +114,7 @@ final class RpcAsContainer implements ContainerSchemaNode { @Override public Collection getChildNodes() { - final List ret = new ArrayList<>(); + final ArrayList ret = new ArrayList<>(); final ContainerSchemaNode input = getInput(); final ContainerSchemaNode output = getOutput(); if(input != null) { diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index ca55ad0255..951e19d180 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java index f382586ef2..1742c03357 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerAttrNode.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import com.google.common.base.MoreObjects.ToStringHelper; -// FIXME: are attributes part of hashCode/equals? public abstract class AbstractImmutableDataContainerAttrNode extends AbstractImmutableDataContainerNode implements AttributesContainer { @@ -45,4 +44,26 @@ public abstract class AbstractImmutableDataContainerAttrNode a : attributes.entrySet()) { +// result = 31 * result + a.hashCode(); +// } +// return result; +// } + + // FIXME: are attributes part of hashCode/equals? +// @Override +// protected boolean valueEquals(final NormalizedNode other) { +// if (!super.valueEquals(other)) { +// return false; +// } +// final Set> tas = getAttributes().entrySet(); +// final Set> oas = container.getAttributes().entrySet(); +// +// return tas.containsAll(oas) && oas.containsAll(tas); +// return true; +// } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java index 842cf231f7..ec615025eb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java @@ -43,7 +43,10 @@ public abstract class AbstractImmutableNormalizedValueAttrNode a : attributes.entrySet()) { +// result = 31 * result + a.hashCode(); +// } return result; } @@ -57,6 +60,11 @@ public abstract class AbstractImmutableNormalizedValueAttrNode> tas = getAttributes().entrySet(); + // final Set> oas = + // container.getAttributes().entrySet(); + // + // return tas.containsAll(oas) && oas.containsAll(tas); return true; } diff --git a/yang/yang-data-operations/pom.xml b/yang/yang-data-operations/pom.xml index a11ebf8510..dec5406e42 100644 --- a/yang/yang-data-operations/pom.xml +++ b/yang/yang-data-operations/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index fc0d94592c..85d904a269 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index c3e8eea65a..29048f106d 100644 --- a/yang/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index 6cbbd6051b..3c88fe63fc 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 35b6f770d8..ab90853988 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index ca4d5540dd..10361ba20c 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java index 453ca46699..1bf809567d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java @@ -156,21 +156,21 @@ public enum Rfc6020Mapping implements StatementDefinition { private final QName argument; private final boolean yinElement; - Rfc6020Mapping(Class> clz, final String nameStr) { + private Rfc6020Mapping(Class> clz, final String nameStr) { type = Preconditions.checkNotNull(clz); name = yinQName(nameStr); argument = null; yinElement = false; } - Rfc6020Mapping(Class> clz, final String nameStr, final String argumentStr) { + private Rfc6020Mapping(Class> clz, final String nameStr, final String argumentStr) { type = Preconditions.checkNotNull(clz); name = yinQName(nameStr); argument = yinQName(argumentStr); this.yinElement = false; } - Rfc6020Mapping(Class> clz, final String nameStr, final String argumentStr, + private Rfc6020Mapping(Class> clz, final String nameStr, final String argumentStr, final boolean yinElement) { type = Preconditions.checkNotNull(clz); name = yinQName(nameStr); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java index cfb9d13124..42b45c38b4 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java @@ -51,40 +51,28 @@ public interface TypeStatement extends DeclaredStatement { @Rfc6020AbnfRule("leafref-specification") interface LeafrefSpecification extends TypeStatement { - @Nonnull PathStatement getPath(); + @Nullable PathStatement getPath(); } - @Rfc6020AbnfRule("instanceidentifier-specification") interface InstanceIdentifierSpecification extends TypeStatement { @Nullable RequireInstanceStatement getRequireInstance(); } - @Rfc6020AbnfRule("identityref-specification") - interface IdentityRefSpecification extends TypeStatement { - @Nonnull BaseStatement getBase(); + interface IdentityRefSpecification extends TypeStatement { } - - @Rfc6020AbnfRule("bits-specification") interface BitsSpecification extends TypeStatement { @Nonnull Collection getBits(); } - @Rfc6020AbnfRule("union-specification") interface UnionSpecification extends TypeStatement { @Nonnull Collection getTypes(); } - - @Rfc6020AbnfRule("binary-specification") - interface BinarySpecification extends TypeStatement { - - @Nullable LengthStatement getLength(); - } } diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index 81699215b7..31f82961be 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-model-parent/pom.xml b/yang/yang-model-parent/pom.xml index 64284634ad..50e2a926fd 100644 --- a/yang/yang-model-parent/pom.xml +++ b/yang/yang-model-parent/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 1.6.0-SNAPSHOT + 1.5.0-SNAPSHOT @@ -21,10 +21,10 @@ org.opendaylight.yangtools yang-model-parent pom - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 06c1b73089..f484e09d3a 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index 448ef2f664..ee32cd90d5 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 5cb407ed8d..6115c83b57 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.yangtools yangtools-parent - 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT /../../common/parent/pom.xml diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java index b6ee244501..b5b3cf0291 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.antlr.v4.runtime.tree.ParseTree; import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser; import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParserBaseListener; @@ -22,7 +23,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import javax.annotation.concurrent.Immutable; @@ -34,7 +34,6 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList private QNameToStatementDefinition stmtDef; private PrefixToModule prefixes; private List toBeSkipped = new ArrayList<>(); - private boolean isType = false; private static final Logger LOG = LoggerFactory.getLogger(YangStatementParserListenerImpl.class); public YangStatementParserListenerImpl(StatementSourceReference ref) { @@ -52,31 +51,17 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList this.prefixes = prefixes; } - private static boolean hasNotEmptyBody(List children) { - for (ParseTree child : children) { - if (child instanceof YangStatementParser.StatementContext) { - return true; - } - } - return false; - } - @Override public void enterStatement(YangStatementParser.StatementContext ctx) { boolean action = true; - QName identifier; for (int i = 0; i < ctx.getChildCount(); i++) { ParseTree child = ctx.getChild(i); if (child instanceof YangStatementParser.KeywordContext) { try { - identifier = new QName(YangConstants.RFC6020_YIN_NAMESPACE, + QName identifier = new QName(YangConstants.RFC6020_YIN_NAMESPACE, ((YangStatementParser.KeywordContext) child).children.get(0).getText()); if (stmtDef != null && Utils.isValidStatementDefinition(prefixes, stmtDef, identifier) && toBeSkipped.isEmpty()) { - if (identifier.equals(Rfc6020Mapping.TYPE.getStatementName()) && hasNotEmptyBody(((YangStatementParser.KeywordContext) child).getParent().children)) { - isType = true; - } else { - writer.startStatement(identifier, ref); - } + writer.startStatement(identifier, ref); } else { action = false; toBeSkipped.add(((YangStatementParser.KeywordContext) child).children.get(0).getText()); @@ -86,13 +71,9 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList } } else if (child instanceof YangStatementParser.ArgumentContext) { try { - final String argument = Utils.stringFromStringContext((YangStatementParser.ArgumentContext) child); - if (isType) { - writer.startStatement(new QName(YangConstants.RFC6020_YIN_NAMESPACE, argument), ref); - writer.argumentValue(argument, ref); - isType = false; - } else if (action) { - writer.argumentValue(Utils.stringFromStringContext((YangStatementParser.ArgumentContext) child), ref); + if (action) { + writer.argumentValue( + Utils.stringFromStringContext((YangStatementParser.ArgumentContext) child), ref); } else { action = true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java index b3d9118731..fc0e3783d8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java @@ -8,10 +8,8 @@ package org.opendaylight.yangtools.yang.parser.spi; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; /** * @@ -21,6 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; * identity identifier namespace. * */ -public interface IdentityNamespace extends IdentifierNamespace>> { +public interface IdentityNamespace extends IdentifierNamespace { } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java index bbf2838548..ad6d70a823 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java @@ -195,15 +195,10 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh switch (sourceProgress) { case FINISHED: currentSource.remove(); - // Fallback to progress, since we were able to make progress in computation case PROGRESS: progressing = true; - break; case NO_PROGRESS: - // Noop - break; - default: - throw new IllegalStateException("Unsupported phase progress " + sourceProgress); + // Noop; } } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java index bf00b764a5..847f8e988e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java @@ -7,19 +7,25 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.reactor; +import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.YangConstants; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; + import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.Objects; +import javax.annotation.Nullable; import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; -import org.opendaylight.yangtools.yang.model.util.BaseTypes; import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.ImportedNamespaceContext; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; @@ -37,25 +43,9 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase.ContextBuilder; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.BitsSpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Decimal64SpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.EnumSpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.IdentityRefSpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.InstanceIdentifierSpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.LeafrefSpecificationImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.NumericalRestrictionsImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.StringRestrictionsImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnionSpecificationImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.UnknownStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; - public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBehaviour.Registry, Mutable { public enum PhaseCompletionProgress { @@ -89,11 +79,8 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh ContextBuilder createDeclaredChild(StatementContextBase current, QName name, StatementSourceReference ref) { StatementDefinitionContext def = getDefinition(name); - if (def == null && BaseTypes.isYangBuildInType(name.getLocalName())) { - //type-body-stmts - def = resolveTypeBodyStmts(name.getLocalName()); - } else if (def == null) { - //extensions + //extensions + if (def == null) { if (Utils.isValidStatementDefinition(prefixToModuleMap, qNameToStmtDefMap, name)) { def = new StatementDefinitionContext<>(new UnknownStatementImpl.Definition(qNameToStmtDefMap.get(Utils.trimPrefix(name)))); } @@ -259,32 +246,6 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } } - private StatementDefinitionContext resolveTypeBodyStmts(String typeArgument) { - switch (typeArgument) { - case "int8": case "int16": case "int32": case "int64": case "uint8": case "uint16": case "uint32": case "uint64": - return new StatementDefinitionContext<>(new NumericalRestrictionsImpl.Definition()); - case "decimal64": - return new StatementDefinitionContext<>(new Decimal64SpecificationImpl.Definition()); - case "union": - return new StatementDefinitionContext<>(new UnionSpecificationImpl.Definition()); - case "string": - return new StatementDefinitionContext<>(new StringRestrictionsImpl.Definition()); - case "enumeration": - return new StatementDefinitionContext<>(new EnumSpecificationImpl.Definition()); - case "leafref": - return new StatementDefinitionContext<>(new LeafrefSpecificationImpl.Definition()); - case "bits": - return new StatementDefinitionContext<>(new BitsSpecificationImpl.Definition()); - case "identityref": - return new StatementDefinitionContext<>(new IdentityRefSpecificationImpl.Definition()); - case "instance-identifier": - return new StatementDefinitionContext<>(new InstanceIdentifierSpecificationImpl.Definition()); - default: - return null; - } - } - - private PrefixToModule prefixes() { Map prefixes = (Map) currentContext.getAllFromNamespace(PrefixToModule.class); for (Map.Entry prefix : prefixes.entrySet()) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java index 7a8d13031b..808518d9d8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java @@ -27,6 +27,7 @@ class SubstatementContext, E extends EffectiveS private final A argument; SubstatementContext(StatementContextBase parent,ContextBuilder builder) throws SourceException { + //super(builder, builder.getDefinition().parseArgumentValue(parent, builder.getRawArgument())); super(builder); this.parent = Preconditions.checkNotNull(parent, "Parent must not be null"); this.argument = builder.getDefinition().parseArgumentValue(this, builder.getRawArgument()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BinarySpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BinarySpecificationImpl.java deleted file mode 100644 index dcc57ab770..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BinarySpecificationImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020; - -import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.LengthStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class BinarySpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.BinarySpecification { - - protected BinarySpecificationImpl(StmtContext context) { - super(context); - } - - public static class Definition extends AbstractStatementSupport> { - - public Definition() { - super(Rfc6020Mapping.TYPE); - } - - @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { - return value; - } - - @Override - public BinarySpecification createDeclared(StmtContext ctx) { - return new BinarySpecificationImpl(ctx); - } - - @Override - public EffectiveStatement createEffective(StmtContext> ctx) { - return null; - } - } - - @Nullable - @Override - public LengthStatement getLength() { - return firstDeclared(LengthStatement.class); - } - - @Nonnull - @Override - public String getName() { - return argument(); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java index f2831bfd30..93e227ac00 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -28,7 +28,9 @@ public class BitStatementImpl extends AbstractDeclaredStatement super(context); } - public static class Definition extends AbstractStatementSupport> { + public static class Definition + extends + AbstractStatementSupport> { public Definition() { super(Rfc6020Mapping.BIT); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java index 5138e0b225..53215e76f7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.BitsSpecificationEffectiveStatementImpl; public class BitsSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.BitsSpecification { @@ -50,7 +49,7 @@ public class BitsSpecificationImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new BitsSpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java index 15d91a4d14..985b18d1a0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; + import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; @@ -16,7 +17,6 @@ import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.Decimal64SpecificationEffectiveStatementImpl; public class Decimal64SpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.Decimal64Specification{ @@ -27,7 +27,7 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.FRACTION_DIGITS); } @Override public String parseArgumentValue(StmtContext ctx, @@ -42,7 +42,7 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement createEffective( StmtContext> ctx) { - return new Decimal64SpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java index f56e9a4739..8a1a9738e3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EnumSpecificationEffectiveStatementImpl; public class EnumSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.EnumSpecification { @@ -32,7 +31,7 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement AbstractStatementSupport> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.ENUM); } @Override @@ -50,7 +49,7 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new EnumSpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java index 7c5ae5a587..3fa1b1ce7f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java index e7bebeee0e..e3ff0d39fb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java @@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; +import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -50,7 +51,7 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement imp } @Override - public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) throws InferenceException, SourceException { stmt.addContext(ExtensionNamespace.class, stmt.getStatementArgument(), stmt); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java index 98a5667df0..30d6ef0769 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java @@ -60,10 +60,9 @@ public class GroupingStatementImpl extends AbstractDeclaredStatement } @Override - public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { - if (stmt != null && stmt.getParentContext() != null) { - stmt.getParentContext().addContext(GroupingNamespace.class, stmt.getStatementArgument(), stmt); - } + public void onFullDefinitionDeclared( + Mutable> stmt) throws SourceException { + stmt.getParentContext().addContext(GroupingNamespace.class, stmt.getStatementArgument(),stmt); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java index 37df53b9b6..bd2b1e7c0a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -7,11 +7,6 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; -import com.google.common.base.Preconditions; -import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; -import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace; -import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; @@ -19,13 +14,10 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IdentityRefSpecificationEffectiveStatementImpl; -import javax.annotation.Nonnull; -import java.util.Map; - -public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.IdentityRefSpecification { +public class IdentityRefSpecificationImpl extends + AbstractDeclaredStatement implements + TypeStatement.IdentityRefSpecification { protected IdentityRefSpecificationImpl( StmtContext context) { @@ -37,7 +29,7 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.BASE); } @Override @@ -55,14 +47,7 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement createEffective( StmtContext> ctx) { - return new IdentityRefSpecificationEffectiveStatementImpl(ctx); - } - - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { - //FIXME: -// StatementContextBase stmtCtx = (StatementContextBase) stmt.getFromNamespace(IdentityNamespace.class, Utils.qNameFromArgument(StmtContextUtils.findFirstDeclaredSubstatement(stmt, BaseStatement.class), (String) StmtContextUtils.findFirstDeclaredSubstatement(stmt, BaseStatement.class).getStatementArgument())); -// Preconditions.checkArgument(stmtCtx != null, "Identity '%s' doesn't exist in given scope (module, imported submodules)", stmt.getStatementArgument()); + throw new UnsupportedOperationException(); } } @@ -71,10 +56,4 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement super(context); } - public static class Definition extends AbstractStatementSupport> { + public static class Definition + extends + AbstractStatementSupport> { public Definition() { super(Rfc6020Mapping.IDENTITY); @@ -55,10 +54,6 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement return new IdentityEffectiveStatementImpl(ctx); } - @Override - public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { - stmt.addToNs(IdentityNamespace.class, stmt.getStatementArgument(), stmt); - } } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java index d51ae869ac..504498db34 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.InstanceIdentifierSpecificationEffectiveStatementImpl; public class InstanceIdentifierSpecificationImpl extends AbstractDeclaredStatement implements @@ -32,7 +31,7 @@ public class InstanceIdentifierSpecificationImpl extends AbstractStatementSupport> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.REQUIRE_INSTANCE); } @Override @@ -50,7 +49,7 @@ public class InstanceIdentifierSpecificationImpl extends @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new InstanceIdentifierSpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java index d01ed15de3..58b7d5cacf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; + import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; @@ -15,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafrefSpecificationEffectiveStatementImpl; public class LeafrefSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.LeafrefSpecification { @@ -30,7 +30,7 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement AbstractStatementSupport> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.PATH); } @Override @@ -48,7 +48,7 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new LeafrefSpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java index 0db8c69f41..5df5575050 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java @@ -1,10 +1,3 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MustEffectiveStatementImpl; @@ -41,7 +34,7 @@ public class MustStatementImpl extends AbstractDeclaredStatement ctx, String value) throws SourceException { - return new RevisionAwareXPathImpl(value, Utils.isXPathAbsolute(value)); + return new RevisionAwareXPathImpl(value, false); } @Override public MustStatement createDeclared( diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java index bcf5b34962..2415db62d8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.NumericalRestrictionsEffectiveStatementImpl; public class NumericalRestrictionsImpl extends AbstractDeclaredStatement implements TypeStatement.NumericalRestrictions{ @@ -26,7 +25,7 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement public static class Definition extends AbstractStatementSupport> { public Definition() { - super(Rfc6020Mapping.TYPE); + super(Rfc6020Mapping.RANGE); } @Override public String parseArgumentValue(StmtContext ctx, @@ -41,7 +40,7 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new NumericalRestrictionsEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java deleted file mode 100644 index d0bc47e81a..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020; - -import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; -import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; -import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; -import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MustEffectiveStatementImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PathEffectiveStatementImpl; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class PathStatementImpl extends AbstractDeclaredStatement implements - PathStatement { - - protected PathStatementImpl(StmtContext context) { - super(context); - } - - public static class Definition extends AbstractStatementSupport> { - - public Definition() { - super(Rfc6020Mapping.PATH); - } - - @Override public RevisionAwareXPath parseArgumentValue( - StmtContext ctx, String value) throws SourceException { - return new RevisionAwareXPathImpl(value, Utils.isXPathAbsolute(value)); - } - - @Override public PathStatement createDeclared( - StmtContext ctx) { - return new PathStatementImpl(ctx); - } - - @Override public EffectiveStatement createEffective( - StmtContext> ctx) { - return new PathEffectiveStatementImpl(ctx); - } - } - - @Nonnull - @Override - public String getValue() { - return rawArgument(); - } - -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java index cd192b9f9a..0573fc310d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java index 0a9cfffcb4..7a85c17778 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.StringRestrictionsEffectiveStatementImpl; public class StringRestrictionsImpl extends AbstractDeclaredStatement implements TypeStatement.StringRestrictions { @@ -51,7 +50,7 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new StringRestrictionsEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java index 6f87836f94..e96db5e9d8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -7,18 +7,13 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; -import com.google.common.base.Preconditions; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.model.util.BaseTypes; -import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.TypeEffectiveStatementImpl; import javax.annotation.Nonnull; @@ -46,17 +41,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement impleme @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new TypeEffectiveStatementImpl(ctx); - } - - @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { - if (!BaseTypes.isYangBuildInType(stmt.getStatementArgument())) { - if (stmt.getParentContext() != null) { - StatementContextBase stmtCtx = (StatementContextBase) stmt.getParentContext().getFromNamespace(TypeNamespace.class, Utils.qNameFromArgument(stmt, stmt.getStatementArgument())); - Preconditions.checkArgument(stmtCtx != null, "Typedef '%s' doesn't exist in given scope", stmt.getStatementArgument()); - } - } + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java index 96c87db15a..595c280e87 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -17,13 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; -import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.TypeDefEffectiveStatementImpl; - import javax.annotation.Nullable; public class TypedefStatementImpl extends AbstractDeclaredStatement @@ -57,14 +54,7 @@ public class TypedefStatementImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new TypeDefEffectiveStatementImpl(ctx); - } - - @Override - public void onStatementDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { - if (stmt != null && stmt.getParentContext() != null) { - stmt.getParentContext().addContext(TypeNamespace.class, stmt.getStatementArgument(), stmt); - } + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java index 22d00f0a68..36ca6f5854 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -8,15 +8,13 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import java.util.Collection; - -import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnionSpecificationEffectiveStatementImpl; public class UnionSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.UnionSpecification { @@ -26,7 +24,9 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement super(context); } - public static class Definition extends AbstractStatementSupport> { + public static class Definition + extends + AbstractStatementSupport> { public Definition() { super(Rfc6020Mapping.TYPE); @@ -47,7 +47,7 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement @Override public EffectiveStatement createEffective( StmtContext> ctx) { - return new UnionSpecificationEffectiveStatementImpl(ctx); + throw new UnsupportedOperationException(); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java index 78d60b1932..7e5fc5646f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -39,7 +39,7 @@ public class WhenStatementImpl extends AbstractDeclaredStatement ctx, String value) throws SourceException { - return new RevisionAwareXPathImpl(value, Utils.isXPathAbsolute(value)); + return new RevisionAwareXPathImpl(value, false); } @Override public WhenStatement createDeclared( diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java index 29fddc0b1c..87bfe2b3f4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java @@ -12,8 +12,6 @@ import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.treeScoped; import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace; -import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace; -import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.source.ModuleQNameToModuleName; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; @@ -29,6 +27,7 @@ import org.opendaylight.yangtools.yang.parser.spi.ModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle; +import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; public final class YangInferencePipeline { @@ -59,6 +58,7 @@ public final class YangInferencePipeline { .addSupport(sourceLocal(IncludedModuleContext.class)) .addSupport(sourceLocal(ImpPrefixToModuleIdentifier.class)) .addSupport(sourceLocal(BelongsToPrefixToModuleName.class)) + .addSupport(sourceLocal(QNameToStatementDefinition.class)) .build(); private static final StatementSupportBundle STMT_DEF_BUNDLE = StatementSupportBundle. @@ -67,10 +67,6 @@ public final class YangInferencePipeline { .addSupport(new ArgumentStatementImpl.Definition()) .addSupport(new ExtensionStatementImpl.Definition()) .addSupport(global(ExtensionNamespace.class)) - .addSupport(new TypedefStatementImpl.Definition()) - .addSupport(treeScoped(TypeNamespace.class)) - .addSupport(new IdentityStatementImpl.Definition()) - .addSupport(global(IdentityNamespace.class)) .build(); private static final StatementSupportBundle FULL_DECL_BUNDLE = StatementSupportBundle. @@ -86,6 +82,7 @@ public final class YangInferencePipeline { .addSupport(new DefaultStatementImpl.Definition()) .addSupport(new MustStatementImpl.Definition()) .addSupport(new MandatoryStatementImpl.Definition()) + .addSupport(new TypedefStatementImpl.Definition()) .addSupport(new AnyxmlStatementImpl.Definition()) .addSupport(new IfFeatureStatementImpl.Definition()) .addSupport(new UsesStatementImpl.Definition()) @@ -104,6 +101,7 @@ public final class YangInferencePipeline { .addSupport(new WhenStatementImpl.Definition()) .addSupport(new AugmentStatementImpl.Definition()) .addSupport(new RefineStatementImpl.Definition()) + .addSupport(new IdentityStatementImpl.Definition()) .addSupport(new BaseStatementImpl.Definition()) .addSupport(new FractionDigitsStatementImpl.Definition()) .addSupport(new EnumStatementImpl.Definition()) @@ -119,8 +117,16 @@ public final class YangInferencePipeline { .addSupport(new ValueStatementImpl.Definition()) .addSupport(new UnitsStatementImpl.Definition()) .addSupport(new RequireInstanceStatementImpl.Definition()) - .addSupport(new BitStatementImpl.Definition()) - .addSupport(new PathStatementImpl.Definition()) + //TODO: add mapping to Rfc6020Mapping class and uncomment following. Please test it. +// .addSupport(new EnumSpecificationImpl.Definition()) +// .addSupport(new Decimal64SpecificationImpl.Definition()) +// .addSupport(new IdentityRefSpecificationImpl.Definition()) +// .addSupport(new InstanceIdentifierSpecificationImpl.Definition()) +// .addSupport(new LeafrefSpecificationImpl.Definition()) +// .addSupport(new NumericalRestrictionsImpl.Definition()) +// .addSupport(new StringRestrictionsImpl.Definition()) +// .addSupport(new UnionSpecificationImpl.Definition()) +// .addSupport(new BitStatementImpl.Definition()) .build(); public static final Map RFC6020_BUNDLES = ImmutableMap diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitEffectiveStatementImpl.java index 010ae58bc3..73cb760233 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitEffectiveStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitsSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitsSpecificationEffectiveStatementImpl.java deleted file mode 100644 index 36ad2978d9..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/BitsSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class BitsSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public BitsSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/Decimal64SpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/Decimal64SpecificationEffectiveStatementImpl.java deleted file mode 100644 index 8d367a440b..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/Decimal64SpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class Decimal64SpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public Decimal64SpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EnumSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EnumSpecificationEffectiveStatementImpl.java deleted file mode 100644 index c94c79fbee..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EnumSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class EnumSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public EnumSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityRefSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityRefSpecificationEffectiveStatementImpl.java deleted file mode 100644 index f06597a7e7..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityRefSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class IdentityRefSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public IdentityRefSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InstanceIdentifierSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InstanceIdentifierSpecificationEffectiveStatementImpl.java deleted file mode 100644 index 68c3476ff2..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InstanceIdentifierSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class InstanceIdentifierSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public InstanceIdentifierSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafrefSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafrefSpecificationEffectiveStatementImpl.java deleted file mode 100644 index 15b36ddae2..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafrefSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class LeafrefSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public LeafrefSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NumericalRestrictionsEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NumericalRestrictionsEffectiveStatementImpl.java deleted file mode 100644 index 98c6dcde9b..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NumericalRestrictionsEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class NumericalRestrictionsEffectiveStatementImpl extends EffectiveStatementBase { - - public NumericalRestrictionsEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/PathEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/PathEffectiveStatementImpl.java deleted file mode 100644 index 5fa69b0aeb..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/PathEffectiveStatementImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; -import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class PathEffectiveStatementImpl extends - EffectiveStatementBase { - - public PathEffectiveStatementImpl( - StmtContext ctx) { - super(ctx); - - } - -} \ No newline at end of file diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RequireInstanceEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RequireInstanceEffectiveStatementImpl.java index 5697b95705..b89b443710 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RequireInstanceEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RequireInstanceEffectiveStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/StringRestrictionsEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/StringRestrictionsEffectiveStatementImpl.java deleted file mode 100644 index 139a7d42ac..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/StringRestrictionsEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class StringRestrictionsEffectiveStatementImpl extends EffectiveStatementBase { - - public StringRestrictionsEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeDefEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeDefEffectiveStatementImpl.java deleted file mode 100644 index 05070c0f0c..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeDefEffectiveStatementImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class TypeDefEffectiveStatementImpl extends EffectiveStatementBase { - - public TypeDefEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeEffectiveStatementImpl.java deleted file mode 100644 index b627725e6d..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/TypeEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class TypeEffectiveStatementImpl extends EffectiveStatementBase { - - public TypeEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnionSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnionSpecificationEffectiveStatementImpl.java deleted file mode 100644 index 12b8ba98a7..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnionSpecificationEffectiveStatementImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.rfc6020.effective; - -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -public class UnionSpecificationEffectiveStatementImpl extends EffectiveStatementBase { - - public UnionSpecificationEffectiveStatementImpl(StmtContext ctx) { - super(ctx); - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnitsEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnitsEffectiveStatementImpl.java index 7ab0ac0971..83e4fd2b22 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnitsEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnitsEffectiveStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/WhenEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/WhenEffectiveStatementImpl.java index 45a1142ce1..c7eeac506f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/WhenEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/WhenEffectiveStatementImpl.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangTypesStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangTypesStmtTest.java deleted file mode 100644 index 68fd50face..0000000000 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangTypesStmtTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2015 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.stmt.test; - -import org.junit.Test; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; - -import static org.junit.Assert.assertNotNull; - -public class YangTypesStmtTest { - - private static final YangStatementSourceImpl TYPEFILE1 = new YangStatementSourceImpl("/semantic-statement-parser/types.yang"); - private static final YangStatementSourceImpl TYPEFILE2 = new YangStatementSourceImpl("/semantic-statement-parser/simple-types.yang"); - - @Test - public void readAndParseYangFileTest() throws SourceException, ReactorException { - CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, TYPEFILE1, TYPEFILE2); - EffectiveModelContext result = reactor.build(); - assertNotNull(result); - } - - private void addSources(CrossSourceStatementReactor.BuildAction reactor, StatementStreamSource... sources) { - for (StatementStreamSource source : sources) { - reactor.addSource(source); - } - } -} diff --git a/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/simple-types.yang b/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/simple-types.yang deleted file mode 100644 index 30d0b13e5a..0000000000 --- a/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/simple-types.yang +++ /dev/null @@ -1,103 +0,0 @@ -module simple-types { - - yang-version 1; - namespace "urn:simple.types"; - prefix "st"; - - organization "opendaylight"; - contact "WILL-BE-DEFINED-LATER"; - revision 2015-04-16; - - typedef myint8 { - type int8 { - range "1..20"; - } - } - - identity my-base; - - typedef myint32 { - type int32 { - range "1..2000"; - } - } - - container mycontainer { - leaf mynumerical { - type int32 { - range "1..3000"; - } - } - - leaf mynorestrictions { - type string; - } - - leaf mytypedefuse1 { - type myint32; - } - - leaf mytypedefuse2 { - type myint8; - } - - leaf myunion { - type union { - type int8; - type int32; - } - } - - leaf mydecimal64 { - type decimal64 { - fraction-digits 2; - range "1 .. 3.14 | 10 | 20..max"; - } - } - - leaf mystring { - type string { - length "1..255"; - pattern "[0-9a-fA-F]*"; - } - } - - leaf myenum { - type enumeration { - enum zero; - enum one; - enum seven { - value 7; - } - } - } - - leaf mybits { - type bits { - bit disable-nagle { - position 0; - } - bit auto-sense-speed { - position 1; - } - bit 10-Mb-only { - position 2; - } - } - default "auto-sense-speed"; - } - - leaf mgmt-interface { - type leafref { - path "../myenum"; - } - } - - leaf crypto { - type identityref { - base "my-base"; - } - } - - } -} diff --git a/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/types.yang b/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/types.yang deleted file mode 100644 index eff282a250..0000000000 --- a/yang/yang-parser-impl/src/test/resources/semantic-statement-parser/types.yang +++ /dev/null @@ -1,132 +0,0 @@ -module custom-types-test { - - yang-version 1; - namespace "urn:custom.types.demo"; - prefix "iit"; - - organization "opendaylight"; - contact "WILL-BE-DEFINED-LATER"; - revision 2012-04-16 { - } - - extension mountpoint { - description "enter point"; - argument "name" { - yin-element "true"; - } - } - - typedef access-operations-type { - type bits { - bit create { - description "Any protocol operation that creates a new data node."; - } - bit read { - description "Any protocol operation or notification that returns the value of a data node."; - position 500; - } - bit update { - description "Any protocol operation that alters an existing data node."; - } - bit delete { - description "Any protocol operation that removes a data node."; - position 365; - } - bit exec { - description "Execution access to the specified protocol operation."; - } - } - description "NETCONF Access Operation."; - } - - leaf inst-id-leaf1 { - type instance-identifier { - require-instance false; - } - iit:mountpoint "mnt-extension"; - } - - leaf inst-id-leaf2 { - type instance-identifier; - } - - leaf type { - type service-type-ref; - } - - identity crypto-id { - base "crypto-base"; - description "crypto-id description"; - iit:mountpoint "mnt-extension"; - } - - identity crypto-base { - description "crypto-base description"; - } - - identity crypto-alg { - base "crypto-base"; - description "crypto-alg description"; - } - - identity crypto-def { - base "crypto-base"; - description "crypto-def description"; - } - - leaf mybits { - type bits { - bit disable-nagle { - position 0; - } - bit auto-sense-speed { - position 1; - } - bit 10-Mb-only { - position 2; - } - } - default "auto-sense-speed"; - } - - typedef ip-version { - type enumeration { - enum unknown { - description "An unknown or unspecified version of the Internet protocol."; - } - enum ipv4 { - value "19"; - description "The IPv4 protocol as defined in RFC 791."; - } - enum ipv6 { - value "7"; - description "The IPv6 protocol as defined in RFC 2460."; - } - enum default { - description "default ip"; - } - } - } - - identity service-type { - description - "Service identity base type. All service identities must be - derived from this type. A service type uniquely defines a single - atomic API contract, such as a Java interface, a set of C - function declarations, or similar. - - If the service type has a corresponding Java interface, the name - of that interface should be attached to the derived identity MUST - include a java-class keyword, whose name argument points to that - interface."; - } - - typedef service-type-ref { - description - "Internal type of references to service type identity."; - type identityref { - base service-type; - } - } - -} -- 2.36.6