Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Catalog): Update to Camel 4.10 #2091

Merged
merged 8 commits into from
Mar 21, 2025
Merged

feat(Catalog): Update to Camel 4.10 #2091

merged 8 commits into from
Mar 21, 2025

Conversation

lordrip
Copy link
Member

@lordrip lordrip commented Mar 14, 2025

No description provided.

@lordrip
Copy link
Member Author

lordrip commented Mar 14, 2025 •
edited
Loading

@mmelko There are 2 XML tests failing, so this update might be affecting the XML parsing.

 FAIL  src/serializers/xml/serializers/rest-xml-serializer.test.ts
  ● serialize full rest

 FAIL  src/serializers/xml/serializers/step-xml-serializer.test.ts
  ● Parse doTry

@lordrip
Copy link
Member Author

lordrip commented Mar 14, 2025 •
edited
Loading

Since when, otherwise, onFallback and whenSkipSendToEndpoint are not part of the ProcessorDefinition type anymore, they are not included in the catalog.

@mmelko mmelko force-pushed the fix/camel-410-build branch from 0c65031 to 229c0dd Compare March 17, 2025 17:12
@mmelko
Copy link
Contributor

mmelko commented Mar 17, 2025

@lordrip fixed, and updated the tests.

@codecov Codecov
Copy link

codecov bot commented Mar 17, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 98.43750% with 1 line in your changes missing coverage. Please review.

Project coverage is 81.13%. Comparing base (6cda43d) to head (c2272b6).
Report is 15 commits behind head on main.

Files with missing lines Patch % Lines
...catalog/generators/CamelCatalogSchemaEnhancer.java 88.88% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #2091      +/-   ##
============================================
+ Coverage     81.09%   81.13%   +0.04%     
- Complexity      451      455       +4     
============================================
  Files           537      537              
  Lines         16748    16805      +57     
  Branches       3277     3187      -90     
============================================
+ Hits          13581    13635      +54     
- Misses         3083     3085       +2     
- Partials         84       85       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mmelko mmelko force-pushed the fix/camel-410-build branch from 229c0dd to 2c84fe5 Compare March 17, 2025 20:37
@lordrip lordrip added this to the 2.5.0 milestone Mar 18, 2025
mmelko added 2 commits March 19, 2025 14:41
@mmelko
fix(catalog-generator): change EIP generator to resolve EIP schemas d…
b37f285 
…irectly from YAML DSL's definitions section instead of ProcessorDefinition. Also names that are not anymore in the ProcessorDefinition are added manually(when, otherwise, onFallback)
@mmelko
fix(e2e-tests):update loadBalancerConfig.cy.ts for removal of inherit…
c642147 
…ErrorHandler from loadBalancer in 4.10 catalog
lordrip
lordrip commented Mar 20, 2025
View reviewed changes
packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generators/EIPGenerator.java Outdated
@@ -117,7 +118,8 @@ private void enhanceJSONSchema(String processorName, ObjectNode processorJSONSch
* @return the list of EIP names
*/
List<String> getEIPNames() {
List<String> eipNames = new ArrayList<>();
// List<String> eipNames = new ArrayList<>();
Copy link
Member Author

Choose a reason for hiding this comment

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

Can we remove this line? :)

Copy link
Contributor

Choose a reason for hiding this comment

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

oops

...log-generator/src/main/java/io/kaoto/camelcatalog/generators/CamelCatalogSchemaEnhancer.java
@@ -244,6 +257,7 @@ private void populateJavaTypeToModelNameMap() {
EipModel model = camelCatalog.eipModel(modelName);
if (model != null) {
JAVA_TYPE_TO_MODEL_NAME.put(model.getJavaType(), modelName);
MODEL_NAME_TO_JAVA_TYPE.put(modelName, model.getJavaType());
Copy link
Member Author

Choose a reason for hiding this comment

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

Is there a Java class that allows us to look for values as well? so we don't need to duplicate the map?

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like Guava has it, probably it isn't worth bringing a dependency for this. Don't mind the previous message.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
9.6% Duplication on New Code

See analysis details on SonarQube Cloud

@lordrip lordrip marked this pull request as ready for review March 20, 2025 14:15
@lordrip lordrip mentioned this pull request Mar 20, 2025
Closed
@lordrip lordrip merged commit 7f0d66a into KaotoIO:main Mar 21, 2025
14 checks passed
@lordrip lordrip deleted the fix/camel-410-build branch March 21, 2025 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmelko mmelko mmelko left review comments

Assignees

@mmelko mmelko

@lordrip lordrip

Labels
None yet
Projects
None yet
Milestone
2.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@lordrip @mmelko @apupier