eng. mcp, remove clean_java_source tool (#46050)

Author: weidongxu-microsoft

.github/copilot-instructions.md

@@ -27,7 +27,6 @@ The Azure SDK for Java repository contains client libraries for Azure services,
 ACTION: Use azure-sdk-java-mcp sdk tools to generate the SDK.
 ACTION: Do not use pure `mvn` command to compile, build or package SDK, use `build_java_sdk` tool instead, it runs `mvn` command inside.
 ACTION: Use azure-sdk-java-mcp sdk tool `update_client_name` to update client name.
-ACTION: Do not clean Java source before generating the SDK because the generated code may have manual written customized code.
 ACTION: Only update the manual written code or class when you fix compile errors. Manual written class does not have `// Code generated by Microsoft (R) TypeSpec Code Generator.` header. Manual written functions or properties do not have `@Generated` annotation.
 
 

eng/tools/mcp/azure-sdk-java-mcp/README.md

@@ -8,13 +8,12 @@ This MCP server provides the following tools:
 
 1. **sync_typespec_source_files** - Synchronize/Download TypeSpec source files for Java SDK generation from local or remote sources
 2. **generate_java_sdk** - Generate or update Java SDK code from TypeSpec definitions 
-3. **clean_java_source** - Clean and remove generated Java source files from SDK directory
-4. **build_java_sdk** - Compile and build the Java SDK with Maven for Azure services
-5. **get_java_sdk_changelog** - Generate and retrieve changelog information for the Java SDK
-6. **update_java_sdk_changelog** - Update the CHANGELOG.md file for a Java SDK module
-7. **instruction_migrate_typespec** - Provide step-by-step instructions for migrating from Swagger to TypeSpec
-8. **update_client_name** - Guide through updating client class and property names in TypeSpec and Java SDK
-9. **prepare_java_sdk_environment** - Provide environment setup instructions and dependency requirements
+3. **build_java_sdk** - Compile and build the Java SDK with Maven for Azure services
+4. **get_java_sdk_changelog** - Generate and retrieve changelog information for the Java SDK
+5. **update_java_sdk_changelog** - Update the CHANGELOG.md file for a Java SDK module
+6. **instruction_migrate_typespec** - Provide step-by-step instructions for migrating from Swagger to TypeSpec
+7. **update_client_name** - Guide through updating client class and property names in TypeSpec and Java SDK
+8. **prepare_java_sdk_environment** - Provide environment setup instructions and dependency requirements
 
 ## Prerequisites
 
@@ -58,7 +57,6 @@ Here are some example prompts you can use with GitHub Copilot to interact with t
 
 ### Environment and Tooling
 - `prepare java sdk environment`
-- `clean java source files for azure-ai-openai`
 
 ### Client Name Updates
 - `update client name: EnableBatchJobOptions to BatchJobEnableOptions`
@@ -120,23 +118,8 @@ Generate SDK from TypeSpec source from 'TempTypeSpecFiles' for a target service
 }
 ```
 
-### 3. clean_java_source
-Clean the Java source code for a module, removing all generated source files and directories.
 
-**Parameters:**
-- `cwd` (required): The absolute path to the directory where tsp-location.yaml is located
-
-**Example:**
-```json
-{
-  "name": "clean_java_source",
-  "arguments": {
-    "cwd": "/path/to/java/sdk/module"
-  }
-}
-```
-
-### 4. build_java_sdk
+### 3. build_java_sdk
 Build the Java SDK for a service sub module whose groupId starts with `com.azure`. The tool takes the module directory, root directory, groupId and artifactId as input parameters.
 
 **Parameters:**
@@ -158,7 +141,7 @@ Build the Java SDK for a service sub module whose groupId starts with `com.azure
 }
 ```
 
-### 5. get_java_sdk_changelog
+### 4. get_java_sdk_changelog
 Get the changelog for a service sub module whose groupId starts with `com.azure`. The tool takes the jarPath, groupId and artifactId as input parameters.
 
 **Parameters:**
@@ -178,7 +161,7 @@ Get the changelog for a service sub module whose groupId starts with `com.azure`
 }
 ```
 
-### 6. update_java_sdk_changelog
+### 5. update_java_sdk_changelog
 Update the CHANGELOG.md file for a service sub module whose groupId starts with `com.azure`. The tool takes the absolute path to the JAR file, groupId and artifactId as input parameters.
 
 **Parameters:**
@@ -198,7 +181,7 @@ Update the CHANGELOG.md file for a service sub module whose groupId starts with
 }
 ```
 
-### 7. instruction_migrate_typespec
+### 6. instruction_migrate_typespec
 Get instructions for generating Java SDK after migrating from Swagger to TypeSpec.
 
 **Parameters:**
@@ -212,7 +195,7 @@ Get instructions for generating Java SDK after migrating from Swagger to TypeSpe
 }
 ```
 
-### 8. update_client_name
+### 7. update_client_name
 Update client name for both client.tsp and the generated java sdk. Follow the returned instruction to update old client name to new client name, be sure to ask for old client name and new client name. e.g. MediaMessageContent.mediaUri to MediaMessageContent.mediaUrl
 
 **Parameters:**
@@ -226,7 +209,7 @@ Update client name for both client.tsp and the generated java sdk. Follow the re
 }
 ```
 
-### 9. prepare_java_sdk_environment
+### 8. prepare_java_sdk_environment
 Prepare the development environment for Java SDK generation, including 3 main areas: Node.js/npm, Java environment, and TypeSpec tools.
 
 **Parameters:**

eng/tools/mcp/azure-sdk-java-mcp/src/brownfield-migrate.ts

@@ -3,17 +3,19 @@ import { CallToolResult } from "@modelcontextprotocol/sdk/types";
 export async function brownfieldMigration(): Promise<CallToolResult> {
     const cookbook = `Follow the instructions below to migrate the Java SDK to generate from TypeSpec.
 
+DO NOT SKIP STEP 3, IN ANY CONDITION.
+
 1. Initiate the Java SDK with the given URL to the "tspconfig.yaml" file.
    Use the tool to initiate the Java SDK, from tspconfig.yaml URL. This tool create a "tsp-location.yaml" file.
 
 2. Find the path to SDK module and its "pom.xml" file.
    Run "git status --porcelain" to find the "tsp-location.yaml" file. The path to the SDK module is the directory containing the "tsp-location.yaml" file. The "pom.xml" file is located in the same directory.
 
 3. Clean the Java source in SDK module.
-   Use the tool to clean the Java source in the SDK module.
+   Delete folder "src/main" in the SDK module. Delete folder "src/samples/**/generated" and "src/test/**/generated" in the SDK module.
 
-4. Synchronize the TypeSpec source for Java SDK.
-   Use the tool to synchronize the TypeSpec source for the Java SDK. This will download the the TypeSpec source specified in the "tsp-location.yaml" file.
+4. Generate Java SDK from the TypeSpec source.
+   Use the tool to generate the Java SDK. This will generate the Java SDK from existing TypeSpec source in "TempTypeSpecFiles" folder.
 
 5. Build the Java SDK.
    Use the tool to build the Java SDK. This will compile the Java code and generate the necessary artifacts, e.g. JAR file.
@@ -28,7 +30,9 @@ export async function brownfieldMigration(): Promise<CallToolResult> {
    If there is no such candidates, the migration is completed, and you can skip all the next steps.
 
 8. Apply the changes to the TypeSpec source.
-   Use the tool to apply the rename changes to the TypeSpec source. Ask it to e.g. "Update client name, rename model from <old_name> to <new_name>".
+   Use the tool to apply the rename changes to the TypeSpec source, so that it can keep the original naming.
+   Ask it to e.g. "Update client name, rename model from <name_after_codegen> to <name_before_codegen>".
+   Java SDK is following the convention of e.g. "username", "hostname", "Ip", "Id". Hence, the tool should keep using these naming patterns.
 
 9. Go to step 5.
 `;

eng/tools/mcp/azure-sdk-java-mcp/src/index.ts

@@ -10,7 +10,6 @@ import { initJavaSdk } from "./init-java-sdk.js";
 import { prepareJavaSdkEnvironmentCookbook } from "./prepare-environment.js";
 import { buildJavaSdk } from "./build-java-sdk.js";
 import { getJavaSdkChangelog } from "./java-sdk-changelog.js";
-import { cleanJavaSource } from "./clean-java-source.js";
 import { updateChangelogMd } from "./update-changelog-md.js";
 
 // Create the MCP server
@@ -25,28 +24,28 @@ const logToolCall = (toolName: string) => {
     process.stderr.write(logMsg);
 };
 
-// Tool: clean_java_source
-server.registerTool(
-    "clean_java_source",
-    {
-        description:
-            "Remove all generated Java source files and directories for a given module. This tool is typically used to clean up the output of previous SDK generations before a new build. It should only be applied to packages with the prefix `azure-resourcemanager-*`.",
-        inputSchema: {
-            cwd: z
-                .string()
-                .describe(
-                    "The absolute path to the module directory containing tsp-location.yaml. Example: C:\\workspace\\azure-sdk-for-java\\sdk\\devcenter\\azure-resourcemanager-devcenter",
-                ),
-        },
-        annotations: {
-            title: "Clean Java Source",
-        },
-    },
-    async (args) => {
-        logToolCall("clean_java_source");
-        return await cleanJavaSource(args.cwd);
-    },
-);
+// // Tool: clean_java_source
+// server.registerTool(
+//     "clean_java_source",
+//     {
+//         description:
+//             "Remove all generated Java source files and directories for a given module. This tool is typically used to clean up the output of previous SDK generations before a new build. It should only be applied to packages with the prefix `azure-resourcemanager-*`.",
+//         inputSchema: {
+//             cwd: z
+//                 .string()
+//                 .describe(
+//                     "The absolute path to the module directory containing tsp-location.yaml. Example: C:\\workspace\\azure-sdk-for-java\\sdk\\devcenter\\azure-resourcemanager-devcenter",
+//                 ),
+//         },
+//         annotations: {
+//             title: "Clean Java Source",
+//         },
+//     },
+//     async (args) => {
+//         logToolCall("clean_java_source");
+//         return await cleanJavaSource(args.cwd);
+//     },
+// );
 
 // Tool: build_java_sdk
 server.registerTool(