address compiler warnings
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
parent
25ac556b54
commit
ce0fb123ad
|
@ -89,7 +89,7 @@ class ModelConstructor extends Constructor {
|
||||||
String value = (String) constructScalar(scalarNode);
|
String value = (String) constructScalar(scalarNode);
|
||||||
|
|
||||||
// don't interpolate single quoted strings
|
// don't interpolate single quoted strings
|
||||||
if (scalarNode.getScalarStyle() == DumperOptions.ScalarStyle.SINGLE_QUOTED) {
|
if (scalarNode == null || scalarNode.getScalarStyle() == DumperOptions.ScalarStyle.SINGLE_QUOTED) {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,11 +196,12 @@ class ModelConstructor extends Constructor {
|
||||||
return Map.of();
|
return Map.of();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, String> vars = Optional.ofNullable(includeOptions.get("vars")).filter(Map.class::isInstance)
|
Map<String, String> vars = Optional.ofNullable(includeOptions.get("vars")).filter(Map.class::isInstance)
|
||||||
.map(Map.class::cast).orElse(Map.of());
|
.map(Map.class::cast).orElse(Map.of());
|
||||||
return new IncludeObject(fileName, vars);
|
return new IncludeObject(fileName, vars);
|
||||||
} else {
|
} else {
|
||||||
logger.warn("Invalid !include argument type: {}", node.getClass().getName());
|
logger.warn("Invalid !include argument type: {}", node == null ? null : node.getClass().getName());
|
||||||
}
|
}
|
||||||
return Map.of();
|
return Map.of();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue