Add optional id to RuleAction annotation

This id field has to be used to distinguish actions when the same method name is used for several actions. Signed-off-by: Laurent Garnier <[email protected]>
openhab · Nov 2, 2024 · 40e791c · 40e791c
1 parent 9646607
commit 40e791c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...on.rest/src/main/java/org/openhab/core/automation/rest/internal/ThingActionsResource.java b/...on.rest/src/main/java/org/openhab/core/automation/rest/internal/ThingActionsResource.java
@@ -172,7 +172,8 @@ public Response getActions(@PathParam("thingUID") @Parameter(description = "thin
                     continue;
                 }
 
-                String actionUid = thingActionsEntry.getKey() + "." + method.getName();
+                String actionUid = thingActionsEntry.getKey() + "."
+                        + (!ruleAction.id().isEmpty() ? ruleAction.id() : method.getName());
                 ActionType actionType = (ActionType) moduleTypeRegistry.get(actionUid, locale);
                 if (actionType == null) {
                     continue;

diff --git a/...nhab.core.automation/src/main/java/org/openhab/core/automation/annotation/RuleAction.java b/...nhab.core.automation/src/main/java/org/openhab/core/automation/annotation/RuleAction.java
@@ -32,6 +32,8 @@
 
     String description() default "";
 
+    String id() default "";
+
     String[] tags() default {};
 
     Visibility visibility() default Visibility.VISIBLE;

diff --git a/...in/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java b/...in/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java
@@ -96,7 +96,7 @@ public Collection<ModuleInformation> parseAnnotations(String name, Object action
                 List<Output> outputs = getOutputsFromAction(method);
 
                 RuleAction ruleAction = method.getAnnotation(RuleAction.class);
-                String uid = name + "." + method.getName();
+                String uid = name + "." + (!ruleAction.id().isEmpty() ? ruleAction.id() : method.getName());
                 Set<String> tags = new HashSet<>(Arrays.asList(ruleAction.tags()));
 
                 ModuleInformation mi = new ModuleInformation(uid, actionProvider, method);