This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit e4336ed75f355ff226cbee94bc737a35b1db743d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Jan 27 05:51:14 2026 +0000 (chores): modernize instanceof checks in camel-ibm-watsonx-ai --- .../ibm/watsonx/ai/handler/AbstractWatsonxAiHandler.java | 16 ++++++++-------- .../ibm/watsonx/ai/handler/DeploymentHandler.java | 3 +-- .../ibm/watsonx/ai/handler/ForecastHandler.java | 3 +-- .../component/ibm/watsonx/ai/handler/ToolHandler.java | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/AbstractWatsonxAiHandler.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/AbstractWatsonxAiHandler.java index 2fbf51f97abb..6f80e54cb435 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/AbstractWatsonxAiHandler.java +++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/AbstractWatsonxAiHandler.java @@ -86,9 +86,9 @@ public abstract class AbstractWatsonxAiHandler implements WatsonxAiOperationHand Object body = in.getBody(); if (body instanceof List) { inputs = (List<String>) body; - } else if (body instanceof String) { + } else if (body instanceof String bodyString) { // Single string input - inputs = List.of((String) body); + inputs = List.of(bodyString); } } @@ -118,8 +118,8 @@ public abstract class AbstractWatsonxAiHandler implements WatsonxAiOperationHand // If no USER_MESSAGE header, try body if (userMessage == null) { Object body = in.getBody(); - if (body instanceof String) { - userMessage = (String) body; + if (body instanceof String bodyString) { + userMessage = bodyString; } else if (body instanceof List) { // Body is a list of messages return (List<ChatMessage>) body; @@ -160,9 +160,9 @@ public abstract class AbstractWatsonxAiHandler implements WatsonxAiOperationHand WrappedFile<?> wrappedFile = (WrappedFile<?>) body; Object fileObject = wrappedFile.getFile(); - if (fileObject instanceof File) { + if (fileObject instanceof File file) { // Local file (file:// component) - return FileInput.of((File) fileObject); + return FileInput.of(file); } else { // Remote file (ftp://, sftp://) - use type converter to get InputStream String fileName = resolveFileName(in); @@ -172,8 +172,8 @@ public abstract class AbstractWatsonxAiHandler implements WatsonxAiOperationHand } // 2. Check for direct File - if (body instanceof File) { - return FileInput.of((File) body); + if (body instanceof File file) { + return FileInput.of(file); } // 3. Check FILE header diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/DeploymentHandler.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/DeploymentHandler.java index e10502bb4b6f..6a7501e6bd4a 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/DeploymentHandler.java +++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/DeploymentHandler.java @@ -239,8 +239,7 @@ public class DeploymentHandler extends AbstractWatsonxAiHandler { // If not in headers, try to get from body as TimeSeriesRequest if (inputSchema == null || forecastData == null) { Object body = in.getBody(); - if (body instanceof TimeSeriesRequest) { - TimeSeriesRequest request = (TimeSeriesRequest) body; + if (body instanceof TimeSeriesRequest request) { inputSchema = request.inputSchema(); forecastData = request.data(); } diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ForecastHandler.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ForecastHandler.java index 6e94ce717844..a2f03e94353b 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ForecastHandler.java +++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ForecastHandler.java @@ -62,8 +62,7 @@ public class ForecastHandler extends AbstractWatsonxAiHandler { // If not in headers, try to get from body as TimeSeriesRequest if (inputSchema == null || forecastData == null) { Object body = in.getBody(); - if (body instanceof TimeSeriesRequest) { - TimeSeriesRequest request = (TimeSeriesRequest) body; + if (body instanceof TimeSeriesRequest request) { inputSchema = request.inputSchema(); forecastData = request.data(); } diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ToolHandler.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ToolHandler.java index 56a8faee639a..4b834153b7d2 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ToolHandler.java +++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/main/java/org/apache/camel/component/ibm/watsonx/ai/handler/ToolHandler.java @@ -88,9 +88,9 @@ public class ToolHandler extends AbstractWatsonxAiHandler { if (body instanceof Map) { // Structured input toolRequest = ToolRequest.structuredInput(toolName, (Map<String, Object>) body, config); - } else if (body instanceof String) { + } else if (body instanceof String bodyString) { // Unstructured input - toolRequest = ToolRequest.unstructuredInput(toolName, (String) body, config); + toolRequest = ToolRequest.unstructuredInput(toolName, bodyString, config); } else { throw new IllegalArgumentException( "Tool input must be provided as Map (structured) or String (unstructured) in message body");
