Merge branch 'mcp-prompts-support' of github.com:yasmewad/smithy-java into mcp-prompts-support

Author: yasmewad

mcp/mcp-schemas/build.gradle.kts

@@ -63,7 +63,7 @@ interface Injected {
 }
 
 fun AbstractCopyTask.configureServiceFileMerging() {
-    val serviceEntries = mutableMapOf<String, MutableList<String>>()
+    val serviceEntries = mutableMapOf<String, MutableSet<String>>()
     val tempServicesDir = temporaryDir // Capture at configuration time
 
     // Configure Jar tasks to include temp directory at configuration time
@@ -76,7 +76,7 @@ fun AbstractCopyTask.configureServiceFileMerging() {
             val serviceName = path.substring("META-INF/services/".length)
 
             if (!serviceEntries.containsKey(serviceName)) {
-                serviceEntries[serviceName] = mutableListOf()
+                serviceEntries[serviceName] = mutableSetOf()
             }
 
             serviceEntries[serviceName]!!.addAll(
@@ -102,7 +102,7 @@ fun AbstractCopyTask.configureServiceFileMerging() {
 
         serviceEntries.forEach { (serviceName, lines) ->
             val serviceFile = File(servicesDir, serviceName)
-            serviceFile.writeText(lines.distinct().joinToString("\n") + "\n")
+            serviceFile.writeText(lines.joinToString("\n") + "\n")
         }
     }
 }

mcp/mcp-server/src/main/java/software/amazon/smithy/java/mcp/server/Prompt.java

@@ -1,6 +1,10 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package software.amazon.smithy.java.mcp.server;
 
 import software.amazon.smithy.java.mcp.model.PromptInfo;
 
-public record Prompt(PromptInfo promptInfo, String promptTemplate) {
-}
+public record Prompt(PromptInfo promptInfo, String promptTemplate) {}

mcp/mcp-server/src/test/java/software/amazon/smithy/java/mcp/server/PromptLoaderTest.java

@@ -1,12 +1,14 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package software.amazon.smithy.java.mcp.server;
 
-import org.junit.jupiter.api.Test;
-import software.amazon.smithy.java.server.ProxyService;
-import software.amazon.smithy.java.server.Service;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 class PromptLoaderTest {
 
@@ -15,4 +17,4 @@ public void testLoadPromptsWithNoServices() {
         var prompts = PromptLoader.loadPrompts(Collections.emptyList());
         assertTrue(prompts.isEmpty());
     }
-}
+}

settings.gradle.kts

@@ -86,16 +86,6 @@ include(":aws:sdkv2:aws-sdkv2-retries")
 include(":aws:sdkv2:aws-sdkv2-shapes")
 include(":aws:sdkv2:aws-sdkv2-auth")
 
-
-//MCP
-include(":mcp")
-include(":mcp:mcp-schemas")
-include(":mcp:mcp-server")
-include(":mcp:mcp-cli")
-include(":mcp:mcp-cli-api")
-include(":mcp:mcp-bundle-api")
-include(":mcp:mcp-traits")
-
 // Examples
 include(":examples")
 include(":examples:basic-server")
@@ -108,5 +98,14 @@ include(":examples:standalone-types")
 include(":examples:mcp-server")
 include(":examples:mcp-traits-example")
 
+//MCP
+include(":mcp")
+include(":mcp:mcp-schemas")
+include(":mcp:mcp-server")
+include(":mcp:mcp-cli")
+include(":mcp:mcp-cli-api")
+include(":mcp:mcp-bundle-api")
+include(":mcp:mcp-traits")
+
 include(":model-bundle")
 include(":model-bundle:model-bundle-api")