From fb23ba5eeb37e35ef5a8b6ed046790c30c0f2bc9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 9 Nov 2017 02:06:25 +0100 Subject: [PATCH] YANGTOOLS-706: Cleanup Unknown{Effective}StatementImpl These classes are actually implementing the UnrecognizedStatement contract, name them accordingly. Change-Id: Iec5cdd4cc06a99a8252595f043e88efe9ae0efdd Signed-off-by: Robert Varga --- .../ModelDefinedStatementDefinition.java | 7 +++--- .../rfc6020/ModelDefinedStatementSupport.java | 17 +++++++------ ...pl.java => UnrecognizedStatementImpl.java} | 24 +++++++++---------- ...> UnrecognizedEffectiveStatementImpl.java} | 14 ++++++----- 4 files changed, 32 insertions(+), 30 deletions(-) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/{UnknownStatementImpl.java => UnrecognizedStatementImpl.java} (74%) rename yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/{UnknownEffectiveStatementImpl.java => UnrecognizedEffectiveStatementImpl.java} (81%) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java index f937bcf565..b943c6b18a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java @@ -17,7 +17,8 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; /** * Public definition for statements declared by extensions. This class is instantiated for every extension that is seen @@ -50,13 +51,13 @@ public final class ModelDefinedStatementDefinition implements StatementDefinitio @Nonnull @Override public Class> getDeclaredRepresentationClass() { - return UnknownStatementImpl.class; + return UnrecognizedStatement.class; } @Nonnull @Override public Class> getEffectiveRepresentationClass() { - return UnknownEffectiveStatementImpl.class; + return UnrecognizedEffectiveStatement.class; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java index 2495d4e48c..5f34bdd7ef 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import java.util.Optional; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; -import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; @@ -18,28 +18,27 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; /** * StatementSupport for statements defined via YANG extensions. This is implemented by piggy-backing - * to a {@link UnknownStatementImpl.Definition}. + * to a {@link UnrecognizedStatementImpl.Definition}. * * @author Robert Varga */ public final class ModelDefinedStatementSupport extends AbstractStatementSupport, EffectiveStatement>> { - private final UnknownStatementImpl.Definition definition; + UnrecognizedStatement, EffectiveStatement> { + private final UnrecognizedStatementImpl.Definition definition; ModelDefinedStatementSupport(final ModelDefinedStatementDefinition publicDefinition) { super(publicDefinition); - this.definition = new UnknownStatementImpl.Definition(publicDefinition); + this.definition = new UnrecognizedStatementImpl.Definition(publicDefinition); } @Override - public UnknownStatement createDeclared(final StmtContext, ?> ctx) { + public UnrecognizedStatement createDeclared(final StmtContext ctx) { return definition.createDeclared(ctx); } @Override - public EffectiveStatement> createEffective( - final StmtContext, - EffectiveStatement>> ctx) { + public EffectiveStatement createEffective( + final StmtContext> ctx) { return definition.createEffective(ctx); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java similarity index 74% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java index 7a7d08986f..dd8ce0d93d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java @@ -12,23 +12,23 @@ import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; -import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnrecognizedEffectiveStatementImpl; -public class UnknownStatementImpl extends AbstractDeclaredStatement implements UnrecognizedStatement { +public final class UnrecognizedStatementImpl extends AbstractDeclaredStatement + implements UnrecognizedStatement { - protected UnknownStatementImpl(final StmtContext context) { + protected UnrecognizedStatementImpl(final StmtContext context) { super(context); } - public static class Definition extends AbstractStatementSupport, - EffectiveStatement>> { + public static class Definition extends AbstractStatementSupport> { public Definition(final StatementDefinition publicDefinition) { super(publicDefinition); @@ -40,15 +40,15 @@ public class UnknownStatementImpl extends AbstractDeclaredStatement impl } @Override - public UnknownStatement createDeclared(final StmtContext, ?> ctx) { - return new UnknownStatementImpl(ctx); + public UnrecognizedStatement createDeclared(final StmtContext ctx) { + return new UnrecognizedStatementImpl(ctx); } @Override - public EffectiveStatement> createEffective( - final StmtContext, - EffectiveStatement>> ctx) { - return new UnknownEffectiveStatementImpl(ctx); + public EffectiveStatement createEffective( + final StmtContext> ctx) { + return new UnrecognizedEffectiveStatementImpl(ctx); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java similarity index 81% rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java index 2c4a154767..54bd6c3163 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java @@ -13,17 +13,19 @@ import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -public final class UnknownEffectiveStatementImpl - extends UnknownEffectiveStatementBase> { +public final class UnrecognizedEffectiveStatementImpl + extends UnknownEffectiveStatementBase + implements UnrecognizedEffectiveStatement { private final QName maybeQNameArgument; private final SchemaPath path; - public UnknownEffectiveStatementImpl(final StmtContext, ?> ctx) { + public UnrecognizedEffectiveStatementImpl(final StmtContext ctx) { super(ctx); // FIXME: Remove following section after fixing 4380 @@ -71,10 +73,10 @@ public final class UnknownEffectiveStatementImpl if (this == obj) { return true; } - if (!(obj instanceof UnknownEffectiveStatementImpl)) { + if (!(obj instanceof UnrecognizedEffectiveStatementImpl)) { return false; } - UnknownEffectiveStatementImpl other = (UnknownEffectiveStatementImpl) obj; + UnrecognizedEffectiveStatementImpl other = (UnrecognizedEffectiveStatementImpl) obj; return Objects.equals(maybeQNameArgument, other.maybeQNameArgument) && Objects.equals(path, other.path) && Objects.equals(getNodeType(), other.getNodeType()) && Objects.equals(getNodeParameter(), other.getNodeParameter()); -- 2.36.6