From 1c3be6af5617695f249a2f7883c1583d35a025e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 10 Nov 2017 18:00:39 +0100 Subject: [PATCH] YANGTOOLS-706: finish evacuation of stmt.rfc6020.effective This patch moves the rest of the effective statement classes to their various places, reducing their visibility where possible. The place for ImplicingChoiceCaseNode remains to be defined, as its instantiation is related to the YANGTOOLS-724 mess. Change-Id: Ia18f120ee7586deaa9b28f725d14822cd785ee9c Signed-off-by: Robert Varga --- .../yang/data/impl/schema/BuilderTest.java | 5 +- .../AbstractEffectiveContainerSchemaNode.java | 8 +- .../AbstractEffectiveDataSchemaNode.java | 7 +- ...tEffectiveDocumentedDataNodeContainer.java | 4 +- ...tractEffectiveSimpleDataNodeContainer.java | 9 +- .../action/ActionEffectiveStatementImpl.java | 4 +- .../AnydataEffectiveStatementImpl.java | 2 +- .../anyxml}/AnyxmlEffectiveStatementImpl.java | 6 +- .../stmt/anyxml/AnyxmlStatementSupport.java | 2 - ...ngModeledAnyXmlEffectiveStatementImpl.java | 6 +- .../case_/AbstractCaseStatementSupport.java | 1 - .../case_}/CaseEffectiveStatementImpl.java | 8 +- .../AbstractChoiceStatementSupport.java | 1 - .../choice}/ChoiceEffectiveStatementImpl.java | 16 +- .../stmt/choice/ImplicitChoiceCaseNode.java} | 12 +- .../AbstractContainerStatementSupport.java | 1 - .../ContainerEffectiveStatementImpl.java | 6 +- .../input/AbstractInputStatementSupport.java | 1 - .../input}/InputEffectiveStatementImpl.java | 6 +- .../leaf}/LeafEffectiveStatementImpl.java | 7 +- .../stmt/leaf/LeafStatementSupport.java | 1 - .../AbstractLeafListStatementSupport.java | 1 - .../LeafListEffectiveStatementImpl.java | 6 +- .../list/AbstractListStatementSupport.java | 1 - .../list}/ListEffectiveStatementImpl.java | 6 +- .../AbstractOutputStatementSupport.java | 1 - .../output}/OutputEffectiveStatementImpl.java | 6 +- .../stmt/rpc/RpcEffectiveStatementImpl.java | 4 +- .../uses}/UsesEffectiveStatementImpl.java | 7 +- .../rfc7950/stmt/uses/UsesStatementImpl.java | 6 +- .../stmt/uses/UsesStatementSupport.java | 1 - .../stmt/rfc6020/effective/package-info.java | 14 -- .../YangDataEffectiveStatementImpl.java | 2 +- .../yangtools/yang/stmt/CaseStmtTest.java | 148 +++++++++--------- 34 files changed, 152 insertions(+), 164 deletions(-) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt}/AbstractEffectiveContainerSchemaNode.java (75%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt}/AbstractEffectiveDataSchemaNode.java (90%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt}/AbstractEffectiveSimpleDataNodeContainer.java (92%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/anyxml}/AnyxmlEffectiveStatementImpl.java (93%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/anyxml}/YangModeledAnyXmlEffectiveStatementImpl.java (89%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/case_}/CaseEffectiveStatementImpl.java (86%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/choice}/ChoiceEffectiveStatementImpl.java (88%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective/CaseShorthandImpl.java => rfc7950/stmt/choice/ImplicitChoiceCaseNode.java} (91%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/container}/ContainerEffectiveStatementImpl.java (94%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/input}/InputEffectiveStatementImpl.java (91%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/leaf}/LeafEffectiveStatementImpl.java (95%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/leaf_list}/LeafListEffectiveStatementImpl.java (96%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/list}/ListEffectiveStatementImpl.java (96%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/output}/OutputEffectiveStatementImpl.java (91%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/{stmt/rfc6020/effective => rfc7950/stmt/uses}/UsesEffectiveStatementImpl.java (94%) delete mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/package-info.java diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java index 70a457747e..fa55a459f0 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java @@ -64,7 +64,6 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.YangModeledAnyXmlSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContainerEffectiveStatementImpl; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BuilderTest { @@ -99,8 +98,8 @@ public class BuilderTest { final SchemaContext schema = YangParserTestUtils.parseYangFiles(leafRefTestYang); final Module module = schema.getModules().iterator().next(); final DataSchemaNode root = module.getDataChildByName(ROOT_CONTAINER); - list = (ListSchemaNode)((ContainerEffectiveStatementImpl) root).getDataChildByName(LIST_MAIN); - leafList = (LeafListSchemaNode)((ContainerEffectiveStatementImpl) root).getDataChildByName(LEAF_LIST_MAIN); + list = (ListSchemaNode)((ContainerSchemaNode) root).getDataChildByName(LIST_MAIN); + leafList = (LeafListSchemaNode)((ContainerSchemaNode) root).getDataChildByName(LEAF_LIST_MAIN); } @Test diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveContainerSchemaNode.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveContainerSchemaNode.java similarity index 75% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveContainerSchemaNode.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveContainerSchemaNode.java index 6a6e17e09d..9ab3339bea 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveContainerSchemaNode.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveContainerSchemaNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import com.google.common.collect.ImmutableSet; import java.util.Collection; @@ -15,11 +15,11 @@ import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -abstract class AbstractEffectiveContainerSchemaNode> extends - AbstractEffectiveSimpleDataNodeContainer implements ContainerSchemaNode { +public abstract class AbstractEffectiveContainerSchemaNode> + extends AbstractEffectiveSimpleDataNodeContainer implements ContainerSchemaNode { private final Collection mustConstraints; - AbstractEffectiveContainerSchemaNode(final StmtContext ctx) { + protected AbstractEffectiveContainerSchemaNode(final StmtContext ctx) { super(ctx); mustConstraints = ImmutableSet.copyOf(allSubstatementsOfType(MustDefinition.class)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveDataSchemaNode.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDataSchemaNode.java similarity index 90% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveDataSchemaNode.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDataSchemaNode.java index dcbc4a88e8..2494843c10 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveDataSchemaNode.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveDataSchemaNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; @@ -13,7 +13,6 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenEffectiveStatement; -import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyHistory; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; @@ -28,7 +27,7 @@ public abstract class AbstractEffectiveDataSchemaNode ctx) { + protected AbstractEffectiveDataSchemaNode(final StmtContext ctx) { super(ctx); this.configuration = ctx.isConfiguration(); @@ -73,7 +72,7 @@ public abstract class AbstractEffectiveDataSchemaNode> extends AbstractEffectiveDocumentedNode implements DataNodeContainer { @@ -63,7 +63,7 @@ public abstract class AbstractEffectiveDocumentedDataNodeContainer> extends +public abstract class AbstractEffectiveSimpleDataNodeContainer> extends AbstractEffectiveDocumentedDataNodeContainer implements DataNodeContainer, AugmentationTarget, DataSchemaNode { @@ -45,7 +44,7 @@ abstract class AbstractEffectiveSimpleDataNodeContainer ctx) { + protected AbstractEffectiveSimpleDataNodeContainer(final StmtContext ctx) { super(ctx); this.path = ctx.getSchemaPath().get(); @@ -130,7 +129,7 @@ abstract class AbstractEffectiveSimpleDataNodeContainer implements ActionDefinition, ActionEffectiveStatement { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java index 82009ed2aa..23d55bc222 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java @@ -22,8 +22,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDataSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AbstractEffectiveDataSchemaNode; /** * YANG 1.1 AnyData effective statement implementation. diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyxmlEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java similarity index 93% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyxmlEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java index 5464128211..363d18c400 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyxmlEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml; import com.google.common.collect.ImmutableSet; import java.util.Collection; @@ -19,8 +19,10 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDataSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +// FIXME: hide this class public class AnyxmlEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode implements AnyxmlEffectiveStatement, AnyXmlSchemaNode, DerivableSchemaNode { @@ -28,7 +30,7 @@ public class AnyxmlEffectiveStatementImpl extends AbstractEffectiveDataSchemaNod private final AnyXmlSchemaNode original; private final boolean mandatory; - public AnyxmlEffectiveStatementImpl( + AnyxmlEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); this.original = (AnyXmlSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java index fb6fd42295..aca91c47e5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java @@ -26,8 +26,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.anyxmlschema.AnyxmlSchemaLoca import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.SupportedExtensionsMapping; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AnyxmlEffectiveStatementImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangModeledAnyXmlEffectiveStatementImpl; public final class AnyxmlStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/YangModeledAnyXmlEffectiveStatementImpl.java similarity index 89% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/YangModeledAnyXmlEffectiveStatementImpl.java index d45da5f731..77ebec921c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/YangModeledAnyXmlEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/YangModeledAnyXmlEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml; import static java.util.Objects.requireNonNull; @@ -18,12 +18,12 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -public final class YangModeledAnyXmlEffectiveStatementImpl extends AnyxmlEffectiveStatementImpl +final class YangModeledAnyXmlEffectiveStatementImpl extends AnyxmlEffectiveStatementImpl implements YangModeledAnyXmlSchemaNode { private final ContainerSchemaNode schemaOfAnyXmlData; - public YangModeledAnyXmlEffectiveStatementImpl(final StmtContext> ctx, final ContainerSchemaNode contentSchema) { super(ctx); schemaOfAnyXmlData = requireNonNull(contentSchema); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java index 89ee3679cb..200e50e784 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.CaseEffectiveStatementImpl; abstract class AbstractCaseStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseEffectiveStatementImpl.java similarity index 86% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseEffectiveStatementImpl.java index acfb58f59a..cff31a0c14 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.case_; import java.util.Objects; import java.util.Optional; @@ -15,16 +15,16 @@ import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveSimpleDataNodeContainer; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -public final class CaseEffectiveStatementImpl extends AbstractEffectiveSimpleDataNodeContainer +final class CaseEffectiveStatementImpl extends AbstractEffectiveSimpleDataNodeContainer implements CaseEffectiveStatement, ChoiceCaseNode, DerivableSchemaNode { private final ChoiceCaseNode original; private final boolean configuration; - public CaseEffectiveStatementImpl( - final StmtContext> ctx) { + CaseEffectiveStatementImpl(final StmtContext> ctx) { super(ctx); this.original = (ChoiceCaseNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java index 0f0fbbf753..ed8f7e5085 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangValidationBundles; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ChoiceEffectiveStatementImpl; abstract class AbstractChoiceStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java similarity index 88% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java index 2fb59354a9..b433df3011 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; @@ -26,13 +26,19 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryEffectiveStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDataSchemaNode; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml.AnyxmlEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf.LeafEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list.LeafListEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list.ListEffectiveStatementImpl; 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; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangValidationBundles; -public final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode implements - ChoiceEffectiveStatement, ChoiceSchemaNode, DerivableSchemaNode { +final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode + implements ChoiceEffectiveStatement, ChoiceSchemaNode, DerivableSchemaNode { private final Set augmentations; private final SortedMap cases; @@ -40,7 +46,7 @@ public final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSch private final ChoiceSchemaNode original; private final boolean mandatory; - public ChoiceEffectiveStatementImpl( + ChoiceEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); this.original = (ChoiceSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); @@ -61,7 +67,7 @@ public final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSch } if (YangValidationBundles.SUPPORTED_CASE_SHORTHANDS.contains(effectiveStatement.statementDefinition())) { final DataSchemaNode dataSchemaNode = (DataSchemaNode) effectiveStatement; - final ChoiceCaseNode shorthandCase = new CaseShorthandImpl(dataSchemaNode); + final ChoiceCaseNode shorthandCase = new ImplicitChoiceCaseNode(dataSchemaNode); // FIXME: we may be overwriting a previous entry, is that really okay? casesInit.put(shorthandCase.getQName(), shorthandCase); if (dataSchemaNode.isAugmenting() && !isAugmenting()) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java similarity index 91% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java index e920fe9574..c1eb882ceb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ImplicitChoiceCaseNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.choice; import static java.util.Objects.requireNonNull; @@ -32,14 +32,14 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; // FIXME: hide this somewhere -public final class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { +public final class ImplicitChoiceCaseNode implements ChoiceCaseNode, DerivableSchemaNode { private final DataSchemaNode caseShorthandNode; private final ChoiceCaseNode original; private final SchemaPath path; private final boolean augmenting; - public CaseShorthandImpl(final DataSchemaNode caseShorthandNode) { + public ImplicitChoiceCaseNode(final DataSchemaNode caseShorthandNode) { this.caseShorthandNode = requireNonNull(caseShorthandNode); this.path = requireNonNull(caseShorthandNode.getPath().getParent()); this.original = getOriginalIfPresent(caseShorthandNode); @@ -157,20 +157,20 @@ public final class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaN if (getClass() != obj.getClass()) { return false; } - CaseShorthandImpl other = (CaseShorthandImpl) obj; + ImplicitChoiceCaseNode other = (ImplicitChoiceCaseNode) obj; return Objects.equals(getQName(), other.getQName()) && Objects.equals(path, other.path); } @Override public String toString() { - return CaseShorthandImpl.class.getSimpleName() + "[" + "qname=" + getQName() + "]"; + return ImplicitChoiceCaseNode.class.getSimpleName() + "[" + "qname=" + getQName() + "]"; } private static ChoiceCaseNode getOriginalIfPresent(final SchemaNode caseShorthandNode) { if (caseShorthandNode instanceof DerivableSchemaNode) { final Optional original = ((DerivableSchemaNode) caseShorthandNode).getOriginal(); if (original.isPresent()) { - return new CaseShorthandImpl((DataSchemaNode) original.get()); + return new ImplicitChoiceCaseNode((DataSchemaNode) original.get()); } } return null; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java index 7314fcaf06..72ec3c5bf3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContainerEffectiveStatementImpl; abstract class AbstractContainerStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerEffectiveStatementImpl.java similarity index 94% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerEffectiveStatementImpl.java index 1c50d45959..c2ae9b4ade 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -21,8 +21,10 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveContainerSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +// FIXME: hide this class public final class ContainerEffectiveStatementImpl extends AbstractEffectiveContainerSchemaNode implements ContainerEffectiveStatement, DerivableSchemaNode { private final Set actions; @@ -30,7 +32,7 @@ public final class ContainerEffectiveStatementImpl extends AbstractEffectiveCont private final ContainerSchemaNode original; private final boolean presence; - public ContainerEffectiveStatementImpl( + ContainerEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); this.original = (ContainerSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java index a5c727cf39..694e287b07 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.InputEffectiveStatementImpl; abstract class AbstractInputStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InputEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputEffectiveStatementImpl.java similarity index 91% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InputEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputEffectiveStatementImpl.java index 3fee5c04dc..f243e3b504 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/InputEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/InputEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input; import com.google.common.collect.ImmutableSet; import java.util.Objects; @@ -16,12 +16,14 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveContainerSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +// FIXME: hide this class public final class InputEffectiveStatementImpl extends AbstractEffectiveContainerSchemaNode implements InputEffectiveStatement { - public InputEffectiveStatementImpl( + InputEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafEffectiveStatementImpl.java similarity index 95% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafEffectiveStatementImpl.java index e61fb000b1..348639e893 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf; import com.google.common.collect.ImmutableSet; import java.util.Collection; @@ -28,10 +28,12 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder; import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDataSchemaNode; 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.TypeUtils; +// FIXME: hide this class public final class LeafEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode implements LeafEffectiveStatement, LeafSchemaNode, DerivableSchemaNode { private final Collection mustConstraints; @@ -41,8 +43,7 @@ public final class LeafEffectiveStatementImpl extends AbstractEffectiveDataSchem private final String unitsStr; private final boolean mandatory; - public LeafEffectiveStatementImpl( - final StmtContext> ctx) { + LeafEffectiveStatementImpl(final StmtContext> ctx) { super(ctx); this.original = (LeafSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java index 467d74643d..12bab1a364 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java @@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafEffectiveStatementImpl; public final class LeafStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java index 0e99c68226..b89198137b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafListEffectiveStatementImpl; abstract class AbstractLeafListStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java similarity index 96% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java index 7235424cc1..30128f6f1c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.leaf_list; import com.google.common.collect.ImmutableSet; import java.util.Collection; @@ -30,11 +30,13 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder; import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDataSchemaNode; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; 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.TypeUtils; +// FIXME: hide this class public final class LeafListEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode implements LeafListEffectiveStatement, LeafListSchemaNode, DerivableSchemaNode { @@ -47,7 +49,7 @@ public final class LeafListEffectiveStatementImpl extends AbstractEffectiveDataS private final Collection mustConstraints; private final ElementCountConstraint elementCountConstraint; - public LeafListEffectiveStatementImpl( + LeafListEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); this.original = (LeafListSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java index 94eccd15bf..507836fa9c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ListEffectiveStatementImpl; abstract class AbstractListStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListEffectiveStatementImpl.java similarity index 96% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListEffectiveStatementImpl.java index ab88852d06..abaaae1feb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -33,10 +33,12 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveSimpleDataNodeContainer; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +// FIXME: hide this class public final class ListEffectiveStatementImpl extends AbstractEffectiveSimpleDataNodeContainer implements ListEffectiveStatement, ListSchemaNode, DerivableSchemaNode { private static final String ORDER_BY_USER_KEYWORD = "user"; @@ -50,7 +52,7 @@ public final class ListEffectiveStatementImpl extends AbstractEffectiveSimpleDat private final ElementCountConstraint elementCountConstraint; private final Collection mustConstraints; - public ListEffectiveStatementImpl( + ListEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java index 8b6856ac5f..124dd85956 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ChildSchemaNodes; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OutputEffectiveStatementImpl; abstract class AbstractOutputStatementSupport extends AbstractQNameStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputEffectiveStatementImpl.java similarity index 91% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputEffectiveStatementImpl.java index cc41b9a5c4..e924ea6989 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output; import com.google.common.collect.ImmutableSet; import java.util.Objects; @@ -16,12 +16,14 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveContainerSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +// FIXME: hide this class public final class OutputEffectiveStatementImpl extends AbstractEffectiveContainerSchemaNode implements OutputEffectiveStatement { - public OutputEffectiveStatementImpl( + OutputEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcEffectiveStatementImpl.java index 4f67e69678..b5b8556c4c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcEffectiveStatementImpl.java @@ -23,9 +23,9 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveSchemaNode; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.input.InputEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.output.OutputEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.InputEffectiveStatementImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OutputEffectiveStatementImpl; final class RpcEffectiveStatementImpl extends AbstractEffectiveSchemaNode implements RpcDefinition, RpcEffectiveStatement { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java similarity index 94% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java index ab63c6d1e9..3ee623e5f7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UsesEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesEffectiveStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public 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; +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.uses; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -public final class UsesEffectiveStatementImpl extends AbstractEffectiveDocumentedNode +final class UsesEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements UsesEffectiveStatement, UsesNode { private final SchemaPath groupingPath; private final boolean addedByUses; @@ -47,8 +47,7 @@ public final class UsesEffectiveStatementImpl extends AbstractEffectiveDocumente private final List unknownNodes; private final RevisionAwareXPath whenCondition; - public UsesEffectiveStatementImpl( - final StmtContext> ctx) { + UsesEffectiveStatementImpl(final StmtContext> ctx) { super(ctx); // initGroupingPath diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementImpl.java index 48c61586a0..89649acd26 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementImpl.java @@ -196,10 +196,8 @@ final class UsesStatementImpl extends AbstractDeclaredStatement implement "Invalid refine argument %s. It must be instance of SchemaNodeIdentifier.", refineArgument); final SchemaNodeIdentifier refineTargetNodeIdentifier = (SchemaNodeIdentifier) refineArgument; - final StatementContextBase refineTargetNodeCtx = Utils.findNode(usesParentCtx, - refineTargetNodeIdentifier); - - InferenceException.throwIfNull(refineTargetNodeCtx, subStmtCtx.getStatementSourceReference(), + final StatementContextBase refineTargetNodeCtx = InferenceException.throwIfNull( + Utils.findNode(usesParentCtx, refineTargetNodeIdentifier), subStmtCtx.getStatementSourceReference(), "Refine target node %s not found.", refineTargetNodeIdentifier); if (StmtContextUtils.isUnknownStatement(refineTargetNodeCtx)) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java index ba16a93cac..2a0da20911 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java @@ -26,7 +26,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; 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.UsesEffectiveStatementImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/package-info.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/package-info.java deleted file mode 100644 index 12cb041002..0000000000 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2017 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 - */ - -/** - * Contains implementation of Rfc6020 effective statements. This package - * may also contain common implementation for both Rfc6020 and Rfc7950 statements, - * if there are no or minimal differences between these statements. - */ -package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; \ No newline at end of file diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc8040/YangDataEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc8040/YangDataEffectiveStatementImpl.java index 6c5b269832..117545b3f2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc8040/YangDataEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc8040/YangDataEffectiveStatementImpl.java @@ -19,9 +19,9 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.UnknownEffectiveStatementBase; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.container.ContainerEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContainerEffectiveStatementImpl; @Beta final class YangDataEffectiveStatementImpl extends UnknownEffectiveStatementBase diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java index 28ac16d895..16638db0f4 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java @@ -21,12 +21,12 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; +import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ChoiceEffectiveStatementImpl; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContainerEffectiveStatementImpl; public class CaseStmtTest { private SchemaContext schema; @@ -61,10 +61,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-fff")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -74,10 +74,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ffn")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -87,10 +87,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-fnf")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -100,10 +100,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-nff")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -113,10 +113,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-nnf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -126,10 +126,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-nfn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -139,10 +139,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-fnn")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -152,10 +152,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ttt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -165,10 +165,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ttn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -178,10 +178,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-tnt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -191,10 +191,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ntt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -204,10 +204,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-nnt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -217,10 +217,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ntn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -230,10 +230,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-tnn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -243,10 +243,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-tff")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -256,10 +256,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-tnf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -269,10 +269,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-tfn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -282,10 +282,10 @@ public class CaseStmtTest { tempChild = rootFoo.getDataChildByName(QName.create(qnameFoo, "root-ntf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -298,10 +298,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-fff")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -311,10 +311,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ffn")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -324,10 +324,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-fnf")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -337,10 +337,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-nff")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -350,10 +350,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-nnf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -363,10 +363,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-nfn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -376,10 +376,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-fnn")); assertNotNull(tempChild); assertFalse(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -389,10 +389,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ttt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -402,10 +402,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ttn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -415,10 +415,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-tnt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -428,10 +428,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ntt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -441,10 +441,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-nnt")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -454,10 +454,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ntn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -467,10 +467,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-tnn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertTrue(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -480,10 +480,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-tff")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -493,10 +493,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-tnf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -506,10 +506,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-tfn")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertFalse(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); @@ -519,10 +519,10 @@ public class CaseStmtTest { tempChild = rootBar.getDataChildByName(QName.create(qnameBar, "sh-root-ntf")); assertNotNull(tempChild); assertTrue(tempChild.isConfiguration()); - tempSecondChild = ((ContainerEffectiveStatementImpl) tempChild).getChildNodes().iterator().next(); + tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next(); assertNotNull(tempSecondChild); assertTrue(tempSecondChild.isConfiguration()); - tempChoice = ((ChoiceEffectiveStatementImpl) tempSecondChild).getCases().values().iterator().next(); + tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next(); assertNotNull(tempChoice); assertFalse(tempChoice.isConfiguration()); tempThirdChild = tempChoice.getChildNodes().iterator().next(); -- 2.36.6