fixes after review

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/YamlWidgetDTO.java

@@ -330,6 +330,12 @@ private boolean isValidRule(@NonNull List<@NonNull String> errors, @NonNull List
                             addToList(warnings, "rule in \"%s\" field: unexpected \"value\" field is ignored"
                                     .formatted(parameterName));
                         }
+                    } else if (rule.item == null && rule.operator == null && rule.argument == null
+                            && rule.value == null) {
+                        addToList(errors,
+                                "invalid rule in \"%s\" field: \"argument\" field and \"value\" field should not both be empty"
+                                        .formatted(parameterName));
+                        ok = false;
                     }
                 } else {
                     addToList(errors, "invalid type for rule in \"%s\" field".formatted(parameterName));
@@ -355,6 +361,11 @@ private boolean isValidRule(@NonNull List<@NonNull String> errors, @NonNull List
                     addToList(warnings,
                             "rule in \"%s\" field: unexpected \"value\" field is ignored".formatted(parameterName));
                 }
+            } else if (rule.item == null && rule.operator == null && rule.argument == null && rule.value == null) {
+                addToList(errors,
+                        "invalid rule in \"%s\" field: \"argument\" field and \"value\" field should not both be empty"
+                                .formatted(parameterName));
+                ok = false;
             }
         }
         ruleErrors.forEach(error -> {

bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java

@@ -368,7 +368,7 @@ private void addWidgetRules(List<Rule> rules, UIComponent component, String key)
             if (sourceRules instanceof Collection<?> sourceRulesCollection) {
                 for (Object sourceRule : sourceRulesCollection) {
                     if (sourceRule instanceof String) {
-                        String argument = !"visibility".equals(key) ? getRuleArgument(sourceRule.toString()) : null;
+                        String argument = getRuleArgument(sourceRule.toString());
                         List<String> conditionsString = getRuleConditions(sourceRule.toString(), argument);
                         Rule rule = sitemapFactory.createRule();
                         List<Condition> conditions = getConditions(conditionsString, component, key);
@@ -419,10 +419,15 @@ List<Condition> getConditions(List<String> conditionsString, UIComponent compone
         return conditions;
     }
 
-    private String getRuleArgument(String rule) {
-        int argIndex = rule.lastIndexOf("=") + 1;
-        String strippedRule = stripQuotes(rule.substring(argIndex).trim());
-        return strippedRule != null ? strippedRule : "";
+    private @Nullable String getRuleArgument(String rule) {
+        String strippedRule = null;
+        int lastEqualsIndex = rule.lastIndexOf("=");
+        String charBeforeEquals = lastEqualsIndex > 0 ? rule.substring(lastEqualsIndex - 1, lastEqualsIndex) : null;
+        if (!("=".equals(charBeforeEquals) && "!".equals(charBeforeEquals) && "<".equals(charBeforeEquals)
+                && ">".equals(charBeforeEquals))) {
+            strippedRule = stripQuotes(rule.substring(lastEqualsIndex + 1).trim());
+        }
+        return strippedRule;
     }
 
     private List<String> getRuleConditions(String rule, @Nullable String argument) {