From ce0fb123ad0379bc8e7f2ea7e1add144d6432cb5 Mon Sep 17 00:00:00 2001 From: Jimmy Tanagra Date: Wed, 28 May 2025 00:00:10 +1000 Subject: [PATCH] address compiler warnings Signed-off-by: Jimmy Tanagra --- .../yaml/internal/util/preprocessor/ModelConstructor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/util/preprocessor/ModelConstructor.java b/bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/util/preprocessor/ModelConstructor.java index 08c9e7ed20..cfb420b201 100644 --- a/bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/util/preprocessor/ModelConstructor.java +++ b/bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/util/preprocessor/ModelConstructor.java @@ -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 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(); }