Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2028534282 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8495068869-1438-cf485ff8-e1b4-4921-8674-0c070b551f38 * Camel Quarkus Commit: 9dde702ff6b587571e575f406d3283d724f3ede9 * Quarkus Main Commit: 9845d7b8321536c755466854ced167bff7600958 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8495068869 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new ae015aa57c0 Regen ae015aa57c0 is described below commit ae015aa57c0e6822219cdfaf0e87a40e7dc78a8f Author: Claus Ibsen AuthorDate: Sat Mar 30 19:01:58 2024 +0100 Regen --- .../catalog/components/rest-openapi.json | 37 ++ .../src/main/docs/rest-openapi.json| 6 .../RestOpenApiComponentConfiguration.java | 17 -- .../springboot/RestOpenApiComponentConverter.java | 2 -- 4 files changed, 17 insertions(+), 45 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json index 92191dd9495..754f9cb93fa 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json @@ -25,23 +25,22 @@ "componentProperties": { "basePath": { "index": 0, "kind": "property", "displayName": "Base Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "API basePath, for example \/v2. Default is unset, if set overrides the value present in OpenApi specification." }, "specificationUri": { "index": 1, "kind": "property", "displayName": "Specification Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "openapi.json", "description": "Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If [...] -"requestValidationCustomizer": { "index": 2, "kind": "property", "displayName": "Request Validation Customizer", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.rest.openapi.validator.RequestValidationCustomizer", "deprecated": false, "autowired": false, "secret": false, "description": "If request validation is enabled, this option provides the capability to customize the creation of OpenApiInterac [...] -"apiContextPath": { "index": 3, "kind": "property", "displayName": "Api Context Path", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the context-path to use for servicing the OpenAPI specification" }, -"bridgeErrorHandler": { "index": 4, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...] -"missingOperation": { "index": 5, "kind": "property", "displayName": "Missing Operation", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "fail", "ignore", "mock" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "fail", "description": "Whether the consumer should fail,ignore or return a mock response for OpenAPI operations that are not mapped to a corresponding route." }, -"consumerComponentName": { "index": 6, "kind": "property", "displayName": "Consumer Component Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the Camel component that will service the requests. The component must be present in Camel registry and it must implement RestOpenApiConsumerFactory service provider interfac [...] -"mockIncludePattern": { "index": 7, "kind": "property", "displayName": "Mock Include Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "classpath:camel-mock\/**", "description": "Used for inclusive
Re: [PR] rest-openapi - validator for producer [camel]
davsclaus merged PR #13666: URL: https://github.com/apache/camel/pull/13666 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: rest-openapi - validator for producer (#13666)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new bd1ca331e03 rest-openapi - validator for producer (#13666) bd1ca331e03 is described below commit bd1ca331e03e9920b6b32a6a087ccd9fd9a2ef3b Author: Claus Ibsen AuthorDate: Sat Mar 30 12:42:52 2024 +0100 rest-openapi - validator for producer (#13666) * CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. --- .../camel/catalog/components/rest-openapi.json | 37 ++- components/camel-rest-openapi/pom.xml | 24 -- .../openapi/RestOpenApiComponentConfigurer.java| 6 - .../openapi/RestOpenApiEndpointConfigurer.java | 21 -- .../openapi/RestOpenApiEndpointUriFactory.java | 8 +- .../camel/component/rest/openapi/rest-openapi.json | 37 ++- .../src/main/docs/rest-openapi-component.adoc | 66 +- .../DefaultRestOpenapiProcessorStrategy.java | 9 +- .../rest/openapi/RestOpenApiComponent.java | 16 -- .../rest/openapi/RestOpenApiEndpoint.java | 61 + .../rest/openapi/RestOpenApiProcessor.java | 5 +- .../openapi/validator/DefaultRequestValidator.java | 143 .../validator/RequestValidationCustomizer.java | 51 - .../rest/openapi/validator/RequestValidator.java | 163 +++--- .../openapi/validator/RestOpenApiOperation.java| 2 +- ...idationCustomizer.java => RestOpenApiPath.java} | 39 +++- .../RestOpenApiCustomValidatorCustomizerTest.java | 135 --- .../openapi/RestOpenApiRequestValidationTest.java | 72 +- .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 4 + .../dsl/RestOpenapiComponentBuilderFactory.java| 19 -- .../dsl/RestOpenApiEndpointBuilderFactory.java | 247 - .../camel/kotlin/components/RestOpenapiUriDsl.kt | 18 -- parent/pom.xml | 1 - 23 files changed, 267 insertions(+), 917 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json index d5104b9f003..3179dafec36 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json @@ -25,23 +25,22 @@ "componentProperties": { "basePath": { "index": 0, "kind": "property", "displayName": "Base Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "API basePath, for example \/v2. Default is unset, if set overrides the value present in OpenApi specification." }, "specificationUri": { "index": 1, "kind": "property", "displayName": "Specification Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "openapi.json", "description": "Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If [...] -"requestValidationCustomizer": { "index": 2, "kind": "property", "displayName": "Request Validation Customizer", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.rest.openapi.validator.RequestValidationCustomizer", "deprecated": false, "autowired": false, "secret": false, "description": "If request validation is enabled, this option provides the capability to customize the creation of OpenApiInterac [...] -"apiContextPath": { "index": 3, "kind": "property", "displayName": "Api Context Path", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the context-path to use for servicing the OpenAPI specification" }, -"bridgeErrorHandler": { "index": 4, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the
(camel) branch val-to deleted (was 721654f8523)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch val-to in repository https://gitbox.apache.org/repos/asf/camel.git was 721654f8523 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] rest-openapi - validator for producer [camel]
github-actions[bot] commented on PR #13666: URL: https://github.com/apache/camel/pull/13666#issuecomment-2028009173 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: 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. * You can label PRs using `build-all`, `build-dependents`, `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](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] rest-openapi - validator for producer [camel]
davsclaus opened a new pull request, #13666: URL: https://github.com/apache/camel/pull/13666 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas 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](https://issues.apache.org/jira/browse/CAMEL) 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 and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch val-to updated: CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pai
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch val-to in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/val-to by this push: new 721654f8523 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. 721654f8523 is described below commit 721654f85238f6593698011a22417c1b473c448a Author: Claus Ibsen AuthorDate: Sat Mar 30 11:43:09 2024 +0100 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. --- .../openapi/RestOpenApiRequestValidationTest.java | 29 -- 1 file changed, 29 deletions(-) diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java index c0cb21956b0..35c6f11857f 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; @@ -48,7 +47,6 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; @@ -371,33 +369,6 @@ public class RestOpenApiRequestValidationTest extends CamelTestSupport { assertEquals("Fruit deleted", result); } -@ParameterizedTest -@MethodSource("fruitsApiVersions") -@Disabled -void requestValidationRequiredFormParamsNotPresent(String fruitsApiVersion) { -Exchange exchange = template.request("direct:formParam", new Processor() { -@Override -public void process(Exchange exchange) throws Exception { -exchange.getMessage().setHeader("fruitsApiVersion", fruitsApiVersion); -exchange.getMessage().setBody("name=="); -} -}); - -Exception exception = exchange.getException(); -assertNotNull(exception); -assertInstanceOf(RestOpenApiValidationException.class, exception); - -RestOpenApiValidationException validationException = (RestOpenApiValidationException) exception; -Set errors = validationException.getValidationErrors(); -// [Path '/name'] Instance type (null) does not match any allowed primitive type string -assertEquals(2, errors.size()); -Iterator iterator = errors.iterator(); -assertEquals("[Path '/color'] Instance type (null) does not match any allowed primitive type (allowed: [\"string\"])", -iterator.next()); -assertEquals("[Path '/name'] Instance type (null) does not match any allowed primitive type (allowed: [\"string\"])", -iterator.next()); -} - @ParameterizedTest @MethodSource("fruitsApiVersions") void requestValidationRequiredFormParamsPresent(String fruitsApiVersion) {
(camel) branch val-to updated: CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pai
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch val-to in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/val-to by this push: new 40467c6d7e1 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. 40467c6d7e1 is described below commit 40467c6d7e180a0ce05e643c05f5b9abc889f7e1 Author: Claus Ibsen AuthorDate: Sat Mar 30 11:41:18 2024 +0100 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. --- .../camel/catalog/components/rest-openapi.json | 3 +- .../openapi/RestOpenApiEndpointConfigurer.java | 15 --- .../openapi/RestOpenApiEndpointUriFactory.java | 7 +- .../camel/component/rest/openapi/rest-openapi.json | 3 +- .../rest/openapi/RestOpenApiComponent.java | 2 - .../rest/openapi/RestOpenApiEndpoint.java | 17 --- .../openapi/RestOpenApiRequestValidationTest.java | 18 --- .../dsl/RestOpenApiEndpointBuilderFactory.java | 139 - .../camel/kotlin/components/RestOpenapiUriDsl.kt | 10 -- 9 files changed, 4 insertions(+), 210 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json index 7e33ff95650..3179dafec36 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json @@ -60,7 +60,6 @@ "requestValidationEnabled": { "index": 14, "kind": "parameter", "displayName": "Request Validation Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable validation of requests against the configured OpenAPI specification" }, "componentName": { "index": 15, "kind": "parameter", "displayName": "Component Name", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPAT [...] "lazyStartProducer": { "index": 16, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...] -"requestValidationLevels": { "index": 17, "kind": "parameter", "displayName": "Request Validation Levels", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map", "prefix": "validation.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Levels for specific OpenAPI request validation options. Multiple options can be specified as URI options prefixed by ' [...] -"clientRequestValidation": { "index": 18, "kind": "parameter", "displayName": "Client Request Validation", "group": "consumes", "label": "consumes", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable validation of the client request to check if the incoming request is valid according to the OpenAPI specification" } +"clientRequestValidation": { "index": 17, "kind": "parameter", "displayName": "Client Request Validation", "group": "consumes", "label": "consumes", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable validation of the client request to check if the incoming request is valid according to the OpenAPI specification" } } } diff --git a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointConfigurer.java b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointConfigurer.java index
(camel) 01/01: CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloadi
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch val-to in repository https://gitbox.apache.org/repos/asf/camel.git commit 75a357064507b761347271bb2e2fbad0634acabc Author: Claus Ibsen AuthorDate: Sat Mar 30 11:35:43 2024 +0100 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. --- .../camel/catalog/components/rest-openapi.json | 38 +++-- components/camel-rest-openapi/pom.xml | 24 --- .../openapi/RestOpenApiComponentConfigurer.java| 6 - .../openapi/RestOpenApiEndpointConfigurer.java | 6 - .../openapi/RestOpenApiEndpointUriFactory.java | 3 +- .../camel/component/rest/openapi/rest-openapi.json | 38 +++-- .../src/main/docs/rest-openapi-component.adoc | 66 + .../DefaultRestOpenapiProcessorStrategy.java | 9 +- .../rest/openapi/RestOpenApiComponent.java | 14 -- .../rest/openapi/RestOpenApiEndpoint.java | 44 +- .../rest/openapi/RestOpenApiProcessor.java | 5 +- .../openapi/validator/DefaultRequestValidator.java | 143 ++ .../validator/RequestValidationCustomizer.java | 51 --- .../rest/openapi/validator/RequestValidator.java | 163 - .../openapi/validator/RestOpenApiOperation.java| 2 +- ...idationCustomizer.java => RestOpenApiPath.java} | 39 - .../RestOpenApiCustomValidatorCustomizerTest.java | 135 - .../openapi/RestOpenApiRequestValidationTest.java | 29 +--- .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 4 + .../dsl/RestOpenapiComponentBuilderFactory.java| 19 --- .../dsl/RestOpenApiEndpointBuilderFactory.java | 108 -- .../camel/kotlin/components/RestOpenapiUriDsl.kt | 8 - parent/pom.xml | 1 - 23 files changed, 270 insertions(+), 685 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json index d5104b9f003..7e33ff95650 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json @@ -25,23 +25,22 @@ "componentProperties": { "basePath": { "index": 0, "kind": "property", "displayName": "Base Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "API basePath, for example \/v2. Default is unset, if set overrides the value present in OpenApi specification." }, "specificationUri": { "index": 1, "kind": "property", "displayName": "Specification Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "openapi.json", "description": "Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If [...] -"requestValidationCustomizer": { "index": 2, "kind": "property", "displayName": "Request Validation Customizer", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.rest.openapi.validator.RequestValidationCustomizer", "deprecated": false, "autowired": false, "secret": false, "description": "If request validation is enabled, this option provides the capability to customize the creation of OpenApiInterac [...] -"apiContextPath": { "index": 3, "kind": "property", "displayName": "Api Context Path", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the context-path to use for servicing the OpenAPI specification" }, -"bridgeErrorHandler": { "index": 4, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...] -"missingOperation": { "index": 5, "kind": "property", "displayName": "Missing Operation", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType":
(camel) branch val-to created (now 75a35706450)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch val-to in repository https://gitbox.apache.org/repos/asf/camel.git at 75a35706450 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. This branch includes the following new commits: new 75a35706450 CAMEL-20623: camel-rest-openapi - Use same client validation as in rest-dsl for producer. Avoid using Atlassian JAR which is not jakarta ee compatible and is causing pain and classloading issues. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] Upgrade camel to 4.5.0 [camel-quarkus]
ppalaga commented on PR #5921: URL: https://github.com/apache/camel-quarkus/pull/5921#issuecomment-2027962781 Rebased and added the upgrade to cq-maven-plugin -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade to cq-maven-plugin 4.7.0 [camel-quarkus]
ppalaga commented on PR #5934: URL: https://github.com/apache/camel-quarkus/pull/5934#issuecomment-2027962632 Added the commit to https://github.com/apache/camel-quarkus/pull/5921 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade to cq-maven-plugin 4.7.0 [camel-quarkus]
ppalaga closed pull request #5934: Upgrade to cq-maven-plugin 4.7.0 URL: https://github.com/apache/camel-quarkus/pull/5934 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch pull/5921/head deleted (was 8db09d8d90)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 This change permanently discards the following revisions: discard 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 discard 16c84ac22c Add Qdrant JVM only extension #5860 discard 815a6486fa Upgrade Camel to 4.5.0
(camel-quarkus) 02/03: Add Qdrant JVM only extension #5860
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 16c84ac22c02009739be950a580af49f6d234b44 Author: aldettinger AuthorDate: Mon Mar 11 17:19:18 2024 +0100 Add Qdrant JVM only extension #5860 --- docs/modules/ROOT/examples/components/qdrant.yml | 13 ++ docs/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/reference/extensions/qdrant.adoc| 41 + extensions-jvm/pom.xml | 1 + extensions-jvm/qdrant/deployment/pom.xml | 2 +- .../qdrant/deployment/QdrantProcessor.java | 46 +++ extensions-jvm/qdrant/pom.xml | 2 +- extensions-jvm/qdrant/runtime/pom.xml | 4 +- .../main/resources/META-INF/quarkus-extension.yaml | 33 ++ integration-tests-jvm/pom.xml | 1 + integration-tests-jvm/qdrant/pom.xml | 2 +- .../component/qdrant/it/QdrantResource.java| 50 .../quarkus/component/qdrant/it/QdrantTest.java| 34 ++ poms/bom/pom.xml | 43 -- poms/bom/src/main/generated/flattened-full-pom.xml | 43 -- .../src/main/generated/flattened-reduced-pom.xml | 53 -- .../generated/flattened-reduced-verbose-pom.xml| 53 -- 17 files changed, 397 insertions(+), 25 deletions(-) diff --git a/docs/modules/ROOT/examples/components/qdrant.yml b/docs/modules/ROOT/examples/components/qdrant.yml new file mode 100644 index 00..0887a47046 --- /dev/null +++ b/docs/modules/ROOT/examples/components/qdrant.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-qdrant +cqArtifactIdBase: qdrant +cqNativeSupported: false +cqStatus: Preview +cqDeprecated: false +cqJvmSince: 3.10.0 +cqNativeSince: n/a +cqCamelPartName: qdrant +cqCamelPartTitle: Qdrant +cqCamelPartDescription: Perform operations on the Qdrant Vector Database. +cqExtensionPageTitle: Qdrant diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index f09f593454..0dabad3803 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -241,6 +241,7 @@ *** xref:reference/extensions/jackson-protobuf.adoc[Protobuf Jackson] *** xref:reference/extensions/pubnub.adoc[PubNub] *** xref:reference/extensions/pulsar.adoc[Pulsar] +*** xref:reference/extensions/qdrant.adoc[Qdrant] *** xref:reference/extensions/quartz.adoc[Quartz] *** xref:reference/extensions/quickfix.adoc[QuickFix] *** xref:reference/extensions/qute.adoc[Qute] diff --git a/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc new file mode 100644 index 00..549ddc6cfb --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc @@ -0,0 +1,41 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-qdrant"] += Qdrant +:linkattrs: +:cq-artifact-id: camel-quarkus-qdrant +:cq-native-supported: false +:cq-status: Preview +:cq-status-deprecation: Preview +:cq-description: Perform operations on the Qdrant Vector Database. +:cq-deprecated: false +:cq-jvm-since: 3.10.0 +:cq-native-since: n/a + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##3.10.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +endif::[] + +Perform operations on the Qdrant Vector Database. + +[id="extensions-qdrant-whats-inside"] +== What's inside + +* xref:{cq-camel-components}::qdrant-component.adoc[Qdrant component], URI syntax: `qdrant:collection` + +Please refer to the above link for usage and configuration details. + +[id="extensions-qdrant-maven-coordinates"] +== Maven coordinates + +[source,xml] + + +org.apache.camel.quarkus +camel-quarkus-qdrant + + +ifeval::[{doc-show-user-guide-link} == true] +Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. +endif::[] diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 8e16b04c66..94eaf452ae 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -85,6 +85,7 @@ opensearch printer pulsar +qdrant quickfix redis robotframework diff --git a/extensions-jvm/qdrant/deployment/pom.xml b/extensions-jvm/qdrant/deployment/pom.xml index 6f5e78b0f3..a84753ed29 100644 --- a/extensions-jvm/qdrant/deployment/pom.xml +++ b/extensions-jvm/qdrant/deployment/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.quarkus camel-quarkus-qdrant-parent -3.9.1-SNAPSHOT +3.10.0-SNAPSHOT ../pom.xml
(camel-quarkus) 03/03: Upgrade to cq-maven-plugin 4.7.0
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8db09d8d907c2c88551c8970e84568e9aabb41a3 Author: Peter Palaga AuthorDate: Fri Mar 29 22:02:02 2024 +0100 Upgrade to cq-maven-plugin 4.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef87411f4c..17bc1eae89 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 0.1.0 -4.6.1 +4.7.0 2.8.0 3.5.0 3.2.0
(camel-quarkus) branch pull/5921/head created (now 8db09d8d90)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 This branch includes the following new commits: new 815a6486fa Upgrade Camel to 4.5.0 new 16c84ac22c Add Qdrant JVM only extension #5860 new 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch main updated: CAMEL-20557: Rest DSL to use openapi spec directly
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 42b67c5e65c CAMEL-20557: Rest DSL to use openapi spec directly 42b67c5e65c is described below commit 42b67c5e65c72fcda3d1c3de6fddedf3449144fc Author: Claus Ibsen AuthorDate: Sat Mar 30 08:56:22 2024 +0100 CAMEL-20557: Rest DSL to use openapi spec directly --- .../src/main/java/org/apache/camel/model/rest/OpenApiDefinition.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/OpenApiDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/OpenApiDefinition.java index 242026c18d5..c6f079b8ea2 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/OpenApiDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/OpenApiDefinition.java @@ -39,7 +39,7 @@ public class OpenApiDefinition extends OptionalIdentifiedDefinition
(camel) branch main updated: Fix flaky test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 59319d35a2e Fix flaky test 59319d35a2e is described below commit 59319d35a2e85394ff3bcc9001150723d2dfd51b Author: Claus Ibsen AuthorDate: Sat Mar 30 07:42:17 2024 +0100 Fix flaky test --- .../src/test/java/org/apache/camel/main/KameletMainTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/KameletMainTest.java b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/KameletMainTest.java index 854bf77b9c0..03ccd93deda 100644 --- a/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/KameletMainTest.java +++ b/dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/KameletMainTest.java @@ -73,7 +73,6 @@ public class KameletMainTest { protected void doTestMain(String includes, BiConsumer consumer) throws Exception { KameletMain main = new KameletMain(); -main.setDownload(false); main.configure().withRoutesIncludePattern(includes); main.configure().withAutoConfigurationEnabled(true); main.start();
(camel-spring-boot) 02/03: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit b7e1656e11884fdb9fa55d2fd586665de5703da0 Author: Claus Ibsen AuthorDate: Sat Mar 30 07:18:42 2024 +0100 Regen --- .../catalog/components/rest-openapi.json | 56 +++--- .../src/main/docs/rest-openapi.json| 7 +++ .../RestOpenApiComponentConfiguration.java | 39 ++- tooling/camel-spring-boot-dependencies/pom.xml | 10 4 files changed, 72 insertions(+), 40 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json index c007e2c7172..92191dd9495 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json @@ -24,43 +24,45 @@ }, "componentProperties": { "basePath": { "index": 0, "kind": "property", "displayName": "Base Path", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "API basePath, for example \/v2. Default is unset, if set overrides the value present in OpenApi specification." }, -"requestValidationEnabled": { "index": 1, "kind": "property", "displayName": "Request Validation Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable validation of requests against the configured OpenAPI specification" }, -"specificationUri": { "index": 2, "kind": "property", "displayName": "Specification Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "openapi.json", "description": "Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If [...] -"requestValidationCustomizer": { "index": 3, "kind": "property", "displayName": "Request Validation Customizer", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.rest.openapi.validator.RequestValidationCustomizer", "deprecated": false, "autowired": false, "secret": false, "description": "If request validation is enabled, this option provides the capability to customize the creation of OpenApiInterac [...] -"apiContextPath": { "index": 4, "kind": "property", "displayName": "Api Context Path", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the context-path to use for servicing the OpenAPI specification" }, -"bridgeErrorHandler": { "index": 5, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...] -"missingOperation": { "index": 6, "kind": "property", "displayName": "Missing Operation", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "fail", "ignore", "mock" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "fail", "description": "Whether the consumer should fail,ignore or return a mock response for OpenAPI operations that are not mapped to a corresponding route." }, -"consumerComponentName": { "index": 7, "kind": "property", "displayName": "Consumer Component Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the Camel component that will service the requests. The component must be present in Camel registry and it must implement RestOpenApiConsumerFactory service provider interfac [...] -"mockIncludePattern": { "index": 8, "kind": "property", "displayName": "Mock Include
(camel-spring-boot) 03/03: CAMEL-20611 : rename camel Langchain to camel Langchain4j
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 2b4a058171bd26a585fdee28c108f7ae696e5d87 Author: Claus Ibsen AuthorDate: Sat Mar 30 07:20:34 2024 +0100 CAMEL-20611 : rename camel Langchain to camel Langchain4j --- .../camel/springboot/catalog/components.properties | 2 + .../catalog/components/langchain4j-chat.json | 41 + .../catalog/components/langchain4j-embeddings.json | 43 + .../camel-langchain4j-chat-starter/pom.xml | 48 + .../src/main/docs/langchain4j-chat.json| 61 +++ .../LangChain4jChatComponentAutoConfiguration.java | 77 .../LangChain4jChatComponentConfiguration.java | 118 .../LangChain4jChatComponentConverter.java | 65 +++ .../src/main/resources/META-INF/LICENSE.txt| 203 + .../src/main/resources/META-INF/NOTICE.txt | 11 ++ ...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++ .../camel-langchain4j-embeddings-starter/pom.xml | 48 + .../src/main/docs/langchain4j-embeddings.json | 55 ++ ...hain4jEmbeddingsComponentAutoConfiguration.java | 77 ...angChain4jEmbeddingsComponentConfiguration.java | 102 +++ .../LangChain4jEmbeddingsComponentConverter.java | 67 +++ .../src/main/resources/META-INF/LICENSE.txt| 203 + .../src/main/resources/META-INF/NOTICE.txt | 11 ++ ...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++ components-starter/pom.xml | 2 + tooling/camel-spring-boot-bom/pom.xml | 10 + tooling/camel-spring-boot-dependencies/pom.xml | 10 + 22 files changed, 1292 insertions(+) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties index 262308e9ecd..124823ce696 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties @@ -207,6 +207,8 @@ kubernetes-secrets kubernetes-service-accounts kubernetes-services kudu +langchain4j-chat +langchain4j-embeddings language ldap ldif diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain4j-chat.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain4j-chat.json new file mode 100644 index 000..ddc009bb1bf --- /dev/null +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain4j-chat.json @@ -0,0 +1,41 @@ +{ + "component": { +"kind": "component", +"name": "langchain4j-chat", +"title": "langChain4j Chat", +"description": "LangChain4j Chat component", +"deprecated": false, +"firstVersion": "4.5.0", +"label": "ai", +"javaType": "org.apache.camel.component.langchain4j.chat.LangChain4jChatComponent", +"supportLevel": "Preview", +"groupId": "org.apache.camel.springboot", +"artifactId": "camel-langchain4j-chat-starter", +"version": "4.6.0-SNAPSHOT", +"scheme": "langchain4j-chat", +"extendsScheme": "", +"syntax": "langchain4j-chat:chatId", +"async": false, +"api": false, +"consumerOnly": false, +"producerOnly": true, +"lenientProperties": false, +"remote": true + }, + "componentProperties": { +"chatOperation": { "index": 0, "kind": "property", "displayName": "Chat Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.langchain4j.chat.LangChain4jChatOperations", "enum": [ "CHAT_SINGLE_MESSAGE", "CHAT_SINGLE_MESSAGE_WITH_PROMPT", "CHAT_MULTIPLE_MESSAGES" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "CHAT_SINGLE_MESSAGE", "configurationClass": "org.apache [...] +"configuration": { "index": 1, "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.langchain4j.chat.LangChain4jChatConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The configuration." }, +"lazyStartProducer": { "index": 2, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the
(camel-spring-boot) 01/03: CAMEL-20611 : rename camel Langchain to camel Langchain4j
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 0d75856621dd9bea8ceb64823c7d2e6f684cc56a Author: Claus Ibsen AuthorDate: Sat Mar 30 07:16:17 2024 +0100 CAMEL-20611 : rename camel Langchain to camel Langchain4j --- .../camel/springboot/catalog/components.properties | 2 - .../catalog/components/langchain-chat.json | 41 - .../catalog/components/langchain-embeddings.json | 43 - .../camel-langchain-chat-starter/pom.xml | 48 - .../src/main/docs/langchain-chat.json | 61 --- .../LangChainChatComponentAutoConfiguration.java | 77 .../LangChainChatComponentConfiguration.java | 116 .../LangChainChatComponentConverter.java | 65 --- .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 -- ...rk.boot.autoconfigure.AutoConfiguration.imports | 21 --- .../camel-langchain-embeddings-starter/pom.xml | 48 - .../src/main/docs/langchain-embeddings.json| 55 -- ...gChainEmbeddingsComponentAutoConfiguration.java | 77 .../LangChainEmbeddingsComponentConfiguration.java | 101 -- .../LangChainEmbeddingsComponentConverter.java | 67 --- .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 -- ...rk.boot.autoconfigure.AutoConfiguration.imports | 21 --- components-starter/pom.xml | 2 - tooling/camel-spring-boot-bom/pom.xml | 10 - tooling/camel-spring-boot-dependencies/pom.xml | 20 -- 22 files changed, 1303 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties index 7ac50ac667a..262308e9ecd 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties @@ -207,8 +207,6 @@ kubernetes-secrets kubernetes-service-accounts kubernetes-services kudu -langchain-chat -langchain-embeddings language ldap ldif diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain-chat.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain-chat.json deleted file mode 100644 index 83f3fd41d9f..000 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/langchain-chat.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "component": { -"kind": "component", -"name": "langchain-chat", -"title": "langChain4j Chat", -"description": "LangChain4j Chat component", -"deprecated": false, -"firstVersion": "4.5.0", -"label": "ai", -"javaType": "org.apache.camel.component.chat.LangChainChatComponent", -"supportLevel": "Preview", -"groupId": "org.apache.camel.springboot", -"artifactId": "camel-langchain-chat-starter", -"version": "4.6.0-SNAPSHOT", -"scheme": "langchain-chat", -"extendsScheme": "", -"syntax": "langchain-chat:chatId", -"async": false, -"api": false, -"consumerOnly": false, -"producerOnly": true, -"lenientProperties": false, -"remote": true - }, - "componentProperties": { -"chatOperation": { "index": 0, "kind": "property", "displayName": "Chat Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.chat.LangChainChatOperations", "enum": [ "CHAT_SINGLE_MESSAGE", "CHAT_SINGLE_MESSAGE_WITH_PROMPT", "CHAT_MULTIPLE_MESSAGES" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "CHAT_SINGLE_MESSAGE", "configurationClass": "org.apache.camel.compone [...] -"configuration": { "index": 1, "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.chat.LangChainChatConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The configuration." }, -"lazyStartProducer": { "index": 2, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first
(camel-spring-boot) branch main updated (c45c03a3ebf -> 2b4a058171b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from c45c03a3ebf Regen new 0d75856621d CAMEL-20611 : rename camel Langchain to camel Langchain4j new b7e1656e118 Regen new 2b4a058171b CAMEL-20611 : rename camel Langchain to camel Langchain4j The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/springboot/catalog/components.properties | 4 +- .../{langchain-chat.json => langchain4j-chat.json} | 22 +-- ...embeddings.json => langchain4j-embeddings.json} | 26 +-- .../catalog/components/rest-openapi.json | 56 +++--- .../camel-langchain-chat-starter/pom.xml | 48 - .../LangChainChatComponentAutoConfiguration.java | 77 .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 -- ...rk.boot.autoconfigure.AutoConfiguration.imports | 21 --- .../camel-langchain-embeddings-starter/pom.xml | 48 - ...gChainEmbeddingsComponentAutoConfiguration.java | 77 .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 -- ...rk.boot.autoconfigure.AutoConfiguration.imports | 21 --- .../pom.xml| 6 +- .../src/main/docs/langchain4j-chat.json} | 46 ++--- ...LangChain4jChatComponentAutoConfiguration.java} | 22 +-- .../LangChain4jChatComponentConfiguration.java}| 32 ++-- .../LangChain4jChatComponentConverter.java}| 8 +- .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 ...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +- .../pom.xml| 6 +- .../src/main/docs/langchain4j-embeddings.json} | 38 ++-- ...ain4jEmbeddingsComponentAutoConfiguration.java} | 22 +-- ...ngChain4jEmbeddingsComponentConfiguration.java} | 19 +- .../LangChain4jEmbeddingsComponentConverter.java} | 8 +- .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 ...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +- .../src/main/docs/rest-openapi.json| 7 + .../RestOpenApiComponentConfiguration.java | 39 ++-- components-starter/pom.xml | 4 +- tooling/camel-spring-boot-bom/pom.xml | 4 +- tooling/camel-spring-boot-dependencies/pom.xml | 8 +- 35 files changed, 205 insertions(+), 900 deletions(-) rename catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/{langchain-chat.json => langchain4j-chat.json} (65%) rename catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/{langchain-embeddings.json => langchain4j-embeddings.json} (57%) delete mode 100644 components-starter/camel-langchain-chat-starter/pom.xml delete mode 100644 components-starter/camel-langchain-chat-starter/src/main/java/org/apache/camel/component/chat/springboot/LangChainChatComponentAutoConfiguration.java delete mode 100644 components-starter/camel-langchain-chat-starter/src/main/resources/META-INF/LICENSE.txt delete mode 100644 components-starter/camel-langchain-chat-starter/src/main/resources/META-INF/NOTICE.txt delete mode 100644 components-starter/camel-langchain-chat-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 components-starter/camel-langchain-embeddings-starter/pom.xml delete mode 100644 components-starter/camel-langchain-embeddings-starter/src/main/java/org/apache/camel/component/langchain/embeddings/springboot/LangChainEmbeddingsComponentAutoConfiguration.java delete mode 100644 components-starter/camel-langchain-embeddings-starter/src/main/resources/META-INF/LICENSE.txt delete mode 100644 components-starter/camel-langchain-embeddings-starter/src/main/resources/META-INF/NOTICE.txt delete mode 100644 components-starter/camel-langchain-embeddings-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports copy components-starter/{camel-azure-files-starter => camel-langchain4j-chat-starter}/pom.xml (91%) rename components-starter/{camel-langchain-chat-starter/src/main/docs/langchain-chat.json => camel-langchain4j-chat-starter/src/main/docs/langchain4j-chat.json} (51%) copy
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
davsclaus closed pull request #1120: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1120 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated (4b89046d701 -> 0912d0d85eb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 4b89046d701 Fixup catalog: make catalog more type safe (#13665) add 0912d0d85eb CAMEL-20611 : rename camel Langchain to camel Langchain4j (#13664) No new revisions were added by this update. Summary of changes: bom/camel-bom/pom.xml | 4 +- catalog/camel-allcomponents/pom.xml| 4 +- .../org/apache/camel/catalog/components.properties | 4 +- .../camel/catalog/components/langchain4j-chat.json | 22 ++--- ...embeddings.json => langchain4j-embeddings.json} | 26 +++--- .../org/apache/camel/component/langchain-chat | 2 - .../camel/configurer/langchain-chat-component | 2 - .../camel/configurer/langchain-chat-endpoint | 2 - ...camel.component.chat.LangChainChatConfiguration | 2 - ...camel.component.chat.LangchainChatConfiguration | 2 - .../camel/urifactory/langchain-chat-endpoint | 2 - .../services/org/apache/camel/TypeConverterLoader | 2 - .../apache/camel/component/langchain-embeddings| 2 - .../configurer/langchain-embeddings-component | 2 - .../camel/configurer/langchain-embeddings-endpoint | 2 - ...ain.embeddings.LangChainEmbeddingsConfiguration | 2 - ...ain.embeddings.LangchainEmbeddingsConfiguration | 2 - .../camel/urifactory/langchain-embeddings-endpoint | 2 - .../pom.xml| 4 +- .../chat/LangChain4jChatComponentConfigurer.java} | 20 ++--- .../LangChain4jChatConfigurationConfigurer.java} | 14 ++-- .../chat/LangChain4jChatEndpointConfigurer.java} | 12 +-- .../chat/LangChain4jChatEndpointUriFactory.java} | 6 +- .../langchain4j/chat/langchain4j-chat.json | 22 ++--- .../services/org/apache/camel/component.properties | 6 +- .../org/apache/camel/component/langchain4j-chat| 2 + .../camel/configurer/langchain4j-chat-component| 2 + .../camel/configurer/langchain4j-chat-endpoint | 2 + ...t.langchain4j.chat.LangChain4jChatConfiguration | 2 + .../camel/urifactory/langchain4j-chat-endpoint | 2 + .../src/main/docs/langchain4j-chat-component.adoc} | 28 +++ .../langchain4j/chat/LangChain4jChat.java} | 10 +-- .../chat/LangChain4jChatComponent.java}| 22 ++--- .../chat/LangChain4jChatConfiguration.java}| 18 ++--- .../langchain4j/chat/LangChain4jChatEndpoint.java} | 22 ++--- .../chat/LangChain4jChatOperations.java} | 4 +- .../langchain4j/chat/LangChain4jChatProducer.java} | 18 ++--- .../langchain4j.chat/LangChain4jChatIT.java} | 16 ++-- .../langchain4j.chat}/OllamaTestSupport.java | 2 +- .../src/test/resources/log4j2.properties | 6 +- .../pom.xml| 4 +- .../LangChain4jEmbeddingsComponentConfigurer.java} | 16 ++-- ...gChain4jEmbeddingsConfigurationConfigurer.java} | 10 +-- .../LangChain4jEmbeddingsConverterLoader.java} | 12 +-- .../LangChain4jEmbeddingsEndpointConfigurer.java} | 8 +- .../LangChain4jEmbeddingsEndpointUriFactory.java} | 6 +- .../embeddings/langchain4j-embeddings.json}| 26 +++--- .../services/org/apache/camel/TypeConverterLoader | 2 + .../services/org/apache/camel/component.properties | 6 +- .../apache/camel/component/langchain4j-embeddings | 2 + .../configurer/langchain4j-embeddings-component| 2 + .../configurer/langchain4j-embeddings-endpoint | 2 + ...j.embeddings.LangChain4jEmbeddingsConfiguration | 2 + .../urifactory/langchain4j-embeddings-endpoint | 2 + .../docs/langchain4j-embeddings-component.adoc}| 10 +-- .../embeddings/LangChain4jEmbeddings.java} | 18 ++--- .../LangChain4jEmbeddingsComponent.java} | 22 ++--- .../LangChain4jEmbeddingsConfiguration.java} | 8 +- .../LangChain4jEmbeddingsConverter.java} | 4 +- .../embeddings/LangChain4jEmbeddingsEndpoint.java} | 24 +++--- .../embeddings/LangChain4jEmbeddingsProducer.java} | 20 ++--- ...gChain4jEmbeddingsComponentMilvusTargetIT.java} | 6 +- ...gChain4jEmbeddingsComponentQdrantTargetIT.java} | 6 +- .../LangChain4jEmbeddingsComponentTest.java} | 16 ++-- .../src/test/resources/log4j2.properties | 6 +- components/camel-ai/pom.xml| 4 +- .../MilvusEmbeddingsDataTypeTransformer.java | 5 +- .../QdrantEmbeddingsDataTypeTransformer.java | 4 +- .../org/apache/camel/main/components.properties| 4 +- .../modules/ROOT/examples/json/langchain-chat.json | 1 - .../ROOT/examples/json/langchain-embeddings.json | 1 - .../ROOT/examples/json/langchain4j-chat.json | 1 + .../ROOT/examples/json/langchain4j-embeddings.json | 1 + docs/components/modules/ROOT/nav.adoc | 4 +- .../ROOT/pages/langchain-chat-component.adoc | 1 - .../ROOT/pages/langchain-embeddings-component.adoc | 1 -
Re: [PR] Fixup catalog: make catalog more type safe [camel]
davsclaus commented on PR #13665: URL: https://github.com/apache/camel/pull/13665#issuecomment-2027935019 its a known issue somewhere else on java 21 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: Fixup catalog: make catalog more type safe (#13665)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 4b89046d701 Fixup catalog: make catalog more type safe (#13665) 4b89046d701 is described below commit 4b89046d701e3f4c53b0b053353fecaa759ac47b Author: Peter Palaga AuthorDate: Sat Mar 30 07:07:16 2024 +0100 Fixup catalog: make catalog more type safe (#13665) --- .../src/main/java/org/apache/camel/catalog/CamelCatalog.java| 6 ++ 1 file changed, 6 insertions(+) diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java index 6406ba99f0c..3ba6ee5263a 100644 --- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java +++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java @@ -250,6 +250,8 @@ public interface CamelCatalog { return findModelNames(); case bean: return findBeansNames(); +case model: +return findModelNames(); default: throw new IllegalArgumentException("Unexpected kind " + kind); } @@ -628,6 +630,10 @@ public interface CamelCatalog { return otherModel(name); case eip: return eipModel(name); +case bean: +return pojoBeanModel(name); +case model: +return eipModel(name); default: throw new IllegalArgumentException("Unexpected kind " + kind); }
Re: [PR] CAMEL-20611 : rename camel Langchain to camel Langchain4j [camel]
davsclaus merged PR #13664: URL: https://github.com/apache/camel/pull/13664 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fixup catalog: make catalog more type safe [camel]
davsclaus merged PR #13665: URL: https://github.com/apache/camel/pull/13665 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org