From 581000862db3d4ac5324cc9502fa0857ac6dc9d7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 18 Apr 2020 11:03:32 +0200 Subject: [PATCH 1/1] Push out FIXMEs to 6.0.0 We are ramping down for 5.0.0 release, hence we need to push out remaining FIXMEs out. Change-Id: Idf66e7907e9dae66b2e6dc9348d5f0b7dfeadf2d Signed-off-by: Robert Varga --- .../data/util/NormalizedMetadataWriter.java | 2 +- .../rfc8528/data/api/MountPointContext.java | 2 +- .../rfc8528/data/api/MountPointNode.java | 2 +- ...stractDynamicMountPointContextFactory.java | 2 +- .../AbstractMountPointContextFactory.java | 2 +- .../yang/data/api/schema/NormalizedNode.java | 9 ++++----- .../stream/NormalizedNodeStreamWriter.java | 2 +- .../schema/tree/DataTreeCandidateNode.java | 1 - .../yang/data/api/schema/tree/TreeType.java | 4 ++-- .../api/schema/tree/spi/MutableTreeNode.java | 1 - .../data/codec/gson/JSONCodecFactory.java | 2 +- .../impl/codec/AbstractDataStringCodec.java | 2 +- .../yang/data/impl/codec/DataStringCodec.java | 2 +- .../data/impl/leafref/LeafRefContext.java | 1 - .../yang/data/util/DataSchemaContextTree.java | 2 +- .../yang/model/api/EffectiveModelContext.java | 2 +- .../yang/model/api/ModuleImport.java | 20 +++++++++---------- .../model/api/NamespaceRevisionAware.java | 2 +- .../yang/model/api/RevisionAwareXPath.java | 4 ++-- .../api/stmt/ModuleEffectiveStatement.java | 2 +- .../api/EffectiveModelContextFactory.java | 2 +- .../rfc7950/reactor/RFC7950Reactors.java | 2 +- .../reactor/YangValidationBundles.java | 4 ++-- .../rfc7950/stmt/BaseStatementSupport.java | 2 +- .../enum_/EnumEffectiveStatementImpl.java | 2 +- .../refine/RefineEffectiveStatementImpl.java | 2 +- .../stmt/type/BuiltinEffectiveStatement.java | 4 ++-- .../parser/spi/meta/NamespaceBehaviour.java | 2 +- .../spi/source/StatementStreamSource.java | 2 +- .../ValidationBundlesNamespace.java | 2 +- 30 files changed, 43 insertions(+), 47 deletions(-) diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java b/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java index d9c96735f0..368c4c33e5 100644 --- a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java +++ b/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java @@ -49,7 +49,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWrit * @author Robert Varga */ @Beta -// FIXME: 5.0.0: consider moving this class to api to keep related stuff together +// FIXME: 6.0.0: consider moving this class to api to keep related stuff together public final class NormalizedMetadataWriter implements Closeable, Flushable { private final NormalizedNodeStreamWriter writer; private final boolean orderKeyLeaves; diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java index 931d2b2755..a1c60803d8 100644 --- a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java +++ b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; * operates w.r.t. mount points. Further evolution is expected. */ /* - * FIXME: 5.0.0: consider yang-data-api integration + * FIXME: 6.0.0: consider yang-data-api integration * * The above note does not give the subject enough attention. RFC8528 redefines the YANG data metamodel is significant * ways in that it ties it with RFC8525/RFC7895. The content of 'schema-mounts' is critical to interpreting diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java index d34f76791e..2a02e527f4 100644 --- a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java +++ b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MixinNode; * seamless. */ /* - * FIXME: 5.0.0: The above is not quite right. DataTree instances should be able to handle mount points and correctly + * FIXME: 6.0.0: The above is not quite right. DataTree instances should be able to handle mount points and correctly * handle them, provided they get enough support from MountPointContext. */ @Beta diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java index df3526a02d..847e2cd81d 100644 --- a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java +++ b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * Abstract base class for dynamic resolvers. */ @Beta -// FIXME: 5.0.0: consider integrating into AbstractMountPointContextFactory +// FIXME: 6.0.0: consider integrating into AbstractMountPointContextFactory public abstract class AbstractDynamicMountPointContextFactory extends AbstractIdentifiable implements MountPointContextFactory { private static final Logger LOG = LoggerFactory.getLogger(AbstractDynamicMountPointContextFactory.class); diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java index 686e42e969..61077f0ebd 100644 --- a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java +++ b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractMountPointContextFactory.java @@ -61,7 +61,7 @@ public abstract class AbstractMountPointContextFactory extends AbstractDynamicMo return config; } - // FIXME: 5.0.0: make this return a set of XPath expressions + // FIXME: 6.0.0: make this return a set of XPath expressions public ImmutableSet getParentReferences() { return parentReferences; } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java index ac3e46a77e..e7ae0eeebc 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNode.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum * @param Value of node */ /* - * FIXME: 5.0.0: NormalizedNode represents the perfectly-compliant view of the data, as evaluated by an implementation, + * FIXME: 6.0.0: NormalizedNode represents the perfectly-compliant view of the data, as evaluated by an implementation, * which is currently singular, with respect of its interpretation of a SchemaContext. This includes * leaf values, which are required to hold normalized representation for a particular implementation, * which may be affected by its understanding of any YANG extensions present -- such as optional type @@ -37,14 +37,13 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum * concept which contains an unverified, potentially non-conformant data tree, which the consumer needs * to check/fixup if it wishes to use it as a NormalizedNode. Such a concept should be called * "UnverifiedData". - */ -/* - * FIXME: 5.0.0: Once we have UnverifiedData, we should really rename this to "NormalizedData" or similar to unload + * + * FIXME: 6.0.0: Once we have UnverifiedData, we should really rename this to "NormalizedData" or similar to unload * some "Node" ambiguity. "Node" should be a generic term reserved for a particular domain -- hence 'node' * can be used to refer to either a 'schema node' in context of yang.model.api, or to * a 'normalized data node' in context of yang.data.api. * - * FIXME: 5.0.0: Well, not quite. The structure of unverified data is really codec specific -- and JSON and XML + * FIXME: 6.0.0: Well, not quite. The structure of unverified data is really codec specific -- and JSON and XML * do not agree on details. Furthermore things get way more complicated when we have a cross-schema * boundary -- like RFC8528. Hence we cannot really have a reasonably-structured concept of unverified * data. Nevertheless, this interface should be named 'NormalizedData'. diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java index a9d2451d9c..6b0cc051a8 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java @@ -339,7 +339,7 @@ public interface NormalizedNodeStreamWriter extends Closeable, Flushable, * implementation does not allow resetting the value. * @throws IOException if an underlying IO error occurs */ - // FIXME: 5.0.0: this probably should integrated with scalarValue() + // FIXME: 6.0.0: this probably should integrated with scalarValue() void domSourceValue(DOMSource value) throws IOException; /** diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java index 48c2684e9a..25b9f693ec 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; * the modification from which this candidate was created. The node itself exposes the before- and after-image * of the tree restricted to the modified nodes. */ -// FIXME: 5.0.0: Use @NonNullByDefault public interface DataTreeCandidateNode { /** * Get the node identifier. diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/TreeType.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/TreeType.java index 28ddb192fc..e635a1a5b5 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/TreeType.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/TreeType.java @@ -15,8 +15,8 @@ import com.google.common.annotations.Beta; * RFC7950 data combinations based on {@code config} * statement. */ -// FIXME: 5.0.0: Consider defining a 'config false'-only type -// FIXME: 5.0.0: Consider renaming this enum +// FIXME: 6.0.0: Consider defining a 'config false'-only type +// FIXME: 6.0.0: Consider renaming this enum @Beta public enum TreeType { /** diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java index c613d1d789..432d1f2782 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode; * A mutable tree node. This is a transient view materialized from a pre-existing node. Modifications are isolated. Once * this object is {@link #seal()}ed, any interactions with it will result in undefined behavior. */ -// FIXME: 5.0.0: Use @NonNullByDefault public interface MutableTreeNode extends StoreTreeNode { /** * Set the data component of the node. 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 87ee320406..87835b0dfa 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 @@ -147,7 +147,7 @@ public abstract class JSONCodecFactory extends AbstractCodecFactory // Returns a one-off factory for the purposes of normalizing an anydata tree. // - // FIXME: 5.0.0: this is really ugly, as we should be able to tell if the new context is the same as ours and + // FIXME: 6.0.0: this is really ugly, as we should be able to tell if the new context is the same as ours and // whether our cache is thread-safe -- in which case we should just return this. // The supplier/cache/factory layout needs to be reworked so that this call ends up being equivalent // to JSONCodecFactorySupplier.getShared() in case this factory is not thread safe. diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractDataStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractDataStringCodec.java index e6ed483813..3f8a00af75 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractDataStringCodec.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractDataStringCodec.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import com.google.common.annotations.Beta; import org.opendaylight.yangtools.concepts.AbstractIllegalArgumentCodec; -// FIXME: 5.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions +// FIXME: 6.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions // encapsulating YANG-based error information. @Beta public abstract class AbstractDataStringCodec extends AbstractIllegalArgumentCodec diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DataStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DataStringCodec.java index 0724ac159a..5e05a933cf 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DataStringCodec.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DataStringCodec.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.IllegalArgumentCodec; -// FIXME: 5.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions +// FIXME: 6.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions // encapsulating YANG-based error information. public interface DataStringCodec extends IllegalArgumentCodec { 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 2f0dae8840..002a6af026 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 @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.AbstractSchemaContextProvider; -// FIXME: 5.0.0 hide this class public final class LeafRefContext extends AbstractSchemaContextProvider { private final QName currentNodeQName; 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 33235a124c..6d55e77745 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 @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; * * @author Robert Varga */ -// FIXME: 5.0.0: @NonNullByDefault +// FIXME: 6.0.0: @NonNullByDefault public final class DataSchemaContextTree { private static final LoadingCache TREES = CacheBuilder.newBuilder() .weakKeys().weakValues().build(new CacheLoader() { diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java index 855184b434..948514ad78 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; * @author Robert Varga */ @Beta -// FIXME: 5.0.0: evaluate if we still need to extend SchemaContext here +// FIXME: 6.0.0: evaluate if we still need to extend SchemaContext here public interface EffectiveModelContext extends SchemaContext { Map getModuleStatements(); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java index 43976a8a16..5b0ce0587c 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java @@ -8,26 +8,26 @@ package org.opendaylight.yangtools.yang.model.api; import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.common.Revision; /** - * Interface describing YANG 'import' statement. - * - *

- * The import statement makes definitions from one module available inside another module or submodule. + * Interface describing YANG 'import' statement. The import statement makes definitions from one module available inside + * another module or submodule. */ -// FIXME: 5.0.0 this class is a leak of the declared world into the effective one. In effective world, all nodes form -// a tree, which consists of multiple (mostly) QName-navigated namespaces. As such module imports contribute -// only a prefix/QNameModule mapping to the effective world and hence should be mapped that way: -// - Module exposes String->QNameModule mapping +// FIXME: 6.0.0: this class is a leak of the declared world into the effective one. In effective world, all nodes form +// a tree, which consists of multiple (mostly) QName-navigated namespaces. As such module imports +// contribute only a prefix/QNameModule mapping to the effective world and hence should be mapped that +// way: +// - Module exposes String->QNameModule mapping public interface ModuleImport extends DocumentedNode { /** * Returns the name of the module to import. * * @return Name of the module to import */ - String getModuleName(); + @NonNull String getModuleName(); /** * Returns the module revision to import. May be null. @@ -48,5 +48,5 @@ public interface ModuleImport extends DocumentedNode { * * @return Prefix used to point to imported module */ - String getPrefix(); + @NonNull String getPrefix(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java index 65e6c26402..ea3a585a1e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NamespaceRevisionAware.java @@ -11,7 +11,7 @@ import java.net.URI; import java.util.Optional; import org.opendaylight.yangtools.yang.common.Revision; -// FIXME: 5.0.0: this really is QNameModuleAware (or some such) +// FIXME: 6.0.0: this really is QNameModuleAware (or some such) public interface NamespaceRevisionAware { URI getNamespace(); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java index 46a1e99823..ed412d153f 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java @@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBo /** * Contains methods for getting data (concrete XPath) and metadata (is XPath absolute) from XPath instance. */ -// FIXME: 5.0.0: find a better name for this interface +// FIXME: 6.0.0: find a better name for this interface public interface RevisionAwareXPath { /** * Returns true if the XPapth starts in root of Yang model, otherwise returns false. @@ -33,7 +33,7 @@ public interface RevisionAwareXPath { @NonNull String getOriginalString(); @Beta - // FIXME: 5.0.0: integrate this interface into RevisionAwareXPath + // FIXME: 6.0.0: integrate this interface into RevisionAwareXPath interface WithExpression extends RevisionAwareXPath { /** * Return the {@link YangXPathExpression} of this XPath. The expression is required to be at least diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java index 2145526cd1..bb6053b921 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; * Effective view of a {@link ModuleStatement}. */ @Beta -// FIXME: 5.0.0: we should reshuffle the String here, as module name is in reality a YANG identifier, e.g. not just +// FIXME: 6.0.0: we should reshuffle the String here, as module name is in reality a YANG identifier, e.g. not just // an ordinary String. We really want this to be a QName, so that we do not need the localQNameModule // bit, but that may be problematic with ModuleStatement, which is getting created before we even know // the namespace :( A type capture of the string may just be sufficient. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/EffectiveModelContextFactory.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/EffectiveModelContextFactory.java index b6d52d0acc..4bbc88671d 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/EffectiveModelContextFactory.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/EffectiveModelContextFactory.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; * {@link SourceIdentifier}s are required and dynamic recursive resolution. */ @Beta -//FIXME: 5.0.0: evaluate if we still need to extend SchemaContext here +// FIXME: 6.0.0: evaluate if we still need to extend SchemaContext here public interface EffectiveModelContextFactory extends SchemaContextFactory { /** * Create a new schema context containing specified sources, pulling in any dependencies they may have. diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java index 40c3f60ea8..5a61ebef02 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java @@ -346,7 +346,7 @@ public final class RFC7950Reactors { .addValidationBundle(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS, YangValidationBundles.SUPPORTED_AUGMENT_TARGETS) - // FIXME: 5.0.0: we do not seem to need this validation bundle + // FIXME: 6.0.0: we do not seem to need this validation bundle .addValidationBundle(ValidationBundleType.SUPPORTED_CASE_SHORTHANDS, YangValidationBundles.SUPPORTED_CASE_SHORTHANDS) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java index 31e089b928..1fa645e624 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java @@ -51,7 +51,7 @@ public final class YangValidationBundles { * * @deprecated This is an implementation leak from statement support and will be removed in next major version. */ - // FIXME: 5.0.0: move this to AbstractDeviateStatementSupport. This is not resolved from validation bundles at all, + // FIXME: 6.0.0: move this to AbstractDeviateStatementSupport. This is not resolved from validation bundles at all, // hence it makes sense to co-locate this with its user. @Deprecated public static final Table> SUPPORTED_DEVIATION_TARGETS = @@ -80,7 +80,7 @@ public final class YangValidationBundles { YangStmtMapping.CONTAINER, YangStmtMapping.LIST, YangStmtMapping.CASE, YangStmtMapping.INPUT, YangStmtMapping.OUTPUT, YangStmtMapping.NOTIFICATION, YangStmtMapping.CHOICE, YangStmtMapping.RPC); - // FIXME: 5.0.0: consider hiding this list, as choice nodes are handling creation of implied shorthands themselves. + // FIXME: 6.0.0: consider hiding this list, as choice nodes are handling creation of implied shorthands themselves. // This has implications on other members of this class, as they really seem like something which // should live in corresponding StatementSupport classes. public static final Set SUPPORTED_CASE_SHORTHANDS = ImmutableSet.of( diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java index 24a7abbf4a..941eb12d9e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseStatementSupport.java @@ -141,7 +141,7 @@ public abstract class BaseStatementSupport, * The reactor would first inline 'uses baz' as that definition is the first one completely resolved and then * inline 'uses bar'. Here we are iterating in declaration order re-inline the statements. * - * FIXME: 5.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a + * FIXME: 6.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a * prerequisite of a resolved 'uses bar'. */ final List> substatementsInit = new ArrayList<>(); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumEffectiveStatementImpl.java index e9957f1790..19805cec48 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/EnumEffectiveStatementImpl.java @@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDocumentedNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -// FIXME: 5.0.0: hide this class +// FIXME: 6.0.0: hide this class public final class EnumEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements EnumEffectiveStatement { private final String name; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java index daad19a9d3..772db16619 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Desce import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDocumentedNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -// FIXME: 5.0.0: hide this class +// FIXME: 6.0.0: hide this class public final class RefineEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements RefineEffectiveStatement, SchemaNode { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java index 87a9a1735e..822992976a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java @@ -60,13 +60,13 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement @Override public final > Optional get(final Class namespace, final K identifier) { - // FIXME: 5.0.0: implement this + // FIXME: 6.0.0: implement this return Optional.empty(); } @Override public final > Map getAll(final Class namespace) { - // FIXME: 5.0.0: implement this + // FIXME: 6.0.0: implement this return ImmutableMap.of(); } diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java index dec746e179..8aba02b8a9 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java @@ -43,7 +43,7 @@ public abstract class NamespaceBehaviour * */ -// FIXME: 5.0.0: this is a push parser, essentially traversing the same tree multiple times. Perhaps we should create +// FIXME: 6.0.0: this is a push parser, essentially traversing the same tree multiple times. Perhaps we should create // a visitor/filter or perform some explicit argument binding? public interface StatementStreamSource extends Identifiable { /** diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java index 5d7133ac68..9410426cce 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java @@ -42,7 +42,7 @@ public interface ValidationBundlesNamespace extends * Whether a case shorthand can be created for a * node. */ - // FIXME: 5.0.0: consider removing this constant, this functionality is part of statement support. + // FIXME: 6.0.0: consider removing this constant, this functionality is part of statement support. SUPPORTED_CASE_SHORTHANDS, /** -- 2.36.6