Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Eliminate superfluous onFullDefinitionDeclared overrides
[yangtools.git]
/
yang
/
yang-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
stmt
/
rfc6020
/
WhenStatementImpl.java
diff --git
a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java
b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java
index 573ef225b32666dc9513bfc8e47b29790101a247..82c89bc92bc5e08baf1991f4c3abf2d8ec9aa996 100644
(file)
--- a/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java
+++ b/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java
@@
-10,7
+10,7
@@
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.yangtools.yang.model.api.
Rfc6020
Mapping;
+import org.opendaylight.yangtools.yang.model.api.
YangStmt
Mapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
@@
-22,10
+22,10
@@
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.WhenEffectiveStatementImpl;
public class WhenStatementImpl extends AbstractDeclaredStatement<RevisionAwareXPath> implements WhenStatement {
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.WhenEffectiveStatementImpl;
public class WhenStatementImpl extends AbstractDeclaredStatement<RevisionAwareXPath> implements WhenStatement {
- private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
Rfc6020
Mapping
+ private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
YangStmt
Mapping
.WHEN)
.WHEN)
- .add
(Rfc6020Mapping.DESCRIPTION, 0, 1
)
- .add
(Rfc6020Mapping.REFERENCE, 0, 1
)
+ .add
Optional(YangStmtMapping.DESCRIPTION
)
+ .add
Optional(YangStmtMapping.REFERENCE
)
.build();
protected WhenStatementImpl(final StmtContext<RevisionAwareXPath, WhenStatement, ?> context) {
.build();
protected WhenStatementImpl(final StmtContext<RevisionAwareXPath, WhenStatement, ?> context) {
@@
-36,7
+36,7
@@
public class WhenStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
AbstractStatementSupport<RevisionAwareXPath, WhenStatement, EffectiveStatement<RevisionAwareXPath, WhenStatement>> {
public Definition() {
AbstractStatementSupport<RevisionAwareXPath, WhenStatement, EffectiveStatement<RevisionAwareXPath, WhenStatement>> {
public Definition() {
- super(
Rfc6020
Mapping.WHEN);
+ super(
YangStmt
Mapping.WHEN);
}
@Override
}
@Override
@@
-56,10
+56,8
@@
public class WhenStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
}
@Override
}
@Override
- public void onFullDefinitionDeclared(StmtContext.Mutable<RevisionAwareXPath, WhenStatement,
- EffectiveStatement<RevisionAwareXPath, WhenStatement>> stmt) {
- super.onFullDefinitionDeclared(stmt);
- SUBSTATEMENT_VALIDATOR.validate(stmt);
+ protected SubstatementValidator getSubstatementValidator() {
+ return SUBSTATEMENT_VALIDATOR;
}
}
}
}