From 11f324d00534f75932df67ba737efe261271cb47 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 3 Oct 2020 12:23:33 +0200 Subject: [PATCH] Propagate EffectiveModelContext to more places We are bent on changing our code on effective statements, make sure we propagate EffectiveModelContext to more places. Change-Id: I7a06aba5fcd67adf0d55232700cf614247ce4d44 Signed-off-by: Robert Varga --- .../yang/data/impl/tree/BenchmarkModel.java | 4 +- .../yang/data/api/schema/tree/DataTree.java | 13 ------ .../data/api/schema/tree/DataTreeFactory.java | 8 ++-- .../api/schema/tree/DataTreeSnapshot.java | 4 +- .../SynchronizedDataTreeModification.java | 6 +-- .../data/codec/gson/JSONCodecFactory.java | 3 +- .../gson/JSONInstanceIdentifierCodec.java | 6 +-- .../Lhotka02JSONInstanceIdentifierCodec.java | 4 +- .../RFC7951JSONInstanceIdentifierCodec.java | 4 +- .../data/codec/xml/IdentityrefXmlCodec.java | 6 +-- ...domPrefixInstanceIdentifierSerializer.java | 6 +-- ...reXMLStreamNormalizedNodeStreamWriter.java | 16 ++++---- .../xml/SchemaAwareXMLStreamWriterUtils.java | 12 +++--- .../data/codec/xml/StreamWriterFacade.java | 2 +- .../XMLStreamNormalizedNodeStreamWriter.java | 18 ++++---- .../yang/data/codec/xml/Bug5446Test.java | 6 +-- .../codec/xml/NormalizedNodesToXmlTest.java | 4 +- ...SchemaOrderedNormalizedNodeWriterTest.java | 8 ++-- .../yang/data/impl/codec/SchemaTracker.java | 6 +-- .../data/impl/leafref/LeafRefContext.java | 4 +- .../impl/leafref/LeafRefContextBuilder.java | 8 ++-- .../leafref/LeafRefContextTreeBuilder.java | 6 +-- .../SchemaOrderedNormalizedNodeWriter.java | 8 ++-- .../data/impl/schema/tree/DataTreeState.java | 10 +++-- .../impl/schema/tree/InMemoryDataTree.java | 16 +++----- .../schema/tree/InMemoryDataTreeFactory.java | 9 ++-- .../tree/InMemoryDataTreeModification.java | 12 +++--- .../schema/tree/InMemoryDataTreeSnapshot.java | 12 +++--- .../yang/data/impl/leafref/Bug7844Test.java | 4 +- .../yang/data/impl/leafref/YT821Test.java | 4 +- .../yang/data/impl/leafref/YT891Test.java | 4 +- .../yang/data/impl/leafref/YT892Test.java | 4 +- .../impl/leafref/context/Bug8713Test.java | 4 +- .../DataTreeCandidateValidatorTest.java | 4 +- .../DataTreeCandidateValidatorTest2.java | 4 +- .../DataTreeCandidateValidatorTest3.java | 4 +- .../leafref/context/LeafRefContextTest.java | 4 +- .../LeafRefContextTreeBuilderTest.java | 4 +- .../data/impl/schema/tree/Bug4454Test.java | 4 +- .../data/impl/schema/tree/Bug5830Test.java | 19 +++++---- .../impl/schema/tree/Bug5968MergeTest.java | 8 ++-- .../data/impl/schema/tree/Bug5968Test.java | 8 ++-- .../data/impl/schema/tree/Bug8291Test.java | 7 ++-- .../impl/schema/tree/CaseAugmentTest.java | 4 +- .../impl/schema/tree/CaseExclusionTest.java | 4 +- .../tree/ListConstraintsValidation.java | 4 +- .../impl/schema/tree/MandatoryLeafTest.java | 5 +-- .../yang/data/impl/schema/tree/YT776Test.java | 4 +- .../yang/data/jaxen/JaxenSchemaContext.java | 6 +-- .../data/jaxen/JaxenSchemaContextFactory.java | 4 +- .../jaxen/api/XPathSchemaContextFactory.java | 10 ++--- .../data/jaxen/BitIsSetXPathFunctionTest.java | 18 ++++---- .../data/jaxen/DerefXPathFunctionTest.java | 8 ++-- .../jaxen/DerivedFromXPathFunctionTest.java | 41 +++++++++++-------- .../jaxen/EnumValueXPathFunctionTest.java | 18 ++++---- .../yangtools/yang/data/jaxen/JaxenTest.java | 5 ++- .../yang/data/util/DataSchemaContextNode.java | 4 +- .../yang/data/util/DataSchemaContextTree.java | 16 ++++---- .../util/ModuleStringIdentityrefCodec.java | 12 +++--- .../data/util/codec/IdentityCodecUtil.java | 4 +- .../util/codec/IdentityCodecUtilTest.java | 4 +- .../yang/model/repo/api/SchemaRepository.java | 8 ++-- .../util/ModuleNameNamespaceContext.java | 26 ++++-------- .../yangtools/yang/validator/Main.java | 4 +- .../yang/validator/SystemTestUtils.java | 8 ++-- .../yang/model/parser/api/YangParser.java | 2 + .../repo/YangTextSchemaContextResolver.java | 26 ------------ .../YangTextSchemaContextResolverTest.java | 5 ++- 68 files changed, 257 insertions(+), 300 deletions(-) diff --git a/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java b/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java index 9faadd07ad..4a3a10636e 100644 --- a/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java +++ b/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.tree; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** @@ -40,7 +40,7 @@ final class BenchmarkModel { } - static SchemaContext createTestContext() { + static EffectiveModelContext createTestContext() { return YangParserTestUtils.parseYangResource("/odl-datastore-test.yang"); } } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTree.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTree.java index 378b980dd9..62c580b8e0 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTree.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTree.java @@ -8,24 +8,11 @@ package org.opendaylight.yangtools.yang.data.api.schema.tree; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Interface representing a data tree which can be modified in an MVCC fashion. */ public interface DataTree extends DataTreeTip, ReadOnlyDataTree { - /** - * Make the data tree use a new schema context. The context will be used - * only by subsequent operations. - * - * @param newSchemaContext new SchemaContext - * @throws IllegalArgumentException if the new context is incompatible - * @throws NullPointerException if newSchemaContext is null - * @deprecated Prefer {@link #setEffectiveModelContext(EffectiveModelContext)}. - */ - @Deprecated - void setSchemaContext(SchemaContext newSchemaContext); - /** * Make the data tree use a new schema context. The context will be used * only by subsequent operations. diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeFactory.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeFactory.java index 3f92744149..2a3055ae57 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeFactory.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeFactory.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.data.api.schema.tree; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * Factory interface for creating data trees. @@ -23,7 +23,7 @@ public interface DataTreeFactory { *

* Correctness note: this method may not accurately initialize the root node in certain non-root scenarios due to * the impossibility to accurately derive root type from plain YangInstanceIdentifier. Using - * {@link #create(DataTreeConfiguration, SchemaContext)} is recommended, as it does not suffer from this + * {@link #create(DataTreeConfiguration, EffectiveModelContext)} is recommended, as it does not suffer from this * shortcoming. * * @param treeConfig @@ -45,7 +45,7 @@ public interface DataTreeFactory { * @throws IllegalArgumentException if tree configuration does not match the SchemaContext, for example by root path * referring to a node which does not exist in the SchemaContext */ - @NonNull DataTree create(DataTreeConfiguration treeConfig, SchemaContext initialSchemaContext); + @NonNull DataTree create(DataTreeConfiguration treeConfig, EffectiveModelContext initialSchemaContext); /** * Create a new data tree based on specified configuration, with the specified node. @@ -57,6 +57,6 @@ public interface DataTreeFactory { * @throws NullPointerException if any of the arguments are null * @throws IllegalArgumentException if a mismatch between the arguments is detected */ - @NonNull DataTree create(DataTreeConfiguration treeConfig, SchemaContext initialSchemaContext, + @NonNull DataTree create(DataTreeConfiguration treeConfig, EffectiveModelContext initialSchemaContext, NormalizedNodeContainer initialRoot) throws DataValidationFailedException; } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeSnapshot.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeSnapshot.java index d7e855e7bd..3197e9814b 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeSnapshot.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeSnapshot.java @@ -11,13 +11,13 @@ import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; /** * Read-only snapshot of a {@link DataTree}. The snapshot is stable and isolated, e.g. data tree changes occurring after * the snapshot has been taken are not visible through the snapshot. */ -public interface DataTreeSnapshot extends SchemaContextProvider { +public interface DataTreeSnapshot extends EffectiveModelContextProvider { /** * Read a particular node from the snapshot. * diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/SynchronizedDataTreeModification.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/SynchronizedDataTreeModification.java index a676074bfe..8737bf2854 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/SynchronizedDataTreeModification.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/SynchronizedDataTreeModification.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * A {@link DataTreeModification} implementation which delegates all calls to @@ -66,7 +66,7 @@ public final class SynchronizedDataTreeModification implements DataTreeModificat } @Override - public synchronized SchemaContext getSchemaContext() { - return delegate.getSchemaContext(); + public synchronized EffectiveModelContext getEffectiveModelContext() { + return delegate.getEffectiveModelContext(); } } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java index a945c604a9..159ecfbf56 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java @@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.data.util.codec.AbstractCodecFactory; import org.opendaylight.yangtools.yang.data.util.codec.CodecCache; import org.opendaylight.yangtools.yang.data.util.codec.LazyCodecCache; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition; @@ -45,7 +44,7 @@ import org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition; /** * Factory for creating JSON equivalents of codecs. Each instance of this object is bound to - * a particular {@link SchemaContext}, but can be reused by multiple {@link JSONNormalizedNodeStreamWriter}s. + * a particular {@link EffectiveModelContext}, but can be reused by multiple {@link JSONNormalizedNodeStreamWriter}s. */ @Beta public abstract class JSONCodecFactory extends AbstractCodecFactory> { diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java index 79b830ccad..0263ef9dad 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java @@ -18,17 +18,17 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; abstract class JSONInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec implements JSONCodec { private final DataSchemaContextTree dataContextTree; private final JSONCodecFactory codecFactory; - private final SchemaContext context; + private final EffectiveModelContext context; - JSONInstanceIdentifierCodec(final SchemaContext context, final JSONCodecFactory jsonCodecFactory) { + JSONInstanceIdentifierCodec(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) { this.context = requireNonNull(context); this.dataContextTree = DataSchemaContextTree.from(context); this.codecFactory = requireNonNull(jsonCodecFactory); diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/Lhotka02JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/Lhotka02JSONInstanceIdentifierCodec.java index c8ff7207a9..4c83a2d0e7 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/Lhotka02JSONInstanceIdentifierCodec.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/Lhotka02JSONInstanceIdentifierCodec.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.data.codec.gson; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; final class Lhotka02JSONInstanceIdentifierCodec extends JSONInstanceIdentifierCodec { - Lhotka02JSONInstanceIdentifierCodec(final SchemaContext context, final JSONCodecFactory jsonCodecFactory) { + Lhotka02JSONInstanceIdentifierCodec(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) { super(context, jsonCodecFactory); } } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java index de7ad7ddb8..6ac2c6fa64 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java @@ -11,10 +11,10 @@ import static com.google.common.base.Preconditions.checkArgument; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; final class RFC7951JSONInstanceIdentifierCodec extends JSONInstanceIdentifierCodec { - RFC7951JSONInstanceIdentifierCodec(final SchemaContext context, final JSONCodecFactory jsonCodecFactory) { + RFC7951JSONInstanceIdentifierCodec(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) { super(context, jsonCodecFactory); } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java index 35bd104d2b..e0d9b7d1ec 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/IdentityrefXmlCodec.java @@ -20,14 +20,14 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.util.codec.IdentityCodecUtil; import org.opendaylight.yangtools.yang.data.util.codec.QNameCodecUtil; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; final class IdentityrefXmlCodec implements XmlCodec { - private final SchemaContext schemaContext; + private final EffectiveModelContext schemaContext; private final QNameModule parentModule; - IdentityrefXmlCodec(final SchemaContext context, final QNameModule parentModule) { + IdentityrefXmlCodec(final EffectiveModelContext context, final QNameModule parentModule) { this.schemaContext = requireNonNull(context); this.parentModule = requireNonNull(parentModule); } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java index 6a666a0da0..68a5ae20bc 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java @@ -14,14 +14,14 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.util.AbstractStringInstanceIdentifierCodec; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; final class RandomPrefixInstanceIdentifierSerializer extends AbstractStringInstanceIdentifierCodec { private final @NonNull DataSchemaContextTree schemaTree; private final RandomPrefix prefixes; - RandomPrefixInstanceIdentifierSerializer(final @NonNull SchemaContext schemaContext, - final NamespaceContext nsContext) { + RandomPrefixInstanceIdentifierSerializer(final @NonNull EffectiveModelContext schemaContext, + final NamespaceContext nsContext) { schemaTree = DataSchemaContextTree.from(schemaContext); prefixes = new RandomPrefix(nsContext); } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java index c74a80e2fc..7ce4f597ee 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java @@ -27,20 +27,20 @@ import org.opendaylight.yangtools.yang.data.impl.codec.SchemaTracker; import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypedDataSchemaNode; final class SchemaAwareXMLStreamNormalizedNodeStreamWriter - extends XMLStreamNormalizedNodeStreamWriter implements SchemaContextProvider { + extends XMLStreamNormalizedNodeStreamWriter implements EffectiveModelContextProvider { private final SchemaTracker tracker; private final SchemaAwareXMLStreamWriterUtils streamUtils; - SchemaAwareXMLStreamNormalizedNodeStreamWriter(final XMLStreamWriter writer, final SchemaContext context, + SchemaAwareXMLStreamNormalizedNodeStreamWriter(final XMLStreamWriter writer, final EffectiveModelContext context, final SchemaTracker tracker) { super(writer); this.tracker = requireNonNull(tracker); @@ -57,8 +57,8 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter @Override String encodeAnnotationValue(final ValueWriter xmlWriter, final QName qname, final Object value) throws XMLStreamException { - final Optional optAnnotation = AnnotationSchemaNode.find(streamUtils.getSchemaContext(), - qname); + final Optional optAnnotation = + AnnotationSchemaNode.find(streamUtils.getEffectiveModelContext(), qname); if (optAnnotation.isPresent()) { final AnnotationSchemaNode schema = optAnnotation.get(); return streamUtils.encodeValue(xmlWriter, schema, schema.getType(), value, qname.getModule()); @@ -150,8 +150,8 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter } @Override - public SchemaContext getSchemaContext() { - return streamUtils.getSchemaContext(); + public EffectiveModelContext getEffectiveModelContext() { + return streamUtils.getEffectiveModelContext(); } @Override diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java index 7d8cbfc60c..c929dcee20 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java @@ -15,17 +15,17 @@ import java.util.Map.Entry; import javax.xml.stream.XMLStreamException; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils implements SchemaContextProvider { - private final @NonNull SchemaContext schemaContext; +final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils implements EffectiveModelContextProvider { + private final @NonNull EffectiveModelContext schemaContext; - SchemaAwareXMLStreamWriterUtils(final SchemaContext schemaContext) { + SchemaAwareXMLStreamWriterUtils(final EffectiveModelContext schemaContext) { this.schemaContext = requireNonNull(schemaContext); } @@ -50,7 +50,7 @@ final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils impleme } @Override - public SchemaContext getSchemaContext() { + public EffectiveModelContext getEffectiveModelContext() { return schemaContext; } } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/StreamWriterFacade.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/StreamWriterFacade.java index 19c05c251c..24949d37a8 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/StreamWriterFacade.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/StreamWriterFacade.java @@ -284,7 +284,7 @@ final class StreamWriterFacade extends ValueWriter { void emitNormalizedAnydata(final NormalizedAnydata anydata) throws XMLStreamException { flushElement(); try { - anydata.writeTo(XMLStreamNormalizedNodeStreamWriter.create(writer, anydata.getSchemaContext(), + anydata.writeTo(XMLStreamNormalizedNodeStreamWriter.create(writer, anydata.getEffectiveModelContext(), new SingleChildDataNodeContainer(anydata.getContextNode()))); } catch (IOException e) { throw new XMLStreamException("Failed to emit anydata " + anydata, e); diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index f39dac6b21..2816d6a5f0 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriterExtension; import org.opendaylight.yangtools.yang.data.impl.codec.SchemaTracker; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,11 +64,11 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz * Create a new writer with the specified context as its root. * * @param writer Output {@link XMLStreamWriter} - * @param context Associated {@link SchemaContext}. + * @param context Associated {@link EffectiveModelContext}. * @return A new {@link NormalizedNodeStreamWriter} */ public static @NonNull NormalizedNodeStreamWriter create(final XMLStreamWriter writer, - final SchemaContext context) { + final EffectiveModelContext context) { return create(writer, context, context); } @@ -76,12 +76,12 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz * Create a new writer with the specified context and rooted at the specified node. * * @param writer Output {@link XMLStreamWriter} - * @param context Associated {@link SchemaContext}. + * @param context Associated {@link EffectiveModelContext}. * @param rootNode Root node * @return A new {@link NormalizedNodeStreamWriter} */ - public static @NonNull NormalizedNodeStreamWriter create(final XMLStreamWriter writer, final SchemaContext context, - final DataNodeContainer rootNode) { + public static @NonNull NormalizedNodeStreamWriter create(final XMLStreamWriter writer, + final EffectiveModelContext context, final DataNodeContainer rootNode) { return new SchemaAwareXMLStreamNormalizedNodeStreamWriter(writer, context, SchemaTracker.create(rootNode)); } @@ -89,12 +89,12 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz * Create a new writer with the specified context and rooted in the specified schema path. * * @param writer Output {@link XMLStreamWriter} - * @param context Associated {@link SchemaContext}. + * @param context Associated {@link EffectiveModelContext}. * @param path path * @return A new {@link NormalizedNodeStreamWriter} */ - public static @NonNull NormalizedNodeStreamWriter create(final XMLStreamWriter writer, final SchemaContext context, - final SchemaPath path) { + public static @NonNull NormalizedNodeStreamWriter create(final XMLStreamWriter writer, + final EffectiveModelContext context, final SchemaPath path) { return new SchemaAwareXMLStreamNormalizedNodeStreamWriter(writer, context, SchemaTracker.create(context, path)); } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java index f9f396ca67..b47d3d34b3 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java @@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -55,7 +55,7 @@ public class Bug5446Test extends XMLTestCase { @Test public void test() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResource("/bug5446/yang/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResource("/bug5446/yang/foo.yang"); final Document doc = loadDocument("/bug5446/xml/foo.xml"); final ContainerNode docNode = createDocNode(); @@ -94,7 +94,7 @@ public class Bug5446Test extends XMLTestCase { .build(); } - private static DOMResult writeNormalizedNode(final ContainerNode normalized, final SchemaContext context) + private static DOMResult writeNormalizedNode(final ContainerNode normalized, final EffectiveModelContext context) throws IOException, XMLStreamException { final Document doc = UntrustedXML.newDocumentBuilder().newDocument(); final DOMResult result = new DOMResult(doc); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java index 8f5f13ed93..f376098071 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java @@ -57,7 +57,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -95,7 +95,7 @@ public class NormalizedNodesToXmlTest { private QName mySecondKeyLeaf; private QName myLeafInList3; - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; private final XMLOutputFactory factory; diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaOrderedNormalizedNodeWriterTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaOrderedNormalizedNodeWriterTest.java index 0e63b5e215..8b737321a4 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaOrderedNormalizedNodeWriterTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaOrderedNormalizedNodeWriterTest.java @@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWrit import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaOrderedNormalizedNodeWriter; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.xml.sax.SAXException; @@ -92,7 +92,7 @@ public class SchemaOrderedNormalizedNodeWriterTest { final StringWriter stringWriter = new StringWriter(); final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(stringWriter); - SchemaContext schemaContext = getSchemaContext("/bug1848/foo.yang"); + EffectiveModelContext schemaContext = getSchemaContext("/bug1848/foo.yang"); NormalizedNodeStreamWriter writer = XMLStreamNormalizedNodeStreamWriter.create(xmlStreamWriter, schemaContext); try (SchemaOrderedNormalizedNodeWriter nnw = new SchemaOrderedNormalizedNodeWriter(writer, schemaContext, @@ -152,7 +152,7 @@ public class SchemaOrderedNormalizedNodeWriterTest { public void testWriteOrder() throws XMLStreamException, IOException, SAXException { final StringWriter stringWriter = new StringWriter(); final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(stringWriter); - SchemaContext schemaContext = getSchemaContext("/bug1848/order.yang"); + EffectiveModelContext schemaContext = getSchemaContext("/bug1848/order.yang"); NormalizedNodeStreamWriter writer = XMLStreamNormalizedNodeStreamWriter.create(xmlStreamWriter, schemaContext); try (NormalizedNodeWriter nnw = new SchemaOrderedNormalizedNodeWriter(writer, schemaContext, SchemaPath.ROOT)) { @@ -174,7 +174,7 @@ public class SchemaOrderedNormalizedNodeWriterTest { XMLAssert.assertXMLIdentical(new Diff(EXPECTED_2, stringWriter.toString()), true); } - private static SchemaContext getSchemaContext(final String filePath) { + private static EffectiveModelContext getSchemaContext(final String filePath) { return YangParserTestUtils.parseYangResource(filePath); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java index 40c181f1a4..9c9488f9ab 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java @@ -36,12 +36,12 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.EffectiveAugmentationSchema; @@ -75,11 +75,11 @@ public final class SchemaTracker { /** * Create a new writer with the specified context and rooted in the specified schema path. * - * @param context Associated {@link SchemaContext} + * @param context Associated {@link EffectiveModelContext} * @param path schema path * @return A new {@link NormalizedNodeStreamWriter} */ - public static @NonNull SchemaTracker create(final SchemaContext context, final SchemaPath path) { + public static @NonNull SchemaTracker create(final EffectiveModelContext context, final SchemaPath path) { final Collection schemaNodes = SchemaUtils.findParentSchemaNodesOnPath(context, path); checkArgument(!schemaNodes.isEmpty(), "Unable to find schema node for supplied schema path: %s", path); if (schemaNodes.size() > 1) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java index 002a6af026..7787c5a331 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.data.impl.leafref; import com.google.common.collect.ImmutableMap; import java.util.Map; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.AbstractSchemaContextProvider; @@ -52,7 +52,7 @@ public final class LeafRefContext extends AbstractSchemaContextProvider { this.module = leafRefContextBuilder.getLeafRefContextModule(); } - public static LeafRefContext create(final SchemaContext ctx) { + public static LeafRefContext create(final EffectiveModelContext ctx) { try { return new LeafRefContextTreeBuilder(ctx).buildLeafRefContextTree(); } catch (LeafRefYangSyntaxErrorException e) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java index b8036a474c..420e213bf5 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java @@ -15,8 +15,8 @@ import java.util.Map; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; final class LeafRefContextBuilder implements Builder { @@ -27,7 +27,7 @@ final class LeafRefContextBuilder implements Builder { private final QName currentNodeQName; private final SchemaPath currentNodePath; - private final SchemaContext schemaContext; + private final EffectiveModelContext schemaContext; private LeafRefPath leafRefTargetPath = null; private LeafRefPath absoluteLeafRefTargetPath = null; @@ -37,7 +37,7 @@ final class LeafRefContextBuilder implements Builder { private boolean isReferencing = false; LeafRefContextBuilder(final QName currentNodeQName, final SchemaPath currentNodePath, - final SchemaContext schemaContext) { + final EffectiveModelContext schemaContext) { this.currentNodeQName = requireNonNull(currentNodeQName); this.currentNodePath = requireNonNull(currentNodePath); // FIXME: requireNonNull @@ -112,7 +112,7 @@ final class LeafRefContextBuilder implements Builder { return currentNodeQName; } - SchemaContext getSchemaContext() { + EffectiveModelContext getSchemaContext() { return schemaContext; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java index 61be82a6c3..29457ed1e8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java @@ -14,20 +14,20 @@ import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.PathExpression; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.TypedDataSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; final class LeafRefContextTreeBuilder { private final List leafRefs = new LinkedList<>(); - private final SchemaContext schemaContext; + private final EffectiveModelContext schemaContext; - LeafRefContextTreeBuilder(final SchemaContext schemaContext) { + LeafRefContextTreeBuilder(final EffectiveModelContext schemaContext) { this.schemaContext = schemaContext; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java index 2f0c797ff3..4f2c4a524c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java @@ -23,8 +23,8 @@ import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; */ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter { private static final Logger LOG = LoggerFactory.getLogger(SchemaOrderedNormalizedNodeWriter.class); - private final SchemaContext schemaContext; + private final EffectiveModelContext schemaContext; private final SchemaNode root; private SchemaNode currentSchemaNode; @@ -51,8 +51,8 @@ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter { * @param path * path */ - public SchemaOrderedNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext, - final SchemaPath path) { + public SchemaOrderedNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, + final EffectiveModelContext schemaContext, final SchemaPath path) { super(writer); this.schemaContext = schemaContext; final Collection schemaNodes = SchemaUtils.findParentSchemaNodesOnPath(schemaContext, path); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java index 48d8d49cde..522b402efd 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java @@ -13,7 +13,7 @@ import com.google.common.base.MoreObjects; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * Instances of this class hold the current state of a DataTree instance. @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ final class DataTreeState { private final LatestOperationHolder holder; - private final SchemaContext schemaContext; + private final EffectiveModelContext schemaContext; private final @NonNull TreeNode root; private DataTreeState(final TreeNode root) { @@ -31,7 +31,8 @@ final class DataTreeState { schemaContext = null; } - private DataTreeState(final TreeNode root, final LatestOperationHolder holder, final SchemaContext schemaContext) { + private DataTreeState(final TreeNode root, final LatestOperationHolder holder, + final EffectiveModelContext schemaContext) { // It should be impossible to instantiate a new root without a SchemaContext this.schemaContext = requireNonNull(schemaContext); this.holder = requireNonNull(holder); @@ -50,7 +51,8 @@ final class DataTreeState { return new InMemoryDataTreeSnapshot(schemaContext, root, holder.newSnapshot()); } - DataTreeState withSchemaContext(final SchemaContext newSchemaContext, final ModificationApplyOperation operation) { + DataTreeState withSchemaContext(final EffectiveModelContext newSchemaContext, + final ModificationApplyOperation operation) { holder.setCurrent(operation); return new DataTreeState(root, holder, newSchemaContext); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java index 683bdc45b0..1a0f74637a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java @@ -28,7 +28,6 @@ import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,17 +57,18 @@ final class InMemoryDataTree extends AbstractDataTreeTip implements DataTree { private volatile DataTreeState state; InMemoryDataTree(final TreeNode rootNode, final DataTreeConfiguration treeConfig, - final SchemaContext schemaContext) { + final EffectiveModelContext schemaContext) { this.treeConfig = requireNonNull(treeConfig, "treeConfig"); maskMandatory = true; state = DataTreeState.createInitial(rootNode); if (schemaContext != null) { - setSchemaContext(schemaContext); + setEffectiveModelContext(schemaContext); } } InMemoryDataTree(final TreeNode rootNode, final DataTreeConfiguration treeConfig, - final SchemaContext schemaContext, final DataSchemaNode rootSchemaNode, final boolean maskMandatory) { + final EffectiveModelContext schemaContext, final DataSchemaNode rootSchemaNode, + final boolean maskMandatory) { this.treeConfig = requireNonNull(treeConfig, "treeConfig"); this.maskMandatory = maskMandatory; @@ -94,12 +94,6 @@ final class InMemoryDataTree extends AbstractDataTreeTip implements DataTree { } } - @Deprecated - @Override - public void setSchemaContext(final SchemaContext newSchemaContext) { - internalSetSchemaContext(newSchemaContext); - } - @Override public void setEffectiveModelContext(final EffectiveModelContext newModelContext) { internalSetSchemaContext(newModelContext); @@ -109,7 +103,7 @@ final class InMemoryDataTree extends AbstractDataTreeTip implements DataTree { * This method is synchronized to guard against user attempting to install * multiple contexts. Otherwise it runs in a lock-free manner. */ - private synchronized void internalSetSchemaContext(final SchemaContext newSchemaContext) { + private synchronized void internalSetSchemaContext(final EffectiveModelContext newSchemaContext) { requireNonNull(newSchemaContext); LOG.debug("Following schema contexts will be attempted {}", newSchemaContext); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java index d997c5ffa5..6a397aa162 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java @@ -34,6 +34,7 @@ import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.osgi.service.component.annotations.Activate; @@ -61,12 +62,12 @@ public final class InMemoryDataTreeFactory implements DataTreeFactory { } @Override - public DataTree create(final DataTreeConfiguration treeConfig, final SchemaContext initialSchemaContext) { + public DataTree create(final DataTreeConfiguration treeConfig, final EffectiveModelContext initialSchemaContext) { return createDataTree(treeConfig, initialSchemaContext, true); } @Override - public DataTree create(final DataTreeConfiguration treeConfig, final SchemaContext initialSchemaContext, + public DataTree create(final DataTreeConfiguration treeConfig, final EffectiveModelContext initialSchemaContext, final NormalizedNodeContainer initialRoot) throws DataValidationFailedException { final DataTree ret = createDataTree(treeConfig, initialSchemaContext, false); @@ -93,7 +94,7 @@ public final class InMemoryDataTreeFactory implements DataTreeFactory { } private static @NonNull DataTree createDataTree(final DataTreeConfiguration treeConfig, - final SchemaContext initialSchemaContext, final boolean maskMandatory) { + final EffectiveModelContext initialSchemaContext, final boolean maskMandatory) { final DataSchemaNode rootSchemaNode = getRootSchemaNode(initialSchemaContext, treeConfig.getRootPath()); final NormalizedNode rootDataNode = createRoot((DataNodeContainer)rootSchemaNode, treeConfig.getRootPath()); @@ -142,7 +143,7 @@ public final class InMemoryDataTreeFactory implements DataTreeFactory { throw new IllegalArgumentException("Unsupported root node " + arg); } - private static DataSchemaNode getRootSchemaNode(final SchemaContext schemaContext, + private static DataSchemaNode getRootSchemaNode(final EffectiveModelContext schemaContext, final YangInstanceIdentifier rootPath) { final DataSchemaContextTree contextTree = DataSchemaContextTree.from(schemaContext); final Optional> rootContextNode = contextTree.findChild(rootPath); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java index 72dac50e49..a34614d074 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java @@ -25,13 +25,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; final class InMemoryDataTreeModification extends AbstractCursorAware implements CursorAwareDataTreeModification, - SchemaContextProvider { + EffectiveModelContextProvider { private static final Logger LOG = LoggerFactory.getLogger(InMemoryDataTreeModification.class); private final RootApplyStrategy strategyTree; @@ -84,8 +84,8 @@ final class InMemoryDataTreeModification extends AbstractCursorAware implements } @Override - public SchemaContext getSchemaContext() { - return snapshot.getSchemaContext(); + public EffectiveModelContext getEffectiveModelContext() { + return snapshot.getEffectiveModelContext(); } @Override @@ -218,7 +218,7 @@ final class InMemoryDataTreeModification extends AbstractCursorAware implements version); checkState(tempRoot.isPresent(), "Data tree root is not present, possibly removed by previous modification"); - final InMemoryDataTreeSnapshot tempTree = new InMemoryDataTreeSnapshot(snapshot.getSchemaContext(), + final InMemoryDataTreeSnapshot tempTree = new InMemoryDataTreeSnapshot(snapshot.getEffectiveModelContext(), tempRoot.get(), strategyTree); return tempTree.newModification(); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java index eef79642a4..688020401c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java @@ -19,16 +19,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeSnapshot; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshotCursor; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements CursorAwareDataTreeSnapshot, - SchemaContextProvider { + EffectiveModelContextProvider { private final @NonNull RootApplyStrategy applyOper; - private final @NonNull SchemaContext schemaContext; + private final @NonNull EffectiveModelContext schemaContext; private final @NonNull TreeNode rootNode; - InMemoryDataTreeSnapshot(final SchemaContext schemaContext, final TreeNode rootNode, + InMemoryDataTreeSnapshot(final EffectiveModelContext schemaContext, final TreeNode rootNode, final RootApplyStrategy applyOper) { this.schemaContext = requireNonNull(schemaContext); this.rootNode = requireNonNull(rootNode); @@ -40,7 +40,7 @@ final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements Curs } @Override - public SchemaContext getSchemaContext() { + public EffectiveModelContext getEffectiveModelContext() { return schemaContext; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/Bug7844Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/Bug7844Test.java index e4cb067bcd..9c8ca831f9 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/Bug7844Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/Bug7844Test.java @@ -18,7 +18,7 @@ import java.util.Map; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug7844Test { @@ -28,7 +28,7 @@ public class Bug7844Test { @Test public void test() { - final SchemaContext context = YangParserTestUtils.parseYangResourceDirectory("/bug7844"); + final EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/bug7844"); assertNotNull(context); final LeafRefContext leafRefContext = LeafRefContext.create(context); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT821Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT821Test.java index 1f772060f8..03f751d111 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT821Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT821Test.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class YT821Test { @@ -39,7 +39,7 @@ public class YT821Test { private static final QName REF_IN_CONTAINER = QName.create(ROOT, "ref-in-container"); private static final YangInstanceIdentifier ROOT_ID = YangInstanceIdentifier.of(ROOT); - private static SchemaContext schemaContext; + private static EffectiveModelContext schemaContext; private static LeafRefContext leafRefContext; private DataTree dataTree; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java index 63b7d26469..0e9412b535 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT891Test.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class YT891Test { @@ -40,7 +40,7 @@ public class YT891Test { private static final QName LIST_IN_CONTAINER = QName.create(BAZ_TOP, "list-in-container"); private static final YangInstanceIdentifier BAZ_TOP_ID = YangInstanceIdentifier.of(BAZ_TOP); - private static SchemaContext schemaContext; + private static EffectiveModelContext schemaContext; private static LeafRefContext leafRefContext; private DataTree dataTree; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java index 1e7c3d3a1e..d20e3530be 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/YT892Test.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class YT892Test { @@ -67,7 +67,7 @@ public class YT892Test { @Before public void setup() { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yt892"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yt892"); leafRefContext = LeafRefContext.create(schemaContext); dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/Bug8713Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/Bug8713Test.java index ca7681a2b5..c6d1dc706d 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/Bug8713Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/Bug8713Test.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidation; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug8713Test { @@ -31,7 +31,7 @@ public class Bug8713Test { @Test public void dataTreeCanditateValidationTest() throws Exception { - final SchemaContext context = YangParserTestUtils.parseYangResourceDirectory("/bug8713/"); + final EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/bug8713/"); final LeafRefContext rootLeafRefContext = LeafRefContext.create(context); final DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_OPERATIONAL, context); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java index 30adebb14e..eee5c861c9 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java @@ -45,16 +45,16 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuil import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataTreeCandidateValidatorTest { - private static SchemaContext context; + private static EffectiveModelContext context; private static Module valModule; private static QNameModule valModuleQname; private static LeafRefContext rootLeafRefContext; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java index 4244aa389e..32106fe362 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest2.java @@ -37,16 +37,16 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNo import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataTreeCandidateValidatorTest2 { - private static SchemaContext context; + private static EffectiveModelContext context; private static Module mainModule; private static QNameModule rootModuleQname; private static LeafRefContext rootLeafRefContext; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java index 6b8928df83..a2c60e8725 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java @@ -37,16 +37,16 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNo import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataTreeCandidateValidatorTest3 { - private static SchemaContext context; + private static EffectiveModelContext context; private static Module mainModule; private static QNameModule rootModuleQname; private static LeafRefContext rootLeafRefContext; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java index 819d8df781..e9c650fb05 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTest.java @@ -20,12 +20,12 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContextUtils; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class LeafRefContextTest { - private static SchemaContext context; + private static EffectiveModelContext context; private static Module rootMod; private static QNameModule root; private static LeafRefContext rootLeafRefContext; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java index a964b17478..d5a8e1cd28 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java @@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContextUtils; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; public class LeafRefContextTreeBuilderTest { private static final Logger LOG = LoggerFactory.getLogger(LeafRefContextTreeBuilderTest.class); - private static SchemaContext context; + private static EffectiveModelContext context; private static Module tstMod; private static QNameModule tst; private static LeafRefContext rootLeafRefContext; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java index bfd6919e7d..933d4497f0 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java @@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug4454Test { @@ -103,7 +103,7 @@ public class Bug4454Test { .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME)) .withChild(bazEntryNode).build(); - private static SchemaContext schemaContext; + private static EffectiveModelContext schemaContext; private DataTree inMemoryDataTree; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5830Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5830Test.java index ce45c4c4b9..f94da1c607 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5830Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5830Test.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class Bug5830Test { private static final String NS = "foo"; @@ -47,7 +47,7 @@ public class Bug5830Test { private static final QName PRESENCE_CONTAINER_2 = QName.create(NS, REV, "presence-container-2"); private static final QName MANDATORY_LEAF_2 = QName.create(NS, REV, "mandatory-leaf-2"); - private static DataTree initDataTree(final SchemaContext schemaContext) + private static DataTree initDataTree(final EffectiveModelContext schemaContext) throws DataValidationFailedException { DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); @@ -71,7 +71,7 @@ public class Bug5830Test { } private static void testPresenceContainer() throws DataValidationFailedException { - final SchemaContext schemaContext = TestModel.createTestContext("/bug5830/foo-presence.yang"); + final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug5830/foo-presence.yang"); assertNotNull("Schema context must not be null.", schemaContext); testContainerIsNotPresent(schemaContext); @@ -87,7 +87,7 @@ public class Bug5830Test { } private static void testNonPresenceContainer() throws DataValidationFailedException { - final SchemaContext schemaContext = TestModel.createTestContext("/bug5830/foo-non-presence.yang"); + final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug5830/foo-non-presence.yang"); assertNotNull("Schema context must not be null.", schemaContext); try { @@ -111,7 +111,7 @@ public class Bug5830Test { } private static void testMultipleContainers() throws DataValidationFailedException { - final SchemaContext schemaContext = TestModel.createTestContext("/bug5830/foo-multiple.yang"); + final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug5830/foo-multiple.yang"); assertNotNull("Schema context must not be null.", schemaContext); testContainerIsNotPresent(schemaContext); @@ -145,7 +145,7 @@ public class Bug5830Test { } } - private static void testContainerIsNotPresent(final SchemaContext schemaContext) + private static void testContainerIsNotPresent(final EffectiveModelContext schemaContext) throws DataValidationFailedException { final DataTree inMemoryDataTree = initDataTree(schemaContext); final MapEntryNode taskEntryNode = Builders.mapEntryBuilder() @@ -164,7 +164,8 @@ public class Bug5830Test { inMemoryDataTree.commit(prepare); } - private static void testContainerIsPresent(final SchemaContext schemaContext) throws DataValidationFailedException { + private static void testContainerIsPresent(final EffectiveModelContext schemaContext) + throws DataValidationFailedException { final DataTree inMemoryDataTree = initDataTree(schemaContext); final MapEntryNode taskEntryNode = Builders.mapEntryBuilder() @@ -184,7 +185,7 @@ public class Bug5830Test { inMemoryDataTree.commit(prepare); } - private static void testMandatoryDataLeafIsPresent(final SchemaContext schemaContext) + private static void testMandatoryDataLeafIsPresent(final EffectiveModelContext schemaContext) throws DataValidationFailedException { final DataTree inMemoryDataTree = initDataTree(schemaContext); @@ -205,7 +206,7 @@ public class Bug5830Test { inMemoryDataTree.commit(prepare); } - private static void testMandatoryLeaf2IsPresent(final SchemaContext schemaContext, + private static void testMandatoryLeaf2IsPresent(final EffectiveModelContext schemaContext, final boolean withPresenceContianer) throws DataValidationFailedException { final DataTree inMemoryDataTree = initDataTree(schemaContext); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968MergeTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968MergeTest.java index 0c8b7d0ade..81922ba217 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968MergeTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968MergeTest.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class Bug5968MergeTest { private static final String NS = "foo"; @@ -40,7 +40,7 @@ public class Bug5968MergeTest { private static final QName LIST_ID = QName.create(NS, REV, "list-id"); private static final QName MANDATORY_LEAF = QName.create(NS, REV, "mandatory-leaf"); private static final QName COMMON_LEAF = QName.create(NS, REV, "common-leaf"); - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; @BeforeClass public static void beforeClass() { @@ -52,7 +52,7 @@ public class Bug5968MergeTest { SCHEMA_CONTEXT = null; } - private static DataTree initDataTree(final SchemaContext schemaContext, final boolean withMapNode) + private static DataTree initDataTree(final EffectiveModelContext schemaContext, final boolean withMapNode) throws DataValidationFailedException { final DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); @@ -74,7 +74,7 @@ public class Bug5968MergeTest { return inMemoryDataTree; } - private static DataTree emptyDataTree(final SchemaContext schemaContext) + private static DataTree emptyDataTree(final EffectiveModelContext schemaContext) throws DataValidationFailedException { return new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java index 9aa7311054..a596d43b8e 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class Bug5968Test { private static final String NS = "foo"; @@ -40,7 +40,7 @@ public class Bug5968Test { private static final QName MANDATORY_LEAF = QName.create(NS, REV, "mandatory-leaf"); private static final QName COMMON_LEAF = QName.create(NS, REV, "common-leaf"); - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; @BeforeClass public static void beforeClass() { @@ -52,7 +52,7 @@ public class Bug5968Test { SCHEMA_CONTEXT = null; } - private static DataTree initDataTree(final SchemaContext schemaContext, final boolean withMapNode) + private static DataTree initDataTree(final EffectiveModelContext schemaContext, final boolean withMapNode) throws DataValidationFailedException { final DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); @@ -74,7 +74,7 @@ public class Bug5968Test { return inMemoryDataTree; } - private static DataTree emptyDataTree(final SchemaContext schemaContext) + private static DataTree emptyDataTree(final EffectiveModelContext schemaContext) throws DataValidationFailedException { return new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug8291Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug8291Test.java index b4b31c0a81..611bde07be 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug8291Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug8291Test.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class Bug8291Test { private static final String NS = "foo"; @@ -33,7 +33,8 @@ public class Bug8291Test { private static final QName OUTER_LIST = QName.create(NS, "outer-list"); private static final QName OUTER_LIST_ID = QName.create(NS, "id"); private static final QName INNER_LIST = QName.create(NS, "inner-list"); - private SchemaContext schemaContext; + + private EffectiveModelContext schemaContext; @Before public void init() { @@ -41,7 +42,7 @@ public class Bug8291Test { assertNotNull("Schema context must not be null.", this.schemaContext); } - private static DataTree initDataTree(final SchemaContext schemaContext) + private static DataTree initDataTree(final EffectiveModelContext schemaContext) throws DataValidationFailedException { final DataTreeConfiguration config = new DataTreeConfiguration.Builder(TreeType.CONFIGURATION).setRootPath( YangInstanceIdentifier.of(ROOT).node(OUTER_LIST)).build(); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseAugmentTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseAugmentTest.java index 82cdd360fe..77ba8bb60a 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseAugmentTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseAugmentTest.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguratio import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class CaseAugmentTest { private static final QName CHOICE1_QNAME = QName.create(TestModel.TEST_QNAME, "choice1"); @@ -37,7 +37,7 @@ public class CaseAugmentTest { private static final AugmentationIdentifier AUGMENT_ID = new AugmentationIdentifier( ImmutableSet.of(C1L2_QNAME, C1L3_QNAME)); - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; @BeforeClass public static void beforeClass() { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseExclusionTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseExclusionTest.java index 4ac26ac681..f92572fe16 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseExclusionTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseExclusionTest.java @@ -25,10 +25,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class CaseExclusionTest { - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; private DataTree inMemoryDataTree; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidation.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidation.java index 587a1743af..8d172f5446 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidation.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListConstraintsValidation.java @@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLe import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ListConstraintsValidation { @@ -70,7 +70,7 @@ public class ListConstraintsValidation { private static final YangInstanceIdentifier UNKEYED_LIST_PATH = YangInstanceIdentifier .builder(MASTER_CONTAINER_PATH).node(UNKEYED_LIST_QNAME).build(); - private static SchemaContext schemaContext; + private static EffectiveModelContext schemaContext; private DataTree inMemoryDataTree; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafTest.java index 943c1de02d..99eb78755b 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafTest.java @@ -24,11 +24,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class MandatoryLeafTest { - - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; @BeforeClass public static void beforeClass() { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/YT776Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/YT776Test.java index 2186464237..6d6bcdc8da 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/YT776Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/YT776Test.java @@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class YT776Test { private static final QName MODULE = QName.create("yt776", "yt776"); @@ -58,7 +58,7 @@ public class YT776Test { private static final NodeIdentifier SOME_LIST_ID = new NodeIdentifier(SOME_LIST); private static final NodeIdentifierWithPredicates SOME_LIST_ITEM = NodeIdentifierWithPredicates.of(SOME_LIST, ImmutableMap.of(SOME_LEAF, "foo")); - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; private DataTree dataTree; diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContext.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContext.java index b81699490f..d1383b6d09 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContext.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContext.java @@ -19,15 +19,15 @@ import org.opendaylight.yangtools.yang.data.jaxen.api.XPathDocument; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathExpression; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @NonNullByDefault final class JaxenSchemaContext implements XPathSchemaContext { private final DataSchemaContextTree tree; - private final SchemaContext context; + private final EffectiveModelContext context; - JaxenSchemaContext(final SchemaContext context) { + JaxenSchemaContext(final EffectiveModelContext context) { this.context = requireNonNull(context); this.tree = DataSchemaContextTree.from(context); } diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContextFactory.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContextFactory.java index ccb738f69d..22117dfe56 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContextFactory.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenSchemaContextFactory.java @@ -11,13 +11,13 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.kohsuke.MetaInfServices; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContextFactory; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; @MetaInfServices @NonNullByDefault public final class JaxenSchemaContextFactory implements XPathSchemaContextFactory { @Override - public XPathSchemaContext createContext(final SchemaContext context) { + public XPathSchemaContext createContext(final EffectiveModelContext context) { return new JaxenSchemaContext(context); } } diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/api/XPathSchemaContextFactory.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/api/XPathSchemaContextFactory.java index 134f4587d4..09bfbfa750 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/api/XPathSchemaContextFactory.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/api/XPathSchemaContextFactory.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.jaxen.api; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * A factory for obtaining {@link XPathSchemaContext}s. This is the primary entry point to an XPath evaluation @@ -22,12 +22,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; @NonNullByDefault public interface XPathSchemaContextFactory { /** - * Create an {@link XPathSchemaContext} based on a {@link SchemaContext}. This effectively binds the namespaces - * the user expects to map to YANG schema. The {@link XPathExpression} compilation, relocation and optimization - * processes can take advantage of the YANG schema provided. + * Create an {@link XPathSchemaContext} based on a {@link EffectiveModelContext}. This effectively binds the + * namespaces the user expects to map to YANG schema. The {@link XPathExpression} compilation, relocation and + * optimization processes can take advantage of the YANG schema provided. * * @param context SchemaContext associated with the resulting {@link XPathSchemaContext} * @return An {@link XPathSchemaContext} instance */ - XPathSchemaContext createContext(SchemaContext context); + XPathSchemaContext createContext(EffectiveModelContext context); } diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java index edf69dc285..021b76a14b 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/BitIsSetXPathFunctionTest.java @@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathDocument; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BitIsSetXPathFunctionTest { @@ -54,8 +54,8 @@ public class BitIsSetXPathFunctionTest { public void testBitIsSetFunction() throws Exception { final Set setOfBits = ImmutableSet.of("UP", "PROMISCUOUS"); - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(BitIsSetXPathFunctionTest.class, - "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + BitIsSetXPathFunctionTest.class, "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -84,8 +84,8 @@ public class BitIsSetXPathFunctionTest { public void testInvalidTypeOfCorrespondingSchemaNode() throws Exception { final Set setOfBits = ImmutableSet.of("UP", "PROMISCUOUS"); - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(BitIsSetXPathFunctionTest.class, - "/yang-xpath-functions-test/bit-is-set-function/foo-invalid.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + BitIsSetXPathFunctionTest.class, "/yang-xpath-functions-test/bit-is-set-function/foo-invalid.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -110,8 +110,8 @@ public class BitIsSetXPathFunctionTest { public void testInvalidNormalizedNodeValueType() throws Exception { final String invalidNodeValueType = "value of invalid type"; - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(BitIsSetXPathFunctionTest.class, - "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + BitIsSetXPathFunctionTest.class, "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -137,8 +137,8 @@ public class BitIsSetXPathFunctionTest { public void shouldFailOnUnknownBitArgument() throws Exception { final Set setOfBits = ImmutableSet.of("UP", "PROMISCUOUS"); - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(BitIsSetXPathFunctionTest.class, - "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + BitIsSetXPathFunctionTest.class, "/yang-xpath-functions-test/bit-is-set-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java index 782df967e7..47bc7226c1 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerefXPathFunctionTest.java @@ -39,7 +39,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.nodes.LazyLeafOperations; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathDocument; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class DerefXPathFunctionTest { @@ -63,7 +63,7 @@ public class DerefXPathFunctionTest { @Test public void testDerefFunctionForInstanceIdentifier() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, "/yang-xpath-functions-test/deref-function-iid/foo.yang"); assertNotNull(schemaContext); @@ -95,7 +95,7 @@ public class DerefXPathFunctionTest { @Test public void testDerefFunctionForLeafref() throws Exception { // tests absolute and relative leafref that references a leaf node - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, "/yang-xpath-functions-test/deref-function-leafref/foo.yang"); assertNotNull(schemaContext); @@ -137,7 +137,7 @@ public class DerefXPathFunctionTest { @Test public void testDerefFunctionForLeafref2() throws Exception { // tests leafref that references a leaf-list node - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources(DerefXPathFunctionTest.class, "/yang-xpath-functions-test/deref-function-leafref/foo.yang"); assertNotNull(schemaContext); diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java index f0c1f15edb..1698004e87 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/DerivedFromXPathFunctionTest.java @@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathDocument; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class DerivedFromXPathFunctionTest { @@ -52,9 +52,10 @@ public class DerivedFromXPathFunctionTest { @Test public void testDerivedFromFunction() throws Exception { // also includes test for derived-from-or-self function - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/foo.yang", - "/yang-xpath-functions-test/derived-from-function/bar.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, + "/yang-xpath-functions-test/derived-from-function/foo.yang", + "/yang-xpath-functions-test/derived-from-function/bar.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -91,8 +92,8 @@ public class DerivedFromXPathFunctionTest { @Test public void testInvalidTypeOfCorrespondingSchemaNode() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/bar-invalid.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, "/yang-xpath-functions-test/derived-from-function/bar-invalid.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -115,9 +116,10 @@ public class DerivedFromXPathFunctionTest { @Test public void testInvalidNormalizedNodeValueType() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/foo.yang", - "/yang-xpath-functions-test/derived-from-function/bar.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, + "/yang-xpath-functions-test/derived-from-function/foo.yang", + "/yang-xpath-functions-test/derived-from-function/bar.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -140,9 +142,10 @@ public class DerivedFromXPathFunctionTest { @Test public void shouldFailOnUnknownPrefixOfIdentity() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/foo.yang", - "/yang-xpath-functions-test/derived-from-function/bar.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, + "/yang-xpath-functions-test/derived-from-function/foo.yang", + "/yang-xpath-functions-test/derived-from-function/bar.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -171,9 +174,10 @@ public class DerivedFromXPathFunctionTest { @Test public void shouldFailOnMalformedIdentityArgument() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/foo.yang", - "/yang-xpath-functions-test/derived-from-function/bar.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, + "/yang-xpath-functions-test/derived-from-function/foo.yang", + "/yang-xpath-functions-test/derived-from-function/bar.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -201,9 +205,10 @@ public class DerivedFromXPathFunctionTest { @Test public void shouldFailOnUnknownIdentityArgument() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(DerivedFromXPathFunctionTest.class, - "/yang-xpath-functions-test/derived-from-function/foo.yang", - "/yang-xpath-functions-test/derived-from-function/bar.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + DerivedFromXPathFunctionTest.class, + "/yang-xpath-functions-test/derived-from-function/foo.yang", + "/yang-xpath-functions-test/derived-from-function/bar.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java index 0bd928d1a8..0a6edaebfb 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/EnumValueXPathFunctionTest.java @@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathDocument; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class EnumValueXPathFunctionTest { @@ -49,8 +49,8 @@ public class EnumValueXPathFunctionTest { @Test public void testEnumValueFunction() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(EnumValueXPathFunctionTest.class, - "/yang-xpath-functions-test/enum-value-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + EnumValueXPathFunctionTest.class, "/yang-xpath-functions-test/enum-value-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -73,8 +73,8 @@ public class EnumValueXPathFunctionTest { @Test public void testInvalidTypeOfCorrespondingSchemaNode() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(EnumValueXPathFunctionTest.class, - "/yang-xpath-functions-test/enum-value-function/foo-invalid.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + EnumValueXPathFunctionTest.class, "/yang-xpath-functions-test/enum-value-function/foo-invalid.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -97,8 +97,8 @@ public class EnumValueXPathFunctionTest { @Test public void testInvalidNormalizedNodeValueType() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(EnumValueXPathFunctionTest.class, - "/yang-xpath-functions-test/enum-value-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + EnumValueXPathFunctionTest.class, "/yang-xpath-functions-test/enum-value-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); @@ -121,8 +121,8 @@ public class EnumValueXPathFunctionTest { @Test public void shouldFailOnUnknownEnumNodeValue() throws Exception { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResources(EnumValueXPathFunctionTest.class, - "/yang-xpath-functions-test/enum-value-function/foo.yang"); + final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResources( + EnumValueXPathFunctionTest.class, "/yang-xpath-functions-test/enum-value-function/foo.yang"); assertNotNull(schemaContext); final XPathSchemaContext jaxenSchemaContext = SCHEMA_CONTEXT_FACTORY.createContext(schemaContext); diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java index cb97aa4be6..48990a1dd1 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenTest.java @@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.jaxen.api.XPathExpression; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathNodesetResult; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathResult; import org.opendaylight.yangtools.yang.data.jaxen.api.XPathSchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -65,7 +65,8 @@ public class JaxenTest { @Before public void setup() throws XPathExpressionException { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResourceDirectory("/test/documentTest"); + final EffectiveModelContext schemaContext = + YangParserTestUtils.parseYangResourceDirectory("/test/documentTest"); assertNotNull(schemaContext); initQNames(); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java index df60e7316c..4ba7406b78 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java @@ -29,10 +29,10 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; /** @@ -197,7 +197,7 @@ public abstract class DataSchemaContextNode extends Abst return new UnorderedLeafListMixinContextNode(potential); } - public static DataSchemaContextNode from(final SchemaContext ctx) { + public static DataSchemaContextNode from(final EffectiveModelContext ctx) { return new ContainerContextNode(ctx); } } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java index db2ea28e33..07b71bb46b 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java @@ -14,31 +14,31 @@ import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** - * Semantic tree binding a {@link SchemaContext} to a {@link NormalizedNode} tree. Since the layout of the schema - * and data has differences, the mapping is not trivial -- which is where this class comes in. + * Semantic tree binding a {@link EffectiveModelContext} to a {@link NormalizedNode} tree. Since the layout of the + * schema and data has differences, the mapping is not trivial -- which is where this class comes in. * * @author Robert Varga */ // FIXME: 6.0.0: @NonNullByDefault public final class DataSchemaContextTree { - private static final LoadingCache TREES = CacheBuilder.newBuilder() - .weakKeys().weakValues().build(new CacheLoader() { + private static final LoadingCache TREES = CacheBuilder.newBuilder() + .weakKeys().weakValues().build(new CacheLoader() { @Override - public DataSchemaContextTree load(final SchemaContext key) throws Exception { + public DataSchemaContextTree load(final EffectiveModelContext key) { return new DataSchemaContextTree(key); } }); private final DataSchemaContextNode root; - private DataSchemaContextTree(final SchemaContext ctx) { + private DataSchemaContextTree(final EffectiveModelContext ctx) { root = DataSchemaContextNode.from(ctx); } - public static @NonNull DataSchemaContextTree from(final @NonNull SchemaContext ctx) { + public static @NonNull DataSchemaContextTree from(final @NonNull EffectiveModelContext ctx) { return TREES.getUnchecked(ctx); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java index 2b85ee83fa..64107a770f 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java @@ -14,27 +14,27 @@ import java.net.URI; import java.util.Iterator; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; /** * Base class for implementing identityref codecs on based on module names. */ @Beta public abstract class ModuleStringIdentityrefCodec extends AbstractModuleStringIdentityrefCodec - implements SchemaContextProvider { - private final SchemaContext context; + implements EffectiveModelContextProvider { + private final EffectiveModelContext context; private final QNameModule parentModule; - protected ModuleStringIdentityrefCodec(final @NonNull SchemaContext context, + protected ModuleStringIdentityrefCodec(final @NonNull EffectiveModelContext context, final @NonNull QNameModule parentModule) { this.context = requireNonNull(context); this.parentModule = requireNonNull(parentModule); } @Override - public final SchemaContext getSchemaContext() { + public final EffectiveModelContext getEffectiveModelContext() { return context; } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtil.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtil.java index 148869cc92..6ddd2f8a62 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtil.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtil.java @@ -15,9 +15,9 @@ import java.util.function.Function; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Utility methods for implementing string-to-identity codecs. @@ -41,7 +41,7 @@ public final class IdentityCodecUtil { * @return Corresponding IdentitySchemaNode. * @throws IllegalArgumentException if the value is invalid or does not refer to an existing identity */ - public static IdentitySchemaNode parseIdentity(final String value, final SchemaContext schemaContext, + public static IdentitySchemaNode parseIdentity(final String value, final EffectiveModelContext schemaContext, final Function prefixToModule) { final QName qname = QNameCodecUtil.decodeQName(value, prefixToModule); final Optional optModule = schemaContext.findModule(qname.getModule()); diff --git a/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java b/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java index 8c6d752902..3a554fb73f 100644 --- a/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java +++ b/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java @@ -16,12 +16,12 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class IdentityCodecUtilTest { private static final QNameModule MODULE = QNameModule.create(URI.create("yangtools846")); - private static SchemaContext SCHEMA_CONTEXT; + private static EffectiveModelContext SCHEMA_CONTEXT; @BeforeClass public static void init() { diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java index a886f8426f..bb76e885e9 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java @@ -10,16 +10,16 @@ package org.opendaylight.yangtools.yang.model.repo.api; import com.google.common.annotations.Beta; import com.google.common.util.concurrent.ListenableFuture; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * Interface exposed by repository implementations. A schema repository is a logically centralized place for model - * storage and creation of {@link SchemaContext} instances. + * storage and creation of {@link EffectiveModelContext} instances. */ @Beta public interface SchemaRepository { /** - * Returns {@link SchemaContextFactory} with supplied configuration. + * Returns {@link EffectiveModelContextFactory} with supplied configuration. * * @param config configuration of schema context factory. * @return schema context factory. @@ -28,7 +28,7 @@ public interface SchemaRepository { @NonNull SchemaContextFactoryConfiguration config); /** - * Returns {@link SchemaContextFactory} with {@link SchemaContextFactoryConfiguration#getDefault()}. + * Returns {@link EffectiveModelContextFactory} with {@link SchemaContextFactoryConfiguration#getDefault()}. * * @return schema context factory. */ diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java index d5e10a27bf..1c2d3d86bd 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java @@ -7,8 +7,6 @@ */ package org.opendaylight.yangtools.yang.model.util; -import static java.util.Objects.requireNonNull; - import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableBiMap.Builder; @@ -18,9 +16,8 @@ import java.util.stream.Collectors; import org.opendaylight.yangtools.yang.common.BiMapYangNamespaceContext; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangNamespaceContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; /** * Utility {@link YangNamespaceContext} backed by a SchemaContext, resolving namespaces to their module names. This @@ -34,14 +31,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; * @author Robert Varga */ @Beta -public final class ModuleNameNamespaceContext implements YangNamespaceContext, SchemaContextProvider { +public final class ModuleNameNamespaceContext extends AbstractSchemaContextProvider implements YangNamespaceContext { private static final long serialVersionUID = 1L; - @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Handled through writeReplace()") - private final SchemaContext schemaContext; - - public ModuleNameNamespaceContext(final SchemaContext schemaContext) { - this.schemaContext = requireNonNull(schemaContext); + @SuppressFBWarnings(value = "SE_NO_SUITABLE_CONSTRUCTOR", justification = "Handled through writeReplace()") + public ModuleNameNamespaceContext(final EffectiveModelContext schemaContext) { + super(schemaContext); } /** @@ -51,25 +46,20 @@ public final class ModuleNameNamespaceContext implements YangNamespaceContext, S */ public BiMapYangNamespaceContext toBiMap() { final Builder builder = ImmutableBiMap.builder(); - for (String name : schemaContext.getModules().stream().map(Module::getName).collect(Collectors.toSet())) { + for (String name : getSchemaContext().getModules().stream().map(Module::getName).collect(Collectors.toSet())) { builder.put(name, findNamespaceForPrefix(name).get()); } return new BiMapYangNamespaceContext(builder.build()); } - @Override - public SchemaContext getSchemaContext() { - return schemaContext; - } - @Override public Optional findNamespaceForPrefix(final String prefix) { - return schemaContext.findModules(prefix).stream().findFirst().map(Module::getQNameModule); + return getSchemaContext().findModules(prefix).stream().findFirst().map(Module::getQNameModule); } @Override public Optional findPrefixForNamespace(final QNameModule namespace) { - return schemaContext.findModule(namespace).map(Module::getName); + return getSchemaContext().findModule(namespace).map(Module::getName); } private Object writeReplace() { diff --git a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java index ddf44806ea..6ccae443f7 100644 --- a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java +++ b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java @@ -28,7 +28,7 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -168,7 +168,7 @@ public final class Main { LOG.info("Yang model files: {} ", yangFiles); LOG.info("Supported features: {} ", supportedFeatures); - SchemaContext context = null; + EffectiveModelContext context = null; printMemoryInfo("start"); final Stopwatch stopWatch = Stopwatch.createStarted(); diff --git a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java index ee1694afb9..248df25b7a 100644 --- a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java +++ b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java @@ -31,7 +31,7 @@ import java.util.regex.Pattern; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangConstants; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.parser.api.YangParser; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; @@ -60,7 +60,7 @@ final class SystemTestUtils { return name.endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION) && file.isFile(); }; - static SchemaContext parseYangSources(final List yangLibDirs, final List yangTestFiles, + static EffectiveModelContext parseYangSources(final List yangLibDirs, final List yangTestFiles, final Set supportedFeatures, final boolean recursiveSearch) throws IOException, YangParserException { /* * Current dir "." should be always present implicitly in the list of @@ -87,7 +87,7 @@ final class SystemTestUtils { return parseYangSources(supportedFeatures, testFiles, libFiles); } - static SchemaContext parseYangSources(final Set supportedFeatures, final List testFiles, + static EffectiveModelContext parseYangSources(final Set supportedFeatures, final List testFiles, final List libFiles) throws IOException, YangParserException { checkArgument(!testFiles.isEmpty(), "No yang sources"); @@ -103,7 +103,7 @@ final class SystemTestUtils { parser.addLibSource(YangTextSchemaSource.forFile(file)); } - return parser.buildSchemaContext(); + return parser.buildEffectiveModel(); } private static File findInFiles(final List libFiles, final String yangTestFile) throws IOException { diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java index bbfb37e77f..805efb6037 100644 --- a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java +++ b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java @@ -152,7 +152,9 @@ public interface YangParser { * * @return An effective schema context comprised of configured models. * @throws YangSyntaxErrorException When a syntactic error is encountered. + * @deprecated Use {@link #buildEffectiveModel()} instead. */ + @Deprecated(forRemoval = true) default @NonNull SchemaContext buildSchemaContext() throws YangParserException { return buildEffectiveModel(); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java index 24cb91f87b..28652a2765 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java @@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.EffectiveModelContextFactory; @@ -270,31 +269,6 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem return sc; } - /** - * Try to parse all currently available yang files and build new schema context. - * - * @return new schema context iif there is at least 1 yang file registered and new schema context was successfully - * built. - * @deprecated Use {@link #getEffectiveModelContext()} instead. - */ - @Deprecated(forRemoval = true) - public Optional getSchemaContext() { - return getEffectiveModelContext(); - } - - /** - * Try to parse all currently available yang files and build new schema context depending on specified parsing mode. - * - * @param statementParserMode mode of statement parser - * @return new schema context iif there is at least 1 yang file registered and - * new schema context was successfully built. - * @deprecated Use {@link #getEffectiveModelContext(StatementParserMode)} instead. - */ - @Deprecated(forRemoval = true) - public Optional getSchemaContext(final StatementParserMode statementParserMode) { - return getEffectiveModelContext(statementParserMode); - } - @Override public synchronized FluentFuture getSource( final SourceIdentifier sourceIdentifier) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java index 53c8ad3cf1..606c6695c9 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java @@ -82,7 +82,8 @@ public class YangTextSchemaContextResolverTest { e.getCause().getMessage()); } - Optional schemaContextOptional = yangTextSchemaContextResolver.getSchemaContext(); + Optional schemaContextOptional = + yangTextSchemaContextResolver.getEffectiveModelContext(); assertTrue(schemaContextOptional.isPresent()); SchemaContext schemaContext = schemaContextOptional.get(); assertEquals(3, schemaContext.getModules().size()); @@ -93,7 +94,7 @@ public class YangTextSchemaContextResolverTest { assertEquals(0, yangTextSchemaContextResolver.getAvailableSources().size()); - schemaContextOptional = yangTextSchemaContextResolver.getSchemaContext(); + schemaContextOptional = yangTextSchemaContextResolver.getEffectiveModelContext(); assertTrue(schemaContextOptional.isPresent()); schemaContext = schemaContextOptional.get(); assertEquals(0, schemaContext.getModules().size()); -- 2.36.6