feat(Catalog): Add CamelCatalogSchemaEnhancer #1960
Merged
Conversation
This file contains 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
lordrip
commented
Jan 28, 2025
Comment on lines
49
to
89
| definitions.fields().forEachRemaining(entry -> { | ||
| String javaType = entry.getKey(); | ||
| ObjectNode node = (ObjectNode) entry.getValue(); | ||
|
|
||
| camelCatalog.findModelNames().stream().findFirst().ifPresent(modelName -> { | ||
| var model = camelCatalog.eipModel(modelName); | ||
| if (model == null) { | ||
| return; | ||
| } | ||
|
|
||
| if (model.getJavaType().equals(javaType)) { | ||
| fillRequiredPropertiesIfNeeded(modelName, node); | ||
| } | ||
| }); | ||
| }); |
There was a problem hiding this comment.
@shivamG640, this code goes from org.apache.camel.model.language.ConstantExpression to the constant model from the Camel Catalog, I think you're gonna need something like this for the sorting, if that's the case, I think we can extract the query part and create a method that receives a lambda where you can place the sorting code and I can place this required code.
34 tasks
lordrip
force-pushed
the
feat/add-required-properties-from-catalog
branch
4 times, most recently
from
9f225b9 to
18a2539
Compare
igarashitm
approved these changes
Jan 28, 2025
lordrip
force-pushed
the
feat/add-required-properties-from-catalog
branch
2 times, most recently
from
606271f to
ad3b054
Compare
lordrip
force-pushed
the
feat/add-required-properties-from-catalog
branch
from
ad3b054 to
29a7f8e
Compare
lordrip
commented
Jan 29, 2025
| * @param modelNode the JSON schema node of the model | ||
| */ | ||
| void sortPropertiesAccordingToCatalog(EipModel model, ObjectNode modelNode) { | ||
| // TODO: Sort properties according to the Camel catalog |
There was a problem hiding this comment.
@shivamG640 Here we need to place your Sorting code, and it will be sorting both Schemas and definitions
|
shivamG640
approved these changes
Jan 29, 2025
lordrip
merged commit 8c027e5
into
KaotoIO:feat/form-with-anyof-support
4 of 8 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
part of: #1939