Review changes

Author: tvallin

apps/mcp/mcp-coffee-shop-declarative/README.md

@@ -16,7 +16,7 @@ menu items they want to order.
 
 The application uses an H2 in-memory database pre-populated with a sample menu containing various coffee drinks 
 (Latte, Cappuccino, Espresso, etc.), food items (Avocado Toast, Blueberry Muffin, etc.), and one sample order.
-The application leverage Helidon Data, providing a unified and efficient approach to data persistence and retrieval operations.
+The application leverages Helidon Data, providing a unified and efficient approach to data persistence and retrieval operations.
 
 ## Build And Run The Application
 
@@ -25,22 +25,22 @@ mvn clean package
 java -jar target/helidon-mcp-coffee-shop-declarative.jar
 ```
 
-The server will start on `http://localhost:8081` with the MCP endpoint available at `/mcp-coffee-shop`.
+The server will start at `http://localhost:8081` with the MCP endpoint available at `/mcp-coffee-shop`.
 
 ## Exercise The Application
 
 ### Using MCP Client
 
-The application is designed to work with MCP-compatible clients supporting `2024-11-05` and `2025-03-26`. The test suite
+The application is designed to work with MCP-compatible clients supporting MCP versions `2024-11-05` and `2025-03-26`. The test suite
 demonstrates how to use it with Langchain4j MCP client:
 
-1. **List Available Tools**: The MCP client can discover the three available tools (`get-menu`, `list-order`, `take-order`)
+1. **List Available Tools**: The MCP client can discover the three available tools (`getMenu`, `listOrders`, `takeOrder`)
 
-2. **Get Menu**: Call the `get-menu` tool to retrieve the complete menu as JSON objects
+2. **Get Menu**: Call the `getMenu` tool to retrieve the complete menu as JSON objects
 
-3. **List Orders**: Call the `list-order` tool to see current orders
+3. **List Orders**: Call the `listOrders` tool to see current orders
 
-4. **Take Order**: Call the `take-order` tool with an order request containing:
+4. **Take Order**: Call the `takeOrder` tool with an order request containing:
     - `name`: Customer name (string)
     - `content`: Array of menu item names (array of strings)
 
@@ -55,22 +55,22 @@ Example order request:
 ### Using Claude Desktop
 
 1. [Install Claude desktop](https://claude.ai/download)
-2. Update Claude desktop configuration to register your MCP server. Edit the `claude_desktop_config.json` file with the
-   following content:
-    ```json
-    {
-      "mcpServers": {
-        "helidon-coffee-shop": {
-          "command": "npx",
-          "args": [
-            "-y",
-            "mcp-remote",
-            "http://localhost:8081/mcp-coffee-shop"
-          ]
-        }
-      }
+2. Update Claude desktop configuration to register your MCP server. Edit the `claude_desktop_config.json` file located under 
+`Settings -> Developer -> Edit Config` with the following content:
+```json
+{
+  "mcpServers": {
+    "helidon-coffee-shop": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "mcp-remote",
+        "http://localhost:8081/mcp-coffee-shop"
+      ]
     }
-    ```
+  }
+}
+```
 3. Open claude desktop application. Claude automatically connects to the coffee shop server at startup.
 4. Ask the following question:
     1. `What is on the menu today?`

apps/mcp/mcp-coffee-shop-declarative/pom.xml

@@ -34,7 +34,7 @@
 
     <properties>
         <mainClass>io.helidon.labs.apps.mcp.coffee.shop.declarative.Main</mainClass>
-        <version.lib.mcp>1.0.1</version.lib.mcp>
+        <version.lib.mcp>1.0.2</version.lib.mcp>
     </properties>
 
     <dependencies>

apps/mcp/mcp-coffee-shop-declarative/src/main/java/io/helidon/labs/apps/mcp/coffee/shop/declarative/CoffeeShopServer.java

@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.helidon.common.LazyValue;
 import io.helidon.extensions.mcp.server.Mcp;
 import io.helidon.extensions.mcp.server.McpToolContent;
 import io.helidon.extensions.mcp.server.McpToolErrorException;
 import io.helidon.json.schema.JsonSchema;
-import io.helidon.service.registry.Services;
+import io.helidon.service.registry.Service;
 import io.helidon.transaction.Tx;
 import io.helidon.transaction.TxException;
 
@@ -41,9 +40,11 @@
 @Mcp.Path("/mcp-coffee-shop")
 @Mcp.Server("mcp-server-coffee-shop")
 class CoffeeShopServer {
-    private final OrderRepository orderRepository = Services.get(OrderRepository.class);
-    private final MenuItemRepository itemRepository = Services.get(MenuItemRepository.class);
-    private final LazyValue<List<MenuItem>> menu = LazyValue.create(itemRepository::listOrderById);
+    @Service.Inject
+    OrderRepository orderRepository;
+
+    @Service.Inject
+    MenuItemRepository itemRepository;
 
     @Mcp.Tool("Provides the coffee shop menu")
     List<McpToolContent> getMenu() {
@@ -82,7 +83,8 @@ List<McpToolContent> takeOrder(OrderRequest orderRequest) {
             BigDecimal totalPrice = new BigDecimal(0);
 
             for (String item : orderRequest.getContent()) {
-                BigDecimal price = menu.get().stream()
+                BigDecimal price = itemRepository.listOrderById()
+                        .stream()
                         .filter(it -> item.equals(it.getName()))
                         .map(MenuItem::getPrice)
                         .findFirst()

apps/mcp/mcp-coffee-shop/README.md

@@ -23,13 +23,13 @@ mvn clean package
 java -jar target/helidon-mcp-coffee-shop-declarative.jar
 ```
 
-The server will start on `http://localhost:8081` with the MCP endpoint available at `/mcp-coffee-shop`.
+The server will start at `http://localhost:8081` with the MCP endpoint available at `/mcp-coffee-shop`.
 
 ## Exercise The Application
 
 ### Using MCP Client
 
-The application is designed to work with MCP-compatible clients supporting `2024-11-05` and `2025-03-26`. The test suite 
+The application is designed to work with MCP-compatible clients supporting MCP versions `2024-11-05` and `2025-03-26`. The test suite 
 demonstrates how to use it with Langchain4j MCP client:
 
 1. **List Available Tools**: The MCP client can discover the three available tools (`get-menu`, `list-order`, `take-order`)
@@ -53,22 +53,22 @@ Example order request:
 ### Using Claude Desktop
 
 1. [Install Claude desktop](https://claude.ai/download)
-2. Update Claude desktop configuration to register your MCP server. Edit the `claude_desktop_config.json` file with the 
-   following content:
-    ```json
-    {
-      "mcpServers": {
-        "helidon-coffee-shop": {
-          "command": "npx",
-          "args": [
-            "-y",
-            "mcp-remote",
-            "http://localhost:8081/mcp-coffee-shop"
-          ]
-        }
-      }
+2. Update Claude desktop configuration to register your MCP server. Edit the `claude_desktop_config.json` file located under 
+`Settings -> Developer -> Edit Config` with the following content:
+```json
+{
+  "mcpServers": {
+    "helidon-coffee-shop": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "mcp-remote",
+        "http://localhost:8081/mcp-coffee-shop"
+      ]
     }
-    ```
+  }
+}
+```
 3. Open claude desktop application. Claude automatically connects to the coffee shop server at startup.
 4. Ask the following question:
     1. `What is on the menu today?`

apps/mcp/mcp-coffee-shop/pom.xml

@@ -34,7 +34,7 @@
 
     <properties>
         <mainClass>io.helidon.labs.apps.mcp.coffee.shop.Main</mainClass>
-        <version.lib.mcp>1.0.1</version.lib.mcp>
+        <version.lib.mcp>1.0.2</version.lib.mcp>
     </properties>
 
     <dependencies>

etc/checkstyle-suppressions.xml

@@ -30,5 +30,8 @@
     <!-- Helidon MCP: ignore JsonSchema redundant public constructor  -->
     <suppress checks="RedundantModifier"
             files="apps/mcp/"/>
+    <!-- Helidon MCP: ignore private field for declarative injection  -->
+    <suppress checks="VisibilityModifier"
+            files="apps/mcp/mcp-coffee-shop-declarative/.*"/>
 </suppressions>