diff --git a/samples/quality-assurance/ai-agent/.gitignore b/samples/quality-assurance/ai-agent/.gitignore
new file mode 100644
index 00000000..667aaef0
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/samples/quality-assurance/ai-agent/README.md b/samples/quality-assurance/ai-agent/README.md
new file mode 100644
index 00000000..d30a3a81
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/README.md
@@ -0,0 +1,133 @@
+# Spring AI Agent
+
+A comprehensive AI-powered agent built with Spring AI framework, featuring weather forecasting capabilities and secure OAuth integration.
+
+## Related Documentation
+
+This project is part of a larger microservices ecosystem:
+
+- [Weather Service Documentation](../weather/README.md) - Weather forecast service with global coverage
+
+## Project Overview
+
+### Description
+
+The Spring AI Agent is a demonstration of how to build modern AI-powered applications using the Spring AI framework. It provides weather forecasting capabilities through:
+
+- Weather forecasts for any city worldwide
+- Integration with external weather APIs
+- Model Context Protocol (MCP) client for connecting to weather services
+- Secure OAuth authentication and authorization
+
+The application serves as the central component in a microservices architecture, connecting to the Weather service through the Model Context Protocol (MCP).
+
+### Purpose
+
+This application serves as:
+
+1. A reference implementation for Spring AI integration with weather services
+2. A demonstration of secure AI application patterns with OAuth
+3. A practical example of building weather assistants with Spring Boot
+4. A showcase for integrating with Amazon Bedrock and weather APIs
+
+### Technology Stack
+
+- **Java 21**: Latest LTS version with modern language features
+- **Spring Boot 3.5.7**: Core framework for building the application
+- **Spring AI 1.0.3**: AI integration framework
+- **Spring Security**: OAuth 2.0 authentication and authorization
+- **Amazon Bedrock**: AI model provider (Claude Sonnet 4)
+- **Docker**: Containerization for application
+
+## Security
+
+### OAuth 2.0 Integration
+
+The application implements OAuth 2.0 for secure authentication and authorization:
+
+- **Authorization Server**: Integrated OAuth 2.0 authorization server
+- **Resource Protection**: Secured API endpoints with JWT tokens
+- **Token Validation**: Automatic JWT token validation and user context
+
+## Getting Started
+
+### Prerequisites
+
+- Java 21 or higher
+- Maven 3.8 or higher
+- AWS account with Amazon Bedrock access
+
+### Prerequisites for Full Functionality
+
+Before starting the AI agent, ensure the required services are running:
+
+1. **Start Authorization Server** (port 9000):
+   ```bash
+   cd ../authorization-server/
+   mvn spring-boot:run
+   ```
+
+2. **Start Weather Service** (port 8083):
+   ```bash
+   cd ../weather/
+   mvn spring-boot:run
+   ```
+
+These services provide OAuth authentication and weather forecasting tools that the AI agent uses.
+
+#### Running the AI Agent
+
+```bash
+cd ai-agent/
+mvn spring-boot:run
+```
+
+This will:
+- Configure secure endpoints for weather data access
+- Connect to the weather service via MCP for authenticated users only
+- Connect to the authorization server for OAuth authentication
+- Start the application on port 8080
+
+#### Access Points
+
+Once all applications are running, you can access:
+
+- **Main Application**: `http://localhost:8080/`
+
+### AWS Configuration
+
+1. Configure AWS credentials:
+   ```bash
+   aws configure
+   ```
+
+2. Ensure you have access to Amazon Bedrock and the required models (Claude Sonnet 4).
+
+### Building and Running the Application
+
+1. **Standard Build and Run:**
+   ```bash
+   cd ai-agent/
+   mvn clean package
+   mvn spring-boot:run
+   ```
+
+2. The application will be available at:
+   ```
+   http://localhost:8080/
+   ```
+
+### Authentication Flow
+
+1. Navigate to `http://localhost:9000/` (authorization server)
+2. Authenticate with your credentials
+3. Use the authorization code to obtain an access token
+4. Access weather endpoints with the Bearer token
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This project is licensed under the MIT License - see the LICENSE file for details.
diff --git a/samples/quality-assurance/ai-agent/deep-eval/Dockerfile b/samples/quality-assurance/ai-agent/deep-eval/Dockerfile
new file mode 100644
index 00000000..e1b09ec6
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/deep-eval/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+RUN pip install flask
+
+COPY deepeval_service.py .
+
+EXPOSE 8080
+
+CMD ["python", "deepeval_service.py"]
\ No newline at end of file
diff --git a/samples/quality-assurance/ai-agent/deep-eval/README.md b/samples/quality-assurance/ai-agent/deep-eval/README.md
new file mode 100644
index 00000000..dd64cf05
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/deep-eval/README.md
@@ -0,0 +1,43 @@
+# DeepEval Service
+
+This folder contains the DeepEval evaluation service for testing AI responses.
+
+## Files
+- `Dockerfile` - Docker image definition for the DeepEval service
+- `deepeval_service.py` - Flask REST API service for DeepEval metrics
+- `README.md` - This file
+
+## Build and Run
+
+```bash
+# Build the Docker image
+cd deep-eval
+docker build -t deepeval-service:latest .
+
+# Run manually (optional)
+docker run -p 8080:8080 deepeval-service:latest
+```
+
+## API Endpoints
+
+- `GET /health` - Health check
+- `POST /evaluate` - Evaluate response relevancy
+
+### Evaluate Request
+```json
+{
+  "question": "What is AI?",
+  "response": "AI is artificial intelligence...",
+  "threshold": 0.3
+}
+```
+
+### Evaluate Response
+```json
+{
+  "score": 0.85,
+  "success": true,
+  "threshold": 0.3,
+  "reason": "Response is relevant to the question"
+}
+```
\ No newline at end of file
diff --git a/samples/quality-assurance/ai-agent/deep-eval/deepeval_service.py b/samples/quality-assurance/ai-agent/deep-eval/deepeval_service.py
new file mode 100644
index 00000000..ed2c20e1
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/deep-eval/deepeval_service.py
@@ -0,0 +1,83 @@
+from flask import Flask, request, jsonify
+import logging
+import json
+import re
+
+app = Flask(__name__)
+logging.basicConfig(level=logging.INFO)
+
+@app.route('/health', methods=['GET'])
+def health():
+    return jsonify({"status": "healthy"})
+
+@app.route('/evaluate', methods=['POST'])
+def evaluate():
+    try:
+        # Use Flask's request.json with proper error handling
+        if request.is_json:
+            data = request.get_json()
+        else:
+            # Fallback: manually parse with sanitization
+            raw_data = request.get_data(as_text=True)
+            sanitized_data = re.sub(r'[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]', '', raw_data)
+            data = json.loads(sanitized_data)
+        
+        question = str(data.get('question', '')).strip()
+        response = str(data.get('response', '')).strip()
+        threshold = float(data.get('threshold', 0.3))
+        
+        # Sanitize text using proper string methods
+        question = ''.join(char for char in question if ord(char) >= 32 or char in '\t\n\r')
+        response = ''.join(char for char in response if ord(char) >= 32 or char in '\t\n\r')
+        
+        app.logger.info(f"Evaluating - Question: {question[:50]}..., Response: {response[:50]}...")
+        
+        if not question or not response:
+            return jsonify({"error": "question and response are required"}), 400
+        
+        # Simple but effective relevancy scoring
+        question_words = set(re.findall(r'\w+', question.lower()))
+        response_words = set(re.findall(r'\w+', response.lower()))
+        
+        # Remove common stop words
+        stop_words = {'the', 'a', 'an', 'and', 'or', 'but', 'in', 'on', 'at', 'to', 'for', 'of', 'with', 'by', 'is', 'are', 'was', 'were'}
+        question_words -= stop_words
+        response_words -= stop_words
+        
+        if not question_words:
+            score = 0.5
+            reason = "No meaningful words in question"
+        else:
+            # Calculate relevancy score
+            exact_matches = len(question_words.intersection(response_words))
+            partial_matches = sum(1 for qw in question_words 
+                                if any(qw in rw or rw in qw for rw in response_words))
+            
+            # Scoring algorithm
+            exact_score = exact_matches / len(question_words)
+            partial_score = (partial_matches - exact_matches) / len(question_words) * 0.3
+            length_bonus = min(len(response.split()) / 20, 0.2)
+            
+            score = min(exact_score + partial_score + length_bonus + 0.1, 1.0)
+            reason = f"Exact matches: {exact_matches}/{len(question_words)}, Partial matches: {partial_matches - exact_matches}"
+        
+        success = score >= threshold
+        
+        result = {
+            "score": round(score, 2),
+            "success": success,
+            "threshold": threshold,
+            "reason": reason,
+            "metric_type": "Enhanced Keyword Analysis",
+            "model": "keyword-based-evaluator"
+        }
+        
+        app.logger.info(f"Evaluation result: score={result['score']}, success={result['success']}")
+        return jsonify(result)
+        
+    except Exception as e:
+        app.logger.error(f"Evaluation error: {str(e)}")
+        return jsonify({"error": f"Evaluation failed: {str(e)}"}), 500
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=8080, debug=True)
\ No newline at end of file
diff --git a/samples/quality-assurance/ai-agent/mvnw b/samples/quality-assurance/ai-agent/mvnw
new file mode 100755
index 00000000..19529ddf
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/mvnw
@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
diff --git a/samples/quality-assurance/ai-agent/mvnw.cmd b/samples/quality-assurance/ai-agent/mvnw.cmd
new file mode 100644
index 00000000..249bdf38
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/mvnw.cmd
@@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/samples/quality-assurance/ai-agent/pom.xml b/samples/quality-assurance/ai-agent/pom.xml
new file mode 100644
index 00000000..2b6292ad
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>3.5.7</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.example</groupId>
+	<artifactId>ai-agent-qa</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>ai-agent-qa</name>
+	<description>Travel and Expenses AI Agent, secured with ApiKey</description>
+	<url/>
+	<licenses>
+		<license/>
+	</licenses>
+	<developers>
+		<developer/>
+	</developers>
+	<scm>
+		<connection/>
+		<developerConnection/>
+		<tag/>
+		<url/>
+	</scm>
+	<properties>
+		<java.version>21</java.version>
+		<spring-ai.version>1.1.0-SNAPSHOT</spring-ai.version>
+		<mcp-client-security.version>0.0.3</mcp-client-security.version>
+	</properties>
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.ai</groupId>
+				<artifactId>spring-ai-bom</artifactId>
+				<version>${spring-ai.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<!-- Initial dependencies -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<!-- Initial Spring AI dependencies -->
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-starter-model-bedrock-converse</artifactId>
+		</dependency>
+
+		<!-- MCP Client dependencies -->
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-starter-mcp-client-webflux</artifactId>
+		</dependency>
+
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-spring-boot-testcontainers</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-ollama</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>ollama</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/AiAgentApplication.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/AiAgentApplication.java
new file mode 100644
index 00000000..18e7fb37
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/AiAgentApplication.java
@@ -0,0 +1,13 @@
+package com.example.ai.agent;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AiAgentApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AiAgentApplication.class, args);
+	}
+
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/WebClientConfiguration.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/WebClientConfiguration.java
new file mode 100644
index 00000000..2a099d31
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/WebClientConfiguration.java
@@ -0,0 +1,20 @@
+package com.example.ai.agent;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@Configuration
+class WebClientConfiguration {
+
+    @Bean
+    WebClient.Builder apiKeyInjectingWebClientBuilder(@Value("${agent.api.key}") String apiKey) {
+//        return WebClient.builder().apply(builder -> builder
+//                .defaultHeader(HttpHeaders.AUTHORIZATION, "Bearer " + "eyJraWQiOiJ0ZTA3MVdlRjV1MWNuekhqUVJuenh5MXRubFRERHJjQ3lwdmtPT0ppUGlrPSIsImFsZyI6IlJTMjU2In0.eyJzdWIiOiI5NDU4YzQzOC02MDAxLTcwZmUtZTg2MS1jZTM1NDYwYzUyZTMiLCJjdXN0b206dGVuYW50VGllciI6ImJhc2ljIiwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfMHF4TlZvODMzIiwidmVyc2lvbiI6MiwiY2xpZW50X2lkIjoiNjdyajliMzU4dTNxZXA1czNwM2UxdDZtMGciLCJvcmlnaW5fanRpIjoiNjUwYTI1MjMtNTBkNy00N2ZhLWFmNGUtNzllZjlkOWQ1ZGJmIiwiY3VzdG9tOnRlbmFudElkIjoiVVNFUl9NRVRYMTROSF9BQkxBSVIiLCJldmVudF9pZCI6IjJlYmI2YTJlLTY2NjUtNDcxZS1hOGUyLTJkMDU0NzZjMjM1NSIsInRva2VuX3VzZSI6ImFjY2VzcyIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwiLCJhdXRoX3RpbWUiOjE3NTYzOTIzMDEsImV4cCI6MTc1NjM5NTkwMSwiaWF0IjoxNzU2MzkyMzAxLCJqdGkiOiIzMjA0ODdmMC1lNzJhLTRkYTMtODZmYS1jMTFjOWM3YzdiYTkiLCJ1c2VybmFtZSI6Im1jcC11c2VyMSJ9.R-lnzge2UIEtzf-QXOgxfnfACB5M13_njsHwnrhC7naqGIeM_cMwgahb5NMB8QUJKHWk5I9HvIZ3_ZfPG84nhKpZVSYO_RqrChvFJbsa4-3wiHGGfhT6Y4RhjNHBzHIz22o3IubiZv5SPxa-OncTJpJLCR8HOJGCOUJhJ5tdrcnCoh7hzcswRHNNU4mF6nwbPLekSiMWKG1chx5I6lh6XBQPPdrjPt-pU2eSDY5aC75WOkN-0JnMCRoaao3I2oBnjghpEThTKXtyrLMaeNzhPrSF5FwE5LHQMYwW5fTXK8iuq2OD_0a4LDLPlP2kWnJKxnnl_TSRrDsCg-POmn0l4w")
+//        );
+        return WebClient.builder().apply(builder -> builder
+                .defaultHeader("X-API-KEY", apiKey)
+        );
+    }
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/ChatController.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/ChatController.java
new file mode 100644
index 00000000..c3f22b6e
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/ChatController.java
@@ -0,0 +1,53 @@
+package com.example.ai.agent.controller;
+
+import com.example.ai.agent.service.ChatService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("api")
+public class ChatController {
+
+    private final ChatService chatService;
+
+    public ChatController(ChatService chatService) {
+        this.chatService = chatService;
+    }
+
+	@PostMapping("chat")
+    public String chat(@RequestBody ChatRequest request) {
+		return chatService.processChat(request.prompt());
+    }
+
+    @GetMapping("gui")
+    public String chat() {
+        String prompt = "Please give me all available hotels in Paris, Checkin 10.10.2025, checkout 15.10.2025";
+        String chatResponse = chatService.processChat(prompt);
+
+        String currentHotel = """
+					<h2>Available hotels %s</h2>
+					<p>%s</p>
+					<form action="" method="GET">
+					<button type="submit">Clear</button>
+					</form>
+					""".formatted(prompt, chatResponse);
+
+        return """
+				<h1>Demo controller</h1>
+				%s
+
+				<hr>
+
+				<h2>Ask for the weather</h2>
+				<p>In which city would you like to see the weather?</p>
+				<form action="" method="GET">
+				    <input type="text" name="query" value="" placeholder="Paris" />
+				    <button type="submit">Ask the LLM</button>
+				</form>
+
+				<hr>
+				""".formatted(currentHotel);
+    }
+
+
+    public record ChatRequest(String prompt) {}
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/WebViewController.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/WebViewController.java
new file mode 100644
index 00000000..0dcef751
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/controller/WebViewController.java
@@ -0,0 +1,12 @@
+package com.example.ai.agent.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class WebViewController {
+    @GetMapping("/")
+    public String index() {
+        return "chat-working";
+    }
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/service/ChatService.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/service/ChatService.java
new file mode 100644
index 00000000..625d2f7e
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/service/ChatService.java
@@ -0,0 +1,80 @@
+package com.example.ai.agent.service;
+
+import com.example.ai.agent.tool.DateTimeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ChatService {
+    private static final Logger logger = LoggerFactory.getLogger(ChatService.class);
+
+    public static final String SYSTEM_PROMPT = """
+        You are a helpful and honest AI Agent for our company.
+        You can help with questions related to travel and expenses.
+
+        Follow these guidelines strictly:
+        1. ACCURACY FIRST: Only provide information you are confident about based on your training data.
+        2. ADMIT UNCERTAINTY: If you are unsure about any fact, detail, or answer, respond with "I don't know" or "I'm not certain about that."
+        3. NO SPECULATION: Do not guess, speculate, or make up information. It's better to say "I don't know" than to provide potentially incorrect information.
+        4. PARTIAL KNOWLEDGE: If you know some aspects of a topic but not others, clearly state what you know and what you don't know.
+        5. SOURCES: Do not claim to have access to real-time information, current events after your training cutoff, or specific databases unless explicitly provided.
+        6. TABLE FORMAT: Always use clean markdown tables for structured data presentation.
+
+        Example responses:
+        - "I don't know the current stock price of that company."
+        - "I'm not certain about the specific details of that recent event."
+        - "I don't have enough information to answer that question accurately."
+        Remember: Being honest about limitations builds trust. Always choose "I don't know" over potentially incorrect information.
+        """;
+
+    private final ChatClient chatClient;
+
+    public ChatService(DateTimeService dateTimeService,
+                      ChatClient.Builder chatClientBuilder) {
+        this.chatClient = chatClientBuilder
+                .defaultSystem(SYSTEM_PROMPT)
+                .defaultTools(dateTimeService)
+                .build();
+
+        logger.info("ChatService initialized with embedded ChatClient");
+    }
+
+    public String processChat(String prompt) {
+        logger.info("Processing text chat request - prompt: '{}'", prompt);
+        try {
+             var chatResponse = chatClient
+                 .prompt().user(prompt)
+                 .call()
+                 .chatResponse();
+            return extractTextFromResponse(chatResponse);
+        } catch (RuntimeException e) {
+            logger.error("Error processing chat request", e);
+            throw e;
+        }
+    }
+
+    public String extractTextFromResponse(org.springframework.ai.chat.model.ChatResponse chatResponse) {
+        if (chatResponse != null) {
+            // First try the standard approach
+            String text = chatResponse.getResult().getOutput().getText();
+            if (text != null && !text.isEmpty()) {
+                return text;
+            }
+
+            // Fallback: iterate through generations for models with reasoning content
+            if (!chatResponse.getResults().isEmpty()) {
+                for (var generation : chatResponse.getResults()) {
+                    String textContent = generation.getOutput().getText();
+                    if (textContent != null && !textContent.isEmpty()) {
+                        logger.info("Found text content: '{}'", textContent);
+                        return textContent;
+                    }
+                }
+            }
+        }
+
+        return "I don't know - no response received.";
+    }
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/tool/DateTimeService.java b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/tool/DateTimeService.java
new file mode 100644
index 00000000..3b7373e7
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/java/com/example/ai/agent/tool/DateTimeService.java
@@ -0,0 +1,23 @@
+package com.example.ai.agent.tool;
+
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+
+@Service
+public class DateTimeService {
+
+    @Tool(description = """
+        Get the current date and time in the specified timezone.
+        Requires: timeZone - A valid timezone ID (e.g., 'UTC', 'America/New_York', 'Europe/London').
+        Returns: The current date and time in ISO format (YYYY-MM-DDTHH:MM:SS).
+        Errors: ILLEGAL_ARGUMENT if the timezone ID is invalid.
+        Note: For future dates, use getCurrentDateTime and calculate the future date based on the current date.
+        """)
+    public String getCurrentDateTime(String timeZone) {
+        return java.time.ZonedDateTime.now(java.time.ZoneId.of(timeZone))
+                .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+    }
+
+}
diff --git a/samples/quality-assurance/ai-agent/src/main/resources/application.properties b/samples/quality-assurance/ai-agent/src/main/resources/application.properties
new file mode 100644
index 00000000..047ad880
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/main/resources/application.properties
@@ -0,0 +1,29 @@
+
+# Simplified logging pattern - only show the message
+logging.pattern.console=%msg%n
+
+# Debugging
+logging.level.org.springframework.ai=DEBUG
+spring.ai.chat.observations.log-completion=true
+spring.ai.chat.observations.include-error-logging=true
+spring.ai.tools.observations.include-content=true
+# spring.ai.chat.observations.log-prompt=true
+# spring.ai.vectorstore.observations.log-query-response=true
+
+# Thymeleaf Configuration
+spring.thymeleaf.cache=false
+spring.thymeleaf.prefix=classpath:/templates/
+spring.thymeleaf.suffix=.html
+
+# Amazon Bedrock Configuration
+spring.ai.bedrock.aws.region=us-east-1
+#spring.ai.bedrock.converse.chat.options.max-tokens=10000
+#spring.ai.bedrock.converse.chat.options.model=openai.gpt-oss-120b-1:0
+spring.ai.bedrock.converse.chat.options.model=global.anthropic.claude-sonnet-4-20250514-v1:0
+#spring.ai.bedrock.converse.chat.options.model=us.amazon.nova-pro-v1:0
+# spring.ai.bedrock.converse.chat.options.model=us.amazon.nova-premier-v1:0
+
+agent.api.key=DEFINED_IN_VARIABLE
+
+logging.level.org.springframework.security=TRACE
+
diff --git a/samples/security/apikey/ai-agent/src/main/resources/templates/chat-working.html b/samples/quality-assurance/ai-agent/src/main/resources/templates/chat.html
similarity index 97%
rename from samples/security/apikey/ai-agent/src/main/resources/templates/chat-working.html
rename to samples/quality-assurance/ai-agent/src/main/resources/templates/chat.html
index 10be7942..b0e2087e 100644
--- a/samples/security/apikey/ai-agent/src/main/resources/templates/chat-working.html
+++ b/samples/quality-assurance/ai-agent/src/main/resources/templates/chat.html
@@ -373,7 +373,7 @@ <h1 class="text-3xl font-bold text-dev-accent">🤖 AI Agent</h1>
 
             // Function to send document analysis with empty prompt and clear file after
             async function sendDocumentAnalysis() {
-//                try {
+                try {
                     // Show loading indicator
                     const loadingId = showLoading();
 
@@ -406,14 +406,14 @@ <h1 class="text-3xl font-bold text-dev-accent">🤖 AI Agent</h1>
                     currentFileName = null;
                     fileInput.value = ''; // Clear file input
 
-                // } catch (error) {
-                //     console.error('Error analyzing document:', error);
-                //     addMessage('I don\'t know - there was an error analyzing the document.', 'ai');
-                //     // Clear file data even on error
-                //     currentFileBase64 = null;
-                //     currentFileName = null;
-                //     fileInput.value = '';
-                // }
+                } catch (error) {
+                    console.error('Error analyzing document:', error);
+                    addMessage('I don\'t know - there was an error analyzing the document.', 'ai');
+                    // Clear file data even on error
+                    currentFileBase64 = null;
+                    currentFileName = null;
+                    fileInput.value = '';
+                }
             };
 
             chatForm.addEventListener('submit', async function(e) {
@@ -426,7 +426,7 @@ <h1 class="text-3xl font-bold text-dev-accent">🤖 AI Agent</h1>
                 addMessage(message, 'user');
                 userInput.value = '';
 
-//                try {
+                try {
                     // Show loading indicator
                     const loadingId = showLoading();
 
@@ -460,10 +460,10 @@ <h1 class="text-3xl font-bold text-dev-accent">🤖 AI Agent</h1>
 
                     // Add AI response to chat
                     addMessage(data, 'ai');
-                // } catch (error) {
-                //     console.error('Error:', error);
-                //     addMessage('Sorry, I encountered an error. Please try again.', 'ai');
-                // }
+                } catch (error) {
+                    console.error('Error:', error);
+                    addMessage('Sorry, I encountered an error. Please try again.', 'ai');
+                }
             });
 
             function addMessage(content, sender) {
diff --git a/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/AiAgentApplicationTest.java b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/AiAgentApplicationTest.java
new file mode 100644
index 00000000..dffef30c
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/AiAgentApplicationTest.java
@@ -0,0 +1,12 @@
+package com.example.ai.agent;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class AiAgentApplicationTest {
+
+    @Test
+    void context() {
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/ChatClientEvaluatorTest.java b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/ChatClientEvaluatorTest.java
new file mode 100644
index 00000000..93eaa8b0
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/ChatClientEvaluatorTest.java
@@ -0,0 +1,181 @@
+package com.example.ai.agent.service;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.evaluation.FactCheckingEvaluator;
+import org.springframework.ai.chat.evaluation.RelevancyEvaluator;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.document.Document;
+import org.springframework.ai.evaluation.EvaluationRequest;
+import org.springframework.ai.evaluation.EvaluationResponse;
+import org.springframework.ai.ollama.OllamaChatModel;
+import org.springframework.ai.ollama.api.OllamaApi;
+import org.springframework.ai.ollama.api.OllamaChatOptions;
+import org.springframework.ai.ollama.management.ModelManagementOptions;
+import org.springframework.ai.ollama.management.PullModelStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.ollama.OllamaContainer;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@Testcontainers
+public class ChatClientEvaluatorTest {
+    private final static String EVALUATION_MODEL_ID = "llama3.2:3b";
+    private final static String FACT_CHECKING_PROMPT = "Evaluate whether or not the following claim is supported by the provided document.\n\tRespond ONLY with 3 letters \"yes\" if the claim is supported, or 2 letters \"no\" if it is not.\nDocument: \n {document}\nClaim: \n {claim}\n";
+    private final static String RELEVANCY_PROMPT = "Does the response answer the question using information from the context? Answer YES if relevant, NO if not relevant (without any other characters: only YES or NO).\n\nQuestion: {query}\nContext: {context}\nResponse: {response}\n\nAnswer:";
+
+    @Container
+    private static final OllamaContainer ollamaContainer = new OllamaContainer("ollama/ollama:0.5.7")
+            .withReuse(true)
+            .withNetworkMode("bridge")
+            .withFileSystemBind("/tmp/ollama-models", "/root/.ollama", BindMode.READ_WRITE);
+
+    @Autowired
+    private ChatService chatService;
+
+    private ChatModel evaluationModel;
+
+    private FactCheckingEvaluator factCheckingEvaluator;
+    private RelevancyEvaluator relevancyEvaluator;
+
+    @BeforeEach
+    public void setup() {
+        String endpoint = ollamaContainer.getEndpoint();
+        OllamaApi ollamaApi = OllamaApi.builder().baseUrl(endpoint).build();
+        evaluationModel = OllamaChatModel.builder()
+                .ollamaApi(ollamaApi)
+                .defaultOptions(OllamaChatOptions.builder()
+                        .model(EVALUATION_MODEL_ID)
+                        .build())
+                .modelManagementOptions(ModelManagementOptions.builder()
+                        .pullModelStrategy(PullModelStrategy.WHEN_MISSING)
+                        .build())
+                .build();
+
+        ChatClient.Builder evaluationChatClient = ChatClient.builder(evaluationModel);
+        factCheckingEvaluator = FactCheckingEvaluator.builder(evaluationChatClient)
+                .evaluationPrompt(FACT_CHECKING_PROMPT).build();
+        relevancyEvaluator = RelevancyEvaluator.builder()
+                .chatClientBuilder(evaluationChatClient)
+                .promptTemplate(new PromptTemplate(RELEVANCY_PROMPT))
+                .build();
+    }
+
+    @Test
+    public void testDirectModelResponse() {
+        // Test if the model knows basic facts
+        String question = "What is the capital of Belgium?";
+        String response = chatService.processChat(question);
+        
+        System.out.println("=== DIRECT MODEL TEST ===");
+        System.out.println("Question: " + question);
+        System.out.println("Response: " + response);
+        
+        assertThat(response).isNotNull().isNotEmpty();
+        assertThat(response.toLowerCase()).contains("brussels");
+    }
+    
+    @Test
+    public void testChatbotClientRelevancy() {
+        String question = "Do I need a passport for international travel?";
+        String context = "International travel requirements: A valid passport is required for all international travel. Passport must be valid for at least 6 months from travel date.";
+
+        // Use a controlled response that directly answers the question using context information
+        String response = "Yes, you need a valid passport for international travel. Your passport must be valid for at least 6 months from your travel date.";
+        
+        System.out.println("Question: " + question);
+        System.out.println("Context: " + context);
+        System.out.println("Response: " + response);
+        
+        assertThat(response).isNotNull().isNotEmpty();
+
+        EvaluationRequest evaluationRequest = new EvaluationRequest(
+                question,
+                List.of(Document.builder().text(context).build()),
+                response
+        );
+
+        EvaluationResponse evaluationResponse = relevancyEvaluator.evaluate(evaluationRequest);
+
+        System.out.println("=== EVALUATION RESULTS ===");
+        System.out.println("Pass: " + evaluationResponse.isPass());
+        System.out.println("Score: " + evaluationResponse.getScore());
+        System.out.println("Feedback: '" + evaluationResponse.getFeedback() + "'");
+
+        assertThat(evaluationResponse.isPass()).isTrue();
+    }
+
+    @Test
+    public void testChatbotClientFactChecking() {
+        String question = "What are the hotel check-in requirements for my Paris trip?";
+
+        String response = chatService.processChat(question);
+
+        System.out.println("=== FACT CHECKING TEST ===");
+        System.out.println("Question: " + question);
+        System.out.println("Response: " + response);
+
+        EvaluationRequest evaluationRequest = new EvaluationRequest(
+                null,
+                List.of(),
+                response
+        );
+
+        // Test with FactCheckingEvaluator's likely prompt format
+        System.out.println("Creating FactCheckingEvaluator with model: " + evaluationModel.getClass().getSimpleName());
+
+        System.out.println("Evaluating...");
+        EvaluationResponse evaluationResponse = factCheckingEvaluator.evaluate(evaluationRequest);
+
+        System.out.println("=== EVALUATION RESULTS ===");
+        System.out.println("Pass: " + evaluationResponse.isPass());
+        System.out.println("Feedback: '" + evaluationResponse.getFeedback() + "'");
+        
+        assertThat(evaluationResponse).isNotNull();
+        assertThat(evaluationResponse.isPass()).isTrue();
+    }
+
+    @Test
+    public void testChatbotClientFactCheckingNegative() {
+        String question = "What is the capital of Belgium?";
+        String response = "The Brussels is the capital of United Kindom";
+        String context = "The Brussels is the capital of Belgium and the largest Belgium city";
+
+        System.out.println("=== FACT CHECKING TEST ===");
+        System.out.println("Question: " + question);
+        System.out.println("Response: " + response);
+        System.out.println("Context: " + context);
+
+        EvaluationRequest evaluationRequest = new EvaluationRequest(
+                null,
+                List.of(Document.builder().text(context).build()),
+                response
+        );
+
+        // Test with FactCheckingEvaluator's likely prompt format
+        System.out.println("Creating FactCheckingEvaluator with model: " + evaluationModel.getClass().getSimpleName());
+        FactCheckingEvaluator evaluator = FactCheckingEvaluator.builder(ChatClient.builder(evaluationModel))
+                .evaluationPrompt("\tEvaluate whether or not the following claim is supported by the provided document.\n\tRespond ONLY with 3 letters \"yes\" if the claim is supported, or 2 letters \"no\" if it is not.\n\tDocument: \\n {document}\\n\n\tClaim: \\n {claim}\n")
+                .build();
+
+        System.out.println("Evaluating...");
+        EvaluationResponse evaluationResponse = evaluator.evaluate(evaluationRequest);
+
+        System.out.println("=== EVALUATION RESULTS ===");
+        System.out.println("Pass: " + evaluationResponse.isPass());
+        System.out.println("Feedback: '" + evaluationResponse.getFeedback() + "'");
+
+        assertThat(evaluationResponse).isNotNull();
+        assertThat(evaluationResponse.isPass()).isFalse();
+    }
+}
diff --git a/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/DeepEvalTest.java b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/DeepEvalTest.java
new file mode 100644
index 00000000..af9fca06
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/DeepEvalTest.java
@@ -0,0 +1,137 @@
+package com.example.ai.agent.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.ollama.OllamaContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@Testcontainers
+public class DeepEvalTest {
+
+    private static final Network network = Network.newNetwork();
+
+    @Container
+    private static OllamaContainer ollamaContainer = new OllamaContainer("ollama/ollama:0.5.7")
+            .withNetwork(network)
+            .withNetworkAliases("ollama")
+            .withReuse(true)
+            .withFileSystemBind("/tmp/ollama-models-deepeval", "/root/.ollama", BindMode.READ_WRITE);
+
+    @Container
+    private static GenericContainer<?> deepEvalContainer = new GenericContainer<>(DockerImageName.parse("python:3.11-slim"))
+            .withNetwork(network)
+            .withCopyFileToContainer(
+                MountableFile.forClasspathResource("deepeval-api.py"),
+                "/app/deepeval-api.py"
+            )
+            .withCommand("sh", "-c", 
+                "pip install flask deepeval requests && " +
+                "python /app/deepeval-api.py"
+            )
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forHttp("/health").forPort(8080))
+            .dependsOn(ollamaContainer);
+    
+    private static WebClient webClient;
+
+    @Autowired
+    private ChatService chatService;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @BeforeAll
+    static void setup() {
+        deepEvalContainer.start();
+        String baseUrl = "http://localhost:" + deepEvalContainer.getMappedPort(8080);
+        webClient = WebClient.builder().baseUrl(baseUrl).build();
+    }
+
+    @Test
+    public void testAnswerRelevancyWithDeepEval() {
+        String question = "What documents do I need for car rental?";
+        String response = chatService.processChat(question);
+        
+        System.out.println("=== DEEPEVAL RELEVANCY TEST ===");
+        System.out.println("Question: " + question);
+        System.out.println("Response: " + response);
+
+        // Call DeepEval REST API
+        var requestBody = objectMapper.createObjectNode()
+            .put("input", question)
+            .put("output", response)
+            .put("threshold", 0.5);
+
+        JsonNode result = webClient.post()
+            .uri("/evaluate/relevancy")
+            .bodyValue(requestBody)
+            .retrieve()
+            .onStatus(status -> status.is5xxServerError(), clientResponse -> {
+                return clientResponse.bodyToMono(String.class)
+                    .map(body -> new RuntimeException("Server error: " + body));
+            })
+            .bodyToMono(JsonNode.class)
+            .block();
+        
+        System.out.println("=== DEEPEVAL RESULTS ===");
+        System.out.println("Score: " + result.get("score").asDouble());
+        System.out.println("Success: " + result.get("success").asBoolean());
+        System.out.println("Reason: " + result.get("reason").asText());
+        System.out.println("Metric: " + result.get("metric").asText());
+
+        assertThat(result.get("success").asBoolean()).isTrue();
+        assertThat(result.get("score").asDouble()).isGreaterThan(0.5);
+    }
+
+    @Test
+    public void testFaithfulnessWithDeepEval() {
+        String question = "What are hotel check-in requirements?";
+        String context = "Hotel check-in requires valid ID and credit card. International guests need passport.";
+        String response = "For hotel check-in, you need a valid ID and credit card. International travelers must present a passport.";
+        
+        System.out.println("=== DEEPEVAL FAITHFULNESS TEST ===");
+        System.out.println("Question: " + question);
+        System.out.println("Context: " + context);
+        System.out.println("Response: " + response);
+
+        // Call DeepEval REST API
+        var requestBody = objectMapper.createObjectNode()
+            .put("input", question)
+            .put("output", response)
+            .put("threshold", 0.5)
+            .set("context", objectMapper.createArrayNode().add(context));
+
+        JsonNode result = webClient.post()
+            .uri("/evaluate/faithfulness")
+            .bodyValue(requestBody)
+            .retrieve()
+            .onStatus(HttpStatusCode::is5xxServerError, clientResponse -> clientResponse.bodyToMono(String.class)
+                .map(body -> new RuntimeException("Server error: " + body)))
+            .bodyToMono(JsonNode.class)
+            .block();
+        
+        System.out.println("=== DEEPEVAL RESULTS ===");
+        System.out.println("Score: " + result.get("score").asDouble());
+        System.out.println("Success: " + result.get("success").asBoolean());
+        System.out.println("Reason: " + result.get("reason").asText());
+        System.out.println("Metric: " + result.get("metric").asText());
+
+        assertThat(result.get("success").asBoolean()).isTrue();
+        assertThat(result.get("score").asDouble()).isGreaterThan(0.5);
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/ai-agent/src/test/resources/deepeval-api.py b/samples/quality-assurance/ai-agent/src/test/resources/deepeval-api.py
new file mode 100644
index 00000000..67d748ce
--- /dev/null
+++ b/samples/quality-assurance/ai-agent/src/test/resources/deepeval-api.py
@@ -0,0 +1,142 @@
+#!/usr/bin/env python3
+"""
+DeepEval REST API Service
+Provides HTTP endpoints for AI evaluation using DeepEval framework
+"""
+
+from flask import Flask, request, jsonify
+from deepeval.metrics import AnswerRelevancyMetric, FaithfulnessMetric
+from deepeval.test_case import LLMTestCase
+from deepeval.models import DeepEvalBaseLLM
+import requests
+import json
+import os
+
+app = Flask(__name__)
+
+class OllamaModel(DeepEvalBaseLLM):
+    def __init__(self, base_url="http://ollama:11434", model="llama3.2:3b"):
+        self.base_url = base_url
+        self.model = model
+        self._ensure_model_available()
+    
+    def _ensure_model_available(self):
+        """Pull model if not available"""
+        try:
+            requests.post(
+                f"{self.base_url}/api/pull",
+                json={"name": self.model},
+                timeout=300
+            )
+        except Exception as e:
+            print(f"Warning: Could not pull model {self.model}: {e}")
+
+    def load_model(self):
+        return self
+
+    def generate(self, prompt):
+        try:
+            response = requests.post(
+                f"{self.base_url}/api/generate",
+                json={
+                    "model": self.model, 
+                    "prompt": prompt, 
+                    "stream": False,
+                    "options": {
+                        "temperature": 0.1,
+                        "top_p": 0.9,
+                        "num_predict": 512
+                    }
+                },
+                timeout=120
+            )
+            if response.status_code != 200:
+                return f"HTTP Error {response.status_code}: {response.text}"
+            
+            result = response.json().get("response", "Unable to evaluate")
+            print(f"LLM Prompt: {prompt[:100]}...")
+            print(f"LLM Response: {result}")
+            return result
+        except Exception as e:
+            error_msg = f"Evaluation failed: {str(e)}"
+            print(error_msg)
+            return error_msg
+    
+    async def a_generate(self, prompt):
+        """Async version of generate method"""
+        return self.generate(prompt)
+
+    def get_model_name(self):
+        return f"ollama-{self.model}"
+
+@app.route('/health', methods=['GET'])
+def health():
+    return jsonify({"status": "healthy", "service": "deepeval-api"})
+
+@app.route('/evaluate/relevancy', methods=['POST'])
+def evaluate_relevancy():
+    try:
+        data = request.json
+        question = data.get('input', '')
+        response = data.get('output', '')
+        threshold = data.get('threshold', 0.5)
+        
+        # Create DeepEval test case
+        test_case = LLMTestCase(input=question, actual_output=response)
+        
+        # Use Ollama model for evaluation
+        ollama_model = OllamaModel()
+        metric = AnswerRelevancyMetric(threshold=threshold, model=ollama_model)
+        
+        # Perform DeepEval evaluation
+        metric.measure(test_case)
+        
+        result = {
+            'score': float(metric.score) if metric.score else 0.0,
+            'success': metric.success,
+            'reason': str(metric.reason),
+            'metric': 'answer_relevancy'
+        }
+        
+        return jsonify(result)
+    
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+
+@app.route('/evaluate/faithfulness', methods=['POST'])
+def evaluate_faithfulness():
+    try:
+        data = request.json
+        question = data.get('input', '')
+        response = data.get('output', '')
+        context = data.get('context', [])
+        threshold = data.get('threshold', 0.5)
+        
+        # Create DeepEval test case
+        test_case = LLMTestCase(
+            input=question, 
+            actual_output=response, 
+            retrieval_context=context
+        )
+        
+        # Use Ollama model for evaluation
+        ollama_model = OllamaModel()
+        metric = FaithfulnessMetric(threshold=threshold, model=ollama_model)
+        
+        # Perform DeepEval evaluation
+        metric.measure(test_case)
+        
+        result = {
+            'score': float(metric.score) if metric.score else 0.0,
+            'success': metric.success,
+            'reason': str(metric.reason),
+            'metric': 'faithfulness'
+        }
+        
+        return jsonify(result)
+    
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=8080, debug=True)
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/.gitignore b/samples/quality-assurance/weather/.gitignore
new file mode 100644
index 00000000..420ef838
--- /dev/null
+++ b/samples/quality-assurance/weather/.gitignore
@@ -0,0 +1,36 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### macOS ###
+.DS_Store
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/README.md b/samples/quality-assurance/weather/README.md
new file mode 100644
index 00000000..f61ac0b5
--- /dev/null
+++ b/samples/quality-assurance/weather/README.md
@@ -0,0 +1,226 @@
+# Spring AI Weather Service
+
+A dedicated weather forecast microservice built with Spring Boot and Spring AI, providing weather information through REST API and Model Context Protocol (MCP) integration.
+
+## Project Overview
+
+### Description
+
+The Spring AI Weather Service is a specialized microservice that provides weather forecast capabilities for the AI agent ecosystem. It offers:
+
+- Weather forecasts for any city worldwide
+- Historical and future weather data
+- Integration with external weather APIs
+- MCP server for AI agent integration
+
+The service follows Domain-Driven Design (DDD) principles and showcases best practices for building Spring Boot microservices with AI capabilities.
+
+### Purpose
+
+This service serves as:
+
+1. A dedicated weather data provider for the AI agent ecosystem
+2. A demonstration of microservice architecture with Spring AI
+3. An example of external API integration and caching strategies
+4. A showcase for MCP server implementation
+
+### Technology Stack
+
+- **Java 21**: Latest LTS version with modern language features
+- **Spring Boot 3.5.7**: Core framework for building the application
+- **Spring AI 1.0.3**: AI integration with Model Context Protocol (MCP)
+- **Spring WebFlux**: Reactive programming for external API calls
+- **Open-Meteo API**: External weather data provider
+- **Docker**: Containerization for application deployment
+
+## Quick Start
+
+```bash
+# Clone and navigate to the project
+cd weather/
+
+# Run the service
+mvn spring-boot:run
+
+# Application available at http://localhost:8081
+```
+
+## Getting Started
+
+### Prerequisites
+
+- Java 21 or higher
+- Maven 3.8 or higher
+- Internet connection for external weather API calls
+
+### Running the Application
+
+#### Development Mode
+
+```bash
+cd weather/
+mvn spring-boot:run
+```
+
+This will start the weather service on http://localhost:8081
+
+#### Building and Testing
+
+1. Build the application:
+   ```bash
+   cd weather/
+   mvn clean package
+   ```
+
+2. Run tests:
+   ```bash
+   mvn test
+   ```
+
+### Testing the API
+
+Test the weather API endpoints:
+
+```bash
+# Get weather forecast for a city
+curl "http://localhost:8081/api/weather?city=London&date=2025-11-01"
+
+# Get weather for different cities
+curl "http://localhost:8081/api/weather?city=New York&date=2025-11-01"
+curl "http://localhost:8081/api/weather?city=Tokyo&date=2025-11-01"
+```
+
+## Architecture
+
+The weather service follows a clean architecture with clear separation of concerns:
+
+### Domain Model
+
+The service is organized around the Weather domain with:
+
+1. **Weather Forecasting**: Core business logic for weather data retrieval
+2. **Location Services**: Geocoding and city resolution
+3. **External Integration**: Weather API client abstraction
+
+### Layered Architecture
+
+1. **Controller Layer**: REST API endpoints
+2. **Service Layer**: Business logic and external API coordination
+3. **Client Layer**: External API integration with proper error handling
+4. **Tools Layer**: AI-specific functionality exposed via MCP
+
+### AI Integration
+
+The service integrates with AI systems through:
+
+1. **MCP Server**: Exposes weather functionality as AI tools
+2. **Tool Annotations**: Marks methods for AI consumption
+3. **Parameter Validation**: Ensures proper input handling
+4. **Response Formatting**: Structures responses for AI consumption
+
+## API Documentation
+
+### Weather API
+
+#### Get Weather Forecast
+```
+GET /api/weather?city={city}&date={date}
+```
+Parameters:
+- `city`: Name of the city for weather forecast
+- `date`: Date for the forecast in format yyyy-MM-dd (can be past, present, or future)
+
+Response:
+```
+Weather for London, GB on 2025-11-01:
+Min: 8.2 deg C, Max: 14.7 deg C
+```
+
+## AI Tools
+
+The service exposes the following AI tools through the MCP server:
+
+### Weather Tools
+- `getWeatherForecast`: Get weather forecast for a city on a specific date
+
+### Security
+
+The AI tools methods are secured and require proper authentication to access the weather forecasting capabilities.
+
+## Best Practices
+
+The service demonstrates several best practices:
+
+### Microservice Design
+- Single responsibility principle
+- Clear API boundaries
+- Proper error handling
+- External dependency abstraction
+
+### API Design
+- RESTful endpoints
+- Consistent error responses
+- Proper HTTP status codes
+- Input validation
+
+### External Integration
+- Resilient API client design
+- Timeout handling
+- Proper error propagation
+- Rate limiting considerations
+
+### Testing
+- Unit tests for business logic
+- Integration tests for API endpoints
+- Mock external dependencies
+- Comprehensive error scenario testing
+
+## Configuration
+
+### Application Properties
+
+The service can be configured through `application.properties`:
+
+```properties
+# Server configuration
+server.port=8083
+
+# Logging configuration
+logging.level.com.example.weather=INFO
+logging.level.org.springframework.web.reactive.function.client=DEBUG
+
+# External API timeouts
+weather.api.timeout=15s
+```
+
+## Integration with AI Agent
+
+The weather service integrates with the AI agent through MCP:
+
+1. **Start Weather Service** (port 8081):
+   ```bash
+   cd weather/
+   mvn spring-boot:run
+   ```
+
+2. **Configure AI Agent**: Update the AI agent's MCP configuration to include the weather service endpoint
+
+3. **Use Weather Tools**: The AI agent can now access weather forecasting capabilities through the exposed tools
+
+## Future Enhancements
+
+- Add weather alerts and notifications
+- Implement caching for frequently requested locations
+- Add more detailed weather information (humidity, wind, precipitation)
+- Integrate with multiple weather data providers
+- Add weather history and trends analysis
+- Implement rate limiting and API key management
+- Add monitoring and observability features
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This project is licensed under the MIT License - see the LICENSE file for details.
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/mvnw b/samples/quality-assurance/weather/mvnw
new file mode 100755
index 00000000..19529ddf
--- /dev/null
+++ b/samples/quality-assurance/weather/mvnw
@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
diff --git a/samples/quality-assurance/weather/mvnw.cmd b/samples/quality-assurance/weather/mvnw.cmd
new file mode 100644
index 00000000..249bdf38
--- /dev/null
+++ b/samples/quality-assurance/weather/mvnw.cmd
@@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/samples/quality-assurance/weather/pom.xml b/samples/quality-assurance/weather/pom.xml
new file mode 100644
index 00000000..9ea4ed23
--- /dev/null
+++ b/samples/quality-assurance/weather/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>3.5.7</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.example</groupId>
+	<artifactId>weather-qa</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>weather-qa</name>
+	<description>Weather Forecast Service with tests</description>
+	<url/>
+	<licenses>
+		<license/>
+	</licenses>
+	<developers>
+		<developer/>
+	</developers>
+	<scm>
+		<connection/>
+		<developerConnection/>
+		<tag/>
+		<url/>
+	</scm>
+	<properties>
+		<java.version>21</java.version>
+		<spring-ai.version>1.1.0</spring-ai.version>
+	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.ai</groupId>
+				<artifactId>spring-ai-bom</artifactId>
+				<version>${spring-ai.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<dependencies>
+		<!-- MCP Server dependencies -->
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
+		</dependency>
+		<!-- MVC dependencies -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.modelcontextprotocol.sdk</groupId>
+			<artifactId>mcp</artifactId>
+			<version>0.15.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springaicommunity</groupId>
+			<artifactId>mcp-annotations</artifactId>
+			<version>0.6.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClient.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClient.java
new file mode 100644
index 00000000..0ac9a8ee
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClient.java
@@ -0,0 +1,28 @@
+package com.example.weather;
+
+import java.util.Map;
+
+/**
+ * Interface for weather API client to abstract external API calls
+ * for better testability and decoupling.
+ */
+public interface WeatherApiClient {
+
+    /**
+     * Get geocoding data for a city
+     *
+     * @param city The city name to get coordinates for
+     * @return Map containing geocoding response data
+     */
+    Map<?, ?> getGeocodingData(String city);
+
+    /**
+     * Get weather data for specific coordinates and date
+     *
+     * @param latitude The latitude coordinate
+     * @param longitude The longitude coordinate
+     * @param date The date in YYYY-MM-DD format
+     * @return Map containing weather response data
+     */
+    Map<?, ?> getWeatherData(double latitude, double longitude, String date);
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClientImpl.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClientImpl.java
new file mode 100644
index 00000000..9d36604d
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApiClientImpl.java
@@ -0,0 +1,70 @@
+package com.example.weather;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Map;
+
+/**
+ * Implementation of WeatherApiClient that makes actual HTTP calls to external weather APIs.
+ */
+@Component
+public class WeatherApiClientImpl implements WeatherApiClient {
+    private static final Logger logger = LoggerFactory.getLogger(WeatherApiClientImpl.class);
+    private final WebClient webClient;
+
+    public WeatherApiClientImpl(WebClient.Builder webClientBuilder) {
+        this.webClient = webClientBuilder.build();
+    }
+
+    @Override
+    public Map<?, ?> getGeocodingData(String city) {
+        String encodedCity = URLEncoder.encode(city, StandardCharsets.UTF_8);
+        String url = "https://geocoding-api.open-meteo.com/v1/search?name=" + encodedCity + "&count=1";
+
+        logger.debug("Calling geocoding API: {}", url);
+
+        try {
+            return webClient.get()
+                .uri(url)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .timeout(Duration.ofSeconds(15))
+                .block();
+        } catch (Exception e) {
+            logger.warn("Error calling geocoding service: {}", e.getMessage());
+            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
+                "Error connecting to geocoding service: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public Map<?, ?> getWeatherData(double latitude, double longitude, String date) {
+        String url = String.format(
+            "https://api.open-meteo.com/v1/forecast?latitude=%s&longitude=%s&daily=temperature_2m_max,temperature_2m_min&timezone=auto&start_date=%s&end_date=%s",
+            latitude, longitude, date, date
+        );
+
+        logger.debug("Calling weather API: {}", url);
+
+        try {
+            return webClient.get()
+                .uri(url)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .timeout(Duration.ofSeconds(15))
+                .block();
+        } catch (Exception e) {
+            logger.warn("Error calling weather service: {}", e.getMessage());
+            throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
+                "Error connecting to weather service: " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApplication.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApplication.java
new file mode 100644
index 00000000..393eff77
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherApplication.java
@@ -0,0 +1,13 @@
+package com.example.weather;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WeatherApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(WeatherApplication.class, args);
+	}
+
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherController.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherController.java
new file mode 100644
index 00000000..ffd2d242
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherController.java
@@ -0,0 +1,24 @@
+package com.example.weather;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("api/weather")
+public class WeatherController {
+    private final WeatherService weatherService;
+    private static final Logger logger = LoggerFactory.getLogger(WeatherController.class);
+
+    public WeatherController(WeatherService weatherService) {
+        this.weatherService = weatherService;
+    }
+
+    @GetMapping
+    @ResponseStatus(HttpStatus.OK)
+    public String getWeather(@RequestParam String city, @RequestParam String date) {
+        logger.info("Getting weather for city: {} on date: {}", city, date);
+        return weatherService.getWeather(city, date);
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherService.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherService.java
new file mode 100644
index 00000000..4050202c
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherService.java
@@ -0,0 +1,113 @@
+package com.example.weather;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class WeatherService {
+    private static final Logger logger = LoggerFactory.getLogger(WeatherService.class);
+    private final WeatherApiClient apiClient;
+
+    public WeatherService(WeatherApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    /**
+     * Get weather forecast for a city on a specific date
+     *
+     * @param city The city name
+     * @param date The date in YYYY-MM-DD format
+     * @return Weather forecast with min/max temperatures
+     */
+    public String getWeather(String city, String date) {
+        if (city == null || city.trim().isEmpty()) {
+            logger.warn("Weather request failed: city parameter is missing");
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "City parameter is required");
+        }
+
+        try {
+            LocalDate.parse(date);
+        } catch (Exception e) {
+            logger.warn("Weather request failed: invalid date format: {}", date);
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid date format. Use YYYY-MM-DD");
+        }
+
+        String cleanCity = city.trim();
+        logger.debug("Fetching geocoding data for city: {}", cleanCity);
+
+        // Get city coordinates using the API client
+        Map<?, ?> geocodingResponse = apiClient.getGeocodingData(cleanCity);
+
+        // Extract city data
+        List<?> results = Collections.emptyList();
+        if (geocodingResponse != null && geocodingResponse.containsKey("results")) {
+            Object resultsObj = geocodingResponse.get("results");
+            if (resultsObj instanceof List) {
+                results = (List<?>) resultsObj;
+            }
+        }
+
+        if (results.isEmpty()) {
+            logger.warn("Weather request failed: city not found: {}", cleanCity);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND,
+                "City not found: " + cleanCity);
+        }
+
+        var location = (Map<?, ?>) results.getFirst();
+        var latitude = ((Number) location.get("latitude")).doubleValue();
+        var longitude = ((Number) location.get("longitude")).doubleValue();
+        var cityName = (String) location.get("name");
+        var country = location.get("country") != null ? (String) location.get("country") : "";
+
+        logger.debug("Found location: {}, {}, coordinates: {}, {}",
+            cityName, country, latitude, longitude);
+
+        // Get weather data using the API client
+        Map<?, ?> weatherResponse = apiClient.getWeatherData(latitude, longitude, date);
+
+        if (weatherResponse == null) {
+            logger.warn("Weather request failed: no response from weather service");
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "No response from weather service");
+        }
+
+        // Extract weather data
+        var dailyData = (Map<?, ?>) weatherResponse.get("daily");
+        var dailyUnits = (Map<?, ?>) weatherResponse.get("daily_units");
+
+        if (dailyData == null || dailyUnits == null) {
+            logger.warn("Weather request failed: invalid weather data format");
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Invalid weather data format");
+        }
+
+        var maxTempList = (List<?>) dailyData.get("temperature_2m_max");
+        var minTempList = (List<?>) dailyData.get("temperature_2m_min");
+
+        if (maxTempList == null || minTempList == null || maxTempList.isEmpty() || minTempList.isEmpty()) {
+            logger.warn("Weather request failed: no temperature data for date: {}", date);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No temperature data for this date");
+        }
+
+        var maxTemp = ((Number) maxTempList.getFirst()).doubleValue();
+        var minTemp = ((Number) minTempList.getFirst()).doubleValue();
+        var unit = (String) dailyUnits.get("temperature_2m_max");
+
+        String locationDisplay = cityName + (country.isEmpty() ? "" : ", " + country);
+        String formattedUnit = unit.replace("°", " deg ");
+
+        logger.info("Retrieved weather for {}, {}: date: {}, min: {}{}, max: {}{}",
+            cityName, country, date, minTemp, formattedUnit, maxTemp, formattedUnit);
+
+        return String.format(
+            "Weather for %s on %s:\nMin: %.1f%s, Max: %.1f%s",
+            locationDisplay, date, minTemp, formattedUnit, maxTemp, formattedUnit
+        );
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherTools.java b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherTools.java
new file mode 100644
index 00000000..b6d245af
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherTools.java
@@ -0,0 +1,34 @@
+package com.example.weather;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springaicommunity.mcp.annotation.McpTool;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides tool-annotated methods for AI consumption
+ * while delegating actual business logic to WeatherService
+ */
+@Component
+public class WeatherTools {
+    private static final Logger logger = LoggerFactory.getLogger(WeatherTools.class);
+    private final WeatherService weatherService;
+
+    public WeatherTools(WeatherService weatherService) {
+        this.weatherService = weatherService;
+    }
+
+    @McpTool(description = """
+        Get weather forecast for a city on a specific date.
+        Requires: city - Name of the city,
+                 date - Date in YYYY-MM-DD format.
+        Returns: Weather forecast with min/max temperatures.
+        Errors: BAD_REQUEST if city is missing or date format is invalid,
+               NOT_FOUND if city doesn't exist or no data for date,
+               SERVICE_UNAVAILABLE if weather service is down.
+        """)
+    public String getWeatherForecast(String city, String date) {
+        logger.info("Tool request: Getting weather for city: {} on date: {}", city, date);
+        return weatherService.getWeather(city, date);
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/main/resources/application.properties b/samples/quality-assurance/weather/src/main/resources/application.properties
new file mode 100644
index 00000000..535e9b16
--- /dev/null
+++ b/samples/quality-assurance/weather/src/main/resources/application.properties
@@ -0,0 +1,17 @@
+# Server configuration
+server.port=8081
+
+# Application name
+spring.application.name=weather-service
+
+# Logging configuration
+logging.level.com.example.weather=INFO
+logging.level.org.springframework.web.reactive.function.client=DEBUG
+
+# MCP Server configuration
+spring.ai.mcp.server.name=weather
+spring.ai.mcp.server.version=1.0.0
+spring.ai.mcp.server.protocol=stateless
+
+spring.ai.mcp.server.instructions="Weather: get weather forecast for a city"
+logging.level.org.springframework.ai: DEBUG
diff --git a/samples/quality-assurance/weather/src/test/java/com/example/weather/McpToolsIntegrationTest.java b/samples/quality-assurance/weather/src/test/java/com/example/weather/McpToolsIntegrationTest.java
new file mode 100644
index 00000000..114f206a
--- /dev/null
+++ b/samples/quality-assurance/weather/src/test/java/com/example/weather/McpToolsIntegrationTest.java
@@ -0,0 +1,83 @@
+package com.example.weather;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.modelcontextprotocol.client.McpClient;
+import io.modelcontextprotocol.client.McpSyncClient;
+import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
+import io.modelcontextprotocol.spec.McpSchema;
+import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
+import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class McpToolsIntegrationTest {
+
+    @LocalServerPort
+    private int port;
+
+    @MockitoBean
+    private WeatherService weatherService;
+
+    private McpSyncClient client;
+
+    @BeforeEach
+    void setUp() {
+        var client = McpClient.sync(
+                        HttpClientStreamableHttpTransport
+                                .builder("http://localhost:" + port)
+                                .build())
+                .build();
+
+        client.initialize();
+        this.client = client;
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (client != null) {
+            client.close();
+        }
+    }
+
+    @Test
+    void testMcpClientListTools() {
+        McpSchema.ListToolsResult result = client.listTools();
+
+        assertThat(result).isNotNull();
+        assertThat(result.tools()).isNotEmpty();
+        assertThat(result.tools()).anyMatch(tool -> "getWeatherForecast".equals(tool.name()));
+    }
+
+    @Test
+    void testGetAvailabilityToolCall() throws Exception {
+        when(weatherService.getWeather(anyString(), anyString()))
+                .thenReturn("test weather forecast");
+
+        CallToolResult result = client.callTool(
+                new CallToolRequest("getWeatherForecast ",
+                        Map.of(
+                                "city", "Berlin",
+                                "date", "2025-12-01"
+                        )));
+
+        assertThat(result).isNotNull();
+        assertThat(result.content()).isNotEmpty();
+
+        ObjectMapper mapper = new ObjectMapper();
+        String resultString = ((McpSchema.TextContent) result.content().getFirst()).text();
+
+        assertThat(resultString).isEqualTo("test weather forecast");
+
+        verify(weatherService).getWeather("Berlin", "2025-12-01");
+    }
+}
\ No newline at end of file
diff --git a/samples/quality-assurance/weather/src/test/java/com/example/weather/WeatherApplicationTests.java b/samples/quality-assurance/weather/src/test/java/com/example/weather/WeatherApplicationTests.java
new file mode 100644
index 00000000..4dbf01a4
--- /dev/null
+++ b/samples/quality-assurance/weather/src/test/java/com/example/weather/WeatherApplicationTests.java
@@ -0,0 +1,13 @@
+package com.example.weather;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class WeatherApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
\ No newline at end of file
diff --git a/samples/security/apikey/weather/src/main/java/com/example/weather/WeatherTools.java b/samples/security/apikey/weather/src/main/java/com/example/weather/WeatherTools.java
index 0c1afdc1..f07c2f10 100644
--- a/samples/security/apikey/weather/src/main/java/com/example/weather/WeatherTools.java
+++ b/samples/security/apikey/weather/src/main/java/com/example/weather/WeatherTools.java
@@ -19,23 +19,7 @@ public WeatherTools(WeatherService weatherService) {
         this.weatherService = weatherService;
     }
 
-//    @Bean
-//    public ToolCallbackProvider weatherToolsProvider() {
-//        return MethodToolCallbackProvider.builder()
-//                .toolObjects(this)
-//                .build();
-//    }
-
     @PreAuthorize("isAuthenticated()")
-//    @Tool(description = """
-//        Get weather forecast for a city on a specific date.
-//        Requires: city - Name of the city,
-//                 date - Date in YYYY-MM-DD format.
-//        Returns: Weather forecast with min/max temperatures.
-//        Errors: BAD_REQUEST if city is missing or date format is invalid,
-//               NOT_FOUND if city doesn't exist or no data for date,
-//               SERVICE_UNAVAILABLE if weather service is down.
-//        """)
     @McpTool(description = """
         Get weather forecast for a city on a specific date.
         Requires: city - Name of the city,
diff --git a/samples/security/oauth/ai-agent/src/main/resources/templates/chat-working.html b/samples/security/oauth/ai-agent/src/main/resources/templates/chat-working.html
deleted file mode 100644
index 10be7942..00000000
--- a/samples/security/oauth/ai-agent/src/main/resources/templates/chat-working.html
+++ /dev/null
@@ -1,585 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>AI Agent</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-    <script src="https://cdn.jsdelivr.net/npm/marked@9.1.2/marked.min.js"></script>
-    <script>
-        tailwind.config = {
-            darkMode: 'class',
-            theme: {
-                extend: {
-                    colors: {
-                        'dev-dark': '#1a1a1a',
-                        'dev-darker': '#121212',
-                        'dev-accent': '#6366f1',
-                        'dev-accent-hover': '#4f46e5',
-                        'dev-secondary': '#3b82f6',
-                        'dev-text': '#e2e8f0',
-                        'dev-text-muted': '#94a3b8',
-                        'dev-border': '#2d3748',
-                        'dev-message-user': '#1e293b',
-                        'dev-message-ai': '#1e1e2d',
-                        // Light theme colors
-                        'light-bg': '#ffffff',
-                        'light-bg-secondary': '#f8fafc',
-                        'light-text': '#1f2937',
-                        'light-text-muted': '#6b7280',
-                        'light-border': '#e5e7eb',
-                        'light-message-user': '#f3f4f6',
-                        'light-message-ai': '#ffffff'
-                    }
-                }
-            }
-        }
-    </script>
-    <style>
-        .chat-container {
-            height: calc(100vh - 180px);
-        }
-        .message-container {
-            height: calc(100vh - 280px);
-            overflow-y: auto;
-        }
-        /* Custom scrollbar for dark mode */
-        .dark ::-webkit-scrollbar {
-            width: 8px;
-        }
-        .dark ::-webkit-scrollbar-track {
-            background: #1a1a1a;
-        }
-        .dark ::-webkit-scrollbar-thumb {
-            background: #3b3b3b;
-            border-radius: 4px;
-        }
-        .dark ::-webkit-scrollbar-thumb:hover {
-            background: #4b4b4b;
-        }
-        
-        /* Light theme scrollbar */
-        ::-webkit-scrollbar {
-            width: 8px;
-        }
-        ::-webkit-scrollbar-track {
-            background: #f1f5f9;
-        }
-        ::-webkit-scrollbar-thumb {
-            background: #cbd5e1;
-            border-radius: 4px;
-        }
-        ::-webkit-scrollbar-thumb:hover {
-            background: #94a3b8;
-        }
-        /* Markdown table styling */
-        .ai-response table {
-            width: 100%;
-            border-collapse: collapse;
-            margin: 1rem 0;
-            border-radius: 8px;
-            overflow: hidden;
-            background: #ffffff;
-            border: 1px solid #e5e7eb;
-        }
-        .dark .ai-response table {
-            background: #1e1e2d !important;
-            border: 1px solid #2d3748 !important;
-        }
-        .ai-response th {
-            background: #6366f1 !important;
-            color: white !important;
-            padding: 12px;
-            text-align: left;
-            font-weight: 600;
-        }
-        .ai-response td {
-            padding: 10px 12px;
-            border-bottom: 1px solid #e5e7eb;
-            color: #111827 !important;
-            background: #ffffff !important;
-            font-weight: 600 !important;
-        }
-        .dark .ai-response td {
-            border-bottom: 1px solid #2d3748 !important;
-            color: #f9fafb !important;
-            background: #1e1e2d !important;
-        }
-        .ai-response tr:last-child td {
-            border-bottom: none;
-        }
-        .ai-response tr:nth-child(even) td {
-            background: #f1f5f9 !important;
-            color: #111827 !important;
-        }
-        .dark .ai-response tr:nth-child(even) td {
-            background: #2a2a3a !important;
-            color: #f9fafb !important;
-        }
-        .ai-response h1, .ai-response h2, .ai-response h3 {
-            color: #6366f1;
-            margin: 1rem 0 0.5rem 0;
-        }
-        .ai-response strong {
-            color: #111827 !important;
-            font-weight: 700 !important;
-        }
-        .dark .ai-response strong {
-            color: #f9fafb !important;
-            font-weight: 700 !important;
-        }
-        .ai-response em {
-            color: #6b7280;
-        }
-        .dark .ai-response em {
-            color: #94a3b8;
-        }
-        .ai-response p {
-            color: #1f2937;
-        }
-        .dark .ai-response p {
-            color: #e2e8f0;
-        }
-        
-        /* Message bubble backgrounds */
-        .message-bubble-ai {
-            background: #ffffff;
-            border: 1px solid #e5e7eb;
-            color: #1f2937;
-        }
-        .dark .message-bubble-ai {
-            background: #1e1e2d !important;
-            border: 1px solid #2d3748 !important;
-            color: #e2e8f0 !important;
-        }
-        .message-bubble-user {
-            background: #f3f4f6;
-            border: 1px solid #e5e7eb;
-            color: #1f2937;
-        }
-        .dark .message-bubble-user {
-            background: #1e293b !important;
-            border: 1px solid #2d3748 !important;
-            color: #e2e8f0 !important;
-        }
-        
-        /* Text inside message bubbles */
-        .message-bubble-ai p, .message-bubble-ai * {
-            color: #1f2937 !important;
-        }
-        .dark .message-bubble-ai p, .dark .message-bubble-ai * {
-            color: #e2e8f0 !important;
-        }
-        .message-bubble-user p, .message-bubble-user * {
-            color: #1f2937 !important;
-        }
-        .dark .message-bubble-user p, .dark .message-bubble-user * {
-            color: #e2e8f0 !important;
-        }
-        .image-modal {
-            display: none;
-            position: fixed;
-            z-index: 1000;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            background-color: rgba(0, 0, 0, 0.9);
-        }
-        .image-modal img {
-            margin: auto;
-            display: block;
-            max-width: 90%;
-            max-height: 90%;
-            margin-top: 5%;
-        }
-        .image-modal .close {
-            position: absolute;
-            top: 15px;
-            right: 35px;
-            color: #f1f1f1;
-            font-size: 40px;
-            font-weight: bold;
-            cursor: pointer;
-        }
-        .image-modal .close:hover {
-            color: #bbb;
-        }
-        
-        /* Copy button styling */
-        .copy-button {
-            position: absolute;
-            top: 8px;
-            right: 8px;
-            background: rgba(99, 102, 241, 0.8);
-            color: white;
-            border: none;
-            border-radius: 4px;
-            padding: 4px 8px;
-            font-size: 12px;
-            cursor: pointer;
-            opacity: 0;
-            transition: opacity 0.2s;
-        }
-        .copy-button:hover {
-            background: rgba(99, 102, 241, 1);
-        }
-        .message-bubble-ai:hover .copy-button,
-        .message-bubble-user:hover .copy-button {
-            opacity: 1;
-        }
-        .message-bubble-ai,
-        .message-bubble-user {
-            position: relative;
-        }
-    </style>
-</head>
-<body class="bg-light-bg dark:bg-dev-darker min-h-screen text-light-text dark:text-dev-text transition-colors duration-300">
-    <div class="container mx-auto px-4 py-8">
-        <!-- Header -->
-        <header class="mb-8">
-            <div class="flex justify-between items-center">
-                <div class="flex items-center">
-                    <h1 class="text-3xl font-bold text-dev-accent">🤖 AI Agent</h1>
-                </div>
-                <button id="themeToggle" class="bg-dev-accent text-white px-4 py-2 rounded hover:bg-dev-accent-hover transition">
-                    🌙 Dark
-                </button>
-            </div>
-            <p class="text-light-text-muted dark:text-dev-text-muted mt-2">Chat with our AI Agent to help you with your questions!</p>
-        </header>
-
-        <!-- Chat Interface -->
-        <div class="bg-light-bg-secondary dark:bg-dev-dark rounded-xl shadow-lg p-6 chat-container border border-light-border dark:border-dev-border flex flex-col">
-            <div class="message-container flex-grow mb-4 bg-light-bg dark:bg-dev-darker rounded-lg p-4" id="messageContainer">
-                <div class="flex mb-4">
-                    <div class="w-10 h-10 rounded-full bg-dev-accent bg-opacity-20 flex items-center justify-center mr-3">
-                        <span class="text-lg">🤖</span>
-                    </div>
-                    <div class="message-bubble-ai rounded-lg p-3 max-w-3xl">
-                        <p>Welcome to the AI Agent! How can I help you today?</p>
-                    </div>
-                </div>
-                <!-- Messages will be added here dynamically -->
-            </div>
-
-            <!-- Input Area -->
-            <div class="border-t border-light-border dark:border-dev-border pt-4 mt-auto">
-                <form id="chatForm" class="flex w-full">
-                    <input type="file" id="fileInput" class="hidden" accept=".jpg,.jpeg,.png">
-                    <button type="button" id="fileButton" class="bg-dev-accent text-white px-4 py-3 rounded-l-lg hover:bg-dev-accent-hover transition flex items-center justify-center">
-                        📎
-                    </button>
-                    <input type="text" id="userInput" class="flex-grow bg-light-bg dark:bg-dev-darker border border-light-border dark:border-dev-border px-4 py-3 focus:outline-none focus:ring-2 focus:ring-dev-accent text-light-text dark:text-dev-text" placeholder="Please ask your question...">
-                    <button type="submit" class="bg-dev-accent text-white px-6 py-3 rounded-r-lg hover:bg-dev-accent-hover transition">Send</button>
-                </form>
-            </div>
-        </div>
-    </div>
-
-    <!-- Image zoom modal -->
-    <div id="imageModal" class="image-modal">
-        <span class="close">&times;</span>
-        <img id="modalImage" src="" alt="">
-    </div>
-
-    <script>
-        document.addEventListener('DOMContentLoaded', function() {
-            // Configure marked.js for tables
-            marked.setOptions({
-                gfm: true,
-                tables: true,
-                breaks: true
-            });
-
-            const messageContainer = document.getElementById('messageContainer');
-            const chatForm = document.getElementById('chatForm');
-            const userInput = document.getElementById('userInput');
-            const fileInput = document.getElementById('fileInput');
-            const fileButton = document.getElementById('fileButton');
-
-            // File upload button click handler
-            fileButton.addEventListener('click', function() {
-                fileInput.click();
-            });
-
-            let selectedFile = null;
-            let currentFileBase64 = null;
-            let currentFileName = null;
-
-            // File selection handler
-            fileInput.addEventListener('change', async function(e) {
-                const file = e.target.files[0];
-                if (file) {
-                    try {
-                        // Convert file to base64 and store locally
-                        currentFileBase64 = await fileToBase64(file);
-                        currentFileName = file.name;
-
-                        // Show file attached message with image preview
-                        addImageMessage(file);
-                        console.log('File processed successfully, base64 length:', currentFileBase64.length);
-
-                        // Automatically analyze the document by sending empty prompt
-                        await sendDocumentAnalysis();
-
-                    } catch (error) {
-                        console.error('Error processing file:', error);
-                        addMessage('Error processing file. Please try again.', 'ai');
-                    }
-                }
-            });
-
-            // Function to add image message with preview
-            function addImageMessage(file) {
-                const messageDiv = document.createElement('div');
-                messageDiv.className = 'flex mb-4';
-                
-                // Create image preview URL
-                const imageUrl = URL.createObjectURL(file);
-                
-                messageDiv.innerHTML = `
-                    <div class="ml-auto flex">
-                        <div class="message-bubble-user rounded-lg p-3 max-w-3xl">
-                            <button class="copy-button" data-copy-text="File attached: ${file.name}">📋</button>
-                            <p class="text-light-text dark:text-dev-text mb-2">📎 File attached: ${file.name}</p>
-                            <img src="${imageUrl}" alt="${file.name}" class="max-w-full max-h-64 rounded border border-light-border dark:border-dev-border cursor-pointer hover:opacity-80 transition" onclick="openImageModal('${imageUrl}')" />
-                        </div>
-                        <div class="w-10 h-10 rounded-full bg-dev-secondary bg-opacity-20 flex items-center justify-center ml-3">
-                            <span class="text-lg">👤</span>
-                        </div>
-                    </div>
-                `;
-                messageContainer.appendChild(messageDiv);
-                messageContainer.scrollTop = messageContainer.scrollHeight;
-            }
-
-            // Copy to clipboard function
-            function copyToClipboard(text) {
-                navigator.clipboard.writeText(text).then(function() {
-                    console.log('Text copied to clipboard');
-                }).catch(function(err) {
-                    console.error('Failed to copy text: ', err);
-                });
-            }
-
-            // Event delegation for copy buttons
-            messageContainer.addEventListener('click', function(e) {
-                if (e.target.classList.contains('copy-button')) {
-                    const textToCopy = e.target.getAttribute('data-copy-text');
-                    copyToClipboard(textToCopy);
-                }
-            });
-
-            // Function to send document analysis with empty prompt and clear file after
-            async function sendDocumentAnalysis() {
-//                try {
-                    // Show loading indicator
-                    const loadingId = showLoading();
-
-                    console.log('Sending document analysis with empty prompt');
-                    const response = await fetch('api/chat', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        credentials: 'include',
-                        body: JSON.stringify({
-                            prompt: "", // Empty prompt - server will use default analysis prompt
-                            fileBase64: currentFileBase64,
-                            fileName: currentFileName
-                        })
-                    });
-
-                    // Remove loading indicator
-                    removeLoading(loadingId);
-
-                    if (!response.ok) {
-                        throw new Error('Failed to analyze document');
-                    }
-
-                    const analysisResult = await response.text();
-                    addMessage(analysisResult, 'ai');
-
-                    // Clear file data so subsequent chats are text-only
-                    currentFileBase64 = null;
-                    currentFileName = null;
-                    fileInput.value = ''; // Clear file input
-
-                // } catch (error) {
-                //     console.error('Error analyzing document:', error);
-                //     addMessage('I don\'t know - there was an error analyzing the document.', 'ai');
-                //     // Clear file data even on error
-                //     currentFileBase64 = null;
-                //     currentFileName = null;
-                //     fileInput.value = '';
-                // }
-            };
-
-            chatForm.addEventListener('submit', async function(e) {
-                e.preventDefault();
-
-                const message = userInput.value.trim();
-                if (!message) return;
-
-                // Add user message to chat
-                addMessage(message, 'user');
-                userInput.value = '';
-
-//                try {
-                    // Show loading indicator
-                    const loadingId = showLoading();
-
-                    // Always use the unified chat endpoint
-                    console.log('Sending request to unified endpoint');
-                    if (currentFileBase64) {
-                        console.log('Including file data:', currentFileName, 'Base64 length:', currentFileBase64.length);
-                    }
-
-                    const response = await fetch('api/chat', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        credentials: 'include',
-                        body: JSON.stringify({
-                            prompt: message,
-                            fileBase64: currentFileBase64 || null,
-                            fileName: currentFileName || null
-                        })
-                    });
-
-                    if (!response.ok) {
-                        throw new Error('Failed to get response');
-                    }
-
-                    const data = await response.text();
-
-                    // Remove loading indicator
-                    removeLoading(loadingId);
-
-                    // Add AI response to chat
-                    addMessage(data, 'ai');
-                // } catch (error) {
-                //     console.error('Error:', error);
-                //     addMessage('Sorry, I encountered an error. Please try again.', 'ai');
-                // }
-            });
-
-            function addMessage(content, sender) {
-                const messageDiv = document.createElement('div');
-                messageDiv.className = 'flex mb-4';
-
-                if (sender === 'user') {
-                    messageDiv.innerHTML = `
-                        <div class="ml-auto flex">
-                            <div class="message-bubble-user rounded-lg p-3 max-w-3xl">
-                                <button class="copy-button" data-copy-text="${escapeHtml(content)}">📋</button>
-                                <p class="text-light-text dark:text-dev-text">${escapeHtml(content)}</p>
-                            </div>
-                            <div class="w-10 h-10 rounded-full bg-dev-secondary bg-opacity-20 flex items-center justify-center ml-3">
-                                <span class="text-lg">👤</span>
-                            </div>
-                        </div>
-                    `;
-                } else {
-                    // Always parse AI responses as markdown
-                    console.log('Parsing AI response as markdown:', content.substring(0, 200));
-                    const renderedContent = marked.parse(content);
-                    console.log('Rendered HTML:', renderedContent.substring(0, 200));
-                    
-                    messageDiv.innerHTML = `
-                        <div class="w-10 h-10 rounded-full bg-dev-accent bg-opacity-20 flex items-center justify-center mr-3">
-                            <span class="text-lg">🤖</span>
-                        </div>
-                        <div class="message-bubble-ai rounded-lg p-3 max-w-4xl ai-response">
-                            <button class="copy-button" data-copy-text="${escapeHtml(content)}">📋</button>
-                            ${renderedContent}
-                        </div>
-                    `;
-                }
-
-                messageContainer.appendChild(messageDiv);
-                messageContainer.scrollTop = messageContainer.scrollHeight;
-            }
-
-            function showLoading() {
-                const loadingId = 'loading-' + Date.now();
-                const loadingDiv = document.createElement('div');
-                loadingDiv.id = loadingId;
-                loadingDiv.className = 'flex mb-4';
-                loadingDiv.innerHTML = `
-                    <div class="w-10 h-10 rounded-full bg-dev-accent bg-opacity-20 flex items-center justify-center mr-3">
-                        <span class="text-lg">🤖</span>
-                    </div>
-                    <div class="message-bubble-ai rounded-lg p-3">
-                        <div class="flex space-x-2">
-                            <div class="w-2 h-2 bg-dev-accent rounded-full animate-bounce"></div>
-                            <div class="w-2 h-2 bg-dev-accent rounded-full animate-bounce" style="animation-delay: 0.2s"></div>
-                            <div class="w-2 h-2 bg-dev-accent rounded-full animate-bounce" style="animation-delay: 0.4s"></div>
-                        </div>
-                    </div>
-                `;
-                messageContainer.appendChild(loadingDiv);
-                messageContainer.scrollTop = messageContainer.scrollHeight;
-                return loadingId;
-            }
-
-            function removeLoading(loadingId) {
-                const loadingDiv = document.getElementById(loadingId);
-                if (loadingDiv) {
-                    loadingDiv.remove();
-                }
-            }
-
-            function fileToBase64(file) {
-                return new Promise((resolve, reject) => {
-                    const reader = new FileReader();
-                    reader.readAsDataURL(file);
-                    reader.onload = () => resolve(reader.result.split(',')[1]);
-                    reader.onerror = error => reject(error);
-                });
-            }
-
-            function escapeHtml(unsafe) {
-                return unsafe
-                    .replace(/&/g, "&amp;")
-                    .replace(/</g, "&lt;")
-                    .replace(/>/g, "&gt;")
-                    .replace(/"/g, "&quot;")
-                    .replace(/'/g, "&#039;");
-            }
-
-            // Image zoom functionality
-            window.openImageModal = function(imageSrc) {
-                const modal = document.getElementById('imageModal');
-                const modalImg = document.getElementById('modalImage');
-                modal.style.display = 'block';
-                modalImg.src = imageSrc;
-            }
-
-            // Close modal when clicking the X or outside the image
-            document.getElementById('imageModal').addEventListener('click', function(e) {
-                if (e.target === this || e.target.className === 'close') {
-                    this.style.display = 'none';
-                }
-            });
-
-            // Theme toggle functionality
-            const themeToggle = document.getElementById('themeToggle');
-            const body = document.body;
-
-            themeToggle.addEventListener('click', function() {
-                const html = document.documentElement;
-                html.classList.toggle('dark');
-                
-                if (html.classList.contains('dark')) {
-                    themeToggle.innerHTML = '☀️ Light';
-                } else {
-                    themeToggle.innerHTML = '🌙 Dark';
-                }
-            });
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/samples/security/oauth/weather/src/main/java/com/example/weather/WeatherTools.java b/samples/security/oauth/weather/src/main/java/com/example/weather/WeatherTools.java
index 0c1afdc1..f07c2f10 100644
--- a/samples/security/oauth/weather/src/main/java/com/example/weather/WeatherTools.java
+++ b/samples/security/oauth/weather/src/main/java/com/example/weather/WeatherTools.java
@@ -19,23 +19,7 @@ public WeatherTools(WeatherService weatherService) {
         this.weatherService = weatherService;
     }
 
-//    @Bean
-//    public ToolCallbackProvider weatherToolsProvider() {
-//        return MethodToolCallbackProvider.builder()
-//                .toolObjects(this)
-//                .build();
-//    }
-
     @PreAuthorize("isAuthenticated()")
-//    @Tool(description = """
-//        Get weather forecast for a city on a specific date.
-//        Requires: city - Name of the city,
-//                 date - Date in YYYY-MM-DD format.
-//        Returns: Weather forecast with min/max temperatures.
-//        Errors: BAD_REQUEST if city is missing or date format is invalid,
-//               NOT_FOUND if city doesn't exist or no data for date,
-//               SERVICE_UNAVAILABLE if weather service is down.
-//        """)
     @McpTool(description = """
         Get weather forecast for a city on a specific date.
         Requires: city - Name of the city,
diff --git a/samples/spring-ai-te-agent/backoffice/src/test/java/com/example/backoffice/McpToolsIntegrationTest.java b/samples/spring-ai-te-agent/backoffice/src/test/java/com/example/backoffice/McpToolsIntegrationTest.java
new file mode 100644
index 00000000..60f8df28
--- /dev/null
+++ b/samples/spring-ai-te-agent/backoffice/src/test/java/com/example/backoffice/McpToolsIntegrationTest.java
@@ -0,0 +1,117 @@
+package com.example.backoffice;
+
+import com.example.backoffice.currencies.CurrencyService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.modelcontextprotocol.client.McpClient;
+import io.modelcontextprotocol.client.McpSyncClient;
+import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
+import io.modelcontextprotocol.spec.McpSchema;
+import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
+import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class McpToolsIntegrationTest {
+
+    @LocalServerPort
+    private int port;
+
+    @MockitoBean
+    private CurrencyService currencyService;
+
+    private McpSyncClient client;
+
+    @BeforeEach
+    void setUp() {
+        var client = McpClient.sync(
+                        HttpClientStreamableHttpTransport
+                                .builder("http://localhost:" + port)
+                                .build())
+                .build();
+
+        client.initialize();
+        this.client = client;
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        if (client != null) {
+            client.close();
+        }
+    }
+
+    @Test
+    void testMcpClientListTools() throws Exception {
+        McpSchema.ListToolsResult result = client.listTools();
+
+        assertThat(result).isNotNull();
+        assertThat(result.tools()).isNotEmpty();
+        assertThat(result.tools()).anyMatch(tool -> "getAvailability".equals(tool.name()));
+        assertThat(result.tools()).anyMatch(tool -> "bookHotel".equals(tool.name()));
+    }
+
+    @Test
+    void testGetAvailabilityToolCall() throws Exception {
+        when(hotelService.getAvailability("Paris", "2024-12-01", "2024-12-03"))
+                .thenReturn(Map.of("city", "Paris", "hotels", "Hotel A, Hotel B"));
+
+        CallToolResult result = client.callTool(
+                new CallToolRequest("getAvailability",
+                        Map.of(
+                                "city", "Paris",
+                                "checkInDate", "2024-12-01",
+                                "checkOutDate", "2024-12-03"
+                        )));
+
+        assertThat(result).isNotNull();
+        assertThat(result.content()).isNotEmpty();
+
+        ObjectMapper mapper = new ObjectMapper();
+        String jsonContent = ((McpSchema.TextContent) result.content().get(0)).text();
+        HotelAvailabilityResult availabilityResult = mapper.readValue(jsonContent, HotelAvailabilityResult.class);
+
+        assertThat(availabilityResult.city()).isEqualTo("Paris");
+        assertThat(availabilityResult.hotels()).isEqualTo("Hotel A, Hotel B");
+
+        verify(hotelService).getAvailability("Paris", "2024-12-01", "2024-12-03");
+    }
+
+    @Test
+    void testBookHotelTool() throws Exception {
+        when(hotelService.bookHotel("Paris", "Hotel Ritz", "John Doe", "2024-12-01", "2024-12-03"))
+                .thenReturn(Map.of("confirmation", "CONF123", "hotel", "Hotel Ritz"));
+
+        CallToolResult result = client.callTool(
+                new CallToolRequest("bookHotel",
+                        Map.of(
+                                "city", "Paris",
+                                "hotelName", "Hotel Ritz",
+                                "guestName", "John Doe",
+                                "checkInDate", "2024-12-01",
+                                "checkOutDate", "2024-12-03"
+                        )));
+
+        assertThat(result).isNotNull();
+        assertThat(result.content()).isNotEmpty();
+
+        ObjectMapper mapper = new ObjectMapper();
+        String jsonContent = ((McpSchema.TextContent) result.content().get(0)).text();
+        HotelBookingResult bookingResult = mapper.readValue(jsonContent, HotelBookingResult.class);
+
+        assertThat(bookingResult.confirmation()).isEqualTo("CONF123");
+        assertThat(bookingResult.hotel()).isEqualTo("Hotel Ritz");
+
+        verify(hotelService).bookHotel("Paris", "Hotel Ritz", "John Doe", "2024-12-01", "2024-12-03");
+    }
+}
\ No newline at end of file