MethodToolCallback ToolExecutionException

  - Handle the entire exception type when throwing ToolExecutionException

Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>

Author: ilayaperumalg

spring-ai-model/src/main/java/org/springframework/ai/tool/method/MethodToolCallback.java

@@ -132,12 +132,10 @@ private Map<String, Object> extractToolArguments(String toolInput) {
 			return JsonParser.fromJson(toolInput, new TypeReference<>() {
 			});
 		}
-		catch (IllegalStateException ex) {
-			if (ex.getCause() instanceof JsonProcessingException jsonExp) {
-				logger.warn("Conversion from JSON failed", ex);
-				throw new ToolExecutionException(this.getToolDefinition(), jsonExp);
-			}
-			throw ex;
+		catch (Exception ex) {
+			logger.warn("Conversion from JSON failed", ex);
+			Throwable cause = (ex.getCause() instanceof JsonProcessingException) ? ex.getCause() : ex;
+			throw new ToolExecutionException(this.getToolDefinition(), cause);
 		}
 	}
 
@@ -168,12 +166,10 @@ private Object buildTypedArgument(@Nullable Object value, Type type) {
 			String json = JsonParser.toJson(value);
 			return JsonParser.fromJson(json, type);
 		}
-		catch (IllegalStateException ex) {
-			if (ex.getCause() instanceof JsonProcessingException jsonExp) {
-				logger.warn("Conversion from JSON failed", ex);
-				throw new ToolExecutionException(this.getToolDefinition(), jsonExp);
-			}
-			throw ex;
+		catch (Exception ex) {
+			logger.warn("Conversion from JSON failed", ex);
+			Throwable cause = (ex.getCause() instanceof JsonProcessingException) ? ex.getCause() : ex;
+			throw new ToolExecutionException(this.getToolDefinition(), cause);
 		}
 	}
 

spring-ai-model/src/test/java/org/springframework/ai/tool/method/MethodToolCallbackExceptionHandlingTest.java

@@ -1,18 +1,19 @@
 /*
-* Copyright 2025 - 2025 the original author or authors.
-*
-* Licensed 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
-*
-* https://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.
-*/
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+
 package org.springframework.ai.tool.method;
 
 import java.util.List;