From eb7464453b9322fff54583394704bee31ad9218d Mon Sep 17 00:00:00 2001 From: oscerd <5106647+oscerd@users.noreply.github.com> Date: Fri, 4 Sep 2026 00:46:41 +0000 Subject: [PATCH] [create-pull-request] automated change --- .../springboot/catalog/beans/JdbcKeyValueRepository.json | 2 +- .../springboot/catalog/components/google-firestore.json | 5 +++-- .../a2a/springboot/A2AComponentAutoConfiguration.java | 3 ++- .../AlibabaEventBridgeComponentAutoConfiguration.java | 3 ++- .../alibaba/fc/springboot/FCComponentAutoConfiguration.java | 3 ++- .../kms/springboot/KMSComponentAutoConfiguration.java | 3 ++- .../mns/springboot/MNSComponentAutoConfiguration.java | 3 ++- .../oss/springboot/OSSComponentAutoConfiguration.java | 3 ++- .../ots/springboot/AlibabaOtsComponentAutoConfiguration.java | 3 ++- .../sls/springboot/AlibabaSlsComponentAutoConfiguration.java | 3 ++- .../sms/springboot/SMSComponentAutoConfiguration.java | 3 ++- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 12 files changed, 23 insertions(+), 13 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JdbcKeyValueRepository.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JdbcKeyValueRepository.json index 5b03dfc9db3..8fc8bd33c96 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JdbcKeyValueRepository.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/JdbcKeyValueRepository.json @@ -10,7 +10,7 @@ "groupId": "org.apache.camel.springboot", "artifactId": "camel-sql-starter", "version": "4.23.0-SNAPSHOT", - "properties": { "jdbcTemplate": { "index": 0, "kind": "property", "displayName": "Jdbc Template", "required": true, "type": "object", "javaType": "org.springframework.jdbc.core.JdbcTemplate", "deprecated": false, "autowired": false, "secret": false, "description": "The Spring JdbcTemplate to use for connecting to the database" }, "transactionTemplate": { "index": 1, "kind": "property", "displayName": "Transaction Template", "required": true, "type": "object", "javaType": "org.springframework.transaction.support.TransactionTemplate", "deprecated": false, "autowired": false, "secret": false, "description": "The Spring TransactionTemplate to use for connecting to the database" }, "tableName": { "index": 2, "kind": "property", "displayName": "Table Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CAMEL_KEYVALUE", "description": "The name of the table to use in the database" }, "createTableIfNotExists": { "index": 3, "kind": "property", "displayName": "Create Table If Not Exists", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to create the table in the database if none exists on startup" }, "tableExistsString": { "index": 4, "kind": "property", "displayName": "Table Exists String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for checking if table exists" }, "createString": { "index": 5, "kind": "property", "displayName": "Create String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for creating table" }, "selectString": { "index": 6, "kind": "property", "displayName": "Select String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for selecting a value by key" }, "insertString": { "index": 7, "kind": "property", "displayName": "Insert String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for inserting a new entry" }, "deleteString": { "index": 8, "kind": "property", "displayName": "Delete String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for deleting an entry by key" }, "clearString": { "index": 9, "kind": "property", "displayName": "Clear String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to delete all entries from the table" }, "selectKeysString": { "index": 10, "kind": "property", "displayName": "Select Keys String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for selecting all non-expired keys" }, "deleteExpiredString": { "index": 11, "kind": "property", "displayName": "Delete Expired String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for deleting expired entries" } } + "properties": { "jdbcTemplate": { "index": 0, "kind": "property", "displayName": "Jdbc Template", "required": true, "type": "object", "javaType": "org.springframework.jdbc.core.JdbcTemplate", "deprecated": false, "autowired": false, "secret": false, "description": "The Spring JdbcTemplate to use for connecting to the database" }, "transactionTemplate": { "index": 1, "kind": "property", "displayName": "Transaction Template", "required": true, "type": "object", "javaType": "org.springframework.transaction.support.TransactionTemplate", "deprecated": false, "autowired": false, "secret": false, "description": "The Spring TransactionTemplate to use for connecting to the database" }, "tableName": { "index": 2, "kind": "property", "displayName": "Table Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CAMEL_KEYVALUE", "description": "The name of the table to use in the database" }, "createTableIfNotExists": { "index": 3, "kind": "property", "displayName": "Create Table If Not Exists", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to create the table in the database if none exists on startup" }, "tableExistsString": { "index": 4, "kind": "property", "displayName": "Table Exists String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for checking if table exists" }, "createString": { "index": 5, "kind": "property", "displayName": "Create String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for creating table" }, "selectString": { "index": 6, "kind": "property", "displayName": "Select String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for selecting a value by key" }, "insertString": { "index": 7, "kind": "property", "displayName": "Insert String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for inserting a new entry" }, "deleteString": { "index": 8, "kind": "property", "displayName": "Delete String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for deleting an entry by key" }, "clearString": { "index": 9, "kind": "property", "displayName": "Clear String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to delete all entries from the table" }, "selectKeysString": { "index": 10, "kind": "property", "displayName": "Select Keys String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for selecting all non-expired keys" }, "deleteExpiredString": { "index": 11, "kind": "property", "displayName": "Delete Expired String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for deleting expired entries" }, "updateIfValueString": { "index": 12, "kind": "property", "displayName": "Update If Value String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for conditional update (CAS replace)" }, "deleteIfValueString": { "index": 13, "kind": "property", "displayName": "Delete If Value String", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "SQL query to use for conditional delete (CAS delete)" } } } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-firestore.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-firestore.json index 4e75e32956b..1af4bbac53a 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-firestore.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-firestore.json @@ -54,8 +54,9 @@ "CamelGoogleFirestoreResponseCreateTime": { "index": 11, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "com.google.cloud.Timestamp", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document create time.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#RESPONSE_CREATE_TIME" }, "CamelGoogleFirestoreResponseUpdateTime": { "index": 12, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "com.google.cloud.Timestamp", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document update time.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#RESPONSE_UPDATE_TIME" }, "CamelGoogleFirestoreResponseReadTime": { "index": 13, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "com.google.cloud.Timestamp", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document read time.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#RESPONSE_READ_TIME" }, - "CamelGoogleFirestoreMerge": { "index": 14, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "When true, merge the data with existing document data instead of overwriting.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#MERGE" }, - "CamelGoogleFirestoreMergeFields": { "index": 15, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "java.util.List", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "List of field paths to merge when using merge option.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#MERGE_FIELDS" } + "CamelGoogleFirestoreChangeType": { "index": 14, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of change reported by the realtime listener: ADDED, MODIFIED or REMOVED. Only set when realtimeUpdates is enabled.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#CHANGE_TYPE" }, + "CamelGoogleFirestoreMerge": { "index": 15, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "When true, merge the data with existing document data instead of overwriting.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#MERGE" }, + "CamelGoogleFirestoreMergeFields": { "index": 16, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "java.util.List", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "List of field paths to merge when using merge option.", "constantName": "org.apache.camel.component.google.firestore.GoogleFirestoreConstants#MERGE_FIELDS" } }, "properties": { "collectionName": { "index": 0, "kind": "path", "displayName": "Collection Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.firestore.GoogleFirestoreConfiguration", "configurationField": "configuration", "description": "The collection name to use" }, diff --git a/components-starter/camel-a2a-starter/src/main/java/org/apache/camel/component/a2a/springboot/A2AComponentAutoConfiguration.java b/components-starter/camel-a2a-starter/src/main/java/org/apache/camel/component/a2a/springboot/A2AComponentAutoConfiguration.java index 0f97a853dfb..983c92ae7aa 100644 --- a/components-starter/camel-a2a-starter/src/main/java/org/apache/camel/component/a2a/springboot/A2AComponentAutoConfiguration.java +++ b/components-starter/camel-a2a-starter/src/main/java/org/apache/camel/component/a2a/springboot/A2AComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureA2AComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.a2a", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-eventbridge-starter/src/main/java/org/apache/camel/component/alibaba/eventbridge/springboot/AlibabaEventBridgeComponentAutoConfiguration.java b/components-starter/camel-alibaba-eventbridge-starter/src/main/java/org/apache/camel/component/alibaba/eventbridge/springboot/AlibabaEventBridgeComponentAutoConfiguration.java index b5321589177..13040b6bff1 100644 --- a/components-starter/camel-alibaba-eventbridge-starter/src/main/java/org/apache/camel/component/alibaba/eventbridge/springboot/AlibabaEventBridgeComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-eventbridge-starter/src/main/java/org/apache/camel/component/alibaba/eventbridge/springboot/AlibabaEventBridgeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureAlibabaEventBridgeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-eventbridge", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-fc-starter/src/main/java/org/apache/camel/component/alibaba/fc/springboot/FCComponentAutoConfiguration.java b/components-starter/camel-alibaba-fc-starter/src/main/java/org/apache/camel/component/alibaba/fc/springboot/FCComponentAutoConfiguration.java index 746f822ad45..4bb7fbd8533 100644 --- a/components-starter/camel-alibaba-fc-starter/src/main/java/org/apache/camel/component/alibaba/fc/springboot/FCComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-fc-starter/src/main/java/org/apache/camel/component/alibaba/fc/springboot/FCComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureFCComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-fc", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-kms-starter/src/main/java/org/apache/camel/component/alibaba/kms/springboot/KMSComponentAutoConfiguration.java b/components-starter/camel-alibaba-kms-starter/src/main/java/org/apache/camel/component/alibaba/kms/springboot/KMSComponentAutoConfiguration.java index 1513ff01e6f..1e2612025f2 100644 --- a/components-starter/camel-alibaba-kms-starter/src/main/java/org/apache/camel/component/alibaba/kms/springboot/KMSComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-kms-starter/src/main/java/org/apache/camel/component/alibaba/kms/springboot/KMSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKMSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-kms", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-mns-starter/src/main/java/org/apache/camel/component/alibaba/mns/springboot/MNSComponentAutoConfiguration.java b/components-starter/camel-alibaba-mns-starter/src/main/java/org/apache/camel/component/alibaba/mns/springboot/MNSComponentAutoConfiguration.java index 127c08cfa42..07580f790e1 100644 --- a/components-starter/camel-alibaba-mns-starter/src/main/java/org/apache/camel/component/alibaba/mns/springboot/MNSComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-mns-starter/src/main/java/org/apache/camel/component/alibaba/mns/springboot/MNSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMNSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-mns", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-oss-starter/src/main/java/org/apache/camel/component/alibaba/oss/springboot/OSSComponentAutoConfiguration.java b/components-starter/camel-alibaba-oss-starter/src/main/java/org/apache/camel/component/alibaba/oss/springboot/OSSComponentAutoConfiguration.java index f667913aed8..4091434fb4c 100644 --- a/components-starter/camel-alibaba-oss-starter/src/main/java/org/apache/camel/component/alibaba/oss/springboot/OSSComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-oss-starter/src/main/java/org/apache/camel/component/alibaba/oss/springboot/OSSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOSSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-oss", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-ots-starter/src/main/java/org/apache/camel/component/alibaba/ots/springboot/AlibabaOtsComponentAutoConfiguration.java b/components-starter/camel-alibaba-ots-starter/src/main/java/org/apache/camel/component/alibaba/ots/springboot/AlibabaOtsComponentAutoConfiguration.java index 0681b1e6bde..e0538aa358c 100644 --- a/components-starter/camel-alibaba-ots-starter/src/main/java/org/apache/camel/component/alibaba/ots/springboot/AlibabaOtsComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-ots-starter/src/main/java/org/apache/camel/component/alibaba/ots/springboot/AlibabaOtsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureAlibabaOtsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-ots", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-sls-starter/src/main/java/org/apache/camel/component/alibaba/sls/springboot/AlibabaSlsComponentAutoConfiguration.java b/components-starter/camel-alibaba-sls-starter/src/main/java/org/apache/camel/component/alibaba/sls/springboot/AlibabaSlsComponentAutoConfiguration.java index 08e562ecaf2..f3486200612 100644 --- a/components-starter/camel-alibaba-sls-starter/src/main/java/org/apache/camel/component/alibaba/sls/springboot/AlibabaSlsComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-sls-starter/src/main/java/org/apache/camel/component/alibaba/sls/springboot/AlibabaSlsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureAlibabaSlsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-sls", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-alibaba-sms-starter/src/main/java/org/apache/camel/component/alibaba/sms/springboot/SMSComponentAutoConfiguration.java b/components-starter/camel-alibaba-sms-starter/src/main/java/org/apache/camel/component/alibaba/sms/springboot/SMSComponentAutoConfiguration.java index 698473966ec..72a0bd1508b 100644 --- a/components-starter/camel-alibaba-sms-starter/src/main/java/org/apache/camel/component/alibaba/sms/springboot/SMSComponentAutoConfiguration.java +++ b/components-starter/camel-alibaba-sms-starter/src/main/java/org/apache/camel/component/alibaba/sms/springboot/SMSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSMSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.alibaba-sms", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index d4b9a64dad5..25a535a95e2 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -63,7 +63,7 @@ com.aliyun sls20201230 - 5.16.0 + 5.17.0 com.aliyun