Skip to content

Fix main branch by reverting requirements on message for log to not be#23299

Merged
apupier merged 1 commit into
apache:mainfrom
apupier:fixMainbranchToNotForceNonNullMessageWhenLogging
May 19, 2026
Merged

Fix main branch by reverting requirements on message for log to not be#23299
apupier merged 1 commit into
apache:mainfrom
apupier:fixMainbranchToNotForceNonNullMessageWhenLogging

Conversation

@apupier
Copy link
Copy Markdown
Contributor

@apupier apupier commented May 18, 2026

null

regression introduced by #23021

Description

Target

  • I checked that the commit is targeting the correct branch (Camel 4 uses the main branch)

Tracking

  • If this is a large change, bug fix, or code improvement, I checked there is a JIRA issue filed for the change (usually before you start working on it).

Apache Camel coding standards and style

  • I checked that each commit in the pull request has a meaningful subject line and body.
  • I have run mvn clean install -DskipTests locally from root folder and I have committed all auto-generated changes.

@apupier
Fix main branch by reverting requirements on message for log to not be
6f1857b 
null

regression introduced by apache#23021

Signed-off-by: Aurélien Pupier <apupier@ibm.com>
This was referenced May 18, 2026
Closed
Merged
Croway added a commit to Croway/camel that referenced this pull request May 18, 2026
@Croway
chore: keep only the S3 Optional.ofNullable fix
abb57f8 
Remove LogProcessor and KinesisResumeStrategyConfiguration changes
as those are better addressed at the source by apache#23299 and apache#23302.
@apupier apupier marked this pull request as ready for review May 18, 2026 15:25
@github-actions github-actions Bot added the core label May 18, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 18, 2026

🌟 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

github-actions Bot commented May 18, 2026

🧪 CI tested the following changed modules:

  • core/camel-api

ℹ️ Dependent modules were not tested because the total number of affected modules exceeded the threshold (50). Use the test-dependents label to force testing all dependents.

⚙️ View full build and test results

Croway added a commit to Croway/camel that referenced this pull request May 19, 2026
@Croway
chore: keep only the S3 Optional.ofNullable fix
c9da2fd 
Remove LogProcessor and KinesisResumeStrategyConfiguration changes
as those are better addressed at the source by apache#23299 and apache#23302.
@apupier apupier merged commit a1f57e6 into apache:main May 19, 2026
6 checks passed
@apupier apupier deleted the fixMainbranchToNotForceNonNullMessageWhenLogging branch May 19, 2026 11:12
Croway added a commit to Croway/camel that referenced this pull request May 19, 2026
@Croway
chore: keep only the S3 Optional.ofNullable fix
aeb39d0 
Remove LogProcessor and KinesisResumeStrategyConfiguration changes
as those are better addressed at the source by apache#23299 and apache#23302.
davsclaus pushed a commit that referenced this pull request May 19, 2026
@Croway
chore: fix latent NPE in S3 consumer includeS3Object with null conten…
efbad7c 
…tType (#23300)

* chore: fix null safety in LogProcessor, S3 consumer, and Kinesis resume config

- LogProcessor: guard against null message before calling doLog() to
  prevent NPE after CAMEL-22640 added requireNonNull to CamelLogger
- AWS2S3Consumer: use Optional.ofNullable in includeS3Object() to
  handle null contentType when includeFolders is false
- KinesisResumeStrategyConfiguration: skip setResumeCache when cache
  is null

* chore: keep only the S3 Optional.ofNullable fix

Remove LogProcessor and KinesisResumeStrategyConfiguration changes
as those are better addressed at the source by #23299 and #23302.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davsclaus davsclaus davsclaus approved these changes

Assignees

No one assigned

Labels

core

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@apupier @davsclaus