ModifierImpl has no use for phase

Since the field is unused, reduce confusion by not propagating it.

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
index 7396b0813d12f72261a34067911336de8afeb009..7a4c4eea2e9ccd99522173eb3b80438f1b442aa9 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
@@ -172,7 +172,7 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, E extends Effect
          * Create a new inference action to be executed during specified phase. The action cannot be cancelled
          * and will be executed even if its definition remains incomplete.
          *
-         * @param phase Target phase
+         * @param phase Target phase in which the action will resolved.
          * @return A new action builder.
          * @throws NullPointerException if the specified phase is null
          */

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java
index 0e5cdc8dde50bd48685df9a75d6af3fa1d34357c..53747f24b9afd2bd968c756b06278167044e1216 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java
@@ -34,20 +34,15 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class ModifierImpl implements ModelActionBuilder {
+final class ModifierImpl implements ModelActionBuilder {
     private static final Logger LOG = LoggerFactory.getLogger(ModifierImpl.class);
 
     private final Set<AbstractPrerequisite<?>> unsatisfied = new HashSet<>(1);
     private final Set<AbstractPrerequisite<?>> mutations = new HashSet<>(1);
-    private final ModelProcessingPhase phase;
 
     private InferenceAction action;
     private boolean actionApplied = false;
 
-    ModifierImpl(final ModelProcessingPhase phase) {
-        this.phase = Preconditions.checkNotNull(phase);
-    }
-
     private <D> AbstractPrerequisite<D> addReq(final AbstractPrerequisite<D> prereq) {
         LOG.trace("Modifier {} adding prerequisite {}", this, prereq);
         unsatisfied.add(prereq);
@@ -81,10 +76,6 @@ class ModifierImpl implements ModelActionBuilder {
         return unsatisfied.isEmpty();
     }
 
-    ModelProcessingPhase getPhase() {
-        return phase;
-    }
-
     boolean isApplied() {
         return actionApplied;
     }
@@ -305,7 +296,7 @@ class ModifierImpl implements ModelActionBuilder {
         @SuppressWarnings("unchecked")
         @Override
         public boolean phaseFinished(final StatementContextBase<?, ?, ?> context, final ModelProcessingPhase phase) {
-            return resolvePrereq((C) (context));
+            return resolvePrereq((C) context);
         }
     }
 

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java
index 3cbb6d389a203488c48a547fbb3a47cb46f88fba..cfe7a9222d72965cb80fa1ccdffc34abce97aedc 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java
@@ -323,7 +323,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh
     }
 
     ModelActionBuilder newInferenceAction(final ModelProcessingPhase phase) {
-        final ModifierImpl action = new ModifierImpl(phase);
+        final ModifierImpl action = new ModifierImpl();
         modifiers.put(phase, action);
         return action;
     }