fix after deployment tests for illegal name

Author: ttmunyunguma

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

@@ -53,7 +53,6 @@ void registerTools(@Observes ProcessManagedBean<?> pmb) {
     void afterDeploymentValidation(@Observes AfterDeploymentValidation afterDeploymentValidation, BeanManager manager) {
         reportOnDuplicateTools(afterDeploymentValidation);
         reportOnToolArgEdgeCases(afterDeploymentValidation);
-        reportOnToolArgNameNoParams(afterDeploymentValidation);
         reportOnDuplicateSpecialArguments(afterDeploymentValidation);
         reportOnInvalidSpecialArguments(afterDeploymentValidation);
     }
@@ -64,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();
@@ -77,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;
                 }
             }
         }
@@ -86,10 +90,9 @@ private void reportOnToolArgEdgeCases(AfterDeploymentValidation afterDeploymentV
         if (duplicateArgumentsFound) {
             afterDeploymentValidation.addDeploymentProblem(new Exception(sbDuplicateArgs.toString()));
         }
-    }
-
-    private void reportOnToolArgNameNoParams(AfterDeploymentValidation afterDeploymentValidation) {
-
+        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

@@ -39,8 +39,8 @@ public static void teardown() throws Exception {
 
     @Test
     public void testNoParamNameToolArg() throws Exception {
-        String expectedErrorHeader = "Blank arguments found in MCP Tool:";
+        String expectedErrorHeader = "Illegal arguments found in MCP Tool:";
         List<String> expectedErrorList = List.of("io.openliberty.mcp.internal.fat.noparamtool.NoParamTools.illegalToolArgNameTool");
-        ExpectedAppFailureValidator.findAndAssertExpectedErrorsInLogs("Blank Tool Arg: ", expectedErrorHeader, expectedErrorList, server);
+        ExpectedAppFailureValidator.findAndAssertExpectedErrorsInLogs("Illegal Tool Arg: ", expectedErrorHeader, expectedErrorList, server);
     }
 }