Shorten Prerequisite reference

We have the interface imported, no need to refer to it via
ModelActionBuilder.

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
index cd2a4226a027d75745b6d004674e74e01562b43e..26bf0c5b43253c1c8e5b35e4031ba9b6a19942f4 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
@@ -30,6 +30,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -98,9 +100,9 @@ abstract class AbstractAugmentStatementSupport extends AbstractStatementSupport<
                 augmentAction.mutatesEffectiveCtxPath(getSearchRoot(augmentNode),
                     ChildSchemaNodeNamespace.class, augmentNode.coerceStatementArgument().getPathFromRoot());
 
-        augmentAction.apply(new ModelActionBuilder.InferenceAction() {
+        augmentAction.apply(new InferenceAction() {
             @Override
-            public void apply(final ModelActionBuilder.InferenceContext ctx) {
+            public void apply(final InferenceContext ctx) {
                 final StatementContextBase<?, ?, ?> augmentTargetCtx =
                         (StatementContextBase<?, ?, ?>) target.resolve(ctx);
                 if (!isSupportedAugmentTarget(augmentTargetCtx)
@@ -142,7 +144,7 @@ abstract class AbstractAugmentStatementSupport extends AbstractStatementSupport<
             }
 
             @Override
-            public void prerequisiteFailed(final Collection<? extends ModelActionBuilder.Prerequisite<?>> failed) {
+            public void prerequisiteFailed(final Collection<? extends Prerequisite<?>> failed) {
                 /*
                  * Do not fail, if it is an uses-augment to an unknown node.
                  */

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
index 29bd851a2030874f01d3a90ca606bd4193182cb2..d4f2ff8684f41c1a309147eb3195ba36e927adb5 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
@@ -89,7 +89,7 @@ public final class BelongsToStatementSupport extends
             }
 
             @Override
-            public void prerequisiteFailed(final Collection<? extends ModelActionBuilder.Prerequisite<?>> failed) {
+            public void prerequisiteFailed(final Collection<? extends Prerequisite<?>> failed) {
                 if (failed.contains(belongsToPrereq)) {
                     throw new InferenceException(belongsToCtx.getStatementSourceReference(),
                         "Module '%s' from belongs-to was not found", belongsToCtx.getStatementArgument());