Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 6901 - [Yang 1.1] Default value MUST NOT be marked with an if-feature
[yangtools.git]
/
yang
/
yang-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
stmt
/
rfc6020
/
BelongsToStatementImpl.java
diff --git
a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java
b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java
index 0b5cb9a0952d9fccb43109d75edf5c2a6707a8f0..8d91f3a238c5aede7efe639c0b2c5616eeec98d8 100644
(file)
--- a/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java
+++ b/
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java
@@
-7,16
+7,16
@@
*/
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
*/
package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
-import com.google.common.base.Optional;
-import java.net.URI;
import java.util.Collection;
import java.util.Collection;
+import java.util.Optional;
+import javax.annotation.Nonnull;
import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
-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.BelongsToStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement;
-import org.opendaylight.yangtools.yang.
parser.builder.imp
l.ModuleIdentifierImpl;
+import org.opendaylight.yangtools.yang.
model.uti
l.ModuleIdentifierImpl;
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.SubstatementValidator;
import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
@@
-34,7
+34,7
@@
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.BelongsEffe
public class BelongsToStatementImpl extends AbstractDeclaredStatement<String>
implements BelongsToStatement {
private static final SubstatementValidator SUBSTATEMENT_VALIDATOR =
public class BelongsToStatementImpl extends AbstractDeclaredStatement<String>
implements BelongsToStatement {
private static final SubstatementValidator SUBSTATEMENT_VALIDATOR =
- SubstatementValidator.builder(
Rfc6020Mapping.BELONGS_TO).add(Rfc6020Mapping.PREFIX, 1, 1
).build();
+ SubstatementValidator.builder(
YangStmtMapping.BELONGS_TO).addMandatory(YangStmtMapping.PREFIX
).build();
protected BelongsToStatementImpl(final StmtContext<String, BelongsToStatement, ?> context) {
super(context);
protected BelongsToStatementImpl(final StmtContext<String, BelongsToStatement, ?> context) {
super(context);
@@
-45,7
+45,7
@@
public class BelongsToStatementImpl extends AbstractDeclaredStatement<String>
AbstractStatementSupport<String, BelongsToStatement, EffectiveStatement<String, BelongsToStatement>> {
public Definition() {
AbstractStatementSupport<String, BelongsToStatement, EffectiveStatement<String, BelongsToStatement>> {
public Definition() {
- super(
Rfc6020
Mapping.BELONGS_TO);
+ super(
YangStmt
Mapping.BELONGS_TO);
}
@Override
}
@Override
@@
-99,23
+99,23
@@
public class BelongsToStatementImpl extends AbstractDeclaredStatement<String>
private static ModuleIdentifier getModuleIdentifier(
final StmtContext.Mutable<String, BelongsToStatement, EffectiveStatement<String, BelongsToStatement>> belongsToCtx) {
String moduleName = belongsToCtx.getStatementArgument();
private static ModuleIdentifier getModuleIdentifier(
final StmtContext.Mutable<String, BelongsToStatement, EffectiveStatement<String, BelongsToStatement>> belongsToCtx) {
String moduleName = belongsToCtx.getStatementArgument();
- return
new ModuleIdentifierImpl(moduleName, Optional.<URI> absent
(),
+ return
ModuleIdentifierImpl.create(moduleName, Optional.empty
(),
Optional.of(SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE));
}
@Override
Optional.of(SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE));
}
@Override
- public void onFullDefinitionDeclared(final StmtContext.Mutable<String, BelongsToStatement,
- EffectiveStatement<String, BelongsToStatement>> stmt) {
- super.onFullDefinitionDeclared(stmt);
- SUBSTATEMENT_VALIDATOR.validate(stmt);
+ protected SubstatementValidator getSubstatementValidator() {
+ return SUBSTATEMENT_VALIDATOR;
}
}
}
}
+ @Nonnull
@Override
public String getModule() {
return argument();
}
@Override
public String getModule() {
return argument();
}
+ @Nonnull
@Override
public PrefixStatement getPrefix() {
return firstDeclared(PrefixStatement.class);
@Override
public PrefixStatement getPrefix() {
return firstDeclared(PrefixStatement.class);