review fixes

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

Author: mherwege

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/sitemaps/YamlSitemapDTO.java

@@ -263,7 +263,7 @@ private void addToList(@Nullable List<@NonNull String> list, String value) {
         }
 
         if (partial.confirmCmd != null) {
-            if (partial.confirmCmd.isValueNode()) {
+            if (partial.confirmCmd.isBoolean()) {
                 result.confirmCmd = partial.confirmCmd.asBoolean();
             } else if (partial.confirmCmd.isArray()) {
                 result.confirmCmd = toRulesDto(partial.confirmCmd);

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/sitemaps/YamlWidgetDTO.java

@@ -320,15 +320,16 @@ private boolean isValidRule(@NonNull List<@NonNull String> errors, @NonNull List
                     }
                 } else if (r instanceof YamlRuleWithUniqueConditionDTO rule) {
                     ok &= rule.isValid(ruleErrors, ruleWarnings);
-                    if (rule.item == null && rule.operator == null && rule.argument == null) {
-                        addToList(errors,
-                                "invalid rule in \"%s\" field: \"argument\" field missing while mandatory in condition"
-                                        .formatted(parameterName));
-                        ok = false;
-                    }
-                    if (ignoreValue && rule.value != null) {
-                        addToList(warnings,
-                                "rule in \"%s\" field: unexpected \"value\" field is ignored".formatted(parameterName));
+                    if (ignoreValue) {
+                        if (rule.item == null && rule.operator == null && rule.argument == null) {
+                            addToList(errors,
+                                    "invalid rule in \"%s\" field: \"argument\" field missing while mandatory in condition"
+                                            .formatted(parameterName));
+                            ok = false;
+                        } else if (rule.value != null) {
+                            addToList(warnings, "rule in \"%s\" field: unexpected \"value\" field is ignored"
+                                    .formatted(parameterName));
+                        }
                     }
                 } else {
                     addToList(errors, "invalid type for rule in \"%s\" field".formatted(parameterName));
@@ -343,15 +344,17 @@ private boolean isValidRule(@NonNull List<@NonNull String> errors, @NonNull List
             }
         } else if (parameter instanceof YamlRuleWithUniqueConditionDTO rule) {
             ok &= rule.isValid(ruleErrors, ruleWarnings);
-            if (rule.item == null && rule.operator == null && rule.argument == null) {
-                addToList(errors,
-                        "invalid rule in \"%s\" field: \"argument\" field missing while mandatory in condition"
-                                .formatted(parameterName));
-                ok = false;
-            }
-            if (ignoreValue && rule.value != null) {
-                addToList(warnings,
-                        "rule in \"%s\" field: unexpected \"value\" field is ignored".formatted(parameterName));
+            if (ignoreValue) {
+                if (rule.item == null && rule.operator == null && rule.argument == null) {
+                    addToList(errors,
+                            "invalid rule in \"%s\" field: \"argument\" field missing while mandatory in condition"
+                                    .formatted(parameterName));
+                    ok = false;
+                }
+                if (rule.value != null) {
+                    addToList(warnings,
+                            "rule in \"%s\" field: unexpected \"value\" field is ignored".formatted(parameterName));
+                }
             }
         }
         ruleErrors.forEach(error -> {

bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java

@@ -193,7 +193,7 @@ private void applyConfig(@Nullable Map<String, Object> config) {
             if (groupMembersSortingString != null) {
                 groupMembersSorting = groupMembersSortingString;
             }
-            final String confirmCmdMessageString = Objects.toString(config.get("confirmCmdMessage"), null);
+            final String confirmCmdMessageString = Objects.toString(config.get("confirmationDialogMessage"), null);
             if (confirmCmdMessageString != null) {
                 confirmCmdMessage = confirmCmdMessageString;
             }