CAMEL-23593: Fix YAML dump for REST DSL and routeConfigurations#23393
Merged
Conversation
…igurations
The YamlWriter only special-cased "routes" and "dataFormats" as root
container elements. When dumping REST DSL or routeConfiguration blocks,
startElement/endElement fell through to the EipModel lookup path,
producing empty objects like "rests: {}" or "routeConfigurations: {}".
Add "rests" and "routeConfigurations" to the container name checks in
both startElement() and endElement(), and fix NPE in the normalize
command by wiring up the MavenResolverMixin.
Co-Authored-By: Claude <noreply@anthropic.com>
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:
Build reactor — dependencies compiled but only changed modules were tested (2 modules)
|
…AML dump The resilience4jConfiguration and faultToleranceConfiguration were incorrectly placed inside the circuitBreaker steps list instead of as direct properties. Add special-case handling in YamlWriter to treat them as configuration properties, following the same pattern used for resequence batchConfig/streamConfig. Co-Authored-By: Claude <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
1 participant
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.
Summary
YamlWriterto recognizerestsandrouteConfigurationsas root container elements alongsideroutesanddataFormats. Without this, the YAML dump produces empty objects likerests: {}orrouteConfigurations: {}, which breakscamel validate normalizefor files containing REST DSL or routeConfiguration blocks.YamlWriterto placeresilience4jConfigurationandfaultToleranceConfigurationas direct properties ofcircuitBreakerinstead of incorrectly putting them insidesteps.YamlNormalizeCommandby wiring up theMavenResolverMixin(needed after CAMEL-23560 changes toRun.java).Test plan
camel-yaml-iotests passcamel validate normalizecorrectly normalizes REST DSL filescamel validate normalizecorrectly normalizes routeConfiguration filescamel validate normalizecorrectly normalizes circuitBreaker with resilience4j configcamel validate normalizestill works for regular route filesClaude Code on behalf of Claus Ibsen