update logging

seaside1 · Jan 4, 2025 · bde2164 · bde2164
1 parent c7d5f30
commit bde2164
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java b/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java
@@ -151,20 +151,19 @@ private void add(Method method, JRule jRule, boolean enableRule) {
             logWarn("Skipping non-public method {} on class {}", method.getName(), jRule.getClass().getName());
             return;
         }
-        // Check if method is has none or a single parameter
+        // Check if method has none or a single parameter
         if (method.getParameterCount() > 1) {
             logWarn("Skipping method {} on class {}. Rule methods should have none or a single parameter",
                     method.getName(), jRule.getClass().getName());
             return;
         }
 
+        String jRuleName = Optional.ofNullable(method.getDeclaredAnnotation(JRuleName.class).value())
+                .filter(n -> !StringUtils.isBlank(n)).orElse(method.getName());
         final String logName = Optional.ofNullable(method.getDeclaredAnnotation(JRuleLogName.class))
-                .map(JRuleLogName::value)
-                .or(() -> Optional.ofNullable(method.getDeclaredAnnotation(JRuleName.class).value()))
-                .orElse(method.getName());
+                .map(JRuleLogName::value).filter(n -> !StringUtils.isBlank(n)).orElse(jRuleName);
 
-        JRuleBuilder jRuleBuilder = createJRuleBuilder(method.getDeclaredAnnotation(JRuleName.class).value(), jRule,
-                method).logName(logName);
+        JRuleBuilder jRuleBuilder = createJRuleBuilder(jRuleName, jRule, method).logName(logName);
 
         ruleLoadingStatistics.addRuleMethod();