OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

address compiler warnings 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/4818/head
Jimmy Tanagra 2025-05-28 00:00:10 +10:00
parent 25ac556b54
commit ce0fb123ad
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/util/preprocessor/ModelConstructor.java
View File

@ -89,7 +89,7 @@ class ModelConstructor extends Constructor {
String value = (String) constructScalar(scalarNode);
// don't interpolate single quoted strings
if (scalarNode.getScalarStyle() == DumperOptions.ScalarStyle.SINGLE_QUOTED) {
if (scalarNode == null || scalarNode.getScalarStyle() == DumperOptions.ScalarStyle.SINGLE_QUOTED) {
return value;
}
@ -196,11 +196,12 @@ class ModelConstructor extends Constructor {
return Map.of();
}
@SuppressWarnings("unchecked")
Map<String, String> vars = Optional.ofNullable(includeOptions.get("vars")).filter(Map.class::isInstance)
.map(Map.class::cast).orElse(Map.of());
return new IncludeObject(fileName, vars);
} 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();
}