We have a few nullness reports, use coerceArgument() when we
are implying a requirement.
Change-Id: I9854f77eeb28945a6cac9fe86695a145eab0687d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
0b4969972e9facb9d0d1aa515e24b9a7073127ee)
@Override
public void onStatementDefinitionDeclared(final Mutable<QName, BaseStatement, BaseEffectiveStatement> baseStmtCtx) {
@Override
public void onStatementDefinitionDeclared(final Mutable<QName, BaseStatement, BaseEffectiveStatement> baseStmtCtx) {
- final Mutable<?, ?, ?> baseParentCtx = baseStmtCtx.getParentContext();
+ final Mutable<?, ?, ?> baseParentCtx = baseStmtCtx.coerceParentContext();
if (baseParentCtx.producesDeclared(IdentityStatement.class)) {
if (baseParentCtx.producesDeclared(IdentityStatement.class)) {
final QName baseIdentityQName = baseStmtCtx.coerceStatementArgument();
final ModelActionBuilder baseIdentityAction = baseStmtCtx.newInferenceAction(
ModelProcessingPhase.STATEMENT_DEFINITION);
final QName baseIdentityQName = baseStmtCtx.coerceStatementArgument();
final ModelActionBuilder baseIdentityAction = baseStmtCtx.newInferenceAction(
ModelProcessingPhase.STATEMENT_DEFINITION);
YinElementStatement.class);
stmt.addToNs(StatementDefinitionNamespace.class, stmt.getStatementArgument(),
YinElementStatement.class);
stmt.addToNs(StatementDefinitionNamespace.class, stmt.getStatementArgument(),
- new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.getStatementArgument(),
+ new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.coerceStatementArgument(),
argument != null ? argument.getStatementArgument() : null,
yinElement != null && yinElement.coerceStatementArgument())));
}
argument != null ? argument.getStatementArgument() : null,
yinElement != null && yinElement.coerceStatementArgument())));
}
final ModelActionBuilder verifyFeatures = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
final Map<Prerequisite<?>, QName> backRef = new HashMap<>();
final ModelActionBuilder verifyFeatures = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
final Map<Prerequisite<?>, QName> backRef = new HashMap<>();
- for (QName feature : stmt.getStatementArgument().getReferencedFeatures()) {
+ for (QName feature : stmt.coerceStatementArgument().getReferencedFeatures()) {
backRef.put(verifyFeatures.requiresCtx(stmt, FeatureNamespace.class, feature,
ModelProcessingPhase.EFFECTIVE_MODEL), feature);
}
backRef.put(verifyFeatures.requiresCtx(stmt, FeatureNamespace.class, feature,
ModelProcessingPhase.EFFECTIVE_MODEL), feature);
}
.build().getRootStatements().forEach(declaredStmt -> {
if (declaredStmt instanceof ModuleStatement) {
declaredStmt.declaredSubstatements().forEach(subStmt -> {
.build().getRootStatements().forEach(declaredStmt -> {
if (declaredStmt instanceof ModuleStatement) {
declaredStmt.declaredSubstatements().forEach(subStmt -> {
- if (subStmt instanceof IncludeStatement && subStmt.rawArgument().equals("child-module")) {
+ if (subStmt instanceof IncludeStatement && "child-module".equals(subStmt.rawArgument())) {
subStmt.declaredSubstatements().forEach(Bug6874Test::verifyDescAndRef);
}
});
subStmt.declaredSubstatements().forEach(Bug6874Test::verifyDescAndRef);
}
});