This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch openapi2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f832211747971567e6d800b8beeec5a152b3341f
Merge: 69b850bf7bf cf2d5d01329
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Mar 28 15:32:57 2024 +0100
Merge branch 'openapi' into openapi2
.../camel/catalog/components/platform-http.json | 4 +-
.../camel/catalog/components/rest-openapi.json | 62 +-
.../org/apache/camel/catalog/models.properties | 1 +
.../org/apache/camel/catalog/models/openApi.json | 24 +
.../org/apache/camel/catalog/models/rest.json | 5 +-
.../camel/catalog/models/restConfiguration.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +-
components/camel-platform-http-vertx/pom.xml | 5 +
...PlatformHttpRestOpenApiConsumerRestDslTest.java | 307 +++++
.../vertx/PlatformHttpRestOpenApiConsumerTest.java | 270 +++++
.../src/test/resources/camel-mock/pet/444.json | 3 +
.../src/test/resources/openapi-v3.json | 1240 ++++++++++++++++++++
.../component/platform/http/platform-http.json | 4 +-
.../platform/http/PlatformHttpComponent.java | 28 +-
.../platform/http/PlatformHttpConsumer.java | 19 +-
.../platform/http/PlatformHttpEndpoint.java | 10 +-
components/camel-rest-openapi/pom.xml | 4 +
.../openapi/RestOpenApiComponentConfigurer.java | 40 +-
.../openapi/RestOpenApiEndpointConfigurer.java | 48 +
.../openapi/RestOpenApiEndpointUriFactory.java | 12 +-
.../camel/component/rest/openapi/rest-openapi.json | 62 +-
.../src/main/docs/rest-openapi-component.adoc | 4 +-
.../DefaultRestOpenapiProcessorStrategy.java | 319 +++++
.../rest/openapi/RestOpenApiComponent.java | 153 ++-
.../rest/openapi/RestOpenApiConsumerPath.java | 53 +
.../rest/openapi/RestOpenApiEndpoint.java | 392 ++++---
.../component/rest/openapi/RestOpenApiHelper.java | 44 +
.../rest/openapi/RestOpenApiProcessor.java | 181 +++
.../rest/openapi/RestOpenapiProcessorStrategy.java | 89 ++
.../validator/RequestValidationCustomizer.java | 1 +
.../rest/openapi/validator/RequestValidator.java | 31 +-
.../camel/component/rest/openapi/HttpsV3Test.java | 3 +-
.../rest/openapi/RestOpenApiComponentV3Test.java | 6 +-
.../openapi/RestOpenApiComponentV3YamlTest.java | 7 +-
.../RestOpenApiCustomValidatorCustomizerTest.java | 3 +-
.../rest/openapi/RestOpenApiEndpointV3Test.java | 8 +-
.../openapi/RestOpenApiRequestValidationTest.java | 6 +-
.../camel/component/rest/DefaultRestRegistry.java | 2 +-
.../apache/camel/spi/RestApiConsumerFactory.java | 14 +-
.../org/apache/camel/spi/RestConsumerFactory.java | 1 +
...actory.java => RestOpenApiConsumerFactory.java} | 20 +-
.../org/apache/camel/model/rest/openApi.json | 24 +
.../META-INF/org/apache/camel/model/rest/rest.json | 5 +-
.../apache/camel/model/rest/restConfiguration.json | 2 +-
.../services/org/apache/camel/model.properties | 1 +
.../org/apache/camel/model/rest/jaxb.index | 1 +
.../apache/camel/model/rest/OpenApiDefinition.java | 245 ++++
.../model/rest/RestConfigurationDefinition.java | 4 +-
.../apache/camel/model/rest/RestDefinition.java | 143 ++-
.../main/support/MockRestConsumerFactory.java | 4 +
.../java/org/apache/camel/xml/in/ModelParser.java | 21 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 20 +
.../org/apache/camel/yaml/out/ModelWriter.java | 20 +
.../working-with-camel-core/pages/index.adoc | 1 +
docs/user-manual/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 7 +-
docs/user-manual/modules/ROOT/pages/dsl.adoc | 1 +
docs/user-manual/modules/ROOT/pages/index.adoc | 1 +
.../modules/ROOT/pages/rest-dsl-openapi.adoc | 123 ++
docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 4 +
.../dsl/RestOpenapiComponentBuilderFactory.java | 238 ++--
.../src/generated/resources/metadata.json | 2 +-
.../builder/endpoint/StaticEndpointBuilders.java | 10 +-
.../dsl/PlatformHttpEndpointBuilderFactory.java | 32 +-
.../dsl/RestOpenApiEndpointBuilderFactory.java | 704 +++++++++--
.../java/org/apache/camel/main/KameletMain.java | 8 +-
.../camel/kotlin/components/RestOpenapiUriDsl.kt | 164 ++-
.../dsl/yaml/deserializers/ModelDeserializers.java | 93 +-
.../deserializers/ModelDeserializersResolver.java | 3 +
.../generated/resources/schema/camelYamlDsl.json | 59 +-
70 files changed, 4923 insertions(+), 586 deletions(-)
diff --cc docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc
index 360199e51bb,27d2fe89a48..878af534033
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc
@@@ -15,6 -15,8 +15,11 @@@ then the variable is no longer set. Als
This is the same logic that the routing engine uses, whether to continue
routing the `Exchange` or not.
+=== camel-elasticsearch
+
- The class
`org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy`
has been renamed to
`org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy`.
++The class
`org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy`
has been renamed to
`org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy`.
++
+ === camel-rest-openapi
+
+ The `specifciationUri` in the `rest-api` component has changed from being a
`java.net.URI` to a `String` type
+ , as it uses Camels `ResourceLoader` to load from pluggable resources and
also more tooling friendly.
-
