fix: operation should be added irrespective of actions or entities

PiperOrigin-RevId: 784199909

Author: google-genai-bot

core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/IntegrationConnectorTool.java

@@ -159,12 +159,14 @@ public Single<Map<String, Object>> runAsync(Map<String, Object> args, ToolContex
       args.put("connectionName", this.connectionName);
       args.put("serviceName", this.serviceName);
       args.put("host", this.host);
-      if (!isNullOrEmpty(this.entity) && !isNullOrEmpty(this.operation)) {
+      if (!isNullOrEmpty(this.entity)) {
         args.put("entity", this.entity);
-        args.put("operation", this.operation);
       } else if (!isNullOrEmpty(this.action)) {
         args.put("action", this.action);
       }
+      if (!isNullOrEmpty(this.operation)) {
+        args.put("operation", this.operation);
+      }
     }
 
     return Single.fromCallable(
@@ -237,10 +239,12 @@ String getOperationIdFromPathUrl(String openApiSchemaString, String pathUrl) thr
         this.action = "";
         if (operationNode.has("x-entity")) {
           this.entity = operationNode.path("x-entity").asText();
-          this.operation = operationNode.path("x-operation").asText();
         } else if (operationNode.has("x-action")) {
           this.action = operationNode.path("x-action").asText();
         }
+        if (operationNode.has("x-operation")) {
+          this.operation = operationNode.path("x-operation").asText();
+        }
         // Get the operationId from the operationNode
         if (operationNode.has("operationId")) {
           return operationNode.path("operationId").asText();

core/src/test/java/com/google/adk/tools/applicationintegrationtoolset/IntegrationConnectorToolTest.java

@@ -72,7 +72,7 @@ public final class IntegrationConnectorToolTest {
           + " for Executing"
           + " Action\\\"},\\\"paths\\\":{\\\"/v2/projects/test-project/locations/test-region/integrations/ExecuteConnection:execute\\\":{\\\"post\\\":{\\\"summary\\\":\\\"Execute"
           + " a custom"
-          + " action\\\",\\\"operationId\\\":\\\"execute_custom_action\\\",\\\"x-action\\\":\\\"CUSTOM_ACTION\\\",\\\"requestBody\\\":{\\\"required\\\":true,\\\"content\\\":{\\\"application/json\\\":{\\\"schema\\\":{\\\"$ref\\\":\\\"#/components/schemas/ActionRequest\\\"}}}}}}},\\\"components\\\":{\\\"schemas\\\":{\\\"ActionRequest\\\":{\\\"type\\\":\\\"object\\\",\\\"required\\\":[\\\"connectionName\\\",\\\"action\\\",\\\"payload\\\"],\\\"properties\\\":{\\\"connectionName\\\":{\\\"type\\\":\\\"string\\\"},\\\"action\\\":{\\\"type\\\":\\\"string\\\"},\\\"payload\\\":{\\\"type\\\":\\\"string\\\"}}}}}}\"}";
+          + " action\\\",\\\"operationId\\\":\\\"execute_custom_action\\\",\\\"x-action\\\":\\\"CUSTOM_ACTION\\\",\\\"x-operation\\\":\\\"EXECUTE_ACTION\\\",\\\"requestBody\\\":{\\\"required\\\":true,\\\"content\\\":{\\\"application/json\\\":{\\\"schema\\\":{\\\"$ref\\\":\\\"#/components/schemas/ActionRequest\\\"}}}}}}},\\\"components\\\":{\\\"schemas\\\":{\\\"ActionRequest\\\":{\\\"type\\\":\\\"object\\\",\\\"required\\\":[\\\"connectionName\\\",\\\"action\\\",\\\"operation\\\"],\\\"properties\\\":{\\\"connectionName\\\":{\\\"type\\\":\\\"string\\\"},\\\"serviceName\\\":{\\\"type\\\":\\\"string\\\"},\\\"host\\\":{\\\"type\\\":\\\"string\\\"},\\\"action\\\":{\\\"type\\\":\\\"string\\\"},\\\"operation\\\":{\\\"type\\\":\\\"string\\\"}}}}}}\"}";
 
   @Before
   public void setUp() {
@@ -242,8 +242,8 @@ public void connectorToolWithAction_runAsync_success() throws Exception {
     assertThat(inputArgs).containsEntry("serviceName", "test-service-action");
     assertThat(inputArgs).containsEntry("host", "test-host-action");
     assertThat(inputArgs).containsEntry("action", "CUSTOM_ACTION");
+    assertThat(inputArgs).containsEntry("operation", "EXECUTE_ACTION");
     assertThat(inputArgs).doesNotContainKey("entity");
-    assertThat(inputArgs).doesNotContainKey("operation");
   }
 
   @Test