From 86287ea68029633cd76d9de4fcf92e23d4c9e881 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 17 Nov 2026 13:02:01 +0100 Subject: [PATCH] dbeaver/pro#11726 Add optional MCP function annotations to API --- .../api/model/DDMcpFunctionDescriptor.java | 17 ++++++++++- .../mcp/api/DDMcpFunctionContractTest.java | 28 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpFunctionDescriptor.java b/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpFunctionDescriptor.java index 49aeb06..c8e00ca 100644 --- a/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpFunctionDescriptor.java +++ b/apis/com.dbeaver.datadam.mcp.api/src/main/java/com/dbeaver/datadam/mcp/api/model/DDMcpFunctionDescriptor.java @@ -21,10 +21,25 @@ import java.util.List; +/** + * Function metadata with optional MCP annotations. Omitted hints use the MCP defaults: + * readOnlyHint=false, destructiveHint=true, idempotentHint=false. + */ public record DDMcpFunctionDescriptor( @NotNull String id, @NotNull String name, @Nullable String description, - @NotNull List parameters + @NotNull List parameters, + @Nullable Boolean readOnlyHint, + @Nullable Boolean destructiveHint, + @Nullable Boolean idempotentHint ) { + public DDMcpFunctionDescriptor( + @NotNull String id, + @NotNull String name, + @Nullable String description, + @NotNull List parameters + ) { + this(id, name, description, parameters, null, null, null); + } } diff --git a/apis/com.dbeaver.datadam.mcp.api/src/test/java/com/dbeaver/datadam/mcp/api/DDMcpFunctionContractTest.java b/apis/com.dbeaver.datadam.mcp.api/src/test/java/com/dbeaver/datadam/mcp/api/DDMcpFunctionContractTest.java index bfbca55..2912b6c 100644 --- a/apis/com.dbeaver.datadam.mcp.api/src/test/java/com/dbeaver/datadam/mcp/api/DDMcpFunctionContractTest.java +++ b/apis/com.dbeaver.datadam.mcp.api/src/test/java/com/dbeaver/datadam/mcp/api/DDMcpFunctionContractTest.java @@ -48,6 +48,34 @@ void preservesTypedParametersAndOptionalDescription() { Assertions.assertEquals(descriptor, gson.fromJson(gson.toJson(descriptor), DDMcpFunctionDescriptor.class)); } + @Test + void readsLegacyDescriptorsWithoutAnnotations() { + var descriptor = gson.fromJson(""" + {"id":"database_query","name":"Query","parameters":[]} + """, DDMcpFunctionDescriptor.class); + Assertions.assertEquals(new DDMcpFunctionDescriptor("database_query", "Query", null, List.of()), descriptor); + Assertions.assertNull(descriptor.readOnlyHint()); + Assertions.assertNull(descriptor.destructiveHint()); + Assertions.assertNull(descriptor.idempotentHint()); + } + + @Test + void preservesExplicitFalseAndPartialAnnotations() { + var descriptor = new DDMcpFunctionDescriptor("database_query", "Query", null, List.of(), true, false, true); + var json = gson.toJsonTree(descriptor).getAsJsonObject(); + Assertions.assertTrue(json.get("readOnlyHint").getAsBoolean()); + Assertions.assertFalse(json.get("destructiveHint").getAsBoolean()); + Assertions.assertTrue(json.get("idempotentHint").getAsBoolean()); + Assertions.assertEquals(descriptor, gson.fromJson(json, DDMcpFunctionDescriptor.class)); + + var partial = gson.fromJson(""" + {"id":"database_query","name":"Query","parameters":[],"destructiveHint":false} + """, DDMcpFunctionDescriptor.class); + Assertions.assertNull(partial.readOnlyHint()); + Assertions.assertEquals(Boolean.FALSE, partial.destructiveHint()); + Assertions.assertNull(partial.idempotentHint()); + } + @Test void preservesMapArgumentsWithoutLosingNullsOrNumericPrecision() { Map arguments = new LinkedHashMap<>();