searchPolicies(String searchQuery) {
+ return mcpClient
+ .invokeTool("search-policies", Map.of("search_query", searchQuery))
+ .thenApply(
+ result -> {
+ if (result.isError() || result.content() == null || result.content().isEmpty())
+ return "No policy information found.";
+ return result.content().stream()
+ .map(content -> content.text())
+ .collect(Collectors.joining(", ", "[", "]"));
});
- }
+ }
}
/**
* 5. THE REST CONTROLLER
- * Now radically simplified! No more manual if/else logic or JSON parsing.
+ *
+ * Now radically simplified! No more manual if/else logic or JSON parsing.
*/
@RestController
@RequestMapping("/api/agent")
class TransitAgentController {
- private final TransitAgent transitAgent;
+ private final TransitAgent transitAgent;
- public TransitAgentController(TransitAgent transitAgent) {
- this.transitAgent = transitAgent;
- }
+ public TransitAgentController(TransitAgent transitAgent) {
+ this.transitAgent = transitAgent;
+ }
- @PostMapping("/chat")
- public ResponseEntity handleUserChat(@RequestBody String userMessage, HttpSession session) {
- // We use the HTTP Session ID to tell LangChain4j which memory context to load
- String sessionId = session.getId();
-
- // Let Gemini 3 Flash handle the thinking, tool execution, and response generation!
- String agentResponse = transitAgent.chat(sessionId, userMessage);
-
- return ResponseEntity.ok(agentResponse);
- }
+ @PostMapping("/chat")
+ public ResponseEntity handleUserChat(
+ @RequestBody String userMessage, HttpSession session) {
+ // We use the HTTP Session ID to tell LangChain4j which memory context to load
+ String sessionId = session.getId();
+
+ // Let Gemini 3.5 Flash handle the thinking, tool execution, and response generation!
+ String agentResponse = transitAgent.chat(sessionId, userMessage);
+
+ return ResponseEntity.ok(agentResponse);
+ }
}
diff --git a/example/pom.xml b/example/pom.xml
index 53ca764..9727be7 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -33,7 +33,7 @@
com.google.cloud.mcp
mcp-toolbox-sdk-java
- 0.2.0
+ 0.3.0-SNAPSHOT
diff --git a/example/src/main/java/cloudcode/helloworld/ExampleUsage.java b/example/src/main/java/cloudcode/helloworld/ExampleUsage.java
index 504886c..5570ad2 100644
--- a/example/src/main/java/cloudcode/helloworld/ExampleUsage.java
+++ b/example/src/main/java/cloudcode/helloworld/ExampleUsage.java
@@ -16,145 +16,168 @@
package cloudcode.helloworld;
-import java.util.Map;
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-import java.io.FileInputStream;
-import com.google.cloud.mcp.McpToolboxClient;
-import com.google.cloud.mcp.AuthTokenGetter;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.IdTokenProvider;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.AuthTokenGetter;
+import java.io.FileInputStream;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* Sample Application to demostrate the usage of the MCP Toolbox Java SDK.
- * Covers: Global Auth, Parameterized Auth, Discovery, Simple Tool, Authenticated Tool, Parameter Binding.
+ *
+ * Covers: Global Auth, Parameterized Auth, Discovery, Simple Tool, Authenticated Tool, Parameter
+ * Binding.
*/
public class ExampleUsage {
- public static void main(String[] args) {
- // CONFIGURATION
- String targetUrl = "YOUR_TOOLBOX_SERVICE_ENDPOINT";
-
- // Match the Service URL if using Cloud Run OIDC
- String tokenAudience = targetUrl;
-
- // --------------------------------------------------------------------------------
- // AUTHENTICATION SETUP
- // --------------------------------------------------------------------------------
- // FOR LOCAL DEVELOPMENT: Use a Service Account Key JSON file.
- // FOR PRODUCTION (Cloud Run): Comment out the 'keyPath' logic and use ADC directly.
- // --------------------------------------------------------------------------------
-
- String keyPath = "YOUR_CREDENTIALS_JSON_FILE_PATH.json";
-
- System.out.println("--- Starting MCP Toolbox Integration Test ---");
- System.out.println("Target Server: " + targetUrl);
-
-try {
- System.out.println(" [Init] Fetching ID Token...");
-
- GoogleCredentials credentials;
-
- // --- OPTION A: LOCAL DEV (Explicit Key File) ---
- if (keyPath != null && !keyPath.isEmpty()) {
- System.out.println(" [Auth] Using Service Account Key File: " + keyPath);
- credentials = GoogleCredentials.fromStream(new FileInputStream(keyPath));
- }
- // --- OPTION B: PRODUCTION (ADC) ---
- else {
- System.out.println(" [Auth] Using Application Default Credentials (ADC)");
- credentials = GoogleCredentials.getApplicationDefault();
- }
-
- if (!(credentials instanceof IdTokenProvider)) {
- throw new RuntimeException("Loaded credentials do not support ID Tokens.");
- }
-
- // Generate Token for the specified Audience
- String idToken = ((IdTokenProvider) credentials).idTokenWithAudience(tokenAudience, Collections.emptyList()).getTokenValue();
- System.out.println(" [Debug] Token Generated.");
-
- // Initialize Client with Global Auth (Applies to ALL calls - Gate 1)
- McpToolboxClient client = McpToolboxClient.builder()
- .baseUrl(targetUrl)
- .apiKey(idToken)
- .build();
-
- // STEP 1: TEST DISCOVERY METHODS
- client.listTools()
- .thenCompose(tools -> {
- System.out.println("\n[1] listTools(): Success. Found " + tools.size() + " tools.");
- return client.loadToolset();
- })
- .thenCompose(tools -> {
- System.out.println("[2] loadToolset() (Alias): Success.");
- return client.loadToolset("retail")
- .handle((res, ex) -> {
- if (ex == null) System.out.println("[3] loadToolset('retail'): Found " + res.size() + " tools.");
- else System.out.println("[3] loadToolset('retail'): Skipped (Not configured on server).");
- return null;
+ public static void main(String[] args) {
+ // CONFIGURATION
+ String targetUrl = "YOUR_TOOLBOX_SERVICE_ENDPOINT";
+
+ // Match the Service URL if using Cloud Run OIDC
+ String tokenAudience = targetUrl;
+
+ // --------------------------------------------------------------------------------
+ // AUTHENTICATION SETUP
+ // --------------------------------------------------------------------------------
+ // FOR LOCAL DEVELOPMENT: Use a Service Account Key JSON file.
+ // FOR PRODUCTION (Cloud Run): Comment out the 'keyPath' logic and use ADC directly.
+ // --------------------------------------------------------------------------------
+
+ String keyPath = "YOUR_CREDENTIALS_JSON_FILE_PATH.json";
+
+ System.out.println("--- Starting MCP Toolbox Integration Test ---");
+ System.out.println("Target Server: " + targetUrl);
+
+ try {
+ System.out.println(" [Init] Fetching ID Token...");
+
+ GoogleCredentials credentials;
+
+ // --- OPTION A: LOCAL DEV (Explicit Key File) ---
+ if (keyPath != null && !keyPath.isEmpty()) {
+ System.out.println(" [Auth] Using Service Account Key File: " + keyPath);
+ credentials = GoogleCredentials.fromStream(new FileInputStream(keyPath));
+ }
+ // --- OPTION B: PRODUCTION (ADC) ---
+ else {
+ System.out.println(" [Auth] Using Application Default Credentials (ADC)");
+ credentials = GoogleCredentials.getApplicationDefault();
+ }
+
+ if (!(credentials instanceof IdTokenProvider)) {
+ throw new RuntimeException("Loaded credentials do not support ID Tokens.");
+ }
+
+ // Generate Token for the specified Audience
+ String idToken =
+ ((IdTokenProvider) credentials)
+ .idTokenWithAudience(tokenAudience, Collections.emptyList())
+ .getTokenValue();
+ System.out.println(" [Debug] Token Generated.");
+
+ // Initialize Client with Global Auth (Applies to ALL calls - Gate 1)
+ McpToolboxClient client =
+ McpToolboxClient.builder().baseUrl(targetUrl).apiKey(idToken).build();
+
+ // STEP 1: TEST DISCOVERY METHODS
+ client
+ .listTools()
+ .thenCompose(
+ tools -> {
+ System.out.println("\n[1] listTools(): Success. Found " + tools.size() + " tools.");
+ return client.loadToolset();
+ })
+ .thenCompose(
+ tools -> {
+ System.out.println("[2] loadToolset() (Alias): Success.");
+ return client
+ .loadToolset("retail")
+ .handle(
+ (res, ex) -> {
+ if (ex == null)
+ System.out.println(
+ "[3] loadToolset('retail'): Found " + res.size() + " tools.");
+ else
+ System.out.println(
+ "[3] loadToolset('retail'): Skipped (Not configured on server).");
+ return null;
});
- })
- .thenCompose(ignore -> {
-
- // STEP 2: INVOKE TOOL WITHOUT EXTRA AUTH
- System.out.println("\n[4] Testing Simple Tool: 'get-retail-facet-filters'...");
- return client.invokeTool("get-retail-facet-filters", Map.of());
- })
- .thenCompose(result -> {
- System.out.println(" -> Result: " + (result.content() != null ? "Received Data" : "Empty"));
-
- // STEP 3: INVOKE TOOL WITH AUTHENTICATED PARAMETERS
- System.out.println("\n[5] Testing Authenticated Tool: 'get-toy-price'...");
-
- // Define the getter for the 'google_auth' service
- AuthTokenGetter toolAuthGetter = () -> CompletableFuture.completedFuture(idToken);
-
- // Load using the sophisticated overload
- return client.loadTool("get-toy-price", Map.of("google_auth", toolAuthGetter));
- })
- .thenCompose(tool -> {
- System.out.println(" -> Loaded Tool: " + tool.definition().description());
-
- // STEP 4: TEST BINDING PARAMETERS SEQUENTIALLY
- System.out.println("\n[A] Executing UNBOUND (Runtime arg: 'barbie')...");
-
- return tool.execute(Map.of("description", "barbie"))
- .thenCompose(result1 -> {
- if (result1.content() != null && !result1.content().isEmpty()) {
- System.out
- .println(" -> Result (Unbound): " + result1.content().get(0).text());
- }
-
- // NOW bind the parameter
- System.out.println("\n[B] Binding 'description' to 'soft toy'...");
- tool.bindParam("description", "soft toy");
-
- System.out.println(" -> Executing BOUND (Runtime arg: 'barbie' - should be IGNORED)...");
- // We pass 'barbie', but expecting 'soft toy' price because of binding override
- return tool.execute(Map.of("description", "barbie"));
+ })
+ .thenCompose(
+ ignore -> {
+
+ // STEP 2: INVOKE TOOL WITHOUT EXTRA AUTH
+ System.out.println("\n[4] Testing Simple Tool: 'get-retail-facet-filters'...");
+ return client.invokeTool("get-retail-facet-filters", Map.of());
+ })
+ .thenCompose(
+ result -> {
+ System.out.println(
+ " -> Result: " + (result.content() != null ? "Received Data" : "Empty"));
+
+ // STEP 3: INVOKE TOOL WITH AUTHENTICATED PARAMETERS
+ System.out.println("\n[5] Testing Authenticated Tool: 'get-toy-price'...");
+
+ // Define the getter for the 'google_auth' service
+ AuthTokenGetter toolAuthGetter = () -> CompletableFuture.completedFuture(idToken);
+
+ // Load using the sophisticated overload
+ return client.loadTool("get-toy-price", Map.of("google_auth", toolAuthGetter));
+ })
+ .thenCompose(
+ tool -> {
+ System.out.println(" -> Loaded Tool: " + tool.definition().description());
+
+ // STEP 4: TEST BINDING PARAMETERS SEQUENTIALLY
+ System.out.println("\n[A] Executing UNBOUND (Runtime arg: 'barbie')...");
+
+ return tool.execute(Map.of("description", "barbie"))
+ .thenCompose(
+ result1 -> {
+ if (result1.content() != null && !result1.content().isEmpty()) {
+ System.out.println(
+ " -> Result (Unbound): " + result1.content().get(0).text());
+ }
+
+ // NOW bind the parameter
+ System.out.println("\n[B] Binding 'description' to 'soft toy'...");
+ tool.bindParam("description", "soft toy");
+
+ System.out.println(
+ " -> Executing BOUND (Runtime arg: 'barbie' - should be"
+ + " IGNORED)...");
+ // We pass 'barbie', but expecting 'soft toy' price because of binding
+ // override
+ return tool.execute(Map.of("description", "barbie"));
});
- })
- .thenAccept(result -> {
- System.out.println("\n[6] Final Result (Bound):");
- if (result.isError()) {
- System.err.println("Tool execution failed: " + result.content().get(0).text());
- } else if (result.content() != null && !result.content().isEmpty()) {
- String output = result.content().get(0).text();
- System.out.println(" " + output.substring(0, Math.min(output.length(), 200)) + "...");
- } else {
- System.out.println(" Empty Response");
- }
- })
- .exceptionally(ex -> {
- System.err.println("\n!!! TEST FAILED !!!");
- ex.printStackTrace();
- return null;
- })
- .join();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- System.out.println("\n--- Test Suite Complete ---");
+ })
+ .thenAccept(
+ result -> {
+ System.out.println("\n[6] Final Result (Bound):");
+ if (result.isError()) {
+ System.err.println("Tool execution failed: " + result.content().get(0).text());
+ } else if (result.content() != null && !result.content().isEmpty()) {
+ String output = result.content().get(0).text();
+ System.out.println(
+ " " + output.substring(0, Math.min(output.length(), 200)) + "...");
+ } else {
+ System.out.println(" Empty Response");
+ }
+ })
+ .exceptionally(
+ ex -> {
+ System.err.println("\n!!! TEST FAILED !!!");
+ ex.printStackTrace();
+ return null;
+ })
+ .join();
+
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ System.out.println("\n--- Test Suite Complete ---");
+ }
}
diff --git a/example/src/main/java/cloudcode/helloworld/InputValidationTest.java b/example/src/main/java/cloudcode/helloworld/InputValidationTest.java
index b171ae7..4971e25 100644
--- a/example/src/main/java/cloudcode/helloworld/InputValidationTest.java
+++ b/example/src/main/java/cloudcode/helloworld/InputValidationTest.java
@@ -16,100 +16,101 @@
package cloudcode.helloworld;
-import com.google.cloud.mcp.McpToolboxClient;
-import com.google.cloud.mcp.Tool;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.IdTokenProvider;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.tool.Tool;
import java.io.FileInputStream;
import java.util.Collections;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.CompletableFuture;
public class InputValidationTest {
- public static void main(String[] args) {
- String targetUrl = "YOUR_TOOLBOX_SERVICE_ENDPOINT";
- String tokenAudience = targetUrl;
- // --------------------------------------------------------------------------------
- // AUTHENTICATION SETUP
- // --------------------------------------------------------------------------------
- // FOR LOCAL DEVELOPMENT: Use a Service Account Key JSON file.
- // FOR PRODUCTION (Cloud Run): Comment out the 'keyPath' logic and use ADC directly.
- // --------------------------------------------------------------------------------
+ public static void main(String[] args) {
+ String targetUrl = "YOUR_TOOLBOX_SERVICE_ENDPOINT";
+ String tokenAudience = targetUrl;
+ // --------------------------------------------------------------------------------
+ // AUTHENTICATION SETUP
+ // --------------------------------------------------------------------------------
+ // FOR LOCAL DEVELOPMENT: Use a Service Account Key JSON file.
+ // FOR PRODUCTION (Cloud Run): Comment out the 'keyPath' logic and use ADC directly.
+ // --------------------------------------------------------------------------------
- String keyPath = "/YOUR_CREDENTIALS_JSON_FILE_PATH.json";
+ String keyPath = "/YOUR_CREDENTIALS_JSON_FILE_PATH.json";
- System.out.println("--- Starting MCP Toolbox Input Validation Test ---");
+ System.out.println("--- Starting MCP Toolbox Input Validation Test ---");
- try {
- // 1. Setup Auth (Same as before)
- System.out.println(" [Init] Fetching ID Token...");
- GoogleCredentials credentials = GoogleCredentials.fromStream(new FileInputStream(keyPath));
- if (!(credentials instanceof IdTokenProvider)) {
- throw new RuntimeException("Loaded credentials do not support ID Tokens.");
- }
- String idToken = ((IdTokenProvider) credentials).idTokenWithAudience(tokenAudience, Collections.emptyList()).getTokenValue();
+ try {
+ // 1. Setup Auth (Same as before)
+ System.out.println(" [Init] Fetching ID Token...");
+ GoogleCredentials credentials = GoogleCredentials.fromStream(new FileInputStream(keyPath));
+ if (!(credentials instanceof IdTokenProvider)) {
+ throw new RuntimeException("Loaded credentials do not support ID Tokens.");
+ }
+ String idToken =
+ ((IdTokenProvider) credentials)
+ .idTokenWithAudience(tokenAudience, Collections.emptyList())
+ .getTokenValue();
- // 2. Initialize Client
- McpToolboxClient client = McpToolboxClient.builder()
- .baseUrl(targetUrl)
- .build();
+ // 2. Initialize Client
+ McpToolboxClient client = McpToolboxClient.builder().baseUrl(targetUrl).build();
- // 3. Load the Tool
- // We MUST use loadTool() because validation relies on the ToolDefinition fetched from the server.
- System.out.println(" [Init] Loading tool 'get-toy-price'...");
- Tool tool = client.loadTool("get-toy-price").join();
+ // 3. Load the Tool
+ // We MUST use loadTool() because validation relies on the ToolDefinition fetched from the
+ // server.
+ System.out.println(" [Init] Loading tool 'get-toy-price'...");
+ Tool tool = client.loadTool("get-toy-price").join();
- // 4. Register Auth
- // We manually register the token getter so the Tool object can inject the header.
- tool.addAuthTokenGetter("google_auth", () -> CompletableFuture.completedFuture(idToken));
+ // 4. Register Auth
+ // We manually register the token getter so the Tool object can inject the header.
+ tool.addAuthTokenGetter("google_auth", () -> CompletableFuture.completedFuture(idToken));
+ // --- Test Case A: Valid Input ---
+ System.out.println("\n[Test A] Sending VALID input (String)...");
+ try {
+ Map validArgs = Map.of("description", "barbie");
+ var result = tool.execute(validArgs).join();
+ System.out.println(
+ " ✅ Success! Output: "
+ + (result.content().isEmpty() ? "Empty" : result.content().get(0).text()));
+ } catch (Exception e) {
+ System.err.println(" ❌ Unexpected failure: " + e.getMessage());
+ e.printStackTrace();
+ }
- // --- Test Case A: Valid Input ---
- System.out.println("\n[Test A] Sending VALID input (String)...");
- try {
- Map validArgs = Map.of("description", "barbie");
- var result = tool.execute(validArgs).join();
- System.out.println(" ✅ Success! Output: " + (result.content().isEmpty() ? "Empty" : result.content().get(0).text()));
- } catch (Exception e) {
- System.err.println(" ❌ Unexpected failure: " + e.getMessage());
- e.printStackTrace();
- }
+ // --- Test Case B: Invalid Type (Int instead of String) ---
+ System.out.println("\n[Test B] Sending INVALID input (Integer instead of String)...");
+ try {
+ // The 'description' parameter is defined as type: string. We pass an Integer.
+ Map invalidArgs = Map.of("description", 12345);
+ tool.execute(invalidArgs).join();
+ System.err.println(" ❌ FAILED: Validation did not catch the error!");
+ } catch (Exception e) {
+ // We expect a RuntimeException wrapping IllegalArgumentException
+ Throwable cause = e.getCause();
+ System.out.println(" ✅ Caught Expected Error: " + cause.getMessage());
+ }
- // --- Test Case B: Invalid Type (Int instead of String) ---
- System.out.println("\n[Test B] Sending INVALID input (Integer instead of String)...");
- try {
- // The 'description' parameter is defined as type: string. We pass an Integer.
- Map invalidArgs = Map.of("description", 12345);
-
- tool.execute(invalidArgs).join();
- System.err.println(" ❌ FAILED: Validation did not catch the error!");
- } catch (Exception e) {
- // We expect a RuntimeException wrapping IllegalArgumentException
- Throwable cause = e.getCause();
- System.out.println(" ✅ Caught Expected Error: " + cause.getMessage());
- }
-
+ // --- Test Case C: Null Value (Filtering) ---
+ System.out.println("\n[Test C] Sending NULL value (should be filtered)...");
+ try {
+ // We use a HashMap because Map.of doesn't allow nulls
+ Map nullArgs = new HashMap<>();
+ nullArgs.put("description", "barbie"); // Valid param
+ nullArgs.put("some_optional_param", null); // Null param
- // --- Test Case C: Null Value (Filtering) ---
- System.out.println("\n[Test C] Sending NULL value (should be filtered)...");
- try {
- // We use a HashMap because Map.of doesn't allow nulls
- Map nullArgs = new HashMap<>();
- nullArgs.put("description", "barbie"); // Valid param
- nullArgs.put("some_optional_param", null); // Null param
-
- // If validation works, 'some_optional_param' will be removed before sending
- var result = tool.execute(nullArgs).join();
- System.out.println(" ✅ Success! Null value was filtered and request succeeded.");
- } catch (Exception e) {
- System.out.println(" ❌ Result: " + e.getCause().getMessage());
- }
+ // If validation works, 'some_optional_param' will be removed before sending
+ var result = tool.execute(nullArgs).join();
+ System.out.println(" ✅ Success! Null value was filtered and request succeeded.");
+ } catch (Exception e) {
+ System.out.println(" ❌ Result: " + e.getCause().getMessage());
+ }
- } catch (Exception e) {
- e.printStackTrace();
- }
- System.out.println("\n--- Done ---");
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ System.out.println("\n--- Done ---");
+ }
}
diff --git a/example/src/main/java/cloudcode/helloworld/StrictFlagTest.java b/example/src/main/java/cloudcode/helloworld/StrictFlagTest.java
index ba32ff9..df01a8c 100644
--- a/example/src/main/java/cloudcode/helloworld/StrictFlagTest.java
+++ b/example/src/main/java/cloudcode/helloworld/StrictFlagTest.java
@@ -17,18 +17,16 @@
package cloudcode.helloworld;
import com.google.cloud.mcp.McpToolboxClient;
-import com.google.cloud.mcp.Tool;
-import java.util.Map;
+import com.google.cloud.mcp.tool.Tool;
import java.util.HashMap;
+import java.util.Map;
public class StrictFlagTest {
public static void main(String[] args) {
String targetUrl = "YOUR_TOOLBOX_SERVICE_ENDPOINT";
System.out.println("--- Starting MCP Toolbox Strict Flag Test ---");
- McpToolboxClient client = McpToolboxClient.builder()
- .baseUrl(targetUrl)
- .build();
+ McpToolboxClient client = McpToolboxClient.builder().baseUrl(targetUrl).build();
// Prepare bindings for a NON-EXISTENT tool
Map> paramBinds = new HashMap<>();
@@ -38,7 +36,8 @@ public static void main(String[] args) {
System.out.println("\n[Test 1] Loading with Strict = FALSE...");
try {
Map tools = client.loadToolset(null, paramBinds, null, false).join();
- System.out.println(" ✅ Success! Loaded " + tools.size() + " tools. Unknown binding was ignored.");
+ System.out.println(
+ " ✅ Success! Loaded " + tools.size() + " tools. Unknown binding was ignored.");
} catch (Exception e) {
System.err.println(" ❌ Failed unexpectedly: " + e.getMessage());
}
@@ -60,4 +59,4 @@ public static void main(String[] args) {
System.out.println("\n--- Done ---");
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 2a8076c..ef1b548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
com.google.cloud.mcp
mcp-toolbox-sdk-java
- 0.2.1-SNAPSHOT
+ 0.3.0-SNAPSHOT
MCP Toolbox SDK for Java
Java client library for the Model Context Protocol (MCP) Toolbox.
https://github.com/googleapis/mcp-toolbox-sdk-java
diff --git a/src/main/java/com/google/cloud/mcp/McpToolboxClient.java b/src/main/java/com/google/cloud/mcp/McpToolboxClient.java
index 472a6f3..ff79e04 100644
--- a/src/main/java/com/google/cloud/mcp/McpToolboxClient.java
+++ b/src/main/java/com/google/cloud/mcp/McpToolboxClient.java
@@ -16,6 +16,14 @@
package com.google.cloud.mcp;
+import com.google.cloud.mcp.auth.AuthTokenGetter;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.client.McpToolboxClientBuilder;
+import com.google.cloud.mcp.tool.Tool;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolPostProcessor;
+import com.google.cloud.mcp.tool.ToolPreProcessor;
+import com.google.cloud.mcp.tool.ToolResult;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/AuthMethods.java b/src/main/java/com/google/cloud/mcp/auth/AuthMethods.java
similarity index 98%
rename from src/main/java/com/google/cloud/mcp/AuthMethods.java
rename to src/main/java/com/google/cloud/mcp/auth/AuthMethods.java
index cb3815f..a287009 100644
--- a/src/main/java/com/google/cloud/mcp/AuthMethods.java
+++ b/src/main/java/com/google/cloud/mcp/auth/AuthMethods.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.IdTokenProvider;
diff --git a/src/main/java/com/google/cloud/mcp/AuthResolver.java b/src/main/java/com/google/cloud/mcp/auth/AuthResolver.java
similarity index 98%
rename from src/main/java/com/google/cloud/mcp/AuthResolver.java
rename to src/main/java/com/google/cloud/mcp/auth/AuthResolver.java
index 109c6ba..0fccadd 100644
--- a/src/main/java/com/google/cloud/mcp/AuthResolver.java
+++ b/src/main/java/com/google/cloud/mcp/auth/AuthResolver.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import java.util.HashMap;
import java.util.List;
diff --git a/src/main/java/com/google/cloud/mcp/AuthTokenGetter.java b/src/main/java/com/google/cloud/mcp/auth/AuthTokenGetter.java
similarity index 96%
rename from src/main/java/com/google/cloud/mcp/AuthTokenGetter.java
rename to src/main/java/com/google/cloud/mcp/auth/AuthTokenGetter.java
index 5d3f736..6067352 100644
--- a/src/main/java/com/google/cloud/mcp/AuthTokenGetter.java
+++ b/src/main/java/com/google/cloud/mcp/auth/AuthTokenGetter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/CredentialsProvider.java b/src/main/java/com/google/cloud/mcp/auth/CredentialsProvider.java
similarity index 96%
rename from src/main/java/com/google/cloud/mcp/CredentialsProvider.java
rename to src/main/java/com/google/cloud/mcp/auth/CredentialsProvider.java
index eb428a0..a9c7ca4 100644
--- a/src/main/java/com/google/cloud/mcp/CredentialsProvider.java
+++ b/src/main/java/com/google/cloud/mcp/auth/CredentialsProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/GoogleCredentialsProvider.java b/src/main/java/com/google/cloud/mcp/auth/GoogleCredentialsProvider.java
similarity index 98%
rename from src/main/java/com/google/cloud/mcp/GoogleCredentialsProvider.java
rename to src/main/java/com/google/cloud/mcp/auth/GoogleCredentialsProvider.java
index 11a7232..bb1490e 100644
--- a/src/main/java/com/google/cloud/mcp/GoogleCredentialsProvider.java
+++ b/src/main/java/com/google/cloud/mcp/auth/GoogleCredentialsProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import com.google.auth.oauth2.GoogleCredentials;
import java.io.IOException;
diff --git a/src/main/java/com/google/cloud/mcp/ResolvedAuth.java b/src/main/java/com/google/cloud/mcp/auth/ResolvedAuth.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/ResolvedAuth.java
rename to src/main/java/com/google/cloud/mcp/auth/ResolvedAuth.java
index 017d7e7..e79ecfb 100644
--- a/src/main/java/com/google/cloud/mcp/ResolvedAuth.java
+++ b/src/main/java/com/google/cloud/mcp/auth/ResolvedAuth.java
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
+import com.google.cloud.mcp.tool.ToolDefinition;
import java.util.Map;
/** Represents a resolved set of authentication credentials for a tool execution. */
diff --git a/src/main/java/com/google/cloud/mcp/McpToolboxClientBuilder.java b/src/main/java/com/google/cloud/mcp/client/McpToolboxClientBuilder.java
similarity index 91%
rename from src/main/java/com/google/cloud/mcp/McpToolboxClientBuilder.java
rename to src/main/java/com/google/cloud/mcp/client/McpToolboxClientBuilder.java
index 7c2f765..0b66c13 100644
--- a/src/main/java/com/google/cloud/mcp/McpToolboxClientBuilder.java
+++ b/src/main/java/com/google/cloud/mcp/client/McpToolboxClientBuilder.java
@@ -14,8 +14,15 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
-
+package com.google.cloud.mcp.client;
+
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.ToolPostProcessor;
+import com.google.cloud.mcp.tool.ToolPreProcessor;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
+import com.google.cloud.mcp.transport.Transport;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/main/java/com/google/cloud/mcp/McpToolboxClientImpl.java b/src/main/java/com/google/cloud/mcp/client/McpToolboxClientImpl.java
similarity index 95%
rename from src/main/java/com/google/cloud/mcp/McpToolboxClientImpl.java
rename to src/main/java/com/google/cloud/mcp/client/McpToolboxClientImpl.java
index c5d254b..d8ebdd2 100644
--- a/src/main/java/com/google/cloud/mcp/McpToolboxClientImpl.java
+++ b/src/main/java/com/google/cloud/mcp/client/McpToolboxClientImpl.java
@@ -14,10 +14,22 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.AuthTokenGetter;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.Tool;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolPostProcessor;
+import com.google.cloud.mcp.tool.ToolPreProcessor;
+import com.google.cloud.mcp.tool.ToolResult;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
+import com.google.cloud.mcp.transport.Transport;
+import com.google.cloud.mcp.transport.TransportManifest;
+import com.google.cloud.mcp.transport.TransportResponse;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/com/google/cloud/mcp/McpException.java b/src/main/java/com/google/cloud/mcp/exception/McpException.java
similarity index 96%
rename from src/main/java/com/google/cloud/mcp/McpException.java
rename to src/main/java/com/google/cloud/mcp/exception/McpException.java
index c057016..9016674 100644
--- a/src/main/java/com/google/cloud/mcp/McpException.java
+++ b/src/main/java/com/google/cloud/mcp/exception/McpException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.exception;
/** Unchecked exception thrown for MCP Toolbox Client operations and protocol failures. */
public class McpException extends RuntimeException {
diff --git a/src/main/java/com/google/cloud/mcp/Tool.java b/src/main/java/com/google/cloud/mcp/tool/Tool.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/Tool.java
rename to src/main/java/com/google/cloud/mcp/tool/Tool.java
index 49cfe59..4fb0229 100644
--- a/src/main/java/com/google/cloud/mcp/Tool.java
+++ b/src/main/java/com/google/cloud/mcp/tool/Tool.java
@@ -14,8 +14,11 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.AuthResolver;
+import com.google.cloud.mcp.auth.AuthTokenGetter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/main/java/com/google/cloud/mcp/ToolDefinition.java b/src/main/java/com/google/cloud/mcp/tool/ToolDefinition.java
similarity index 98%
rename from src/main/java/com/google/cloud/mcp/ToolDefinition.java
rename to src/main/java/com/google/cloud/mcp/tool/ToolDefinition.java
index ac8e60b..bef492f 100644
--- a/src/main/java/com/google/cloud/mcp/ToolDefinition.java
+++ b/src/main/java/com/google/cloud/mcp/tool/ToolDefinition.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/google/cloud/mcp/ToolPostProcessor.java b/src/main/java/com/google/cloud/mcp/tool/ToolPostProcessor.java
similarity index 96%
rename from src/main/java/com/google/cloud/mcp/ToolPostProcessor.java
rename to src/main/java/com/google/cloud/mcp/tool/ToolPostProcessor.java
index 09000bb..61280ea 100644
--- a/src/main/java/com/google/cloud/mcp/ToolPostProcessor.java
+++ b/src/main/java/com/google/cloud/mcp/tool/ToolPostProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/ToolPreProcessor.java b/src/main/java/com/google/cloud/mcp/tool/ToolPreProcessor.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/ToolPreProcessor.java
rename to src/main/java/com/google/cloud/mcp/tool/ToolPreProcessor.java
index a280a85..190e38d 100644
--- a/src/main/java/com/google/cloud/mcp/ToolPreProcessor.java
+++ b/src/main/java/com/google/cloud/mcp/tool/ToolPreProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/ToolResult.java b/src/main/java/com/google/cloud/mcp/tool/ToolResult.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/ToolResult.java
rename to src/main/java/com/google/cloud/mcp/tool/ToolResult.java
index d447adc..29b6a61 100644
--- a/src/main/java/com/google/cloud/mcp/ToolResult.java
+++ b/src/main/java/com/google/cloud/mcp/tool/ToolResult.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/google/cloud/mcp/HttpMcpTransport.java b/src/main/java/com/google/cloud/mcp/transport/BaseMcpTransport.java
similarity index 56%
rename from src/main/java/com/google/cloud/mcp/HttpMcpTransport.java
rename to src/main/java/com/google/cloud/mcp/transport/BaseMcpTransport.java
index 6cfcc86..a09b383 100644
--- a/src/main/java/com/google/cloud/mcp/HttpMcpTransport.java
+++ b/src/main/java/com/google/cloud/mcp/transport/BaseMcpTransport.java
@@ -14,10 +14,13 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.ToolDefinition;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
@@ -33,91 +36,29 @@
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;
-/** Default HTTP transport implementation using Java 11 HttpClient. */
-public final class HttpMcpTransport implements Transport {
+public abstract class BaseMcpTransport implements Transport {
- private static final Logger logger = Logger.getLogger(HttpMcpTransport.class.getName());
- private static final String HTTP_WARNING =
+ protected static final Logger logger = Logger.getLogger(BaseMcpTransport.class.getName());
+ protected static final String HTTP_WARNING =
"This connection is using HTTP. To prevent credential exposure, please ensure all"
+ " communication is sent over HTTPS.";
- private final String baseUrl;
- private final Map clientHeaders;
- private final CredentialsProvider credentialsProvider;
- private final HttpClient httpClient;
- private final ObjectMapper objectMapper;
- private final ProtocolVersion preferredProtocolVersion;
- private final Object initLock = new Object();
- private CompletableFuture initFuture;
- private volatile ProtocolVersion negotiatedProtocolVersion;
- private volatile String sessionId;
-
- /**
- * Constructs a new HttpMcpTransport with a base URL.
- *
- * @param baseUrl The base URL of the remote service.
- */
- public HttpMcpTransport(String baseUrl) {
- this(baseUrl, Map.of(), (CredentialsProvider) null);
- }
-
- /**
- * Constructs a new HttpMcpTransport with base URL and default headers.
- *
- * @param baseUrl The base URL of the remote service.
- * @param clientHeaders Default HTTP headers to include in every request.
- */
- public HttpMcpTransport(String baseUrl, Map clientHeaders) {
- this(baseUrl, clientHeaders, (CredentialsProvider) null);
- }
-
- /**
- * Constructs a new HttpMcpTransport with base URL, default headers and credentials provider.
- *
- * @param baseUrl The base URL of the remote service.
- * @param clientHeaders Default HTTP headers to include in every request.
- * @param credentialsProvider Provider for retrieving authorization credentials.
- */
- public HttpMcpTransport(
- String baseUrl, Map clientHeaders, CredentialsProvider credentialsProvider) {
- this(baseUrl, clientHeaders, credentialsProvider, null, null, null);
- }
-
- /**
- * Constructs a HttpMcpTransport.
- *
- * @param baseUrl The base URL of the remote service.
- * @param clientHeaders Default HTTP headers to include in every request.
- * @param preferredProtocolVersion Preferred MCP protocol version.
- * @param httpClient Custom HTTP Client.
- * @param executor Optional Executor for handling async requests.
- */
- public HttpMcpTransport(
- String baseUrl,
- Map clientHeaders,
- ProtocolVersion preferredProtocolVersion,
- HttpClient httpClient,
- java.util.concurrent.Executor executor) {
- this(baseUrl, clientHeaders, null, preferredProtocolVersion, httpClient, executor);
- }
-
- /**
- * Primary constructor for HttpMcpTransport.
- *
- * @param baseUrl The base URL of the remote service.
- * @param clientHeaders Default HTTP headers to include in every request.
- * @param credentialsProvider Provider for retrieving authorization credentials.
- * @param preferredProtocolVersion Preferred MCP protocol version.
- * @param httpClient Custom HTTP Client.
- * @param executor Optional Executor for handling async requests.
- */
- public HttpMcpTransport(
- String baseUrl,
- Map clientHeaders,
- CredentialsProvider credentialsProvider,
- ProtocolVersion preferredProtocolVersion,
- HttpClient httpClient,
- java.util.concurrent.Executor executor) {
+ protected final String baseUrl;
+ protected final Map clientHeaders;
+ protected final CredentialsProvider credentialsProvider;
+ protected final HttpClient httpClient;
+ protected final ObjectMapper objectMapper;
+ protected final ProtocolVersion preferredProtocolVersion;
+ protected final Object initLock = new Object();
+ protected CompletableFuture initFuture;
+
+ protected BaseMcpTransport(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final ProtocolVersion preferredProtocolVersion,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
if (baseUrl == null || baseUrl.isEmpty()) {
throw new IllegalArgumentException("Base URL must be provided");
}
@@ -146,28 +87,13 @@ public HttpMcpTransport(
this.objectMapper = new ObjectMapper();
}
- HttpMcpTransport(String baseUrl, HttpClient httpClient) {
- this(baseUrl, Map.of(), null, null, httpClient, null);
- }
-
- HttpMcpTransport(String baseUrl, Map clientHeaders, HttpClient httpClient) {
- this(baseUrl, clientHeaders, null, null, httpClient, null);
- }
-
- HttpMcpTransport(
- String baseUrl,
- Map clientHeaders,
- CredentialsProvider credentialsProvider,
- HttpClient httpClient) {
- this(baseUrl, clientHeaders, credentialsProvider, null, httpClient, null);
- }
-
@Override
- public String getBaseUrl() {
+ public final String getBaseUrl() {
return this.baseUrl;
}
- private CompletableFuture> mergeHeaders(Map extraMetadata) {
+ final CompletableFuture> mergeHeaders(
+ final Map extraMetadata) {
CompletableFuture authFuture =
this.credentialsProvider != null
? this.credentialsProvider.getAuthorizationHeader()
@@ -234,7 +160,7 @@ private CompletableFuture> mergeHeaders(Map
});
}
- private CompletableFuture ensureInitialized(Map extraMetadata) {
+ final CompletableFuture ensureInitialized(final Map extraMetadata) {
synchronized (initLock) {
if (initFuture == null) {
Map handshakeMetadata = new HashMap<>();
@@ -260,118 +186,14 @@ private CompletableFuture ensureInitialized(Map extraMetad
}
}
- private CompletableFuture performInitialization(
- String authHeader, Map handshakeHeaders) {
- try {
- if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
- && authHeader != null) {
- logger.warning(HTTP_WARNING);
- }
- JsonRpc.Request initReq =
- new JsonRpc.Request(
- "initialize",
- new JsonRpc.InitializeParams(
- preferredProtocolVersion.getValue(), "mcp-toolbox-sdk-java"));
- String body = objectMapper.writeValueAsString(initReq);
- HttpRequest.Builder req =
- HttpRequest.newBuilder()
- .uri(URI.create(baseUrl))
- .POST(HttpRequest.BodyPublishers.ofString(body));
-
- handshakeHeaders.forEach(req::setHeader);
- applyProtocolHeaders(req);
-
- return httpClient
- .sendAsync(req.build(), HttpResponse.BodyHandlers.ofString())
- .thenCompose(
- res -> {
- if (res.statusCode() != 200) {
- return CompletableFuture.failedFuture(
- new McpException("Init failed: " + res.statusCode() + " " + res.body()));
- }
- try {
- JsonNode responseJson = objectMapper.readTree(res.body());
- if (responseJson.has("error")) {
- return CompletableFuture.failedFuture(
- new McpException("MCP Error: " + responseJson.get("error").toString()));
- }
- JsonNode result = responseJson.get("result");
- String serverVersion;
- if (result != null && result.has("protocolVersion")) {
- serverVersion = result.get("protocolVersion").asText();
- } else {
- // Fallback to the client's preferred version for backward-compatible/mock
- // servers
- serverVersion = preferredProtocolVersion.getValue();
- }
+ protected abstract CompletableFuture performInitialization(
+ final String authHeader, final Map handshakeHeaders);
- // Verify strict compliance with Python/Go behavior
- if (!preferredProtocolVersion.getValue().equals(serverVersion)) {
- return CompletableFuture.failedFuture(
- new McpException(
- "MCP version mismatch: client ("
- + preferredProtocolVersion.getValue()
- + ") != server ("
- + serverVersion
- + ")"));
- }
-
- this.negotiatedProtocolVersion = ProtocolVersion.fromString(serverVersion);
-
- if (negotiatedProtocolVersion == ProtocolVersion.VERSION_2025_03_26) {
- java.util.Optional sessionIdOpt =
- res.headers().firstValue("Mcp-Session-Id");
- if (sessionIdOpt.isEmpty()) {
- return CompletableFuture.failedFuture(
- new McpException(
- "Server did not return a Mcp-Session-Id header during"
- + " initialization."));
- }
- this.sessionId = sessionIdOpt.get();
- }
-
- JsonRpc.Notification notif =
- new JsonRpc.Notification("notifications/initialized", Map.of());
- String notifBody = objectMapper.writeValueAsString(notif);
- HttpRequest.Builder nReq =
- HttpRequest.newBuilder()
- .uri(URI.create(baseUrl))
- .POST(HttpRequest.BodyPublishers.ofString(notifBody));
-
- handshakeHeaders.forEach(nReq::setHeader);
- applyProtocolHeaders(nReq);
-
- return httpClient
- .sendAsync(nReq.build(), HttpResponse.BodyHandlers.ofString())
- .thenAccept(nRes -> {});
- } catch (Exception e) {
- return CompletableFuture.failedFuture(e);
- }
- });
- } catch (Exception e) {
- return CompletableFuture.failedFuture(e);
- }
- }
-
- private void applyProtocolHeaders(HttpRequest.Builder builder) {
- builder.header("Content-Type", "application/json");
- if (negotiatedProtocolVersion == null) {
- return;
- }
- if (negotiatedProtocolVersion.requiresAcceptJson()) {
- builder.header("Accept", "application/json");
- }
- if (negotiatedProtocolVersion.requiresVersionHeader()) {
- builder.header("MCP-Protocol-Version", negotiatedProtocolVersion.getValue());
- }
- if (negotiatedProtocolVersion.requiresSessionIdHeader() && sessionId != null) {
- builder.header("Mcp-Session-Id", sessionId);
- }
- }
+ protected abstract void applyProtocolHeaders(final HttpRequest.Builder builder);
@Override
- public CompletableFuture listTools(
- String toolsetName, Map metadata) {
+ public final CompletableFuture listTools(
+ final String toolsetName, final Map metadata) {
if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
&& !metadata.isEmpty()) {
logger.warning(HTTP_WARNING);
@@ -402,8 +224,10 @@ public CompletableFuture listTools(
}
@Override
- public CompletableFuture invokeTool(
- String toolName, Map arguments, Map metadata) {
+ public final CompletableFuture invokeTool(
+ final String toolName,
+ final Map arguments,
+ final Map metadata) {
if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
&& !metadata.isEmpty()) {
logger.warning(HTTP_WARNING);
@@ -440,10 +264,11 @@ public void close() {
// No-op for HttpClient in Java 11
}
- private TransportManifest handleListToolsResponse(HttpResponse response) {
- if (response.statusCode() != 200)
+ private TransportManifest handleListToolsResponse(final HttpResponse response) {
+ if (response.statusCode() != 200) {
throw new RuntimeException(
"Failed to list tools. Status: " + response.statusCode() + " " + response.body());
+ }
try {
JsonNode root = objectMapper.readTree(response.body());
if (root.has("error")) {
diff --git a/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransport.java b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransport.java
new file mode 100644
index 0000000..b034a87
--- /dev/null
+++ b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransport.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.mcp.transport;
+
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import java.net.http.HttpClient;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+/** Default HTTP transport implementation routing requests to version-specific handlers. */
+public final class HttpMcpTransport implements Transport {
+
+ private final Transport delegate;
+
+ /**
+ * Constructs a new HttpMcpTransport with a base URL.
+ *
+ * @param baseUrl The base URL of the remote service.
+ */
+ public HttpMcpTransport(final String baseUrl) {
+ this(baseUrl, Map.of(), (CredentialsProvider) null);
+ }
+
+ /**
+ * Constructs a new HttpMcpTransport with base URL and default headers.
+ *
+ * @param baseUrl The base URL of the remote service.
+ * @param clientHeaders Default HTTP headers to include in every request.
+ */
+ public HttpMcpTransport(final String baseUrl, final Map clientHeaders) {
+ this(baseUrl, clientHeaders, (CredentialsProvider) null);
+ }
+
+ /**
+ * Constructs a new HttpMcpTransport with base URL, default headers and credentials provider.
+ *
+ * @param baseUrl The base URL of the remote service.
+ * @param clientHeaders Default HTTP headers to include in every request.
+ * @param credentialsProvider Provider for retrieving authorization credentials.
+ */
+ public HttpMcpTransport(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider) {
+ this(baseUrl, clientHeaders, credentialsProvider, null, null, null);
+ }
+
+ /**
+ * Constructs a HttpMcpTransport.
+ *
+ * @param baseUrl The base URL of the remote service.
+ * @param clientHeaders Default HTTP headers to include in every request.
+ * @param preferredProtocolVersion Preferred MCP protocol version.
+ * @param httpClient Custom HTTP Client.
+ * @param executor Optional Executor for handling async requests.
+ */
+ public HttpMcpTransport(
+ final String baseUrl,
+ final Map clientHeaders,
+ final ProtocolVersion preferredProtocolVersion,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ this(baseUrl, clientHeaders, null, preferredProtocolVersion, httpClient, executor);
+ }
+
+ /**
+ * Primary constructor for HttpMcpTransport.
+ *
+ * @param baseUrl The base URL of the remote service.
+ * @param clientHeaders Default HTTP headers to include in every request.
+ * @param credentialsProvider Provider for retrieving authorization credentials.
+ * @param preferredProtocolVersion Preferred MCP protocol version.
+ * @param httpClient Custom HTTP Client.
+ * @param executor Optional Executor for handling async requests.
+ */
+ public HttpMcpTransport(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final ProtocolVersion preferredProtocolVersion,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ final ProtocolVersion version =
+ preferredProtocolVersion != null
+ ? preferredProtocolVersion
+ : ProtocolVersion.VERSION_2025_11_25;
+
+ switch (version) {
+ case VERSION_2025_11_25:
+ this.delegate =
+ new HttpMcpTransportV20251125(
+ baseUrl, clientHeaders, credentialsProvider, httpClient, executor);
+ break;
+ case VERSION_2025_06_18:
+ this.delegate =
+ new HttpMcpTransportV20250618(
+ baseUrl, clientHeaders, credentialsProvider, httpClient, executor);
+ break;
+ case VERSION_2025_03_26:
+ this.delegate =
+ new HttpMcpTransportV20250326(
+ baseUrl, clientHeaders, credentialsProvider, httpClient, executor);
+ break;
+ case VERSION_2024_11_05:
+ this.delegate =
+ new HttpMcpTransportV20241105(
+ baseUrl, clientHeaders, credentialsProvider, httpClient, executor);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported protocol version: " + version);
+ }
+ }
+
+ /** Internal constructor for testing purposes. */
+ public HttpMcpTransport(final String baseUrl, final HttpClient httpClient) {
+ this(baseUrl, Map.of(), null, null, httpClient, null);
+ }
+
+ /** Internal constructor for testing purposes. */
+ public HttpMcpTransport(
+ final String baseUrl, final Map clientHeaders, final HttpClient httpClient) {
+ this(baseUrl, clientHeaders, null, null, httpClient, null);
+ }
+
+ HttpMcpTransport(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final HttpClient httpClient) {
+ this(baseUrl, clientHeaders, credentialsProvider, null, httpClient, null);
+ }
+
+ @Override
+ public String getBaseUrl() {
+ return delegate.getBaseUrl();
+ }
+
+ @Override
+ public CompletableFuture listTools(
+ final String toolsetName, final Map metadata) {
+ return delegate.listTools(toolsetName, metadata);
+ }
+
+ @Override
+ public CompletableFuture invokeTool(
+ final String toolName,
+ final Map arguments,
+ final Map metadata) {
+ return delegate.invokeTool(toolName, arguments, metadata);
+ }
+
+ @Override
+ public void close() {
+ delegate.close();
+ }
+}
diff --git a/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20241105.java b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20241105.java
new file mode 100644
index 0000000..f9a0576
--- /dev/null
+++ b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20241105.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.mcp.transport;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public final class HttpMcpTransportV20241105 extends BaseMcpTransport {
+
+ public HttpMcpTransportV20241105(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ super(
+ baseUrl,
+ clientHeaders,
+ credentialsProvider,
+ ProtocolVersion.VERSION_2024_11_05,
+ httpClient,
+ executor);
+ }
+
+ @Override
+ protected CompletableFuture performInitialization(
+ final String authHeader, final Map handshakeHeaders) {
+ try {
+ if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
+ && authHeader != null) {
+ logger.warning(HTTP_WARNING);
+ }
+ JsonRpc.Request initReq =
+ new JsonRpc.Request(
+ "initialize",
+ new JsonRpc.InitializeParams(
+ ProtocolVersion.VERSION_2024_11_05.getValue(), "mcp-toolbox-sdk-java"));
+ String body = objectMapper.writeValueAsString(initReq);
+ HttpRequest.Builder req =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(body));
+
+ handshakeHeaders.forEach(req::setHeader);
+ applyProtocolHeaders(req);
+
+ return httpClient
+ .sendAsync(req.build(), HttpResponse.BodyHandlers.ofString())
+ .thenCompose(
+ res -> {
+ if (res.statusCode() != 200) {
+ return CompletableFuture.failedFuture(
+ new McpException("Init failed: " + res.statusCode() + " " + res.body()));
+ }
+ try {
+ JsonNode responseJson = objectMapper.readTree(res.body());
+ if (responseJson.has("error")) {
+ return CompletableFuture.failedFuture(
+ new McpException("MCP Error: " + responseJson.get("error").toString()));
+ }
+ JsonNode result = responseJson.get("result");
+ String serverVersion;
+ if (result != null && result.has("protocolVersion")) {
+ serverVersion = result.get("protocolVersion").asText();
+ } else {
+ serverVersion = ProtocolVersion.VERSION_2024_11_05.getValue();
+ }
+
+ if (!ProtocolVersion.VERSION_2024_11_05.getValue().equals(serverVersion)) {
+ return CompletableFuture.failedFuture(
+ new McpException(
+ "MCP version mismatch: client ("
+ + ProtocolVersion.VERSION_2024_11_05.getValue()
+ + ") != server ("
+ + serverVersion
+ + ")"));
+ }
+
+ JsonRpc.Notification notif =
+ new JsonRpc.Notification("notifications/initialized", Map.of());
+ String notifBody = objectMapper.writeValueAsString(notif);
+ HttpRequest.Builder nReq =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(notifBody));
+
+ handshakeHeaders.forEach(nReq::setHeader);
+ applyProtocolHeaders(nReq);
+
+ return httpClient
+ .sendAsync(nReq.build(), HttpResponse.BodyHandlers.ofString())
+ .thenAccept(nRes -> {});
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ });
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ }
+
+ @Override
+ protected void applyProtocolHeaders(final HttpRequest.Builder builder) {
+ builder.header("Content-Type", "application/json");
+ }
+}
diff --git a/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250326.java b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250326.java
new file mode 100644
index 0000000..d642076
--- /dev/null
+++ b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250326.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.mcp.transport;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public final class HttpMcpTransportV20250326 extends BaseMcpTransport {
+
+ private volatile String sessionId;
+
+ public HttpMcpTransportV20250326(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ super(
+ baseUrl,
+ clientHeaders,
+ credentialsProvider,
+ ProtocolVersion.VERSION_2025_03_26,
+ httpClient,
+ executor);
+ }
+
+ @Override
+ protected CompletableFuture performInitialization(
+ final String authHeader, final Map handshakeHeaders) {
+ try {
+ if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
+ && authHeader != null) {
+ logger.warning(HTTP_WARNING);
+ }
+ JsonRpc.Request initReq =
+ new JsonRpc.Request(
+ "initialize",
+ new JsonRpc.InitializeParams(
+ ProtocolVersion.VERSION_2025_03_26.getValue(), "mcp-toolbox-sdk-java"));
+ String body = objectMapper.writeValueAsString(initReq);
+ HttpRequest.Builder req =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(body));
+
+ handshakeHeaders.forEach(req::setHeader);
+ applyProtocolHeaders(req);
+
+ return httpClient
+ .sendAsync(req.build(), HttpResponse.BodyHandlers.ofString())
+ .thenCompose(
+ res -> {
+ if (res.statusCode() != 200) {
+ return CompletableFuture.failedFuture(
+ new McpException("Init failed: " + res.statusCode() + " " + res.body()));
+ }
+ try {
+ JsonNode responseJson = objectMapper.readTree(res.body());
+ if (responseJson.has("error")) {
+ return CompletableFuture.failedFuture(
+ new McpException("MCP Error: " + responseJson.get("error").toString()));
+ }
+ JsonNode result = responseJson.get("result");
+ String serverVersion;
+ if (result != null && result.has("protocolVersion")) {
+ serverVersion = result.get("protocolVersion").asText();
+ } else {
+ serverVersion = ProtocolVersion.VERSION_2025_03_26.getValue();
+ }
+
+ if (!ProtocolVersion.VERSION_2025_03_26.getValue().equals(serverVersion)) {
+ return CompletableFuture.failedFuture(
+ new McpException(
+ "MCP version mismatch: client ("
+ + ProtocolVersion.VERSION_2025_03_26.getValue()
+ + ") != server ("
+ + serverVersion
+ + ")"));
+ }
+
+ Optional sessionIdOpt = res.headers().firstValue("Mcp-Session-Id");
+ if (sessionIdOpt.isEmpty()) {
+ return CompletableFuture.failedFuture(
+ new McpException(
+ "Server did not return a Mcp-Session-Id header during"
+ + " initialization."));
+ }
+ this.sessionId = sessionIdOpt.get();
+
+ JsonRpc.Notification notif =
+ new JsonRpc.Notification("notifications/initialized", Map.of());
+ String notifBody = objectMapper.writeValueAsString(notif);
+ HttpRequest.Builder nReq =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(notifBody));
+
+ handshakeHeaders.forEach(nReq::setHeader);
+ applyProtocolHeaders(nReq);
+
+ return httpClient
+ .sendAsync(nReq.build(), HttpResponse.BodyHandlers.ofString())
+ .thenAccept(nRes -> {});
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ });
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ }
+
+ @Override
+ protected void applyProtocolHeaders(final HttpRequest.Builder builder) {
+ builder.header("Content-Type", "application/json");
+ builder.header("Accept", "application/json");
+ if (sessionId != null) {
+ builder.header("Mcp-Session-Id", sessionId);
+ }
+ }
+}
diff --git a/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250618.java b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250618.java
new file mode 100644
index 0000000..8ac79c9
--- /dev/null
+++ b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20250618.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.mcp.transport;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public final class HttpMcpTransportV20250618 extends BaseMcpTransport {
+
+ public HttpMcpTransportV20250618(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ super(
+ baseUrl,
+ clientHeaders,
+ credentialsProvider,
+ ProtocolVersion.VERSION_2025_06_18,
+ httpClient,
+ executor);
+ }
+
+ @Override
+ protected CompletableFuture performInitialization(
+ final String authHeader, final Map handshakeHeaders) {
+ try {
+ if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
+ && authHeader != null) {
+ logger.warning(HTTP_WARNING);
+ }
+ JsonRpc.Request initReq =
+ new JsonRpc.Request(
+ "initialize",
+ new JsonRpc.InitializeParams(
+ ProtocolVersion.VERSION_2025_06_18.getValue(), "mcp-toolbox-sdk-java"));
+ String body = objectMapper.writeValueAsString(initReq);
+ HttpRequest.Builder req =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(body));
+
+ handshakeHeaders.forEach(req::setHeader);
+ applyProtocolHeaders(req);
+
+ return httpClient
+ .sendAsync(req.build(), HttpResponse.BodyHandlers.ofString())
+ .thenCompose(
+ res -> {
+ if (res.statusCode() != 200) {
+ return CompletableFuture.failedFuture(
+ new McpException("Init failed: " + res.statusCode() + " " + res.body()));
+ }
+ try {
+ JsonNode responseJson = objectMapper.readTree(res.body());
+ if (responseJson.has("error")) {
+ return CompletableFuture.failedFuture(
+ new McpException("MCP Error: " + responseJson.get("error").toString()));
+ }
+ JsonNode result = responseJson.get("result");
+ String serverVersion;
+ if (result != null && result.has("protocolVersion")) {
+ serverVersion = result.get("protocolVersion").asText();
+ } else {
+ serverVersion = ProtocolVersion.VERSION_2025_06_18.getValue();
+ }
+
+ if (!ProtocolVersion.VERSION_2025_06_18.getValue().equals(serverVersion)) {
+ return CompletableFuture.failedFuture(
+ new McpException(
+ "MCP version mismatch: client ("
+ + ProtocolVersion.VERSION_2025_06_18.getValue()
+ + ") != server ("
+ + serverVersion
+ + ")"));
+ }
+
+ JsonRpc.Notification notif =
+ new JsonRpc.Notification("notifications/initialized", Map.of());
+ String notifBody = objectMapper.writeValueAsString(notif);
+ HttpRequest.Builder nReq =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(notifBody));
+
+ handshakeHeaders.forEach(nReq::setHeader);
+ applyProtocolHeaders(nReq);
+
+ return httpClient
+ .sendAsync(nReq.build(), HttpResponse.BodyHandlers.ofString())
+ .thenAccept(nRes -> {});
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ });
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ }
+
+ @Override
+ protected void applyProtocolHeaders(final HttpRequest.Builder builder) {
+ builder.header("Content-Type", "application/json");
+ builder.header("Accept", "application/json");
+ builder.header("MCP-Protocol-Version", ProtocolVersion.VERSION_2025_06_18.getValue());
+ }
+}
diff --git a/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20251125.java b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20251125.java
new file mode 100644
index 0000000..4ab7f37
--- /dev/null
+++ b/src/main/java/com/google/cloud/mcp/transport/HttpMcpTransportV20251125.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.mcp.transport;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public final class HttpMcpTransportV20251125 extends BaseMcpTransport {
+
+ public HttpMcpTransportV20251125(
+ final String baseUrl,
+ final Map clientHeaders,
+ final CredentialsProvider credentialsProvider,
+ final HttpClient httpClient,
+ final java.util.concurrent.Executor executor) {
+ super(
+ baseUrl,
+ clientHeaders,
+ credentialsProvider,
+ ProtocolVersion.VERSION_2025_11_25,
+ httpClient,
+ executor);
+ }
+
+ @Override
+ protected CompletableFuture performInitialization(
+ final String authHeader, final Map handshakeHeaders) {
+ try {
+ if (this.baseUrl.toLowerCase(java.util.Locale.ROOT).startsWith("http://")
+ && authHeader != null) {
+ logger.warning(HTTP_WARNING);
+ }
+ JsonRpc.Request initReq =
+ new JsonRpc.Request(
+ "initialize",
+ new JsonRpc.InitializeParams(
+ ProtocolVersion.VERSION_2025_11_25.getValue(), "mcp-toolbox-sdk-java"));
+ String body = objectMapper.writeValueAsString(initReq);
+ HttpRequest.Builder req =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(body));
+
+ handshakeHeaders.forEach(req::setHeader);
+ applyProtocolHeaders(req);
+
+ return httpClient
+ .sendAsync(req.build(), HttpResponse.BodyHandlers.ofString())
+ .thenCompose(
+ res -> {
+ if (res.statusCode() != 200) {
+ return CompletableFuture.failedFuture(
+ new McpException("Init failed: " + res.statusCode() + " " + res.body()));
+ }
+ try {
+ JsonNode responseJson = objectMapper.readTree(res.body());
+ if (responseJson.has("error")) {
+ return CompletableFuture.failedFuture(
+ new McpException("MCP Error: " + responseJson.get("error").toString()));
+ }
+ JsonNode result = responseJson.get("result");
+ String serverVersion;
+ if (result != null && result.has("protocolVersion")) {
+ serverVersion = result.get("protocolVersion").asText();
+ } else {
+ serverVersion = ProtocolVersion.VERSION_2025_11_25.getValue();
+ }
+
+ if (!ProtocolVersion.VERSION_2025_11_25.getValue().equals(serverVersion)) {
+ return CompletableFuture.failedFuture(
+ new McpException(
+ "MCP version mismatch: client ("
+ + ProtocolVersion.VERSION_2025_11_25.getValue()
+ + ") != server ("
+ + serverVersion
+ + ")"));
+ }
+
+ JsonRpc.Notification notif =
+ new JsonRpc.Notification("notifications/initialized", Map.of());
+ String notifBody = objectMapper.writeValueAsString(notif);
+ HttpRequest.Builder nReq =
+ HttpRequest.newBuilder()
+ .uri(URI.create(baseUrl))
+ .POST(HttpRequest.BodyPublishers.ofString(notifBody));
+
+ handshakeHeaders.forEach(nReq::setHeader);
+ applyProtocolHeaders(nReq);
+
+ return httpClient
+ .sendAsync(nReq.build(), HttpResponse.BodyHandlers.ofString())
+ .thenAccept(nRes -> {});
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ });
+ } catch (Exception e) {
+ return CompletableFuture.failedFuture(e);
+ }
+ }
+
+ @Override
+ protected void applyProtocolHeaders(final HttpRequest.Builder builder) {
+ builder.header("Content-Type", "application/json");
+ builder.header("Accept", "application/json");
+ builder.header("MCP-Protocol-Version", ProtocolVersion.VERSION_2025_11_25.getValue());
+ }
+}
diff --git a/src/main/java/com/google/cloud/mcp/JsonRpc.java b/src/main/java/com/google/cloud/mcp/transport/JsonRpc.java
similarity index 82%
rename from src/main/java/com/google/cloud/mcp/JsonRpc.java
rename to src/main/java/com/google/cloud/mcp/transport/JsonRpc.java
index 902ac2a..9ec7719 100644
--- a/src/main/java/com/google/cloud/mcp/JsonRpc.java
+++ b/src/main/java/com/google/cloud/mcp/transport/JsonRpc.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
import java.util.Map;
import java.util.UUID;
@@ -26,7 +26,7 @@ static class Request {
public String method;
public Object params;
- public Request(String method, Object params) {
+ public Request(final String method, final Object params) {
this.id = UUID.randomUUID().toString();
this.method = method;
this.params = params;
@@ -38,7 +38,7 @@ static class Notification {
public String method;
public Object params;
- public Notification(String method, Object params) {
+ public Notification(final String method, final Object params) {
this.method = method;
this.params = params;
}
@@ -48,7 +48,7 @@ static class CallToolParams {
public String name;
public Map arguments;
- public CallToolParams(String name, Map arguments) {
+ public CallToolParams(final String name, final Map arguments) {
this.name = name;
this.arguments = arguments;
}
@@ -59,7 +59,7 @@ static class InitializeParams {
public Map capabilities;
public Map clientInfo;
- public InitializeParams(String version, String clientName) {
+ public InitializeParams(final String version, final String clientName) {
this.protocolVersion = version;
this.capabilities = Map.of();
this.clientInfo = Map.of("name", clientName, "version", "1.0.0");
diff --git a/src/main/java/com/google/cloud/mcp/Transport.java b/src/main/java/com/google/cloud/mcp/transport/Transport.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/Transport.java
rename to src/main/java/com/google/cloud/mcp/transport/Transport.java
index 566eefe..37ac88b 100644
--- a/src/main/java/com/google/cloud/mcp/Transport.java
+++ b/src/main/java/com/google/cloud/mcp/transport/Transport.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/com/google/cloud/mcp/TransportManifest.java b/src/main/java/com/google/cloud/mcp/transport/TransportManifest.java
similarity index 92%
rename from src/main/java/com/google/cloud/mcp/TransportManifest.java
rename to src/main/java/com/google/cloud/mcp/transport/TransportManifest.java
index e294afa..f8a8dac 100644
--- a/src/main/java/com/google/cloud/mcp/TransportManifest.java
+++ b/src/main/java/com/google/cloud/mcp/transport/TransportManifest.java
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
+import com.google.cloud.mcp.tool.ToolDefinition;
import java.util.Map;
/** Represents the raw tools manifest returned by the transport. */
diff --git a/src/main/java/com/google/cloud/mcp/TransportResponse.java b/src/main/java/com/google/cloud/mcp/transport/TransportResponse.java
similarity index 97%
rename from src/main/java/com/google/cloud/mcp/TransportResponse.java
rename to src/main/java/com/google/cloud/mcp/transport/TransportResponse.java
index 4532b69..5044af4 100644
--- a/src/main/java/com/google/cloud/mcp/TransportResponse.java
+++ b/src/main/java/com/google/cloud/mcp/transport/TransportResponse.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
/** Represents a raw transport response containing status code and response body. */
public final class TransportResponse {
diff --git a/src/test/java/com/google/cloud/mcp/AuthMethodsTest.java b/src/test/java/com/google/cloud/mcp/auth/AuthMethodsTest.java
similarity index 99%
rename from src/test/java/com/google/cloud/mcp/AuthMethodsTest.java
rename to src/test/java/com/google/cloud/mcp/auth/AuthMethodsTest.java
index 3cd75ab..66a497f 100644
--- a/src/test/java/com/google/cloud/mcp/AuthMethodsTest.java
+++ b/src/test/java/com/google/cloud/mcp/auth/AuthMethodsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.auth;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/src/test/java/com/google/cloud/mcp/HttpMcpToolboxClientTest.java b/src/test/java/com/google/cloud/mcp/client/HttpMcpToolboxClientTest.java
similarity index 98%
rename from src/test/java/com/google/cloud/mcp/HttpMcpToolboxClientTest.java
rename to src/test/java/com/google/cloud/mcp/client/HttpMcpToolboxClientTest.java
index a558e6d..9ea1dad 100644
--- a/src/test/java/com/google/cloud/mcp/HttpMcpToolboxClientTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/HttpMcpToolboxClientTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -22,6 +22,8 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.ProtocolVersion;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
diff --git a/src/test/java/com/google/cloud/mcp/McpToolboxClientBuilderTest.java b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientBuilderTest.java
similarity index 94%
rename from src/test/java/com/google/cloud/mcp/McpToolboxClientBuilderTest.java
rename to src/test/java/com/google/cloud/mcp/client/McpToolboxClientBuilderTest.java
index 5de1e1f..b5b1168 100644
--- a/src/test/java/com/google/cloud/mcp/McpToolboxClientBuilderTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientBuilderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -23,6 +23,13 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import com.google.cloud.mcp.tool.ToolPostProcessor;
+import com.google.cloud.mcp.tool.ToolPreProcessor;
+import com.google.cloud.mcp.transport.Transport;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
diff --git a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplErrorsTest.java b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplErrorsTest.java
similarity index 97%
rename from src/test/java/com/google/cloud/mcp/McpToolboxClientImplErrorsTest.java
rename to src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplErrorsTest.java
index 36d1686..49732a8 100644
--- a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplErrorsTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplErrorsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -24,6 +24,10 @@
import static org.mockito.Mockito.when;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolResult;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
diff --git a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplHeadersTest.java b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplHeadersTest.java
similarity index 92%
rename from src/test/java/com/google/cloud/mcp/McpToolboxClientImplHeadersTest.java
rename to src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplHeadersTest.java
index 72b7031..7dc2aab 100644
--- a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplHeadersTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplHeadersTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
@@ -24,6 +24,10 @@
import static org.mockito.Mockito.when;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.transport.BaseMcpTransport;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
import java.lang.reflect.Field;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
@@ -66,9 +70,12 @@ void testCustomHeadersPopulatedInAllRequests() throws Exception {
Field transportField = McpToolboxClientImpl.class.getDeclaredField("transport");
transportField.setAccessible(true);
HttpMcpTransport transport = (HttpMcpTransport) transportField.get(client);
- Field httpClientField = HttpMcpTransport.class.getDeclaredField("httpClient");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field httpClientField = BaseMcpTransport.class.getDeclaredField("httpClient");
httpClientField.setAccessible(true);
- httpClientField.set(transport, mockHttpClient);
+ httpClientField.set(delegate, mockHttpClient);
HttpResponse initResponse = mock(HttpResponse.class);
when(initResponse.statusCode()).thenReturn(200);
@@ -150,9 +157,12 @@ void testExtraHeadersOverrideAndAuthPriority() throws Exception {
Field transportField = McpToolboxClientImpl.class.getDeclaredField("transport");
transportField.setAccessible(true);
HttpMcpTransport transport = (HttpMcpTransport) transportField.get(client);
- Field httpClientField = HttpMcpTransport.class.getDeclaredField("httpClient");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field httpClientField = BaseMcpTransport.class.getDeclaredField("httpClient");
httpClientField.setAccessible(true);
- httpClientField.set(transport, mockHttpClient);
+ httpClientField.set(delegate, mockHttpClient);
HttpResponse initResponse = mock(HttpResponse.class);
when(initResponse.statusCode()).thenReturn(200);
@@ -223,9 +233,12 @@ void testNoDuplicateHeaders() throws Exception {
Field transportField = McpToolboxClientImpl.class.getDeclaredField("transport");
transportField.setAccessible(true);
HttpMcpTransport transport = (HttpMcpTransport) transportField.get(client);
- Field httpClientField = HttpMcpTransport.class.getDeclaredField("httpClient");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field httpClientField = BaseMcpTransport.class.getDeclaredField("httpClient");
httpClientField.setAccessible(true);
- httpClientField.set(transport, mockHttpClient);
+ httpClientField.set(delegate, mockHttpClient);
HttpResponse initResponse = mock(HttpResponse.class);
when(initResponse.statusCode()).thenReturn(200);
diff --git a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplJsonRpcTest.java b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplJsonRpcTest.java
similarity index 99%
rename from src/test/java/com/google/cloud/mcp/McpToolboxClientImplJsonRpcTest.java
rename to src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplJsonRpcTest.java
index 3a9a99e..7721f3d 100644
--- a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplJsonRpcTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplJsonRpcTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -26,6 +26,10 @@
import static org.mockito.Mockito.when;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolResult;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
@@ -486,13 +490,6 @@ void testListTools_withMissingInputSchemaOrProperties() throws Exception {
assertTrue(toolDef.parameters().isEmpty());
}
- @Test
- void testJsonRpcInstantiation() {
- // Instantiate package-private JsonRpc namespace to cover its default constructor
- JsonRpc rpc = new JsonRpc();
- assertNotNull(rpc);
- }
-
@Test
void testListTools_withMetaNodeEdgeCases() throws Exception {
HttpResponse initResponse = mock(HttpResponse.class);
diff --git a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplTest.java b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplTest.java
similarity index 94%
rename from src/test/java/com/google/cloud/mcp/McpToolboxClientImplTest.java
rename to src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplTest.java
index 075fbf0..ca473fb 100644
--- a/src/test/java/com/google/cloud/mcp/McpToolboxClientImplTest.java
+++ b/src/test/java/com/google/cloud/mcp/client/McpToolboxClientImplTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -31,6 +31,19 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.auth.oauth2.GoogleCredentials;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.AuthTokenGetter;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.tool.Tool;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolPostProcessor;
+import com.google.cloud.mcp.tool.ToolPreProcessor;
+import com.google.cloud.mcp.tool.ToolResult;
+import com.google.cloud.mcp.transport.BaseMcpTransport;
+import com.google.cloud.mcp.transport.HttpMcpTransport;
+import com.google.cloud.mcp.transport.Transport;
+import com.google.cloud.mcp.transport.TransportManifest;
+import com.google.cloud.mcp.transport.TransportResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -514,10 +527,12 @@ void testLoadToolset_withInvalidUriThrowsException() {
@Test
void testInvokeTool_withInvalidUriThrowsException() throws Exception {
HttpMcpTransport transport = new HttpMcpTransport("http://invalid uri", mockHttpClient);
- Field initFutureField = HttpMcpTransport.class.getDeclaredField("initFuture");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field initFutureField = BaseMcpTransport.class.getDeclaredField("initFuture");
initFutureField.setAccessible(true);
- initFutureField.set(
- transport, CompletableFuture.completedFuture(null)); // bypass initialization
+ initFutureField.set(delegate, CompletableFuture.completedFuture(null)); // bypass initialization
McpToolboxClientImpl badClient =
new McpToolboxClientImpl(transport, java.util.Collections.emptyMap(), null);
@@ -594,11 +609,15 @@ void testEnsureInitialized_withNullAuthHeader() throws Exception {
.thenReturn(CompletableFuture.completedFuture(initResponse))
.thenReturn(CompletableFuture.completedFuture(notifResponse));
- Method initMethod = HttpMcpTransport.class.getDeclaredMethod("ensureInitialized", Map.class);
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+
+ Method initMethod = BaseMcpTransport.class.getDeclaredMethod("ensureInitialized", Map.class);
initMethod.setAccessible(true);
CompletableFuture future =
- (CompletableFuture) initMethod.invoke(transport, java.util.Collections.emptyMap());
+ (CompletableFuture) initMethod.invoke(delegate, java.util.Collections.emptyMap());
future.join(); // should complete and NOT set Authorization header
ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(HttpRequest.class);
@@ -782,9 +801,12 @@ void testListTools_withInvalidToolsetNameThrows() throws Exception {
HttpMcpTransport transport = new HttpMcpTransport("http://localhost:8080", mockHttpClient);
// Force transport to be initialized first
- Field initFutureField = HttpMcpTransport.class.getDeclaredField("initFuture");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field initFutureField = BaseMcpTransport.class.getDeclaredField("initFuture");
initFutureField.setAccessible(true);
- initFutureField.set(transport, CompletableFuture.completedFuture(null));
+ initFutureField.set(delegate, CompletableFuture.completedFuture(null));
CompletableFuture future =
transport.listTools("invalid path with spaces \\", java.util.Collections.emptyMap());
@@ -801,13 +823,21 @@ void testEnsureInitialized_withNotificationSerializationFailure() throws Excepti
// Mock ObjectMapper to throw on notification
ObjectMapper mockMapper = mock(ObjectMapper.class);
when(mockMapper.readTree(any(String.class))).thenReturn(new ObjectMapper().readTree("{}"));
- when(mockMapper.writeValueAsString(any(JsonRpc.Request.class))).thenReturn("{}");
- when(mockMapper.writeValueAsString(any(JsonRpc.Notification.class)))
+ when(mockMapper.writeValueAsString(
+ org.mockito.ArgumentMatchers.argThat(
+ arg -> arg != null && arg.getClass().getSimpleName().equals("Request"))))
+ .thenReturn("{}");
+ when(mockMapper.writeValueAsString(
+ org.mockito.ArgumentMatchers.argThat(
+ arg -> arg != null && arg.getClass().getSimpleName().equals("Notification"))))
.thenThrow(new RuntimeException("Simulated notification serialization failure"));
- Field mapperField = HttpMcpTransport.class.getDeclaredField("objectMapper");
+ Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+ Field mapperField = BaseMcpTransport.class.getDeclaredField("objectMapper");
mapperField.setAccessible(true);
- mapperField.set(transport, mockMapper);
+ mapperField.set(delegate, mockMapper);
HttpResponse initResponse = mock(HttpResponse.class);
when(initResponse.statusCode()).thenReturn(200);
@@ -816,11 +846,11 @@ void testEnsureInitialized_withNotificationSerializationFailure() throws Excepti
when(mockHttpClient.sendAsync(any(HttpRequest.class), any(HttpResponse.BodyHandler.class)))
.thenReturn(CompletableFuture.completedFuture(initResponse));
- Method initMethod = HttpMcpTransport.class.getDeclaredMethod("ensureInitialized", Map.class);
+ Method initMethod = BaseMcpTransport.class.getDeclaredMethod("ensureInitialized", Map.class);
initMethod.setAccessible(true);
CompletableFuture future =
- (CompletableFuture) initMethod.invoke(transport, java.util.Collections.emptyMap());
+ (CompletableFuture) initMethod.invoke(delegate, java.util.Collections.emptyMap());
java.util.concurrent.ExecutionException ex =
org.junit.jupiter.api.Assertions.assertThrows(
diff --git a/src/test/java/com/google/cloud/mcp/e2e/McpToolboxClientTest.java b/src/test/java/com/google/cloud/mcp/e2e/McpToolboxClientTest.java
index c2b61e9..77f9823 100644
--- a/src/test/java/com/google/cloud/mcp/e2e/McpToolboxClientTest.java
+++ b/src/test/java/com/google/cloud/mcp/e2e/McpToolboxClientTest.java
@@ -21,9 +21,9 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.cloud.mcp.McpToolboxClient;
-import com.google.cloud.mcp.Tool;
-import com.google.cloud.mcp.ToolDefinition;
-import com.google.cloud.mcp.ToolResult;
+import com.google.cloud.mcp.tool.Tool;
+import com.google.cloud.mcp.tool.ToolDefinition;
+import com.google.cloud.mcp.tool.ToolResult;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/google/cloud/mcp/ToolTest.java b/src/test/java/com/google/cloud/mcp/tool/ToolTest.java
similarity index 99%
rename from src/test/java/com/google/cloud/mcp/ToolTest.java
rename to src/test/java/com/google/cloud/mcp/tool/ToolTest.java
index 4c3682a..9ba2c0d 100644
--- a/src/test/java/com/google/cloud/mcp/ToolTest.java
+++ b/src/test/java/com/google/cloud/mcp/tool/ToolTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
@@ -28,6 +28,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.google.cloud.mcp.McpToolboxClient;
+import com.google.cloud.mcp.auth.ResolvedAuth;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/test/java/com/google/cloud/mcp/ToolValidationTest.java b/src/test/java/com/google/cloud/mcp/tool/ToolValidationTest.java
similarity index 99%
rename from src/test/java/com/google/cloud/mcp/ToolValidationTest.java
rename to src/test/java/com/google/cloud/mcp/tool/ToolValidationTest.java
index bef9d1a..e645a73 100644
--- a/src/test/java/com/google/cloud/mcp/ToolValidationTest.java
+++ b/src/test/java/com/google/cloud/mcp/tool/ToolValidationTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.tool;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.google.cloud.mcp.McpToolboxClient;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/test/java/com/google/cloud/mcp/HttpMcpTransportTest.java b/src/test/java/com/google/cloud/mcp/transport/HttpMcpTransportTest.java
similarity index 96%
rename from src/test/java/com/google/cloud/mcp/HttpMcpTransportTest.java
rename to src/test/java/com/google/cloud/mcp/transport/HttpMcpTransportTest.java
index 1787e89..0953558 100644
--- a/src/test/java/com/google/cloud/mcp/HttpMcpTransportTest.java
+++ b/src/test/java/com/google/cloud/mcp/transport/HttpMcpTransportTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.cloud.mcp;
+package com.google.cloud.mcp.transport;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -26,6 +26,10 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.google.cloud.mcp.ProtocolVersion;
+import com.google.cloud.mcp.auth.CredentialsProvider;
+import com.google.cloud.mcp.exception.McpException;
+import com.google.cloud.mcp.tool.ToolDefinition;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
@@ -253,9 +257,13 @@ void testConstructor_WithCustomExecutorConfiguresHttpClient() throws Exception {
null,
customExecutor);
- java.lang.reflect.Field httpClientField = HttpMcpTransport.class.getDeclaredField("httpClient");
+ java.lang.reflect.Field delegateField = HttpMcpTransport.class.getDeclaredField("delegate");
+ delegateField.setAccessible(true);
+ Object delegate = delegateField.get(transport);
+
+ java.lang.reflect.Field httpClientField = BaseMcpTransport.class.getDeclaredField("httpClient");
httpClientField.setAccessible(true);
- java.net.http.HttpClient httpClient = (java.net.http.HttpClient) httpClientField.get(transport);
+ java.net.http.HttpClient httpClient = (java.net.http.HttpClient) httpClientField.get(delegate);
assertNotNull(httpClient);
Object internalExecutor = null;
@@ -319,7 +327,7 @@ void testListTools_WithHttpUrlAndMetadata_LogsWarning() throws Exception {
.thenReturn(CompletableFuture.completedFuture(mockListResponse));
java.util.logging.Logger transportLogger =
- java.util.logging.Logger.getLogger(HttpMcpTransport.class.getName());
+ java.util.logging.Logger.getLogger(BaseMcpTransport.class.getName());
java.util.List logRecords = new java.util.ArrayList<>();
java.util.logging.Handler logHandler =
new java.util.logging.Handler() {
@@ -466,4 +474,11 @@ void testListTools_ParsesComplexToolsCorrectly() throws Exception {
assertFalse(p2.required());
assertEquals("string", p2.type());
}
+
+ @Test
+ void testJsonRpcInstantiation() {
+ // Instantiate package-private JsonRpc namespace to cover its default constructor
+ JsonRpc rpc = new JsonRpc();
+ assertNotNull(rpc);
+ }
}