This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch CAMEL-11114-cache-eip in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11e25b3bf88826701365483dae77cb125a08e6b1 Merge: 25f2c87c2b52 1d70c58d6269 Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Aug 27 15:27:25 2026 +0200 Merge origin/main into CAMEL-11114-cache-eip Resolve conflicts from CAMEL-24463 squash merge landing on main: - add/add conflicts on KVR SPI files: accept main (has review feedback) - rename/delete false conflicts on new components (alibaba-ots, spiffe, toon): accept main - state-store docs: accept main (removed backend sub-modules, Object put() return type) - camel-support pom.xml: keep awaitility dependency from main Co-Authored-By: Claude Opus 4.6 <[email protected]> .../actions/incremental-build/incremental-build.sh | 2 +- .github/workflows/alternative-os-build-main.yml | 2 +- .github/workflows/camel-launcher-native-exe.yml | 6 +- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/main-build.yml | 2 +- .github/workflows/package-native-validation.yml | 4 +- .github/workflows/pr-build-main.yml | 2 +- .github/workflows/security-scan.yml | 2 +- .github/workflows/sonar-build.yml | 2 +- .github/workflows/sonar-scan.yml | 2 +- .mvn/extensions.xml | 2 +- AGENTS.md | 29 +- apache-camel/pom.xml | 4 - bom/camel-bom/pom.xml | 67 +- catalog/camel-allcomponents/pom.xml | 62 +- catalog/camel-catalog-lucene/pom.xml | 90 - .../catalog/lucene/LuceneSuggestionStrategy.java | 70 - .../src/main/resources/META-INF/LICENSE.txt | 203 -- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../catalog/lucene/CamelCatalogLuceneTest.java | 50 - .../src/test/resources/log4j2.properties | 28 - .../org/apache/camel/catalog/components.properties | 11 +- .../camel/catalog/components/alibaba-ots.json | 46 + .../camel/catalog/components/alibaba-sls.json | 70 + .../org/apache/camel/catalog/components/as2.json | 33 +- .../camel/catalog/components/digitalocean.json | 69 - .../apache/camel/catalog/components/ibm-cos.json | 2 +- .../camel/catalog/components/ibm-watsonx-ai.json | 2 +- .../camel/catalog/components/iec60870-client.json | 72 - .../camel/catalog/components/iec60870-server.json | 64 - .../org/apache/camel/catalog/components/irc.json | 76 - .../apache/camel/catalog/components/ironmq.json | 73 - .../camel/catalog/components/json-patch.json | 42 - .../apache/camel/catalog/components/knative.json | 38 +- .../catalog/components/langchain4j-tools.json | 56 - .../org/apache/camel/catalog/components/mina.json | 4 +- .../apache/camel/catalog/components/spiffe.json | 50 + .../apache/camel/catalog/components/splunk.json | 83 - .../apache/camel/catalog/dataformats.properties | 1 + .../org/apache/camel/catalog/dataformats/toon.json | 26 + .../org/apache/camel/catalog/docs.properties | 15 +- .../camel/catalog/docs/alibaba-ots-component.adoc | 73 + .../camel/catalog/docs/alibaba-sls-component.adoc | 87 + .../camel/catalog/docs/dead-letter-channel.adoc | 20 + .../camel/catalog/docs/digitalocean-component.adoc | 598 ------ .../catalog/docs/google-pubsub-component.adoc | 39 +- .../org/apache/camel/catalog/docs/headersmap.adoc | 34 - .../catalog/docs/iec60870-client-component.adoc | 300 --- .../catalog/docs/iec60870-server-component.adoc | 48 - .../apache/camel/catalog/docs/irc-component.adoc | 161 -- .../camel/catalog/docs/ironmq-component.adoc | 141 -- .../camel/catalog/docs/json-patch-component.adoc | 48 - .../catalog/docs/langchain4j-tools-component.adoc | 702 ------ .../catalog/docs/reactive-executor-tomcat.adoc | 40 - .../camel/catalog/docs/spiffe-component.adoc | 89 + .../camel/catalog/docs/splunk-component.adoc | 325 --- .../camel/catalog/docs/state-store-component.adoc | 17 +- .../catalog/docs/threadpoolfactory-vertx.adoc | 68 - .../apache/camel/catalog/docs/toon-dataformat.adoc | 186 ++ .../org/apache/camel/catalog/models.properties | 1 + .../catalog/models/dataFormatTransformer.json | 2 +- .../apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/models/doCatch.json | 4 +- .../org/apache/camel/catalog/models/doFinally.json | 4 +- .../apache/camel/catalog/models/errorHandler.json | 4 +- .../org/apache/camel/catalog/models/marshal.json | 2 +- .../apache/camel/catalog/models/onException.json | 4 +- .../org/apache/camel/catalog/models/toon.json | 23 + .../org/apache/camel/catalog/models/unmarshal.json | 2 +- .../org/apache/camel/catalog/others.properties | 3 - .../apache/camel/catalog/others/headersmap.json | 15 - .../catalog/others/reactive-executor-tomcat.json | 15 - .../catalog/others/threadpoolfactory-vertx.json | 15 - .../apache/camel/catalog/schemas/camel-spring.xsd | 67 + .../apache/camel/catalog/schemas/camel-xml-io.xsd | 67 + .../camel/catalog/schemas/camelYamlDsl-model.json | 79 + catalog/pom.xml | 1 - .../camel-ai/camel-langchain4j-tools/pom.xml | 131 -- .../LangChain4jToolsConfigurationConfigurer.java | 51 - .../tools/LangChain4jToolsEndpointConfigurer.java | 115 - .../langchain4j/tools/langchain4j-tools.json | 56 - .../services/org/apache/camel/component.properties | 7 - .../org/apache/camel/component/langchain4j-tools | 2 - .../camel/configurer/langchain4j-tools-component | 2 - .../camel/configurer/langchain4j-tools-endpoint | 2 - ...langchain4j.tools.LangChain4jToolsConfiguration | 2 - .../camel/urifactory/langchain4j-tools-endpoint | 2 - .../src/main/docs/langchain4j-tools-component.adoc | 702 ------ .../tools/LangChain4jToolsComponent.java | 86 - .../tools/LangChain4jToolsConfiguration.java | 58 - .../tools/LangChain4jToolsEndpoint.java | 449 ---- .../langchain4j/tools/LangChain4jToolsHeaders.java | 41 - .../tools/LangChain4jToolsProducer.java | 503 ----- .../component/langchain4j/tools/TagsHelper.java | 34 - .../langchain4j/tools/ToolSearchTool.java | 136 -- .../tools/spec/CamelSimpleToolParameter.java | 76 - .../tools/spec/CamelToolExecutorCache.java | 110 - .../tools/spec/CamelToolSpecification.java | 95 - .../tools/LangChain4jToolDefectsTest.java | 208 -- .../tools/LangChain4jToolMultipleCallsTest.java | 145 -- .../tools/LangChain4jToolMultipleGroupsTest.java | 118 - .../LangChain4jToolMultipleMatchingGroupsTest.java | 121 -- .../tools/LangChain4jToolNoToolsExistTest.java | 110 - .../LangChain4jToolNoToolsToBeCalledTest.java | 110 - ...hain4jToolParameterValueTypeConversionTest.java | 118 - .../LangChain4jToolRequiredParameterTest.java | 426 ---- .../tools/LangChain4jToolStopEipTest.java | 130 -- .../langchain4j/tools/LangChain4jToolTest.java | 221 -- .../tools/LangChain4jToolsObservabilityTest.java | 204 -- .../tools/ToolSearchToolFormatTest.java | 121 -- .../langchain4j/tools/ToolSearchToolTest.java | 177 -- .../component/langchain4j/tools/ToolsHelper.java | 54 - .../tools/integration/LangChain4jToolIT.java | 38 - .../LangChain4jToolMultipleCallsIT.java | 39 - .../LangChain4jToolMultipleGroupsIT.java | 39 - .../LangChain4jToolMultipleMatchingGroupsIT.java | 38 - .../integration/LangChain4jToolNoToolsExistIT.java | 39 - .../LangChain4jToolNoToolsToBeCalledIT.java | 39 - .../tools/spec/CamelToolExecutorCacheTest.java | 160 -- .../src/test/resources/log4j2.properties | 30 - .../camel-langchain4j-tools/test-execution.md | 38 - components/camel-ai/pom.xml | 1 - components/camel-ai/src/main/docs/ai-summary.adoc | 4 - .../camel-alibaba-ots}/pom.xml | 46 +- .../ots/AlibabaOtsComponentConfigurer.java} | 14 +- .../alibaba/ots/AlibabaOtsEndpointConfigurer.java | 89 + .../alibaba/ots/AlibabaOtsEndpointUriFactory.java} | 31 +- .../camel/component/alibaba/ots/alibaba-ots.json | 46 + .../services/org/apache/camel/component.properties | 7 + .../org/apache/camel/component/alibaba-ots | 2 + .../apache/camel/configurer/alibaba-ots-component} | 2 +- .../apache/camel/configurer/alibaba-ots-endpoint} | 2 +- .../apache/camel/urifactory/alibaba-ots-endpoint} | 2 +- .../src/main/docs/alibaba-ots-component.adoc | 73 + .../alibaba/ots/AlibabaOtsComponent.java} | 23 +- .../component/alibaba/ots/AlibabaOtsEndpoint.java | 163 ++ .../component/alibaba/ots/AlibabaOtsProducer.java | 102 + .../component/alibaba/ots/AlibabaOtsUtils.java | 168 ++ .../alibaba/ots/constants/AlibabaOtsHeaders.java} | 13 +- .../ots/constants/AlibabaOtsOperations.java} | 18 +- .../ots/constants/AlibabaOtsProperties.java} | 18 +- .../alibaba/ots/models/ClientConfigurations.java} | 14 +- .../alibaba/ots/AlibabaOtsEndpointTest.java | 70 + .../alibaba/ots/AlibabaOtsProducerTest.java | 56 + .../camel/component/alibaba/ots/DeleteRowTest.java | 88 + .../camel/component/alibaba/ots/GetRowTest.java | 103 + .../component/alibaba/ots/ListTablesTest.java | 80 + .../camel/component/alibaba/ots/PutRowTest.java | 88 + .../component/alibaba/ots/TestConfiguration.java | 57 + .../camel/component/alibaba/ots/UpdateRowTest.java | 88 + .../ots/constants/AlibabaOtsOperationsTest.java} | 28 +- .../src/test/resources/log4j2.properties | 2 +- .../test/resources/testconfiguration.properties} | 6 +- .../camel-alibaba-sls}/pom.xml | 53 +- .../sls/AlibabaSlsComponentConfigurer.java} | 20 +- .../alibaba/sls/AlibabaSlsEndpointConfigurer.java | 116 + .../alibaba/sls/AlibabaSlsEndpointUriFactory.java} | 50 +- .../camel/component/alibaba/sls/alibaba-sls.json | 70 + .../services/org/apache/camel/component.properties | 7 + .../org/apache/camel/component/alibaba-sls | 2 + .../apache/camel/configurer/alibaba-sls-component} | 2 +- .../apache/camel/configurer/alibaba-sls-endpoint} | 2 +- .../apache/camel/urifactory/alibaba-sls-endpoint} | 2 +- .../src/main/docs/alibaba-sls-component.adoc | 87 + .../alibaba/sls/AlibabaSlsComponent.java} | 19 +- .../component/alibaba/sls/AlibabaSlsEndpoint.java | 266 +++ .../component/alibaba/sls/AlibabaSlsProducer.java | 122 ++ .../component/alibaba/sls/AlibabaSlsUtils.java | 215 ++ .../alibaba/sls/constants/AlibabaSlsHeaders.java | 76 + .../sls/constants/AlibabaSlsOperations.java} | 12 +- .../sls/constants/AlibabaSlsProperties.java | 76 + .../alibaba/sls/models/ClientConfigurations.java | 156 ++ .../alibaba/sls/AlibabaSlsEndpointTest.java | 55 + .../alibaba/sls/AlibabaSlsProducerTest.java | 56 + .../camel/component/alibaba/sls/GetLogsTest.java | 102 + .../component/alibaba/sls/ListLogStoresTest.java | 126 ++ .../camel/component/alibaba/sls/PutLogsTest.java | 104 + .../component/alibaba/sls/TestConfiguration.java | 57 + .../sls/constants/AlibabaSlsOperationsTest.java} | 23 +- .../src/test/resources/log4j2.properties | 3 +- .../test/resources/testconfiguration.properties} | 15 +- components/camel-alibaba/pom.xml | 2 + .../as2/api/AS2AsynchronousMDNManager.java | 84 +- .../component/as2/api/AS2ServerConnection.java | 26 +- ...2AsynchronousMDNManagerDeliveryAddressTest.java | 102 + ...rverManagerEndpointConfigurationConfigurer.java | 7 + ...ientManagerEndpointConfigurationConfigurer.java | 7 + .../component/as2/AS2ConfigurationConfigurer.java | 7 + .../camel/component/as2/AS2EndpointConfigurer.java | 7 + .../camel/component/as2/AS2EndpointUriFactory.java | 3 +- ...rverManagerEndpointConfigurationConfigurer.java | 7 + .../org/apache/camel/component/as2/as2.json | 33 +- .../camel/component/as2/AS2Configuration.java | 18 + .../as2/internal/AS2ConnectionHelper.java | 3 +- .../as2/AS2AsyncMdnBasicAuthHeaderTest.java | 5 +- .../as2/AS2AsyncMdnTokenAuthHeaderTest.java | 5 +- .../as2/AS2ServerBasicAuthHeaderTest.java | 3 + .../as2/AS2ServerBearerAuthHeaderTest.java | 3 + components/camel-digitalocean/pom.xml | 59 - .../DigitalOceanComponentConfigurer.java | 57 - .../DigitalOceanEndpointConfigurer.java | 99 - .../camel/component/digitalocean/digitalocean.json | 69 - .../services/org/apache/camel/component.properties | 7 - .../org/apache/camel/component/digitalocean | 2 - .../apache/camel/configurer/digitalocean-component | 2 - .../apache/camel/configurer/digitalocean-endpoint | 2 - .../apache/camel/urifactory/digitalocean-endpoint | 2 - .../src/main/docs/digitalocean-component.adoc | 598 ------ .../digitalocean/DigitalOceanComponent.java | 49 - .../digitalocean/DigitalOceanConfiguration.java | 171 -- .../digitalocean/DigitalOceanEndpoint.java | 154 -- .../constants/DigitalOceanHeaders.java | 73 - .../constants/DigitalOceanImageTypes.java | 25 - .../constants/DigitalOceanOperations.java | 58 - .../constants/DigitalOceanResources.java | 34 - .../producer/DigitalOceanAccountProducer.java | 41 - .../producer/DigitalOceanActionsProducer.java | 73 - .../DigitalOceanBlockStoragesProducer.java | 289 --- .../producer/DigitalOceanDropletsProducer.java | 451 ---- .../producer/DigitalOceanFloatingIPsProducer.java | 166 -- .../producer/DigitalOceanImagesProducer.java | 196 -- .../producer/DigitalOceanKeysProducer.java | 156 -- .../producer/DigitalOceanProducer.java | 54 - .../producer/DigitalOceanRegionsProducer.java | 41 - .../producer/DigitalOceanSizesProducer.java | 41 - .../producer/DigitalOceanSnapshotsProducer.java | 110 - .../producer/DigitalOceanTagsProducer.java | 101 - .../digitalocean/DigitalOceanComponentTest.java | 63 - .../integration/DigitalOceanComponentIT.java | 347 --- .../integration/DigitalOceanTestSupport.java | 52 - .../src/test/resources/log4j2.properties | 28 - .../camel/component/file/GenericFileConsumer.java | 6 +- ...dempotentChangedRepositoryReadLockStrategy.java | 25 +- ...IdempotentRenameRepositoryReadLockStrategy.java | 25 +- .../FileIdempotentRepositoryReadLockStrategy.java | 24 +- .../src/main/docs/google-pubsub-component.adoc | 39 +- components/camel-headersmap/pom.xml | 76 - .../services/org/apache/camel/headers-map-factory | 2 - .../services/org/apache/camel/other.properties | 7 - .../src/generated/resources/headersmap.json | 15 - .../camel-headersmap/src/main/docs/headersmap.adoc | 34 - .../headersmap/FastHeadersMapFactory.java | 60 - .../headersmap/CamelFastHeadersMapTest.java | 53 - .../headersmap/FastHeadersMapFactoryTest.java | 73 - .../src/test/resources/log4j2.properties | 31 - .../apache/camel/component/ibm/cos/ibm-cos.json | 2 +- .../camel/component/ibm/cos/IBMCOSConstants.java | 2 +- .../camel/component/ibm/cos/IBMCOSConsumer.java | 27 +- .../camel/component/ibm/cos/IBMCOSEndpoint.java | 5 +- .../camel/component/ibm/cos/IBMCOSProducer.java | 52 +- .../watson/language/WatsonLanguageProducer.java | 6 + .../ibm/watson/stt/WatsonSpeechToTextProducer.java | 56 +- .../component/ibm/watsonx/ai/ibm-watsonx-ai.json | 2 +- .../ibm/watsonx/ai/WatsonxAiConstants.java | 3 +- .../ibm/watsonx/ai/WatsonxAiEndpoint.java | 24 +- .../ai/service/WatsonxAiServiceFactory.java | 13 + components/camel-iec60870/pom.xml | 109 - .../iec60870/client/ClientComponentConfigurer.java | 69 - .../iec60870/client/ClientEndpointConfigurer.java | 156 -- .../iec60870/client/ClientEndpointUriFactory.java | 97 - .../iec60870/server/ServerComponentConfigurer.java | 69 - .../iec60870/server/ServerEndpointConfigurer.java | 162 -- .../iec60870/server/ServerEndpointUriFactory.java | 98 - .../component/iec60870/client/iec60870-client.json | 72 - .../component/iec60870/server/iec60870-server.json | 64 - .../services/org/apache/camel/component.properties | 7 - .../org/apache/camel/component/iec60870-client | 2 - .../org/apache/camel/component/iec60870-server | 2 - .../src/main/docs/iec60870-client-component.adoc | 300 --- .../src/main/docs/iec60870-server-component.adoc | 48 - .../iec60870/AbstractConnectionMultiplexor.java | 107 - .../component/iec60870/AbstractIecComponent.java | 175 -- .../component/iec60870/AbstractIecEndpoint.java | 126 -- .../camel/component/iec60870/BaseOptions.java | 224 -- .../camel/component/iec60870/ConnectionId.java | 95 - .../apache/camel/component/iec60870/Constants.java | 108 - .../iec60870/DiscardAckChannelHandler.java | 55 - .../camel/component/iec60870/DiscardAckModule.java | 45 - .../camel/component/iec60870/ObjectAddress.java | 117 - .../component/iec60870/client/ClientComponent.java | 75 - .../iec60870/client/ClientConnection.java | 335 --- .../client/ClientConnectionMultiplexor.java | 44 - .../component/iec60870/client/ClientConsumer.java | 84 - .../component/iec60870/client/ClientEndpoint.java | 55 - .../component/iec60870/client/ClientOptions.java | 114 - .../component/iec60870/client/ClientProducer.java | 173 -- .../component/iec60870/server/ServerComponent.java | 81 - .../server/ServerConnectionMultiplexor.java | 44 - .../component/iec60870/server/ServerConsumer.java | 112 - .../component/iec60870/server/ServerEndpoint.java | 69 - .../component/iec60870/server/ServerInstance.java | 196 -- .../component/iec60870/server/ServerOptions.java | 152 -- .../component/iec60870/server/ServerProducer.java | 70 - .../camel/component/iec60870/ConnectionIdTest.java | 75 - .../camel/component/iec60870/ConnectionTest.java | 395 ---- .../src/test/resources/log4j2.properties | 28 - .../component/irc/IrcComponentConfigurer.java | 69 - .../camel/component/irc/IrcEndpointConfigurer.java | 183 -- .../camel/component/irc/IrcEndpointUriFactory.java | 110 - .../org/apache/camel/component/irc/irc.json | 76 - .../services/org/apache/camel/component.properties | 7 - .../org/apache/camel/configurer/irc-component | 2 - .../org/apache/camel/configurer/irc-endpoint | 2 - .../org/apache/camel/urifactory/irc-endpoint | 2 - .../camel-irc/src/main/docs/irc-component.adoc | 161 -- .../camel/component/irc/CamelSSLIRCConnection.java | 114 - .../org/apache/camel/component/irc/IrcBinding.java | 30 - .../org/apache/camel/component/irc/IrcChannel.java | 50 - .../apache/camel/component/irc/IrcComponent.java | 189 -- .../camel/component/irc/IrcConfiguration.java | 547 ----- .../apache/camel/component/irc/IrcConstants.java | 52 - .../apache/camel/component/irc/IrcConsumer.java | 289 --- .../apache/camel/component/irc/IrcEndpoint.java | 174 -- .../org/apache/camel/component/irc/IrcLogger.java | 127 -- .../org/apache/camel/component/irc/IrcMessage.java | 169 -- .../apache/camel/component/irc/IrcProducer.java | 156 -- .../org/apache/camel/component/irc/package.html | 27 - .../camel/component/irc/IrcConfigurationTest.java | 115 - .../camel/component/irc/IrcConsumerTest.java | 91 - .../camel/component/irc/IrcEndpointTest.java | 87 - .../camel/component/irc/IrcProducerTest.java | 121 -- .../component/irc/it/IrcIntegrationITSupport.java | 72 - .../component/irc/it/IrcMultiChannelRouteIT.java | 95 - .../camel/component/irc/it/IrcOnReplyIT.java | 85 - .../camel/component/irc/it/IrcPrivmsgIT.java | 91 - .../apache/camel/component/irc/it/IrcRouteIT.java | 93 - .../camel/component/irc/it/IrcsListUsersIT.java | 74 - .../irc/it/IrcsWithSslContextParamsRouteIT.java | 64 - .../camel-irc/src/test/resources/localhost.p12 | Bin 2533 -> 0 bytes components/camel-irc/src/test/unrealircd/ircd.motd | 18 - .../camel-irc/src/test/unrealircd/server.cert.pem | 15 - .../camel-irc/src/test/unrealircd/server.key.pem | 16 - .../camel-irc/src/test/unrealircd/unrealircd.conf | 218 -- .../component/ironmq/IronMQEndpointConfigurer.java | 219 -- .../component/ironmq/IronMQEndpointUriFactory.java | 112 - .../org/apache/camel/component/ironmq/ironmq.json | 73 - .../services/org/apache/camel/component.properties | 7 - .../services/org/apache/camel/component/ironmq | 2 - .../org/apache/camel/configurer/ironmq-component | 2 - .../org/apache/camel/configurer/ironmq-endpoint | 2 - .../org/apache/camel/urifactory/ironmq-endpoint | 2 - .../src/main/docs/ironmq-component.adoc | 141 -- .../apache/camel/component/ironmq/GsonUtil.java | 74 - .../component/ironmq/IronMQConfiguration.java | 207 -- .../camel/component/ironmq/IronMQConstants.java | 39 - .../camel/component/ironmq/IronMQConsumer.java | 207 -- .../camel/component/ironmq/IronMQEndpoint.java | 122 -- .../camel/component/ironmq/IronMQProducer.java | 82 - components/camel-ironmq/src/test/data/test.txt | 1 - .../component/ironmq/FromQueueToQueueTest.java | 95 - .../component/ironmq/IronMQBatchConsumerTest.java | 87 - .../ironmq/IronMQBatchDeleteConsumerTest.java | 88 - .../component/ironmq/IronMQBatchProducerTest.java | 85 - .../ironmq/IronMQComponentConfigurationTest.java | 111 - .../ironmq/IronMQComponentSpringTest.java | 82 - .../component/ironmq/IronMQComponentTest.java | 120 -- .../ironmq/IronMQConsumerHeaderFilterTest.java | 80 - .../ironmq/IronMQPreserveHeadersTest.java | 69 - .../apache/camel/component/ironmq/MockQueue.java | 141 -- .../ConcurrentConsumerLoadManualTest.java | 105 - .../ironmq/integrationtest/FileCopyManualTest.java | 64 - .../integrationtest/IronMQComponentManualTest.java | 62 - .../ironmq/integrationtest/IronMQFIFOTest.java | 77 - .../IronMQRackspaceComponentManualTest.java | 63 - .../component/ironmq/integrationtest/LoadTest.java | 86 - .../Queue2QueueExampleManualTest.java | 69 - .../ironmq/IronMQComponentSpringTest-context.xml | 42 - components/camel-json-patch/pom.xml | 66 - .../jsonpatch/JsonPatchComponentConfigurer.java | 69 - .../jsonpatch/JsonPatchEndpointConfigurer.java | 69 - .../camel/component/jsonpatch/json-patch.json | 42 - .../services/org/apache/camel/component.properties | 7 - .../services/org/apache/camel/component/json-patch | 2 - .../apache/camel/configurer/json-patch-component | 2 - .../apache/camel/configurer/json-patch-endpoint | 2 - .../apache/camel/urifactory/json-patch-endpoint | 2 - .../src/main/docs/json-patch-component.adoc | 48 - .../component/jsonpatch/JsonPatchComponent.java | 67 - .../component/jsonpatch/JsonPatchEndpoint.java | 79 - .../component/jsonpatch/JsonPatchProducer.java | 59 - .../jsonpatch/JsonPatchComponentTest.java | 62 - .../component/jsonpatch/JsonPatchRefTest.java | 47 - .../src/test/resources/log4j2.properties | 29 - .../apache/camel/component/jsonpatch/patch.json | 1 - .../camel/component/jsonpatch/patch_error.json | 1 - .../knative/spi/KnativeTransportConfiguration.java | 21 + .../knative/KnativeComponentConfigurer.java | 6 + .../knative/KnativeEndpointConfigurer.java | 6 + .../knative/KnativeEndpointUriFactory.java | 3 +- .../apache/camel/component/knative/knative.json | 38 +- .../component/knative/KnativeConfiguration.java | 14 + .../camel/component/knative/KnativeEndpoint.java | 3 +- .../knative/http/KnativeHttpConsumer.java | 17 +- .../component/knative/http/KnativeHttpTest.java | 60 + .../lumberjack/LumberjackMultiThreadIT.java | 6 +- .../camel/component/lumberjack/LumberjackUtil.java | 4 +- components/camel-mina/pom.xml | 5 + .../org/apache/camel/component/mina/mina.json | 4 +- .../camel/component/mina/MinaConfiguration.java | 7 +- .../apache/camel/component/mina/MinaConsumer.java | 2 +- .../camel/component/mina/MinaPayloadHelper.java | 43 +- .../apache/camel/component/mina/MinaProducer.java | 4 +- .../component/mina/MinaExchangeHolderGateTest.java | 99 + .../http/vertx/VertxPlatformHttpConsumer.java | 14 +- .../RestOpenApiContractFirstRootBasePathTest.java | 99 + ...PlatformHttpConsumerNormalizedEndpointTest.java | 150 ++ components/camel-reactive-executor-tomcat/pom.xml | 66 - .../services/org/apache/camel/other.properties | 7 - .../services/org/apache/camel/reactive-executor | 2 - .../resources/reactive-executor-tomcat.json | 15 - .../src/main/docs/reactive-executor-tomcat.adoc | 40 - .../reactive/tomcat/TomcatReactiveExecutor.java | 298 --- .../org/apache/camel/reactive/SimpleMockTest.java | 65 - .../src/test/resources/log4j2.properties | 31 - .../camel/component/seda/QueueReference.java | 21 + .../apache/camel/component/seda/SedaComponent.java | 23 +- .../apache/camel/component/seda/SedaEndpoint.java | 23 +- components/{camel-irc => camel-spiffe}/pom.xml | 26 +- .../spiffe/SpiffeComponentConfigurer.java} | 48 +- .../component/spiffe/SpiffeEndpointConfigurer.java | 74 + .../spiffe/SpiffeEndpointUriFactory.java} | 21 +- .../org/apache/camel/component/spiffe/spiffe.json | 50 + .../services/org/apache/camel/component.properties | 7 + .../services/org/apache/camel/component/spiffe} | 2 +- .../org/apache/camel/configurer/spiffe-component | 2 + .../org/apache/camel/configurer/spiffe-endpoint | 2 + .../org/apache/camel/urifactory/spiffe-endpoint | 2 + .../src/main/docs/spiffe-component.adoc | 89 + .../camel/component/spiffe/SpiffeComponent.java} | 47 +- .../component/spiffe/SpiffeConfiguration.java | 98 + .../camel/component/spiffe/SpiffeConstants.java | 45 + .../camel/component/spiffe/SpiffeEndpoint.java | 116 + .../camel/component/spiffe/SpiffeOperation.java} | 12 +- .../camel/component/spiffe/SpiffeProducer.java | 114 + .../camel/component/spiffe/SpiffeProducerTest.java | 149 ++ .../component/splunk/SplunkEndpointConfigurer.java | 279 --- .../component/splunk/SplunkEndpointUriFactory.java | 129 -- .../org/apache/camel/component/splunk/splunk.json | 83 - .../services/org/apache/camel/component.properties | 7 - .../services/org/apache/camel/component/splunk | 2 - .../org/apache/camel/configurer/splunk-component | 2 - .../org/apache/camel/configurer/splunk-endpoint | 2 - .../org/apache/camel/urifactory/splunk-endpoint | 2 - .../src/main/docs/splunk-component.adoc | 325 --- .../camel/component/splunk/ConsumerType.java | 34 - .../splunk/DefaultSplunkConfigurationFactory.java | 41 - .../camel/component/splunk/ProducerType.java | 33 - .../camel/component/splunk/SplunkComponent.java | 59 - .../component/splunk/SplunkConfiguration.java | 421 ---- .../component/splunk/SplunkConnectionFactory.java | 202 -- .../camel/component/splunk/SplunkConsumer.java | 127 -- .../camel/component/splunk/SplunkEndpoint.java | 149 -- .../camel/component/splunk/SplunkProducer.java | 121 -- .../camel/component/splunk/event/SplunkEvent.java | 513 ----- .../camel/component/splunk/support/DataWriter.java | 32 - .../component/splunk/support/SplunkDataReader.java | 360 ---- .../component/splunk/support/SplunkDataWriter.java | 108 - .../splunk/support/SplunkResultProcessor.java | 27 - .../component/splunk/support/StreamDataWriter.java | 66 - .../component/splunk/support/SubmitDataWriter.java | 65 - .../component/splunk/support/TcpDataWriter.java | 72 - .../component/splunk/ConsumerStreamingTest.java | 75 - .../camel/component/splunk/ConsumerTest.java | 78 - .../org/apache/camel/component/splunk/Helper.java | 60 - .../camel/component/splunk/ProducerTest.java | 180 -- .../camel/component/splunk/RawProducerTest.java | 122 -- .../splunk/SplunkComponentConfigurationTest.java | 141 -- .../camel/component/splunk/SplunkEventTest.java | 56 - .../component/splunk/SplunkMockTestSupport.java | 49 - .../splunk/integration/NormalSearchManualTest.java | 64 - .../integration/RealtimeSearchManualTest.java | 62 - .../splunk/integration/SavedSearchManualTest.java | 65 - .../integration/SplunkProducerManualTest.java | 88 - .../component/splunk/integration/SplunkTest.java | 42 - .../test/resources/resultsreader_test_data.json | 40 - .../org/apache/camel/spring/xml/errorHandler.json | 4 +- .../src/main/docs/state-store-component.adoc | 17 +- .../services/org/apache/camel/other.properties | 7 - .../services/org/apache/camel/thread-pool-factory | 2 - .../resources/threadpoolfactory-vertx.json | 15 - .../src/main/docs/threadpoolfactory-vertx.adoc | 68 - .../reactive/vertx/VertXThreadPoolFactory.java | 175 -- .../camel/reactive/SplitCustomThreadPoolTest.java | 80 - .../reactive/SplitParallelLookupVertxTest.java | 71 - .../apache/camel/reactive/SplitParallelTest.java | 75 - .../src/test/resources/log4j2.properties | 31 - .../pom.xml | 41 +- .../dataformat/toon/ToonDataFormatConfigurer.java | 82 + .../org/apache/camel/dataformat/toon/toon.json | 26 + .../org/apache/camel/configurer/toon-dataformat | 2 + .../org/apache/camel/dataformat.properties | 7 + .../services/org/apache/camel/dataformat/toon} | 2 +- .../camel-toon/src/main/docs/toon-dataformat.adoc | 186 ++ .../camel/dataformat/toon/ToonDataFormat.java | 188 ++ .../camel/dataformat/toon/ToonDataFormatTest.java | 342 +++ .../src/test/resources/log4j2.properties | 3 +- .../zookeeper/cluster/ZooKeeperClusterView.java | 30 +- .../ZooKeeperClusterViewLeadershipLostIT.java | 117 + components/pom.xml | 11 +- .../org/apache/camel/ExchangeConstantProvider.java | 5 +- .../src/main/java/org/apache/camel/Exchange.java | 9 + .../java/org/apache/camel/ExchangePropertyKey.java | 6 + .../org/apache/camel/TypeConversionException.java | 16 +- .../org/apache/camel/spi/HeadersMapFactory.java | 7 +- .../org/apache/camel/spi/KeyValueRepository.java | 10 +- .../camel/impl/engine/DefaultErrorRegistry.java | 29 +- .../modules/eips/pages/dead-letter-channel.adoc | 20 + .../apache/camel/model/dataformat/dataFormats.json | 2 +- .../org/apache/camel/model/dataformat/toon.json | 23 + .../META-INF/org/apache/camel/model/doCatch.json | 4 +- .../META-INF/org/apache/camel/model/doFinally.json | 4 +- .../org/apache/camel/model/errorHandler.json | 4 +- .../META-INF/org/apache/camel/model/marshal.json | 2 +- .../org/apache/camel/model/onException.json | 4 +- .../model/transformer/dataFormatTransformer.json | 2 +- .../META-INF/org/apache/camel/model/unmarshal.json | 2 +- .../services/org/apache/camel/model.properties | 1 + .../org/apache/camel/model/dataformat/jaxb.index | 1 + .../camel/builder/DataFormatBuilderFactory.java | 8 + .../org/apache/camel/builder/DataFormatClause.java | 8 + .../org/apache/camel/model/MarshalDefinition.java | 2 + .../apache/camel/model/UnmarshalDefinition.java | 2 + .../model/dataformat/DataFormatsDefinition.java | 1 + .../camel/model/dataformat/ToonDataFormat.java | 219 ++ .../DataFormatTransformerDefinition.java | 2 + .../org/apache/camel/processor/CatchProcessor.java | 5 - .../apache/camel/processor/FinallyProcessor.java | 7 +- .../org/apache/camel/processor/TryProcessor.java | 9 + .../ShareUnitOfWorkAggregationStrategy.java | 8 + .../errorhandler/RedeliveryErrorHandler.java | 16 +- .../reifier/dataformat/DataFormatReifier.java | 2 + .../reifier/dataformat/ToonDataFormatReifier.java | 30 +- .../camel/TypeConversionExceptionMessageTest.java | 69 + ...dempotentChangedReadLockRemoveOnCommitTest.java | 82 + ...mpotentRepositoryReadLockStrategyAbortTest.java | 105 + .../SedaDiscardIfNoConsumerAfterRemovalTest.java | 137 ++ ...scardIfNoConsumersProducerRouteRestartTest.java | 56 + .../jaxp/SaxParserFactoryHardeningTest.java | 60 + .../org/apache/camel/impl/ErrorRegistryTest.java | 44 + .../apache/camel/java/out/JavaDslModelWriter.java | 19 + .../org/apache/camel/main/components.properties | 11 +- .../org/apache/camel/main/dataformats.properties | 1 + core/camel-support/pom.xml | 6 + .../org/apache/camel/support/ExchangeHelper.java | 29 + .../support/KeyValueAggregationRepository.java | 16 +- .../support/KeyValueIdempotentRepository.java | 19 +- .../camel/support/MemoryKeyValueRepository.java | 11 +- .../support/KeyValueIdempotentRepositoryTest.java | 38 +- .../support/MemoryKeyValueRepositoryTest.java | 51 +- .../java/org/apache/camel/util/SecurityUtils.java | 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 11 + .../java/org/apache/camel/xml/out/ModelWriter.java | 17 + .../apache/camel/converter/jaxp/XmlConverter.java | 12 + .../org/apache/camel/yaml/out/YamlModelWriter.java | 17 + coverage/pom.xml | 65 +- design/aiTool.adoc | 13 +- .../modules/ROOT/examples/json/alibaba-ots.json | 1 + .../modules/ROOT/examples/json/alibaba-sls.json | 1 + .../modules/ROOT/examples/json/digitalocean.json | 1 - .../ROOT/examples/json/iec60870-client.json | 1 - .../ROOT/examples/json/iec60870-server.json | 1 - .../components/modules/ROOT/examples/json/irc.json | 1 - .../modules/ROOT/examples/json/ironmq.json | 1 - .../modules/ROOT/examples/json/json-patch.json | 1 - .../ROOT/examples/json/langchain4j-tools.json | 1 - .../modules/ROOT/examples/json/spiffe.json | 1 + .../modules/ROOT/examples/json/splunk.json | 1 - docs/components/modules/ROOT/nav.adoc | 11 +- .../modules/ROOT/pages/alibaba-ots-component.adoc | 1 + .../modules/ROOT/pages/alibaba-sls-component.adoc | 1 + .../modules/ROOT/pages/digitalocean-component.adoc | 1 - .../ROOT/pages/iec60870-client-component.adoc | 1 - .../ROOT/pages/iec60870-server-component.adoc | 1 - .../modules/ROOT/pages/irc-component.adoc | 1 - .../modules/ROOT/pages/ironmq-component.adoc | 1 - .../modules/ROOT/pages/json-patch-component.adoc | 1 - .../ROOT/pages/langchain4j-tools-component.adoc | 1 - .../modules/ROOT/pages/spiffe-component.adoc | 1 + .../modules/ROOT/pages/splunk-component.adoc | 1 - .../modules/dataformats/examples/json/toon.json | 1 + docs/components/modules/dataformats/nav.adoc | 1 + .../modules/dataformats/pages/toon-dataformat.adoc | 1 + .../modules/others/examples/json/headersmap.json | 1 - .../examples/json/reactive-executor-tomcat.json | 1 - .../examples/json/threadpoolfactory-vertx.json | 1 - docs/components/modules/others/nav.adoc | 3 - .../modules/others/pages/headersmap.adoc | 1 - .../others/pages/reactive-executor-tomcat.adoc | 1 - .../others/pages/threadpoolfactory-vertx.adoc | 1 - .../modules/ROOT/pages/batch-consumer.adoc | 2 - .../ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 40 + .../ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 42 + .../ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 187 ++ .../ROOT/pages/camel-configuration-utilities.adoc | 1 - dsl/camel-componentdsl/pom.xml | 4 - .../component/ComponentsBuilderFactory.java | 135 +- ...java => AlibabaOtsComponentBuilderFactory.java} | 116 +- ...java => AlibabaSlsComponentBuilderFactory.java} | 81 +- .../dsl/DigitaloceanComponentBuilderFactory.java | 120 -- .../dsl/Iec60870ClientComponentBuilderFactory.java | 168 -- .../dsl/Iec60870ServerComponentBuilderFactory.java | 168 -- .../component/dsl/IrcComponentBuilderFactory.java | 167 -- .../dsl/KnativeComponentBuilderFactory.java | 19 + .../Langchain4jToolsComponentBuilderFactory.java | 189 -- .../component/dsl/MinaComponentBuilderFactory.java | 7 +- .../dsl/SpiffeComponentBuilderFactory.java | 222 ++ .../dsl/SplunkComponentBuilderFactory.java | 206 -- dsl/camel-endpointdsl/pom.xml | 4 - .../builder/endpoint/EndpointBuilderFactory.java | 11 +- .../camel/builder/endpoint/EndpointBuilders.java | 11 +- .../builder/endpoint/EndpointHeaderBuilders.java | 141 +- .../builder/endpoint/StaticEndpointBuilders.java | 470 +--- .../endpoint/dsl/AS2EndpointBuilderFactory.java | 63 + .../dsl/AlibabaOtsEndpointBuilderFactory.java | 328 +++ .../dsl/AlibabaSlsEndpointBuilderFactory.java | 707 ++++++ .../endpoint/dsl/ClientEndpointBuilderFactory.java | 1945 ----------------- .../dsl/DigitalOceanEndpointBuilderFactory.java | 703 ------ .../endpoint/dsl/IBMCOSEndpointBuilderFactory.java | 6 +- .../endpoint/dsl/IrcEndpointBuilderFactory.java | 2266 -------------------- .../endpoint/dsl/IronMQEndpointBuilderFactory.java | 1444 ------------- .../dsl/JsonPatchEndpointBuilderFactory.java | 317 --- .../dsl/KnativeEndpointBuilderFactory.java | 32 + .../LangChain4jToolsEndpointBuilderFactory.java | 740 ------- .../endpoint/dsl/MinaEndpointBuilderFactory.java | 21 +- .../endpoint/dsl/ServerEndpointBuilderFactory.java | 1924 ----------------- .../endpoint/dsl/SpiffeEndpointBuilderFactory.java | 347 +++ .../endpoint/dsl/SplunkEndpointBuilderFactory.java | 1899 ---------------- .../dsl/WatsonxAiEndpointBuilderFactory.java | 2 +- .../dsl/jbang/core/commands/mcp/AiTraceTools.java | 2 +- dsl/camel-jbang/camel-launcher/pom.xml | 2 +- .../camel-component-known-dependencies.properties | 11 +- ...mel-factoryfinder-known-dependencies.properties | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 99 + .../deserializers/ModelDeserializersResolver.java | 2 + .../resources/schema/camelYamlDsl-canonical.json | 58 +- .../resources/schema/camelYamlDsl-model.json | 79 + .../generated/resources/schema/camelYamlDsl.json | 78 + parent/pom.xml | 108 +- .../infra/cassandra/services/container.properties | 1 + .../apache/camel/maven/packaging/MojoHelper.java | 4 +- .../maven/packaging/PrepareDocSymlinksMojo.java | 2 +- 641 files changed, 11050 insertions(+), 43991 deletions(-)
