test signing

test signing

test signing

test signing

no param after deployment test

fix after deployment tests for illegal name

Author: ttmunyunguma

dev/io.openliberty.mcp.internal/src/io/openliberty/mcp/internal/McpCdiExtension.java

@@ -63,8 +63,10 @@ void afterDeploymentValidation(@Observes AfterDeploymentValidation afterDeployme
     private void reportOnToolArgEdgeCases(AfterDeploymentValidation afterDeploymentValidation) {
         StringBuilder sbBlankArgs = new StringBuilder("Blank arguments found in MCP Tool:");
         StringBuilder sbDuplicateArgs = new StringBuilder("Duplicate arguments found in MCP Tool:");
+        StringBuilder sbIllegalArgs = new StringBuilder("Illegal arguments found in MCP Tool:");
         boolean blankArgumentsFound = false;
         boolean duplicateArgumentsFound = false;
+        boolean illegalArgumentsFound = false;
 
         for (ToolMetadata tool : tools.getAllTools()) {
             Map<String, ArgumentMetadata> arguments = tool.arguments();
@@ -76,6 +78,9 @@ private void reportOnToolArgEdgeCases(AfterDeploymentValidation afterDeploymentV
                 } else if (arguments.get(argName).isDuplicate()) {
                     sbDuplicateArgs.append("\n").append("Tool: " + tool.getToolQualifiedName() + " -  Argument: " + argName);
                     duplicateArgumentsFound = true;
+                } else if (argName.equals(ToolMetadata.ILLEGAL_TOOL_ARG_NAME)) {
+                    sbIllegalArgs.append("\n").append("Tool: " + tool.getToolQualifiedName());
+                    illegalArgumentsFound = true;
                 }
             }
         }
@@ -85,6 +90,9 @@ private void reportOnToolArgEdgeCases(AfterDeploymentValidation afterDeploymentV
         if (duplicateArgumentsFound) {
             afterDeploymentValidation.addDeploymentProblem(new Exception(sbDuplicateArgs.toString()));
         }
+        if (illegalArgumentsFound) {
+            afterDeploymentValidation.addDeploymentProblem(new Exception(sbIllegalArgs.toString()));
+        }
     }
 
     private void reportOnDuplicateTools(AfterDeploymentValidation afterDeploymentValidation) {

dev/io.openliberty.mcp.internal/src/io/openliberty/mcp/internal/ToolMetadata.java

@@ -29,6 +29,8 @@ public record ToolMetadata(Tool annotation, Bean<?> bean, AnnotatedMethod<?> met
                            String name, String title, String description,
                            List<Class<? extends Throwable>> businessExceptions) {
 
+    public static final String ILLEGAL_TOOL_ARG_NAME = "<<<ILLEGAL NAME>>>";
+
     public record ArgumentMetadata(Type type, int index, String description, boolean required, boolean isDuplicate) {}
 
     public record SpecialArgumentMetadata(SpecialArgumentType.Resolution typeResolution, int index) {}
@@ -84,7 +86,7 @@ private static String resolveArgumentName(AnnotatedParameter<?> param, ToolArg a
             return param.getJavaParameter().getName();
         }
 
-        throw new IllegalStateException("Parameter name not set. Ensure that javac -parameter flag is enabled");
+        return ILLEGAL_TOOL_ARG_NAME;
     }
 
     private static List<SpecialArgumentMetadata> getSpecialArgumentList(AnnotatedMethod<?> method) {

dev/io.openliberty.mcp.internal_fat/fat/src/io/openliberty/mcp/internal/fat/tool/NoParamNameTest.java

@@ -9,25 +9,18 @@
  *******************************************************************************/
 package io.openliberty.mcp.internal.fat.tool;
 
-import static com.ibm.websphere.simplicity.ShrinkHelper.DeployOptions.SERVER_ONLY;
+import java.util.List;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-import com.ibm.websphere.simplicity.ShrinkHelper;
 
 import componenttest.annotation.Server;
 import componenttest.custom.junit.runner.FATRunner;
 import componenttest.topology.impl.LibertyServer;
 import componenttest.topology.utils.FATServletClient;
 import io.openliberty.mcp.internal.fat.noparamtool.NoParamTools;
-import io.openliberty.mcp.internal.fat.utils.HttpTestUtils;
 
 @RunWith(FATRunner.class)
 public class NoParamNameTest extends FATServletClient {
@@ -36,40 +29,18 @@ public class NoParamNameTest extends FATServletClient {
 
     @BeforeClass
     public static void setup() throws Exception {
-        WebArchive war = ShrinkWrap.create(WebArchive.class, "toolTest.war").addPackage(NoParamTools.class.getPackage());
-
-        ShrinkHelper.exportDropinAppToServer(server, war, SERVER_ONLY);
-
-        server.startServer();
+        ExpectedAppFailureValidator.deployAppToAssertFailure(server, "ExpectedNoParamNameFailureTest", NoParamTools.class.getPackage());
     }
 
     @AfterClass
     public static void teardown() throws Exception {
-        server.stopServer();
+        server.stopServer(ExpectedAppFailureValidator.APP_START_FAILED_CODE);
     }
 
     @Test
-    public void testIllegalToolArgNameTool() throws Exception {
-        String request = """
-                          {
-                          "jsonrpc": "2.0",
-                          "id": "2",
-                          "method": "tools/call",
-                          "params": {
-                            "name": "illegalToolArgNameTool",
-                            "arguments": {
-                              "input": "Hello"
-                            }
-                          }
-                        }
-                        """;
-
-        String response = HttpTestUtils.callMCP(server, "/toolTest", request);
-        JSONObject jsonResponse = new JSONObject(response);
-
-        String expectedResponseString = """
-                        Exception thrown
-                        """;
-        JSONAssert.assertEquals(expectedResponseString, response, true);
+    public void testNoParamNameToolArg() throws Exception {
+        String expectedErrorHeader = "Illegal arguments found in MCP Tool:";
+        List<String> expectedErrorList = List.of("io.openliberty.mcp.internal.fat.noparamtool.NoParamTools.illegalToolArgNameTool");
+        ExpectedAppFailureValidator.findAndAssertExpectedErrorsInLogs("Illegal Tool Arg: ", expectedErrorHeader, expectedErrorList, server);
     }
 }