Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Propagate @Nonnull and @Nullable annotations
[yangtools.git]
/
yang
/
yang-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
stmt
/
rfc6020
/
FeatureStatementImpl.java
diff --git
a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java
b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java
index c59ea619b55e129fd029aaa079307a54b539bb28..ff3681b9e68b22ff0694e9ab568cf3bd4c28f4e5 100644
(file)
--- a/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java
+++ b/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java
@@
-1,4
+1,4
@@
-/*
*
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@
-7,26
+7,34
@@
*/
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
*/
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.FeatureEffectiveStatementImpl;
-
import java.util.Collection;
import java.util.Collection;
-import
org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement
;
+import
javax.annotation.Nonnull
;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
+import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
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.StmtContext;
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.StmtContext;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.FeatureEffectiveStatementImpl;
public class FeatureStatementImpl extends AbstractDeclaredStatement<QName>
implements FeatureStatement {
public class FeatureStatementImpl extends AbstractDeclaredStatement<QName>
implements FeatureStatement {
+ private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+ .FEATURE)
+ .addOptional(Rfc6020Mapping.DESCRIPTION)
+ .addAny(Rfc6020Mapping.IF_FEATURE)
+ .addOptional(Rfc6020Mapping.STATUS)
+ .addOptional(Rfc6020Mapping.REFERENCE)
+ .build();
protected FeatureStatementImpl(
protected FeatureStatementImpl(
- StmtContext<QName, FeatureStatement, ?> context) {
+
final
StmtContext<QName, FeatureStatement, ?> context) {
super(context);
}
super(context);
}
@@
-39,22
+47,28
@@
public class FeatureStatementImpl extends AbstractDeclaredStatement<QName>
}
@Override
}
@Override
- public QName parseArgumentValue(
StmtContext<?, ?, ?> ctx,
String value) {
+ public QName parseArgumentValue(
final StmtContext<?, ?, ?> ctx, final
String value) {
return Utils.qNameFromArgument(ctx, value);
}
@Override
public FeatureStatement createDeclared(
return Utils.qNameFromArgument(ctx, value);
}
@Override
public FeatureStatement createDeclared(
- StmtContext<QName, FeatureStatement, ?> ctx) {
+
final
StmtContext<QName, FeatureStatement, ?> ctx) {
return new FeatureStatementImpl(ctx);
}
@Override
public EffectiveStatement<QName, FeatureStatement> createEffective(
return new FeatureStatementImpl(ctx);
}
@Override
public EffectiveStatement<QName, FeatureStatement> createEffective(
- StmtContext<QName, FeatureStatement, EffectiveStatement<QName, FeatureStatement>> ctx) {
+
final
StmtContext<QName, FeatureStatement, EffectiveStatement<QName, FeatureStatement>> ctx) {
return new FeatureEffectiveStatementImpl(ctx);
}
return new FeatureEffectiveStatementImpl(ctx);
}
+ @Override
+ public void onFullDefinitionDeclared(final StmtContext.Mutable<QName, FeatureStatement,
+ EffectiveStatement<QName, FeatureStatement>> stmt) {
+ super.onFullDefinitionDeclared(stmt);
+ SUBSTATEMENT_VALIDATOR.validate(stmt);
+ }
}
@Override
}
@Override
@@
-72,11
+86,13
@@
public class FeatureStatementImpl extends AbstractDeclaredStatement<QName>
return firstDeclared(ReferenceStatement.class);
}
return firstDeclared(ReferenceStatement.class);
}
+ @Nonnull
@Override
public Collection<? extends IfFeatureStatement> getIfFeatures() {
return allDeclared(IfFeatureStatement.class);
}
@Override
public Collection<? extends IfFeatureStatement> getIfFeatures() {
return allDeclared(IfFeatureStatement.class);
}
+ @Nonnull
@Override
public QName getName() {
return argument();
@Override
public QName getName() {
return argument();