This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-24524
in repository https://gitbox.apache.org/repos/asf/camel.git
from cccef7634d1e Merge branch 'main' into fix/CAMEL-24524
add 443ebb407373 CAMEL-24511: camel-paho-mqtt5 - restart route on
resubscribe failure
add 1ee5ed350c6a CAMEL-23398: Add QuickJS language (#25778)
add 91d5bdac5118 CAMEL-24445: camel-pqc - use a per-exchange Signature
instance
add 957b28aa7fad CAMEL-24447: camel-pqc - restrict private key files to
their owner (#25826)
add d347583a37ff CAMEL-24530: camel-djl - close the InputStream opened
from File/Path bodies in DJLConverter (#25852)
add ee074873e92d CAMEL-24448: camel-keycloak - reject an introspection
result that carries no issuer (#25827)
add 6ae5e852416e CAMEL-23861: GenAI observability Phase 3 - Spring AI chat
and camel-main config
add 8945a71e3457 Merge remote-tracking branch 'origin/main' into
fix/CAMEL-24524
No new revisions were added by this update.
Summary of changes:
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml | 5 +
.../apache/camel/catalog/components/language.json | 2 +-
.../org/apache/camel/catalog/docs.properties | 1 +
.../camel/catalog/docs/ai-observability.adoc | 17 +-
.../org/apache/camel/catalog/docs/main.adoc | 10 +
.../camel/catalog/docs/quickjs-language.adoc | 171 ++++++++++
.../catalog/docs/spring-ai-chat-component.adoc | 17 +
.../org/apache/camel/catalog/languages.properties | 1 +
.../apache/camel/catalog/languages/quickjs.json | 24 ++
.../main/camel-main-configuration-metadata.json | 2 +
.../org/apache/camel/catalog/models.properties | 1 +
.../org/apache/camel/catalog/models/aggregate.json | 8 +-
.../org/apache/camel/catalog/models/delay.json | 2 +-
.../apache/camel/catalog/models/dynamicRouter.json | 2 +-
.../org/apache/camel/catalog/models/enrich.json | 2 +-
.../org/apache/camel/catalog/models/filter.json | 2 +-
.../camel/catalog/models/idempotentConsumer.json | 2 +-
.../org/apache/camel/catalog/models/loop.json | 2 +-
.../apache/camel/catalog/models/onException.json | 6 +-
.../org/apache/camel/catalog/models/onWhen.json | 2 +-
.../apache/camel/catalog/models/pollEnrich.json | 2 +-
.../camel/catalog/models/predicateValidator.json | 2 +-
.../camel/catalog/models/propertyExpression.json | 2 +-
.../org/apache/camel/catalog/models/quickjs.json | 21 ++
.../apache/camel/catalog/models/recipientList.json | 2 +-
.../apache/camel/catalog/models/resequence.json | 2 +-
.../apache/camel/catalog/models/routingSlip.json | 2 +-
.../org/apache/camel/catalog/models/script.json | 2 +-
.../org/apache/camel/catalog/models/setBody.json | 2 +-
.../org/apache/camel/catalog/models/setHeader.json | 2 +-
.../apache/camel/catalog/models/setProperty.json | 2 +-
.../apache/camel/catalog/models/setVariable.json | 2 +-
.../org/apache/camel/catalog/models/sort.json | 2 +-
.../org/apache/camel/catalog/models/split.json | 2 +-
.../camel/catalog/models/stickyLoadBalancer.json | 2 +-
.../org/apache/camel/catalog/models/throttle.json | 4 +-
.../org/apache/camel/catalog/models/transform.json | 2 +-
.../org/apache/camel/catalog/models/validate.json | 2 +-
.../org/apache/camel/catalog/models/when.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 39 +++
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 39 +++
.../camel/catalog/schemas/camelYamlDsl-model.json | 56 ++++
.../ai/observability/GenAiModelResolver.java | 368 +++++++++++++++++++--
.../GenAiObservabilityProperties.java | 2 +-
.../src/main/docs/ai-observability.adoc | 17 +-
.../ai/observability/GenAiModelResolverTest.java | 126 ++++++-
.../ai/openai/FakeOpenAiChatModel.java} | 24 +-
.../apache/camel/component/djl/DJLConverter.java | 16 +-
.../camel/component/djl/DJLConverterTest.java | 49 +++
.../agent/LangChain4jAgentProducer.java | 4 +-
.../langchain4j/chat/LangChain4jChatProducer.java | 14 +-
.../embeddings/LangChain4jEmbeddingsProducer.java | 4 +-
.../security/KeycloakSecurityProcessor.java | 16 +-
.../security/KeycloakSecurityProcessorTest.java | 67 ++++
.../apache/camel/component/language/language.json | 2 +-
.../camel/component/language/LanguageEndpoint.java | 2 +-
.../component/paho/mqtt5/PahoMqtt5Consumer.java | 40 ++-
.../mqtt5/PahoMqtt5ResubscribeFailureTest.java | 206 ++++++++++++
.../apache/camel/component/pqc/PQCProducer.java | 129 ++++++--
.../lifecycle/FileBasedKeyLifecycleManager.java | 49 ++-
.../pqc/PQCConcurrentSignatureIsolationTest.java | 96 ++++++
...ileBasedKeyLifecycleManagerPermissionsTest.java | 91 +++++
components/camel-quickjs/pom.xml | 77 +++++
.../org/apache/camel/language/quickjs/quickjs.json | 24 ++
.../services/org/apache/camel/language.properties | 7 +
.../services/org/apache/camel/language/quickjs | 2 +
.../src/main/docs/quickjs-language.adoc | 171 ++++++++++
.../apache/camel/language/quickjs/Quickjs.java} | 27 +-
.../camel/language/quickjs/QuickjsExpression.java | 53 +++
.../camel/language/quickjs/QuickjsHelper.java | 299 +++++++++++++++++
.../camel/language/quickjs/QuickjsLanguage.java | 221 +++++++++++++
.../org/apache/camel/language/quickjs/package.html | 27 ++
.../camel/language/QuickjsLanguageTest.java} | 17 +-
.../language/quickjs/QuickjsErrorHandlingTest.java | 103 ++++++
.../camel/language/quickjs/QuickjsJavaDslTest.java | 74 +++++
.../quickjs/QuickjsLanguageEndpointTest.java | 49 +++
.../language/quickjs/QuickjsLanguageEvalTest.java | 207 ++++++++++++
.../quickjs/QuickjsLanguageLifecycleTest.java | 131 ++++++++
.../quickjs/QuickjsLanguageSecurityTest.java | 183 ++++++++++
.../language/quickjs/QuickjsResourceTest.java | 92 ++++++
.../language/quickjs/QuickjsSerializationTest.java | 126 +++++++
.../src/test/resources/log4j2.properties | 28 ++
.../src/test/resources/myquickjs.js} | 16 +-
.../camel-spring-ai/camel-spring-ai-chat/pom.xml | 17 +
.../src/main/docs/spring-ai-chat-component.adoc | 17 +
.../springai/chat/SpringAiChatProducer.java | 143 +++++++-
.../chat/SpringAiChatObservabilityTest.java | 291 ++++++++++++++++
.../ai/openai/EntityJsonStubOpenAiChatModel.java | 82 +++++
.../ai/openai/StubOpenAiChatModel.java | 82 +++++
components/pom.xml | 1 +
.../META-INF/org/apache/camel/model/aggregate.json | 8 +-
.../META-INF/org/apache/camel/model/delay.json | 2 +-
.../org/apache/camel/model/dynamicRouter.json | 2 +-
.../META-INF/org/apache/camel/model/enrich.json | 2 +-
.../META-INF/org/apache/camel/model/filter.json | 2 +-
.../org/apache/camel/model/idempotentConsumer.json | 2 +-
.../org/apache/camel/model/language/quickjs.json | 21 ++
.../model/loadbalancer/stickyLoadBalancer.json | 2 +-
.../META-INF/org/apache/camel/model/loop.json | 2 +-
.../org/apache/camel/model/onException.json | 6 +-
.../META-INF/org/apache/camel/model/onWhen.json | 2 +-
.../org/apache/camel/model/pollEnrich.json | 2 +-
.../org/apache/camel/model/propertyExpression.json | 2 +-
.../org/apache/camel/model/recipientList.json | 2 +-
.../org/apache/camel/model/resequence.json | 2 +-
.../org/apache/camel/model/routingSlip.json | 2 +-
.../META-INF/org/apache/camel/model/script.json | 2 +-
.../META-INF/org/apache/camel/model/setBody.json | 2 +-
.../META-INF/org/apache/camel/model/setHeader.json | 2 +-
.../org/apache/camel/model/setProperty.json | 2 +-
.../org/apache/camel/model/setVariable.json | 2 +-
.../META-INF/org/apache/camel/model/sort.json | 2 +-
.../META-INF/org/apache/camel/model/split.json | 2 +-
.../META-INF/org/apache/camel/model/throttle.json | 4 +-
.../META-INF/org/apache/camel/model/transform.json | 2 +-
.../META-INF/org/apache/camel/model/validate.json | 2 +-
.../camel/model/validator/predicateValidator.json | 2 +-
.../META-INF/org/apache/camel/model/when.json | 2 +-
.../services/org/apache/camel/model.properties | 1 +
.../org/apache/camel/model/language/jaxb.index | 1 +
.../org/apache/camel/builder/ExpressionClause.java | 21 ++
.../camel/builder/ExpressionClauseSupport.java | 24 ++
.../camel/builder/LanguageBuilderFactory.java | 17 +
.../camel/model/language/QuickjsExpression.java | 71 ++++
.../apache/camel/java/out/JavaDslModelWriter.java | 16 +
core/camel-main/pom.xml | 6 +
...rvabilityConfigurationPropertiesConfigurer.java | 60 ++++
.../camel-main-configuration-metadata.json | 2 +
...mel.main.AiObservabilityConfigurationProperties | 2 +
.../org/apache/camel/main/languages.properties | 1 +
core/camel-main/src/main/docs/main.adoc | 10 +
.../AiObservabilityConfigurationProperties.java | 67 ++++
.../org/apache/camel/main/BaseMainSupport.java | 36 +-
.../camel/main/MainConfigurationProperties.java | 22 ++
...AiObservabilityConfigurationPropertiesTest.java | 65 ++++
.../src/test/resources/ai-observability.properties | 17 +
.../java/org/apache/camel/xml/in/ModelParser.java | 4 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 10 +
.../org/apache/camel/yaml/out/YamlModelWriter.java | 10 +
coverage/pom.xml | 5 +
.../modules/languages/examples/json/quickjs.json | 1 +
docs/components/modules/languages/nav.adoc | 1 +
.../modules/languages/pages/quickjs-language.adoc | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 54 ++-
.../builder/endpoint/StaticEndpointBuilders.java | 12 +-
.../dsl/LanguageEndpointBuilderFactory.java | 10 +-
.../deserializers/ExpressionDeserializers.java | 5 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 73 ++++
.../deserializers/ModelDeserializersResolver.java | 2 +
.../resources/schema/camelYamlDsl-canonical.json | 36 ++
.../resources/schema/camelYamlDsl-model.json | 56 ++++
.../generated/resources/schema/camelYamlDsl.json | 123 +++++++
parent/pom.xml | 6 +
.../maven/packaging/PrepareCamelMainMojo.java | 5 +
155 files changed, 5063 insertions(+), 243 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/quickjs-language.adoc
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/quickjs.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/quickjs.json
copy
components/camel-ai/{camel-ai-observability-api/src/main/java/org/apache/camel/component/ai/observability/GenAiObservabilityProperties.java
=>
camel-ai-observability/src/test/java/org/springframework/ai/openai/FakeOpenAiChatModel.java}
(62%)
create mode 100644
components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/DJLConverterTest.java
create mode 100644
components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ResubscribeFailureTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCConcurrentSignatureIsolationTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/lifecycle/FileBasedKeyLifecycleManagerPermissionsTest.java
create mode 100644 components/camel-quickjs/pom.xml
create mode 100644
components/camel-quickjs/src/generated/resources/META-INF/org/apache/camel/language/quickjs/quickjs.json
create mode 100644
components/camel-quickjs/src/generated/resources/META-INF/services/org/apache/camel/language.properties
create mode 100644
components/camel-quickjs/src/generated/resources/META-INF/services/org/apache/camel/language/quickjs
create mode 100644 components/camel-quickjs/src/main/docs/quickjs-language.adoc
copy
components/{camel-ai/camel-ai-observability-api/src/main/java/org/apache/camel/component/ai/observability/GenAiObservabilityProperties.java
=> camel-quickjs/src/main/java/org/apache/camel/language/quickjs/Quickjs.java}
(56%)
create mode 100644
components/camel-quickjs/src/main/java/org/apache/camel/language/quickjs/QuickjsExpression.java
create mode 100644
components/camel-quickjs/src/main/java/org/apache/camel/language/quickjs/QuickjsHelper.java
create mode 100644
components/camel-quickjs/src/main/java/org/apache/camel/language/quickjs/QuickjsLanguage.java
create mode 100644
components/camel-quickjs/src/main/java/org/apache/camel/language/quickjs/package.html
copy
components/{camel-ai/camel-ai-observability-api/src/main/java/org/apache/camel/component/ai/observability/GenAiObservabilityProperties.java
=>
camel-quickjs/src/test/java/org/apache/camel/language/QuickjsLanguageTest.java}
(65%)
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsErrorHandlingTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsJavaDslTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsLanguageEndpointTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsLanguageEvalTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsLanguageLifecycleTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsLanguageSecurityTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsResourceTest.java
create mode 100644
components/camel-quickjs/src/test/java/org/apache/camel/language/quickjs/QuickjsSerializationTest.java
create mode 100644
components/camel-quickjs/src/test/resources/log4j2.properties
copy
components/{camel-ai/camel-ai-observability-api/src/main/java/org/apache/camel/component/ai/observability/GenAiObservabilityProperties.java
=> camel-quickjs/src/test/resources/myquickjs.js} (65%)
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatObservabilityTest.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/springframework/ai/openai/EntityJsonStubOpenAiChatModel.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/springframework/ai/openai/StubOpenAiChatModel.java
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/quickjs.json
create mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/language/QuickjsExpression.java
create mode 100644
core/camel-main/src/generated/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesConfigurer.java
create mode 100644
core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.main.AiObservabilityConfigurationProperties
create mode 100644
core/camel-main/src/main/java/org/apache/camel/main/AiObservabilityConfigurationProperties.java
create mode 100644
core/camel-main/src/test/java/org/apache/camel/main/AiObservabilityConfigurationPropertiesTest.java
create mode 100644
core/camel-main/src/test/resources/ai-observability.properties
create mode 120000 docs/components/modules/languages/examples/json/quickjs.json
create mode 120000
docs/components/modules/languages/pages/quickjs-language.adoc
