From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 6 Oct 2020 05:25:16 +0000 (+0200)
Subject: Push FIXMEs out
X-Git-Tag: v6.0.0~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8c607e59c59d0bd5986aa65f02cde40452e31cea;p=yangtools.git

Push FIXMEs out

A number of FIXMEs will not be addressed in 6.0.0, push them out
to 7.0.0.

Change-Id: I6cd2b9b661cd60ae3c3a81b8d341d7ca46092bf7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

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 368c4c33e5..136ca83b31 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: 6.0.0: consider moving this class to api to keep related stuff together
+// FIXME: 7.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-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 0ae083eedf..2eee5690c2 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: 6.0.0: consider integrating into AbstractMountPointContextFactory
+// FIXME: 7.0.0: consider integrating into AbstractMountPointContextFactory
 public abstract class AbstractDynamicMountPointContextFactory extends AbstractIdentifiable<MountPointIdentifier>
         implements MountPointContextFactory {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDynamicMountPointContextFactory.class);
diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index a8be02e203..29a8fd4eef 100644
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -77,7 +77,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
  *
  * @see <a href="http://tools.ietf.org/html/rfc6020#section-9.13">RFC6020</a>
  */
-// FIXME: 6.0.0: this concept needs to be moved to yang-common, as parser components need the ability to refer
+// FIXME: 7.0.0: this concept needs to be moved to yang-common, as parser components need the ability to refer
 //               to data nodes -- most notably XPath expressions and {@code default} statement arguments need to be able
 //               to represent these.
 public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentifier>, Immutable, Serializable {
diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodeContainer.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodeContainer.java
index 536b158830..01f1965503 100644
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodeContainer.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodeContainer.java
@@ -47,7 +47,7 @@ public interface NormalizedNodeContainer<I extends PathArgument, K extends PathA
      *
      * @return Number of child nodes in this container.
      */
-    // FIXME: 6.0.0: consider making this method non-default
+    // FIXME: 7.0.0: consider making this method non-default, but then it will conflict in OrderedLeafSet
     default int size() {
         return getValue().size();
     }
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 b2d5ccb12b..b768b5f27a 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: 6.0.0: this probably should integrated with scalarValue()
+    // FIXME: 7.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/TreeType.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/TreeType.java
index e635a1a5b5..427096ad92 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;
  * <a href="https://tools.ietf.org/html/rfc6020#section-7.19.1">RFC7950</a> data combinations based on {@code config}
  * statement.
  */
-// FIXME: 6.0.0: Consider defining a 'config false'-only type
-// FIXME: 6.0.0: Consider renaming this enum
+// FIXME: 7.0.0: Consider defining a 'config false'-only type
+// FIXME: 7.0.0: Consider renaming this enum
 @Beta
 public enum TreeType {
     /**
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 159ecfbf56..aaa6730195 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<JSONCodec<?>
 
     // Returns a one-off factory for the purposes of normalizing an anydata tree.
     //
-    // 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
+    // FIXME: 7.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-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java
index 0baabbb64c..038299d6f9 100644
--- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java
+++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java
@@ -439,7 +439,7 @@ public final class XmlParserStream implements Closeable, Flushable {
 
         switch (in.nextTag()) {
             case XMLStreamConstants.START_ELEMENT:
-                // FIXME: 6.0.0: why do we even need this tracker? either document it or remove it.
+                // FIXME: 7.0.0: why do we even need this tracker? either document it or remove it.
                 //               it looks like it is a crude duplicate finder, which should really be handled via
                 //               ChildReusePolicy.REJECT
                 final Set<Entry<String, String>> namesakes = new HashSet<>();
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 3f8a00af75..fe3084de55 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: 6.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions
+// FIXME: 7.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<T> extends AbstractIllegalArgumentCodec<String, T>
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 5e05a933cf..afb69554c3 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: 6.0.0: yang-data-api is tied to yang-model-api, hence it should be opinionated to export exceptions
+// FIXME: 7.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<T> extends IllegalArgumentCodec<String, T> {
 
diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java
index 0523436632..3c22d88497 100644
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java
@@ -26,7 +26,7 @@ final class ChoiceNodeDataWithSchema extends CompositeNodeDataWithSchema<ChoiceS
         super(schema);
     }
 
-    // FIXME: 6.0.0: this should be impossible to hit
+    // FIXME: 7.0.0: this should be impossible to hit
     @Override
     CaseNodeDataWithSchema addCompositeChild(final DataSchemaNode schema, final ChildReusePolicy policy) {
         verify(schema instanceof CaseSchemaNode, "Unexpected schema %s", schema);
diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
index 9b4dd3a164..db16fbec44 100644
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
@@ -196,7 +196,7 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
             augSchema = null;
         }
 
-        // FIXME: 6.0.0: use policy once we have removed addChild() visibility
+        // FIXME: 7.0.0: use policy to determine if we should reuse or replace the child
 
         if (augSchema != null) {
             augmentationsToChild.put(augSchema, newChild);
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 07b71bb46b..6d072096c5 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
@@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
  *
  * @author Robert Varga
  */
-// FIXME: 6.0.0: @NonNullByDefault
 public final class DataSchemaContextTree {
     private static final LoadingCache<EffectiveModelContext, DataSchemaContextTree> TREES = CacheBuilder.newBuilder()
             .weakKeys().weakValues().build(new CacheLoader<EffectiveModelContext, DataSchemaContextTree>() {
@@ -53,7 +52,7 @@ public final class DataSchemaContextTree {
         return getRoot().findChild(path);
     }
 
-    public DataSchemaContextNode<?> getRoot() {
+    public @NonNull DataSchemaContextNode<?> getRoot() {
         return root;
     }
 }
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 948514ad78..19ed9a2a94 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: 6.0.0: evaluate if we still need to extend SchemaContext here
+// FIXME: 7.0.0: evaluate if we still need to extend SchemaContext here
 public interface EffectiveModelContext extends SchemaContext {
 
     Map<QNameModule, ModuleEffectiveStatement> 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 25d0c30544..4a135bb4a2 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
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ImportEffectiveStatement;
  * Interface describing YANG 'import' statement. The import statement makes definitions from one module available inside
  * another module or submodule.
  */
-// FIXME: 6.0.0: this class is a leak of the declared world into the effective one. In effective world, all nodes form
+// FIXME: 7.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:
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
index 3a9e2ad3f7..ad81de8b88 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
@@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
 @Beta
 public interface LengthEffectiveStatement extends EffectiveStatement<List<ValueRange>, LengthStatement>,
-        // FIXME: 6.0.0: reconsider this interface extension
-        // FIXME: 6.0.0: if we are keeping it, consider a default implementation (shared with others effective
+        // FIXME: 7.0.0: reconsider this interface extension
+        // FIXME: 7.0.0: if we are keeping it, consider a default implementation (shared with others effective
         //               statements)
         ConstraintMetaDefinition {
     @Override
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
index 1274c713c7..bba2793be4 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
@@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
 @Beta
 public interface RangeEffectiveStatement extends EffectiveStatement<List<ValueRange>, RangeStatement>,
-        // FIXME: 6.0.0: reconsider this interface extension
-        // FIXME: 6.0.0: if we are keeping it, consider a default implementation (shared with others effective
+        // FIXME: 7.0.0: reconsider this interface extension
+        // FIXME: 7.0.0: if we are keeping it, consider a default implementation (shared with others effective
         //               statements)
         ConstraintMetaDefinition {
     @Override
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
index 760fd40f44..6eb2cd6978 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java
@@ -30,7 +30,7 @@ public interface TypeStatement extends DeclaredStatement<String> {
     }
 
     @Rfc6020AbnfRule("numerical-restrictions")
-    // FIXME: 6.0.0: this interface does not have an implementation
+    // FIXME: 7.0.0: this interface does not have an implementation
     interface NumericalRestrictions extends TypeStatement {
         default @Nullable RangeStatement getRange() {
             return findFirstDeclaredSubstatement(RangeStatement.class).orElse(null);
@@ -50,7 +50,7 @@ public interface TypeStatement extends DeclaredStatement<String> {
     }
 
     @Rfc6020AbnfRule("string-restrictions")
-    // FIXME: 6.0.0: this interface does not have an implementation
+    // FIXME: 7.0.0: this interface does not have an implementation
     interface StringRestrictions extends TypeStatement {
         default @Nullable LengthStatement getLength() {
             final Optional<LengthStatement> opt = findFirstDeclaredSubstatement(LengthStatement.class);
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 0f3afed61c..b4c9ee5404 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
@@ -347,7 +347,7 @@ public final class RFC7950Reactors {
                 .addValidationBundle(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS,
                     YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
 
-                // FIXME: 6.0.0: we do not seem to need this validation bundle
+                // FIXME: 7.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 1fa645e624..bee9d0bf40 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: 6.0.0: move this to AbstractDeviateStatementSupport. This is not resolved from validation bundles at all,
+    // FIXME: 7.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<YangVersion, StatementDefinition, Set<StatementDefinition>> 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: 6.0.0: consider hiding this list, as choice nodes are handling creation of implied shorthands themselves.
+    // FIXME: 7.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<StatementDefinition> 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 9490e66a35..8a149087e9 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
@@ -143,7 +143,7 @@ public abstract class BaseStatementSupport<A, D extends DeclaredStatement<A>,
          * 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: 6.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a
+         * FIXME: 7.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a
          *               prerequisite of a resolved 'uses bar'.
          */
         final List<StmtContext<?, ?, ?>> substatementsInit = new ArrayList<>();
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 a695518034..430c6df1e2 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
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultArgument.WithSubstatements;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DocumentedNodeMixin;
 
-// FIXME: 6.0.0: hide this class
+// FIXME: 7.0.0: hide this class
 // FIXME: 6.0.0: do not implement SchemaNode
 public final class RefineEffectiveStatementImpl extends WithSubstatements<Descendant, RefineStatement>
         implements RefineEffectiveStatement, SchemaNode, DocumentedNodeMixin<Descendant, RefineStatement> {
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 822992976a..cc3c1b6967 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<TypeStatement>
     @Override
     public final <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends V> get(final Class<N> namespace,
             final K identifier) {
-        // FIXME: 6.0.0: implement this
+        // FIXME: 7.0.0: implement this
         return Optional.empty();
     }
 
     @Override
     public final <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(final Class<N> namespace) {
-        // FIXME: 6.0.0: implement this
+        // FIXME: 7.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 8aba02b8a9..ade7c48e50 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<K, V, N extends IdentifierNamespace<K,
         /**
          * Storage of the root statement of a particular source and any sources it is importing.
          */
-        // FIXME: 6.0.0: this is a misnomer and should be renamed
+        // FIXME: 7.0.0: this is a misnomer and should be renamed
         SOURCE_LOCAL_SPECIAL,
         /**
          * Storage of a single statement.
diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java
index 9cae589207..c1694c90a1 100644
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java
@@ -50,7 +50,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
  * build full declared statement model of source.</li>
  * </ol>
  */
-// FIXME: 6.0.0: this is a push parser, essentially traversing the same tree multiple times. Perhaps we should create
+// FIXME: 7.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<SourceIdentifier> {
     /**
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 9410426cce..5681ea50cb 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 <a href="https://tools.ietf.org/html/rfc6020#section-7.9.2">case shorthand</a> can be created for a
          * node.
          */
-        // FIXME: 6.0.0: consider removing this constant, this functionality is part of statement support.
+        // FIXME: 7.0.0: consider removing this constant, this functionality is part of statement support.
         SUPPORTED_CASE_SHORTHANDS,
 
         /**
diff --git a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathMathMode.java b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathMathMode.java
index 9e5d3bbefc..9411b0becb 100644
--- a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathMathMode.java
+++ b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangXPathMathMode.java
@@ -33,7 +33,7 @@ public enum YangXPathMathMode {
     EXACT(BigDecimalXPathMathSupport.INSTANCE);
 
     /*
-     * FIXME: 6.0.0: specify and implement this:
+     * FIXME: 7.0.0: specify and implement this:
      *
      * All number expressions are treated either as {@code org.opendaylight.yangtools.yang.common} types with
      * precision required to hold them. Decimal types are mapped to {@link Decimal64} with all range restrictions