Skip to content

CAMEL-24324: camel-aws-bedrock - throw when pojoRequest=true and the body is the wrong type - #25278

Merged
oscerd merged 1 commit into
apache:mainfrom
oscerd:a1/CAMEL-24324-bedrock
Jul 31, 2026
Merged

CAMEL-24324: camel-aws-bedrock - throw when pojoRequest=true and the body is the wrong type#25278
oscerd merged 1 commit into
apache:mainfrom
oscerd:a1/CAMEL-24324-bedrock

Conversation

@oscerd

@oscerd oscerd commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Child of CAMEL-24261 (completing CAMEL-23462 across the AWS2 producers).

Problem

Most BedrockAgent / BedrockAgentRuntime operations already fail fast when
pojoRequest=true and the body is not the expected request type. Four did not —
they fell through the instanceof with no else, so no AWS call was made, no
response was set, and the original body was returned with no error:

  • BedrockAgentProducer: startIngestionJob, listIngestionJobs, getIngestionJob
  • BedrockAgentRuntimeProducer: retrieveAndGenerate

(BedrockProducer in the runtime package is already covered by CAMEL-23462.)

Fix

Each of the four branches now throws IllegalArgumentException, matching the
wording the sibling operations in the same module already use, e.g.
"retrieveAndGenerate operation requires a RetrieveAndGenerateRequest body when pojoRequest=true".

Tests

camel-aws-bedrock has no producer route/mock harness, so this is covered by two
new Mockito unit tests that mock the endpoint + client, send a wrong-typed body
with pojoRequest=true, and assert the IllegalArgumentException. Each was
verified to fail (silent no-op) before the fix. Region-free — no localstack or
real AWS.

Docs / backport

The shared 4.22 upgrade-guide entry was added with CAMEL-24263. Main only, matching
the CAMEL-23462 precedent (behaviour change, shipped in a minor, not backported).


Claude Code on behalf of oscerd

…body is the wrong type

Child of CAMEL-24261. Most BedrockAgent/BedrockAgentRuntime operations already
fail fast on a wrong POJO body, but four did not: startIngestionJob,
listIngestionJobs, getIngestionJob (BedrockAgentProducer) and retrieveAndGenerate
(BedrockAgentRuntimeProducer) silently fell through with no AWS call and no error.
Add the missing else that throws IllegalArgumentException, matching the wording
already used by the sibling operations in the same module. BedrockProducer
(runtime) is already covered by CAMEL-23462.

Covered by two new Mockito-based unit tests (the module has no producer route
harness); each was verified to fail (silent no-op) before the fix.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
@oscerd
oscerd requested a review from davsclaus July 31, 2026 12:23
@oscerd oscerd added the bug Something isn't working label Jul 31, 2026
@oscerd
oscerd requested a review from Croway July 31, 2026 12:23
@oscerd oscerd added this to the 4.22.0 milestone Jul 31, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟
🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run
  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot although they are normally detected and executed by CI.
  • You can label PRs using skip-tests and test-dependents to fine-tune the checks executed by this PR.
  • Build and test logs are available in the summary page. Only Apache Camel committers have access to the summary.

⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

@github-actions

Copy link
Copy Markdown
Contributor

🧪 CI tested the following changed modules:

  • components/camel-aws/camel-aws-bedrock

🔬 Scalpel shadow comparison — Scalpel: 9 tested, 29 compile-only — current: 9 all tested

Maveniverse Scalpel detected 38 affected modules (current approach: 9).

⚠️ Modules only in Scalpel (29)
  • apache-camel
  • camel-allcomponents
  • camel-catalog
  • camel-catalog-console
  • camel-catalog-lucene
  • camel-catalog-maven
  • camel-catalog-suggest
  • camel-componentdsl
  • camel-csimple-maven-plugin
  • camel-endpointdsl
  • camel-endpointdsl-support
  • camel-itest
  • camel-jbang-core
  • camel-jbang-it
  • camel-jbang-main
  • camel-jbang-plugin-edit
  • camel-jbang-plugin-generate
  • camel-jbang-plugin-kubernetes
  • camel-jbang-plugin-test
  • camel-kamelet-main
  • camel-launcher
  • camel-report-maven-plugin
  • camel-route-parser
  • camel-yaml-dsl
  • camel-yaml-dsl-deserializers
  • camel-yaml-dsl-maven-plugin
  • coverage
  • docs
  • dummy-component

Skip-tests mode would test 9 modules (1 direct + 8 downstream), skip tests for 29 (generated code, meta-modules)

Modules Scalpel would test (9)
  • camel-aws-bedrock
  • camel-jbang-mcp
  • camel-jbang-plugin-mcp
  • camel-jbang-plugin-route-parser
  • camel-jbang-plugin-tui
  • camel-jbang-plugin-validate
  • camel-launcher-container
  • camel-yaml-dsl-validator
  • camel-yaml-dsl-validator-maven-plugin
Modules with tests skipped (29)
  • apache-camel
  • camel-allcomponents
  • camel-catalog
  • camel-catalog-console
  • camel-catalog-lucene
  • camel-catalog-maven
  • camel-catalog-suggest
  • camel-componentdsl
  • camel-csimple-maven-plugin
  • camel-endpointdsl
  • camel-endpointdsl-support
  • camel-itest
  • camel-jbang-core
  • camel-jbang-it
  • camel-jbang-main
  • camel-jbang-plugin-edit
  • camel-jbang-plugin-generate
  • camel-jbang-plugin-kubernetes
  • camel-jbang-plugin-test
  • camel-kamelet-main
  • camel-launcher
  • camel-report-maven-plugin
  • camel-route-parser
  • camel-yaml-dsl
  • camel-yaml-dsl-deserializers
  • camel-yaml-dsl-maven-plugin
  • coverage
  • docs
  • dummy-component

ℹ️ Shadow mode — Scalpel observes but does not affect test execution. Learn more

All tested modules (38 modules)
  • Camel :: AWS2 Bedrock
  • Camel :: All Components Sync point
  • Camel :: Assembly
  • Camel :: Catalog :: CSimple Maven Plugin (deprecated)
  • Camel :: Catalog :: Camel Catalog
  • Camel :: Catalog :: Camel Report Maven Plugin
  • Camel :: Catalog :: Camel Route Parser
  • Camel :: Catalog :: Console
  • Camel :: Catalog :: Dummy Component
  • Camel :: Catalog :: Lucene (deprecated)
  • Camel :: Catalog :: Maven
  • Camel :: Catalog :: Suggest
  • Camel :: Component DSL
  • Camel :: Coverage
  • Camel :: Docs
  • Camel :: Endpoint DSL
  • Camel :: Endpoint DSL :: Support
  • Camel :: Integration Tests
  • Camel :: JBang :: Core
  • Camel :: JBang :: Integration tests
  • Camel :: JBang :: MCP
  • Camel :: JBang :: Main
  • Camel :: JBang :: Plugin :: Edit
  • Camel :: JBang :: Plugin :: Generate
  • Camel :: JBang :: Plugin :: Kubernetes
  • Camel :: JBang :: Plugin :: MCP
  • Camel :: JBang :: Plugin :: Route Parser
  • Camel :: JBang :: Plugin :: TUI
  • Camel :: JBang :: Plugin :: Testing
  • Camel :: JBang :: Plugin :: Validate
  • Camel :: Kamelet Main
  • Camel :: Launcher
  • Camel :: Launcher :: Container
  • Camel :: YAML DSL
  • Camel :: YAML DSL :: Deserializers
  • Camel :: YAML DSL :: Maven Plugins
  • Camel :: YAML DSL :: Validator
  • Camel :: YAML DSL :: Validator Maven Plugin

⚙️ View full build and test results

@gnodet gnodet left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean, well-scoped fix that adds missing else branches to throw IllegalArgumentException when pojoRequest=true and the body is the wrong type for four Bedrock Agent/AgentRuntime operations that previously silently did nothing. Tests are well-written and follow project conventions.

Highlights:

  • The fix correctly mirrors the pattern already established by the retrieve and invokeFlow operations in the same BedrockAgentRuntimeProducer class. Error message wording is consistent across all agent/agentruntime operations.
  • Tests properly use AssertJ assertions and package-private visibility, following project conventions.
  • The parameterized test approach for the three agent operations is a nice touch, reducing boilerplate.

Minor nit (non-blocking): Each parameterized test invocation creates a new DefaultCamelContext without closing it. While the context is never started and this is a lightweight unit test, wrapping in try-with-resources would be slightly cleaner for resource hygiene.

Claude Code on behalf of Guillaume Nodet

@oscerd oscerd self-assigned this Jul 31, 2026
@oscerd
oscerd merged commit 0089244 into apache:main Jul 31, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working components components-aws

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants