Refactor annotation codegen structure and simplify config naming.

Split AnnotationProcessor code emission into typed *Codegen modules and rename configuration and converter classes to remove redundant Mcp prefixes, updating docs and tests accordingly.

Author: codeboyzhou

README.md

@@ -296,7 +296,7 @@ The SDK creates **one instance per component class** (no-arg constructor) and re
 This project builds on the official [MCP Java SDK](https://github.com/modelcontextprotocol/java-sdk) **2.0.0-M3**, a **pre-release milestone**. APIs may change before 2.0 GA — pin dependency versions and re-run tests when upgrading.
 
 - **STREAMABLE** is the recommended HTTP transport for new projects.
-- **SSE** (`ServerMode.SSE`, `McpSseServer`, `McpServerSSE`, `sse.*` in YAML) is **deprecated with `forRemoval = true` since 0.16.0** and scheduled for removal in a future release. Existing deployments may still use it for compatibility; migrate to **STREAMABLE** (`McpStreamableServer`, `streamable.*`).
+- **SSE** (`ServerMode.SSE`, `McpSseServer`, `ServerSse`, `sse.*` in YAML) is **deprecated with `forRemoval = true` since 0.16.0** and scheduled for removal in a future release. Existing deployments may still use it for compatibility; migrate to **STREAMABLE** (`McpStreamableServer`, `streamable.*`).
 
 ## 🏗️ Project Structure
 

README.zh-CN.md

@@ -298,7 +298,7 @@ SDK 为每个组件类创建 **唯一实例**（无参构造），该类上所
 本项目基于官方 [MCP Java SDK](https://github.com/modelcontextprotocol/java-sdk) **2.0.0-M3**，属于 **预发布里程碑**。2.0 正式版发布前 API 可能变更 — 请锁定依赖版本，升级后重新跑集成测试。
 
 - 新项目 HTTP 传输推荐 **STREAMABLE**。
-- **SSE**（`ServerMode.SSE`、`McpSseServer`、`McpServerSSE`、YAML 中的 `sse.*`）自 **0.16.0** 起已标记为 **`@Deprecated(forRemoval = true)`**，将在后续版本中移除。现有部署仍可兼容使用；请迁移至 **STREAMABLE**（`McpStreamableServer`、`streamable.*`）。
+- **SSE**（`ServerMode.SSE`、`McpSseServer`、`ServerSse`、YAML 中的 `sse.*`）自 **0.16.0** 起已标记为 **`@Deprecated(forRemoval = true)`**，将在后续版本中移除。现有部署仍可兼容使用；请迁移至 **STREAMABLE**（`McpStreamableServer`、`streamable.*`）。
 
 ## 🏗️ 推荐项目结构
 

docs/getting-started.md

@@ -210,7 +210,7 @@ The SDK creates **one instance per component class** and reuses it for all reque
 This SDK depends on MCP Java SDK **2.0.0-M3** (pre-release). Pin versions and retest when upgrading.
 
 - **STREAMABLE** is the recommended HTTP transport for new projects.
-- **SSE** (`ServerMode.SSE`, `McpSseServer`, `McpServerSSE`, `sse.*` in YAML) is **deprecated with `forRemoval = true` since 0.16.0** and scheduled for removal in a future release. Existing deployments may still use it for compatibility; migrate to **STREAMABLE** (`McpStreamableServer`, `streamable.*`).
+- **SSE** (`ServerMode.SSE`, `McpSseServer`, `ServerSse`, `sse.*` in YAML) is **deprecated with `forRemoval = true` since 0.16.0** and scheduled for removal in a future release. Existing deployments may still use it for compatibility; migrate to **STREAMABLE** (`McpStreamableServer`, `streamable.*`).
 
 ## Profile-based Configuration
 

llms-full.txt

@@ -478,7 +478,7 @@ public String createUser(
 ## Important Notes
 
 1. **Entry point**: Use `McpApplication.run()`; component classes are discovered via `@McpServerApplication` package scanning.
-2. **Deprecated SSE (for removal since 0.16.0)**: HTTP SSE mode and related APIs (`ServerMode.SSE`, `McpSseServer`, `McpServerSSE`, `sse.*` config) are deprecated with `forRemoval = true` since 0.16.0. Use STREAMABLE mode (`McpStreamableServer`, `streamable.*`) for new HTTP projects.
+2. **Deprecated SSE (for removal since 0.16.0)**: HTTP SSE mode and related APIs (`ServerMode.SSE`, `McpSseServer`, `ServerSse`, `sse.*` config) are deprecated with `forRemoval = true` since 0.16.0. Use STREAMABLE mode (`McpStreamableServer`, `streamable.*`) for new HTTP projects.
 3. **MCP SDK milestone**: This project depends on MCP Java SDK **2.0.0-M3** (pre-release). Pin versions and retest when upgrading.
 4. **ASYNC is not reactive**: `type: ASYNC` selects the async MCP server API; handlers wrap blocking Java methods in `Mono.fromCallable(...)`. Annotated methods do not return `Mono`/`Flux`.
 5. **Singleton components**: One instance per component class is shared across concurrent requests. Keep components stateless or thread-safe.

llms.txt

@@ -131,7 +131,7 @@ change-notification:
 
 - Use `McpApplication.run()` as the server entry point; components are discovered through `@McpServerApplication` package scanning
 - `instructions` must be a non-blank string in `mcp-server.yml` (validated at startup)
-- SSE mode and related APIs (`ServerMode.SSE`, `McpSseServer`, `McpServerSSE`, `sse.*` config) are deprecated with `forRemoval = true` since 0.16.0; use STREAMABLE for new HTTP deployments
+- SSE mode and related APIs (`ServerMode.SSE`, `McpSseServer`, `ServerSse`, `sse.*` config) are deprecated with `forRemoval = true` since 0.16.0; use STREAMABLE for new HTTP deployments
 - Built on MCP Java SDK **2.0.0-M3** (milestone) — pin versions and retest when upgrading
 - `type: ASYNC` uses the async MCP server API; annotated methods stay blocking Java wrapped in `Mono.fromCallable(...)` — not Project Reactor
 - One instance per component class is created and shared across concurrent requests — keep components stateless or thread-safe

src/main/java/com/github/thought2code/mcp/annotated/McpApplication.java

@@ -1,8 +1,8 @@
 package com.github.thought2code.mcp.annotated;
 
-import com.github.thought2code.mcp.annotated.configuration.McpConfigurationLoader;
-import com.github.thought2code.mcp.annotated.configuration.McpServerConfiguration;
-import com.github.thought2code.mcp.annotated.configuration.McpServerDefaults;
+import com.github.thought2code.mcp.annotated.configuration.ConfigurationLoader;
+import com.github.thought2code.mcp.annotated.configuration.ServerConfiguration;
+import com.github.thought2code.mcp.annotated.configuration.ServerDefaults;
 import com.github.thought2code.mcp.annotated.enums.ServerMode;
 import com.github.thought2code.mcp.annotated.enums.ServerType;
 import com.github.thought2code.mcp.annotated.server.AnnotatedMcpServer;
@@ -65,7 +65,7 @@ public static void run(Class<?> mainClass, String[] args, String configFileName)
    * @param args the command-line arguments passed to the application
    */
   public static void run(Class<?> mainClass, String[] args) {
-    run(mainClass, args, McpServerDefaults.CONFIG_FILE_NAME);
+    run(mainClass, args, ServerDefaults.CONFIG_FILE_NAME);
   }
 
   /**
@@ -92,14 +92,14 @@ public static void run(Class<?> mainClass, String[] args) {
    * @param configFileName the name of the configuration file to load
    * @param context the application context for component discovery and localization
    * @see McpApplicationContext
-   * @see McpConfigurationLoader
-   * @see McpServerConfiguration
+   * @see ConfigurationLoader
+   * @see ServerConfiguration
    * @see AnnotatedMcpServer
    * @see McpSyncServer
    */
   private static void startMcpServer(String configFileName, McpApplicationContext context) {
-    McpConfigurationLoader configurationLoader = new McpConfigurationLoader(configFileName);
-    McpServerConfiguration configuration = configurationLoader.loadConfig();
+    ConfigurationLoader configurationLoader = new ConfigurationLoader(configFileName);
+    ServerConfiguration configuration = configurationLoader.loadConfig();
     log.info("Starting MCP server with config: {}", JacksonHelper.toJsonString(configuration));
 
     if (!configuration.enabled()) {
@@ -143,7 +143,7 @@ private static void startMcpServer(String configFileName, McpApplicationContext
    */
   @Deprecated(since = "0.16.0", forRemoval = true)
   private static AnnotatedMcpServer createSseServer(
-      McpServerConfiguration configuration, McpApplicationContext context) {
+      ServerConfiguration configuration, McpApplicationContext context) {
     return new McpSseServer(configuration, context);
   }
 }

…nfiguration/McpConfigurationChecker.java …/configuration/ConfigurationChecker.javasrc/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationChecker.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationChecker.java src/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationChecker.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationChecker.java

@@ -12,12 +12,12 @@
  * validates both base configuration properties and mode-specific settings for SSE and STREAMABLE
  * server modes.
  *
- * @see McpServerConfiguration
+ * @see ServerConfiguration
  * @author codeboyzhou
  */
-public final class McpConfigurationChecker {
+public final class ConfigurationChecker {
 
-  private McpConfigurationChecker() {
+  private ConfigurationChecker() {
     throw new UnsupportedOperationException("Utility class should not be instantiated");
   }
 
@@ -27,7 +27,7 @@ private McpConfigurationChecker() {
    * @param configuration the MCP server configuration to validate
    * @throws McpServerConfigurationException if any required configuration property is missing
    */
-  public static void check(McpServerConfiguration configuration) {
+  public static void check(ServerConfiguration configuration) {
     checkCore(configuration);
     checkCapabilities(configuration.capabilities());
     checkChangeNotification(configuration.changeNotification());
@@ -38,7 +38,7 @@ public static void check(McpServerConfiguration configuration) {
     }
   }
 
-  private static void checkCore(McpServerConfiguration configuration) {
+  private static void checkCore(ServerConfiguration configuration) {
     checkNull("enabled", configuration.enabled());
     checkNull("mode", configuration.mode());
     checkBlank("name", configuration.name());
@@ -50,7 +50,7 @@ private static void checkCore(McpServerConfiguration configuration) {
     checkNull("change-notification", configuration.changeNotification());
   }
 
-  private static void checkCapabilities(McpServerCapabilities capabilities) {
+  private static void checkCapabilities(ServerCapabilities capabilities) {
     checkNull("capabilities.resource", capabilities.resource());
     if (capabilities.resource()) {
       checkNull("capabilities.subscribe-resource", capabilities.subscribeResource());
@@ -60,7 +60,7 @@ private static void checkCapabilities(McpServerCapabilities capabilities) {
     checkNull("capabilities.completion", capabilities.completion());
   }
 
-  private static void checkChangeNotification(McpServerChangeNotification changeNotification) {
+  private static void checkChangeNotification(ServerChangeNotification changeNotification) {
     checkNull("change-notification.resource", changeNotification.resource());
     checkNull("change-notification.prompt", changeNotification.prompt());
     checkNull("change-notification.tool", changeNotification.tool());
@@ -73,15 +73,15 @@ private static void checkChangeNotification(McpServerChangeNotification changeNo
    * @deprecated HTTP SSE mode is deprecated; use {@link ServerMode#STREAMABLE} instead.
    */
   @Deprecated(since = "0.16.0", forRemoval = true)
-  private static void checkSse(McpServerSSE sse) {
+  private static void checkSse(ServerSse sse) {
     checkNull("sse", sse);
     checkBlank("sse.message-endpoint", sse.messageEndpoint());
     checkBlank("sse.endpoint", sse.endpoint());
     checkBlank("sse.base-url", sse.baseUrl());
     checkNull("sse.port", sse.port());
   }
 
-  private static void checkStreamable(McpServerStreamable streamable) {
+  private static void checkStreamable(ServerStreamable streamable) {
     checkNull("streamable", streamable);
     checkBlank("streamable.mcp-endpoint", streamable.mcpEndpoint());
     checkNull("streamable.disallow-delete", streamable.disallowDelete());

…onfiguration/McpConfigurationLoader.java …d/configuration/ConfigurationLoader.javasrc/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationLoader.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationLoader.java src/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationLoader.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationLoader.java

@@ -24,21 +24,20 @@
  *     Annotated Java SDK Documentation</a>
  * @author codeboyzhou
  */
-public record McpConfigurationLoader(String configFileName) {
+public record ConfigurationLoader(String configFileName) {
 
   /** The logger instance for this class. */
-  private static final Logger log = LoggerFactory.getLogger(McpConfigurationLoader.class);
+  private static final Logger log = LoggerFactory.getLogger(ConfigurationLoader.class);
 
   /**
    * Loads the MCP server configuration from the specified YAML file.
    *
    * @return the loaded MCP server configuration
    * @throws McpServerConfigurationException if the configuration file cannot be loaded
    */
-  public McpServerConfiguration loadConfig() {
+  public ServerConfiguration loadConfig() {
     File file = getConfigFilePath(configFileName).toFile();
-    McpServerConfiguration configuration =
-        JacksonHelper.fromYaml(file, McpServerConfiguration.class);
+    ServerConfiguration configuration = JacksonHelper.fromYaml(file, ServerConfiguration.class);
     log.info("Configuration loaded successfully from file: {}", configFileName);
 
     final String profile = configuration.profile();
@@ -48,13 +47,13 @@ public McpServerConfiguration loadConfig() {
       final String profileConfigFileName = configFileName.replace(".yml", "-" + profile + ".yml");
       File profileConfigFile = getConfigFilePath(profileConfigFileName).toFile();
       configuration =
-          JacksonHelper.mergeYaml(configuration, profileConfigFile, McpServerConfiguration.class);
+          JacksonHelper.mergeYaml(configuration, profileConfigFile, ServerConfiguration.class);
       log.info("Profile configuration merged successfully from file: {}", profileConfigFileName);
     }
 
-    McpServerConfiguration mergedConfig =
-        McpConfigurationSupport.finalizeMerged(Objects.requireNonNull(configuration), profile);
-    McpConfigurationChecker.check(mergedConfig);
+    ServerConfiguration mergedConfig =
+        ConfigurationSupport.finalizeMerged(Objects.requireNonNull(configuration), profile);
+    ConfigurationChecker.check(mergedConfig);
     return mergedConfig;
   }
 
@@ -67,7 +66,7 @@ public McpServerConfiguration loadConfig() {
    */
   private Path getConfigFilePath(String fileName) {
     try {
-      ClassLoader classLoader = McpConfigurationLoader.class.getClassLoader();
+      ClassLoader classLoader = ConfigurationLoader.class.getClassLoader();
       URL configFileUrl = classLoader.getResource(fileName);
       if (configFileUrl == null) {
         throw new McpServerConfigurationException(

…nfiguration/McpConfigurationSupport.java …/configuration/ConfigurationSupport.javasrc/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationSupport.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationSupport.java src/main/java/com/github/thought2code/mcp/annotated/configuration/McpConfigurationSupport.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ConfigurationSupport.java

@@ -9,9 +9,9 @@
  * <p>Jackson profile merging handles field overlays; this class applies MCP-specific rules that are
  * not expressible through generic YAML merge alone.
  */
-public final class McpConfigurationSupport {
+public final class ConfigurationSupport {
 
-  private McpConfigurationSupport() {
+  private ConfigurationSupport() {
     throw new UnsupportedOperationException("Utility class should not be instantiated");
   }
 
@@ -27,13 +27,13 @@ private McpConfigurationSupport() {
    * @param profileFromBase profile name from the base configuration file
    * @return finalized configuration
    */
-  public static McpServerConfiguration finalizeMerged(
-      McpServerConfiguration configuration, String profileFromBase) {
+  public static ServerConfiguration finalizeMerged(
+      ServerConfiguration configuration, String profileFromBase) {
     ServerMode mode = configuration.mode();
     final String profile =
         StringHelper.isBlank(profileFromBase) ? configuration.profile() : profileFromBase;
 
-    return new McpServerConfiguration(
+    return new ServerConfiguration(
         profile,
         configuration.enabled(),
         mode,

…configuration/McpServerCapabilities.java …ed/configuration/ServerCapabilities.javasrc/main/java/com/github/thought2code/mcp/annotated/configuration/McpServerCapabilities.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ServerCapabilities.java src/main/java/com/github/thought2code/mcp/annotated/configuration/McpServerCapabilities.java renamed to src/main/java/com/github/thought2code/mcp/annotated/configuration/ServerCapabilities.java

@@ -7,38 +7,38 @@
  *
  * @author codeboyzhou
  */
-public record McpServerCapabilities(
+public record ServerCapabilities(
     @JsonProperty("resource") Boolean resource,
     @JsonProperty("subscribe-resource") Boolean subscribeResource,
     @JsonProperty("prompt") Boolean prompt,
     @JsonProperty("tool") Boolean tool,
     @JsonProperty("completion") Boolean completion) {
 
   /**
-   * Creates a new instance of {@code Builder} to build {@code McpServerCapabilities}.
+   * Creates a new instance of {@code Builder} to build {@code ServerCapabilities}.
    *
    * @return A new instance of {@code Builder}.
    */
   public static Builder builder() {
     return new Builder();
   }
 
-  /** Builder class for {@code McpServerCapabilities}. */
+  /** Builder class for {@code ServerCapabilities}. */
   public static class Builder {
     /** The resource capability. */
-    private Boolean resource = McpServerDefaults.CAPABILITY_ENABLED;
+    private Boolean resource = ServerDefaults.CAPABILITY_ENABLED;
 
     /** The subscribe-resource capability. */
-    private Boolean subscribeResource = McpServerDefaults.CAPABILITY_ENABLED;
+    private Boolean subscribeResource = ServerDefaults.CAPABILITY_ENABLED;
 
     /** The prompt capability. */
-    private Boolean prompt = McpServerDefaults.CAPABILITY_ENABLED;
+    private Boolean prompt = ServerDefaults.CAPABILITY_ENABLED;
 
     /** The tool capability. */
-    private Boolean tool = McpServerDefaults.CAPABILITY_ENABLED;
+    private Boolean tool = ServerDefaults.CAPABILITY_ENABLED;
 
     /** The completion capability. */
-    private Boolean completion = McpServerDefaults.CAPABILITY_ENABLED;
+    private Boolean completion = ServerDefaults.CAPABILITY_ENABLED;
 
     /**
      * Sets the resource capability.
@@ -96,12 +96,12 @@ public Builder completion(Boolean completion) {
     }
 
     /**
-     * Builds an instance of {@code McpServerCapabilities} with the configured values.
+     * Builds an instance of {@code ServerCapabilities} with the configured values.
      *
-     * @return A new instance of {@code McpServerCapabilities}.
+     * @return A new instance of {@code ServerCapabilities}.
      */
-    public McpServerCapabilities build() {
-      return new McpServerCapabilities(resource, subscribeResource, prompt, tool, completion);
+    public ServerCapabilities build() {
+      return new ServerCapabilities(resource, subscribeResource, prompt, tool, completion);
     }
   }
 }