MethodToolCallback ToolExecutionException

  - Handle the entire exception type when throwing ToolExecutionException

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

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);
 		}
 	}