CAMEL-24460: Mark ProducerTemplate body, header and property values as @Nullable - #26032
Merged
Conversation
…@nullable The org.apache.camel package is @NullMarked, so unannotated reference parameters are treated as non-null under JSpecify. Camel supports null message bodies at runtime, and the sibling FluentProducerTemplate already annotates its withBody/withHeader/withExchangeProperty values as @nullable. Align ProducerTemplate by marking body, header value and property value parameters as @nullable. Header/property names and the headers Map stay non-null (keys cannot be null). Annotation-only change: no runtime or binary compatibility impact. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
…via ProducerTemplate Drives a null body, null header value and null property value through the ProducerTemplate API end-to-end, verifying they are accepted and routed. Closes the property-value coverage gap and anchors the @nullable contract. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
Croway
approved these changes
Sep 2, 2026
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 565 tested, 27 compile-only — current: 565 all testedMaveniverse Scalpel detected 592 affected modules (current approach: 565).
|
davsclaus
added a commit
that referenced
this pull request
Sep 2, 2026
…@nullable (backport 4.22.x) (#26037) CAMEL-24460: Mark ProducerTemplate body, header and property values as @nullable The org.apache.camel package is @NullMarked, so unannotated reference parameters are treated as non-null under JSpecify. Camel supports null message bodies at runtime, and the sibling FluentProducerTemplate already annotates its withBody/withHeader/withExchangeProperty values as @nullable. ProducerTemplate was missed in that rollout. Align ProducerTemplate by marking body, header value and property value parameters as @nullable. Header/property names and the headers Map stay non-null (keys cannot be null). Annotation-only change with no runtime or binary compatibility impact. Adds a test driving a null body, header value and property value through the API end-to-end. Closes #26032 (cherry picked from commit 01b6fd5) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The
org.apache.camelpackage is@NullMarked, so unannotated reference parameters are treated as non-null under JSpecify. However, Camel fully supportsnullmessage bodies at runtime, and the siblingFluentProducerTemplatealready annotates itswithBody/withHeader/withExchangePropertyvalues as@Nullable(added in CAMEL-22640).ProducerTemplatewas missed in that rollout, so callers with null-checking enabled were forced to work around a contract that does not match reality.This aligns
ProducerTemplatewithFluentProducerTemplate:@Nullableadded to allbodyparameters (sendBody*,requestBody*,asyncSendBody,asyncRequestBody*)@Nullableadded toheaderValueandpropertyValueparametersString header,String property) and theMap<String, Object> headersremain non-null — keys cannot be nullImpact
Testing
Added
DefaultProducerTemplateTest.testNullBodyAndValues, driving a null body, null header value, and null property value through the API end-to-end (the property-value case had no prior direct coverage). Null bodies and null header values are already exercised widely across the core test suite.JIRA: https://issues.apache.org/jira/browse/CAMEL-24460
Claude Code on behalf of @davsclaus