From e467cab74d3b81ac1d4e09378da4929cc0075c74 Mon Sep 17 00:00:00 2001
From: Laurent Garnier <lg.hc@free.fr>
Date: Fri, 22 Nov 2024 10:23:43 +0100
Subject: [PATCH] [dbquery] Fix thing action annotation

Related to #17504

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../dbquery/action/DBQueryActions.java        | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.dbquery/src/main/java/org/openhab/binding/dbquery/action/DBQueryActions.java b/bundles/org.openhab.binding.dbquery/src/main/java/org/openhab/binding/dbquery/action/DBQueryActions.java
index 04c650cf35e93..db7b9b529b789 100644
--- a/bundles/org.openhab.binding.dbquery/src/main/java/org/openhab/binding/dbquery/action/DBQueryActions.java
+++ b/bundles/org.openhab.binding.dbquery/src/main/java/org/openhab/binding/dbquery/action/DBQueryActions.java
@@ -26,6 +26,7 @@
 import org.openhab.binding.dbquery.internal.domain.ResultRow;
 import org.openhab.binding.dbquery.internal.error.UnnexpectedCondition;
 import org.openhab.core.automation.annotation.ActionInput;
+import org.openhab.core.automation.annotation.ActionOutput;
 import org.openhab.core.automation.annotation.RuleAction;
 import org.openhab.core.thing.binding.ThingActions;
 import org.openhab.core.thing.binding.ThingActionsScope;
@@ -49,8 +50,10 @@ public class DBQueryActions implements IDBQueryActions, ThingActions {
 
     @Override
     @RuleAction(label = "Execute query", description = "Execute query synchronously (use with care)")
-    public ActionQueryResult executeQuery(String query, Map<String, @Nullable Object> parameters,
-            int timeoutInSeconds) {
+    public @ActionOutput(label = "Result", type = "org.openhab.binding.dbquery.action.ActionQueryResult") ActionQueryResult executeQuery(
+            @ActionInput(name = "query") String query,
+            @ActionInput(name = "parameters") Map<String, @Nullable Object> parameters,
+            @ActionInput(name = "timeoutInSeconds") int timeoutInSeconds) {
         logger.debug("executeQuery from action {} params={}", query, parameters);
         var currentDatabaseBridgeHandler = databaseBridgeHandler;
         if (currentDatabaseBridgeHandler != null) {
@@ -91,7 +94,7 @@ public void setQueryParameters(@ActionInput(name = "parameters") Map<String, @Nu
 
     @Override
     @RuleAction(label = "Get last query result", description = "Get last result from a query")
-    public ActionQueryResult getLastQueryResult() {
+    public @ActionOutput(label = "Result", type = "org.openhab.binding.dbquery.action.ActionQueryResult") ActionQueryResult getLastQueryResult() {
         var currentQueryHandler = queryHandler;
         if (currentQueryHandler != null) {
             return queryResult2ActionQueryResult(queryHandler.getLastQueryResult());
@@ -101,6 +104,19 @@ public ActionQueryResult getLastQueryResult() {
         }
     }
 
+    public static ActionQueryResult executeQuery(ThingActions actions, String query,
+            Map<String, @Nullable Object> parameters, int timeoutInSeconds) {
+        return ((DBQueryActions) actions).executeQuery(query, parameters, timeoutInSeconds);
+    }
+
+    public static void setQueryParameters(ThingActions actions, Map<String, @Nullable Object> parameters) {
+        ((DBQueryActions) actions).setQueryParameters(parameters);
+    }
+
+    public static ActionQueryResult getLastQueryResult(ThingActions actions) {
+        return ((DBQueryActions) actions).getLastQueryResult();
+    }
+
     @Override
     public void setThingHandler(ThingHandler thingHandler) {
         if (thingHandler instanceof QueryHandler queryHandler) {