Clean up

Author: nquinquenel

src/main/java/org/sonarsource/sonarqube/mcp/tools/Tool.java

@@ -120,14 +120,6 @@ public List<String> getOptionalStringList(String argumentName) {
   }
 
   public static class Result {
-    public static Result success(String content, Map<String, Object> structuredContent) {
-      return new Result(McpSchema.CallToolResult.builder()
-        .isError(false)
-        .addTextContent(content)
-        .structuredContent(structuredContent)
-        .build());
-    }
-
     /**
      * Create a successful result from a response object.
      * The response object will be serialized to both JSON text content and structured content.

src/main/java/org/sonarsource/sonarqube/mcp/tools/analysis/ToggleAutomaticAnalysisTool.java

@@ -18,7 +18,6 @@
 
 import org.sonarsource.sonarqube.mcp.bridge.SonarQubeIdeBridgeClient;
 import org.sonarsource.sonarqube.mcp.tools.SchemaToolBuilder;
-import org.sonarsource.sonarqube.mcp.tools.SchemaUtils;
 import org.sonarsource.sonarqube.mcp.tools.Tool;
 
 public class ToggleAutomaticAnalysisTool extends Tool {
@@ -59,7 +58,7 @@ public Result execute(Arguments arguments) {
 
     var message = "Successfully toggled automatic analysis to " + enabled + ".";
     var response = new ToggleAutomaticAnalysisToolResponse(true, enabled, message);
-    return Result.success(message, SchemaUtils.toStructuredContent(response));
+    return Result.success(response);
   }
 
 }

src/main/java/org/sonarsource/sonarqube/mcp/tools/issues/ChangeIssueStatusTool.java

@@ -19,7 +19,6 @@
 import org.sonarsource.sonarqube.mcp.serverapi.ServerApiProvider;
 import org.sonarsource.sonarqube.mcp.serverapi.issues.Transition;
 import org.sonarsource.sonarqube.mcp.tools.SchemaToolBuilder;
-import org.sonarsource.sonarqube.mcp.tools.SchemaUtils;
 import org.sonarsource.sonarqube.mcp.tools.Tool;
 
 public class ChangeIssueStatusTool extends Tool {
@@ -46,7 +45,7 @@ public ChangeIssueStatusTool(ServerApiProvider serverApiProvider) {
   @Override
   public Tool.Result execute(Tool.Arguments arguments) {
     var key = arguments.getStringOrThrow(KEY_PROPERTY);
-    var statusString = arguments.getStringListOrThrow(STATUS_PROPERTY).get(0);
+    var statusString = arguments.getStringListOrThrow(STATUS_PROPERTY).getFirst();
     var status = Transition.fromStatus(statusString);
     if (status.isEmpty()) {
       return Tool.Result.failure("Status is unknown: " + statusString);
@@ -55,7 +54,7 @@ public Tool.Result execute(Tool.Arguments arguments) {
     serverApiProvider.get().issuesApi().doTransition(key, status.get());
     var message = "The issue status was successfully changed.";
     var response = new ChangeIssueStatusToolResponse(true, message, key, statusString);
-    return Tool.Result.success(message, SchemaUtils.toStructuredContent(response));
+    return Tool.Result.success(response);
   }
 
 }

src/main/java/org/sonarsource/sonarqube/mcp/tools/system/SystemPingTool.java

@@ -18,7 +18,6 @@
 
 import org.sonarsource.sonarqube.mcp.serverapi.ServerApiProvider;
 import org.sonarsource.sonarqube.mcp.tools.SchemaToolBuilder;
-import org.sonarsource.sonarqube.mcp.tools.SchemaUtils;
 import org.sonarsource.sonarqube.mcp.tools.Tool;
 
 public class SystemPingTool extends Tool {
@@ -39,9 +38,8 @@ public SystemPingTool(ServerApiProvider serverApiProvider) {
   @Override
   public Tool.Result execute(Tool.Arguments arguments) {
     var response = serverApiProvider.get().systemApi().getPing();
-    var trimmedResponse = response.trim();
-    var toolResponse = new SystemPingToolResponse(trimmedResponse);
-    return Tool.Result.success(trimmedResponse, SchemaUtils.toStructuredContent(toolResponse));
+    var toolResponse = new SystemPingToolResponse(response);
+    return Tool.Result.success(toolResponse);
   }
 
 }

src/main/java/org/sonarsource/sonarqube/mcp/tools/webhooks/CreateWebhookTool.java

@@ -18,7 +18,6 @@
 
 import org.sonarsource.sonarqube.mcp.serverapi.ServerApiProvider;
 import org.sonarsource.sonarqube.mcp.tools.SchemaToolBuilder;
-import org.sonarsource.sonarqube.mcp.tools.SchemaUtils;
 import org.sonarsource.sonarqube.mcp.tools.Tool;
 
 public class CreateWebhookTool extends Tool {
@@ -56,20 +55,8 @@ public Result execute(Arguments arguments) {
     var apiResponse = serverApiProvider.get().webhooksApi().createWebhook(name, url, project, secret);
     var webhook = apiResponse.webhook();
 
-    var resultMessage = """
-      Webhook created successfully.
-      Key: %s
-      Name: %s
-      URL: %s
-      Has Secret: %s""".formatted(
-      webhook.key(),
-      webhook.name(),
-      webhook.url(),
-      webhook.hasSecret() ? "Yes" : "No"
-    );
-
     var response = new CreateWebhookToolResponse(webhook.key(), webhook.name(), webhook.url(), webhook.hasSecret());
-    return Result.success(resultMessage, SchemaUtils.toStructuredContent(response));
+    return Result.success(response);
   }
 
 }