Skip to content

CAMEL-24280: camel-aws2-mq - throw when pojoRequest=true and the body is the wrong type - #25184

Merged
oscerd merged 2 commits into
apache:mainfrom
oscerd:a1/CAMEL-24280-mq
Jul 28, 2026
Merged

CAMEL-24280: camel-aws2-mq - throw when pojoRequest=true and the body is the wrong type#25184
oscerd merged 2 commits into
apache:mainfrom
oscerd:a1/CAMEL-24280-mq

Conversation

@oscerd

@oscerd oscerd commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

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

Problem

With pojoRequest=true, MQ2Producer's listBrokers, createBroker,
deleteBroker, rebootBroker, updateBroker and describeBroker branches only
acted when the body was the matching request type; any other body 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.

Fix

Each branch now throws IllegalArgumentException naming the required request
type, e.g.:

} else {
    throw new IllegalArgumentException(
            "updateBroker operation requires UpdateBrokerRequest in POJO mode");
}

Tests

Six tests in MQProducerTest send a wrong-typed body to pojoRequest=true
routes (reusing the module's AmazonMQClientMock) and assert the message. Each
was verified to fail (silent no-op) before the fix — rebootBroker, for example,
reports "Expecting code to raise a throwable" on main. Class 15/15 green.
Hermetic unit tests against the in-JVM mock (run 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

… is the wrong type

Child of CAMEL-24261. MQ2Producer's listBrokers, createBroker, deleteBroker,
rebootBroker, updateBroker and describeBroker branches only acted when the body
was the matching request type under pojoRequest=true; any other body silently
fell through with no AWS call and no error. Add the missing else that throws
IllegalArgumentException naming the required type, consistent with CAMEL-23462.

Six tests send a wrong-typed body to pojoRequest=true routes and assert the
message; each was verified to fail (silent no-op) before the fix. The shared 4.22
upgrade-guide entry was added with CAMEL-24263.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
@oscerd oscerd added the bug Something isn't working label Jul 28, 2026
@oscerd
oscerd requested a review from davsclaus July 28, 2026 09:55
@oscerd oscerd added this to the 4.22.0 milestone Jul 28, 2026
@oscerd
oscerd requested a review from Croway July 28, 2026 09:55
@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

github-actions Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

🧪 CI tested the following changed modules:

  • components/camel-aws/camel-aws2-mq

🔬 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-aws2-mq
  • 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 MQ
  • 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 PR that adds missing else branches in six MQ2Producer POJO-mode operations to throw IllegalArgumentException when the body is the wrong type, exactly matching the pattern established by sibling PRs (CAMEL-24277/MSK, CAMEL-24263/STS, CAMEL-24264/Translate). CI is green, tests are correct, and project conventions are followed.

Key observations:

  • Implementation is consistent with the established pattern from sibling PRs in the CAMEL-24261 family.
  • Tests correctly use AssertJ assertThatThrownBy (per project conventions), assert both hasRootCauseInstanceOf(IllegalArgumentException.class) and the exact message, and use package-private visibility.
  • All six operations are covered: listBrokers, createBroker, deleteBroker, rebootBroker, updateBroker, describeBroker.

Minor pre-existing note: the log message in describeBroker's POJO branch (line ~360) says "Reboot Broker command" instead of "Describe Broker command" — a copy-paste issue from before this PR, worth fixing in a follow-up.

This review was generated by an AI agent and may contain inaccuracies. Please verify all suggestions before applying.

Claude Code on behalf of Guillaume Nodet

@oscerd oscerd self-assigned this Jul 28, 2026
@oscerd
oscerd merged commit 3662cab into apache:main Jul 28, 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.

3 participants