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 50867ccbc370 (#30260)
50867ccbc370 is described below
commit 50867ccbc370d47279e8d345f8fc4d55406a3893
Author: Saravanakumar Selvaraj <[email protected]>
AuthorDate: Tue Nov 17 12:50:19 2026 +0000
(#30260)
region was marked as required, although FCUtils.createClient needs the
region or the endpoint: it throws "Region or
endpoint is required" only when both are empty, and the client of the SDK
uses the endpoint as it is when it is set. The
operation header was declared only in FCProperties, which the build does
not read, so it was missing from the header
list of the component, and the five texts on FCProperties were not used.
region is no longer required. FCHeaders has OPERATION with the text of the
operation header of camel-alibaba-ots, and
FCProperties keeps its constants without the unused annotations. The
component JSON, the catalog and the Endpoint DSL
are regenerated, and a new test of CamelCatalogTest covers the change.
The review of the pull request asked for an entry in the 4.24 upgrade
guide, like the one for camel-alibaba-sms.
The entry says that region is no longer marked as required, that the Camel
endpoint needs region or endpoint to create
the client, and neither when the fcClient option is set or autowired, and
that the behavior of the component at runtime
does not change. It also says that a URI with neither option still fails at
the first message with "Region or endpoint
is required", unless the fcClient option is set or autowired.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../org/apache/camel/catalog/components/alibaba-fc.json | 13 +++++++------
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 10 ++++++++++
.../org/apache/camel/component/alibaba/fc/alibaba-fc.json | 13 +++++++------
.../org/apache/camel/component/alibaba/fc/FCEndpoint.java | 1 -
.../camel/component/alibaba/fc/constants/FCHeaders.java | 6 ++++++
.../component/alibaba/fc/constants/FCProperties.java | 7 -------
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 8 ++++++++
.../builder/endpoint/dsl/FCEndpointBuilderFactory.java | 15 ++++++++++++++-
8 files changed, 52 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/alibaba-fc.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/alibaba-fc.json
index 4506845b3eeb..3f8ded33d559 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/alibaba-fc.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/alibaba-fc.json
@@ -30,11 +30,12 @@
"healthCheckProducerEnabled": { "index": 3, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on producer [...]
},
"headers": {
- "CamelAlibabaFcServiceName": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the service that contains the function. This header
replaces the serviceName option. If this header is not set, an exchange
property of the same name replaces the serviceName option.", "constantName":
"org.apache.camel.component.alibaba.fc [...]
- "CamelAlibabaFcFunctionName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the function. This header replaces the functionName
option. If this header is not set, an exchange property of the same name
replaces the functionName option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#FU [...]
- "CamelAlibabaFcQualifier": { "index": 2, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The version or alias of the service. This header replaces the
qualifier option. If this header is not set, an exchange property of the same
name replaces the qualifier option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders# [...]
- "CamelAlibabaFcRequestId": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The request ID that Function Compute returns in the response to
invokeFunction. The producer sets it for invokeFunction, unless the exchange
fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#REQUEST_ID" },
- "CamelAlibabaFcStatusCode": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The HTTP status code of the response to the operation. The
producer sets it, unless the exchange fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#STATUS_CODE" }
+ "CamelAlibabaFcOperation": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The operation that the producer performs. This header replaces
the operation option. If this header is not set, an exchange property of the
same name replaces the operation option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHea [...]
+ "CamelAlibabaFcServiceName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the service that contains the function. This header
replaces the serviceName option. If this header is not set, an exchange
property of the same name replaces the serviceName option.", "constantName":
"org.apache.camel.component.alibaba.fc [...]
+ "CamelAlibabaFcFunctionName": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the function. This header replaces the functionName
option. If this header is not set, an exchange property of the same name
replaces the functionName option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#FU [...]
+ "CamelAlibabaFcQualifier": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The version or alias of the service. This header replaces the
qualifier option. If this header is not set, an exchange property of the same
name replaces the qualifier option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders# [...]
+ "CamelAlibabaFcRequestId": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The request ID that Function Compute returns in the response to
invokeFunction. The producer sets it for invokeFunction, unless the exchange
fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#REQUEST_ID" },
+ "CamelAlibabaFcStatusCode": { "index": 5, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The HTTP status code of the response to the operation. The
producer sets it, unless the exchange fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#STATUS_CODE" }
},
"bodyTypes": {
"producerIn": { "carriers": [ "any" ], "byOption": [ { "option":
"operation", "value": "invokeFunction", "carriers": [ "text", "bytes",
"stream", "file", "null" ] } ], "description": "invokeFunction sends the body
as the payload of the function: text in UTF-8, bytes as they are, a stream or a
file as its bytes, so binary data is kept, and no body as an empty payload. A
Map or a POJO fails, as it does not convert to bytes, so marshal it first.
getFunction does not use the body" },
@@ -45,7 +46,7 @@
"endpoint": { "index": 1, "kind": "parameter", "displayName": "Endpoint",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The endpoint of Function Compute, which is a
host name without http:\/\/ or https:\/\/. The producer sends requests to it
over HTTPS. If not set, the region option determines the endpoint, and one of
the two is required. Not used when th [...]
"functionName": { "index": 2, "kind": "parameter", "displayName":
"Function Name", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The name of the function. The
CamelAlibabaFcFunctionName header replaces this option for a request that the
producer sends. If that header is not set, an exchange property of the same
name replaces this option. One of the three [...]
"qualifier": { "index": 3, "kind": "parameter", "displayName":
"Qualifier", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The version or alias of the service.
The CamelAlibabaFcQualifier header replaces this option for a request that the
producer sends. If that header is not set, an exchange property of the same
name replaces this option. If none of the t [...]
- "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The region ID of Function Compute, for example
cn-hangzhou. Only used when the endpoint option is not set, to build the
endpoint of Function Compute. Not used when the fcClient option is set or
autowired." },
+ "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The region ID of Function Compute, for example
cn-hangzhou. Only used when the endpoint option is not set, to build the
endpoint of Function Compute. Not used when the fcClient option is set or
autowired." },
"serviceName": { "index": 5, "kind": "parameter", "displayName": "Service
Name", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the service that contains the
function. The CamelAlibabaFcServiceName header replaces this option for a
request that the producer sends. If that header is not set, an exchange
property of the same name replaces this op [...]
"lazyStartProducer": { "index": 6, "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 produc [...]
"fcClient": { "index": 7, "kind": "parameter", "displayName": "FC Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.aliyun.fc_open20210406.Client", "deprecated": false,
"autowired": true, "secret": false, "description": "To use a custom
com.aliyun.fc_open20210406.Client. The producer sends its requests with this
client, and the region, endpoint, accessKey, secretKey and serviceKeys options
are not used. If no client is set or aut [...]
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 5da6a3a2c096..d245d6333383 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1604,6 +1604,16 @@ public class CamelCatalogTest {
assertTrue(result.isSuccess());
}
+ @Test
+ public void testValidateEndpointAlibabaFc() {
+ String uri =
"alibaba-fc:invokeFunction?endpoint=12345.cn-hangzhou.fc.aliyuncs.com";
+ EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
+ assertTrue(result.isSuccess(), result.summaryErrorMessage(false));
+
+ ComponentModel model = catalog.componentModel("alibaba-fc");
+ assertTrue(model.getEndpointHeaders().stream().anyMatch(h ->
"CamelAlibabaFcOperation".equals(h.getName())));
+ }
+
@Test
public void testValidateApiEndpoint() {
// there is a type converter that converts from and to to phone number
diff --git
a/components/camel-alibaba/camel-alibaba-fc/src/generated/resources/META-INF/org/apache/camel/component/alibaba/fc/alibaba-fc.json
b/components/camel-alibaba/camel-alibaba-fc/src/generated/resources/META-INF/org/apache/camel/component/alibaba/fc/alibaba-fc.json
index 4506845b3eeb..3f8ded33d559 100644
---
a/components/camel-alibaba/camel-alibaba-fc/src/generated/resources/META-INF/org/apache/camel/component/alibaba/fc/alibaba-fc.json
+++
b/components/camel-alibaba/camel-alibaba-fc/src/generated/resources/META-INF/org/apache/camel/component/alibaba/fc/alibaba-fc.json
@@ -30,11 +30,12 @@
"healthCheckProducerEnabled": { "index": 3, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on producer [...]
},
"headers": {
- "CamelAlibabaFcServiceName": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the service that contains the function. This header
replaces the serviceName option. If this header is not set, an exchange
property of the same name replaces the serviceName option.", "constantName":
"org.apache.camel.component.alibaba.fc [...]
- "CamelAlibabaFcFunctionName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the function. This header replaces the functionName
option. If this header is not set, an exchange property of the same name
replaces the functionName option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#FU [...]
- "CamelAlibabaFcQualifier": { "index": 2, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The version or alias of the service. This header replaces the
qualifier option. If this header is not set, an exchange property of the same
name replaces the qualifier option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders# [...]
- "CamelAlibabaFcRequestId": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The request ID that Function Compute returns in the response to
invokeFunction. The producer sets it for invokeFunction, unless the exchange
fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#REQUEST_ID" },
- "CamelAlibabaFcStatusCode": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The HTTP status code of the response to the operation. The
producer sets it, unless the exchange fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#STATUS_CODE" }
+ "CamelAlibabaFcOperation": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The operation that the producer performs. This header replaces
the operation option. If this header is not set, an exchange property of the
same name replaces the operation option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHea [...]
+ "CamelAlibabaFcServiceName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the service that contains the function. This header
replaces the serviceName option. If this header is not set, an exchange
property of the same name replaces the serviceName option.", "constantName":
"org.apache.camel.component.alibaba.fc [...]
+ "CamelAlibabaFcFunctionName": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the function. This header replaces the functionName
option. If this header is not set, an exchange property of the same name
replaces the functionName option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#FU [...]
+ "CamelAlibabaFcQualifier": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The version or alias of the service. This header replaces the
qualifier option. If this header is not set, an exchange property of the same
name replaces the qualifier option.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders# [...]
+ "CamelAlibabaFcRequestId": { "index": 4, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The request ID that Function Compute returns in the response to
invokeFunction. The producer sets it for invokeFunction, unless the exchange
fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#REQUEST_ID" },
+ "CamelAlibabaFcStatusCode": { "index": 5, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The HTTP status code of the response to the operation. The
producer sets it, unless the exchange fails.", "constantName":
"org.apache.camel.component.alibaba.fc.constants.FCHeaders#STATUS_CODE" }
},
"bodyTypes": {
"producerIn": { "carriers": [ "any" ], "byOption": [ { "option":
"operation", "value": "invokeFunction", "carriers": [ "text", "bytes",
"stream", "file", "null" ] } ], "description": "invokeFunction sends the body
as the payload of the function: text in UTF-8, bytes as they are, a stream or a
file as its bytes, so binary data is kept, and no body as an empty payload. A
Map or a POJO fails, as it does not convert to bytes, so marshal it first.
getFunction does not use the body" },
@@ -45,7 +46,7 @@
"endpoint": { "index": 1, "kind": "parameter", "displayName": "Endpoint",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The endpoint of Function Compute, which is a
host name without http:\/\/ or https:\/\/. The producer sends requests to it
over HTTPS. If not set, the region option determines the endpoint, and one of
the two is required. Not used when th [...]
"functionName": { "index": 2, "kind": "parameter", "displayName":
"Function Name", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The name of the function. The
CamelAlibabaFcFunctionName header replaces this option for a request that the
producer sends. If that header is not set, an exchange property of the same
name replaces this option. One of the three [...]
"qualifier": { "index": 3, "kind": "parameter", "displayName":
"Qualifier", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The version or alias of the service.
The CamelAlibabaFcQualifier header replaces this option for a request that the
producer sends. If that header is not set, an exchange property of the same
name replaces this option. If none of the t [...]
- "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The region ID of Function Compute, for example
cn-hangzhou. Only used when the endpoint option is not set, to build the
endpoint of Function Compute. Not used when the fcClient option is set or
autowired." },
+ "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The region ID of Function Compute, for example
cn-hangzhou. Only used when the endpoint option is not set, to build the
endpoint of Function Compute. Not used when the fcClient option is set or
autowired." },
"serviceName": { "index": 5, "kind": "parameter", "displayName": "Service
Name", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the service that contains the
function. The CamelAlibabaFcServiceName header replaces this option for a
request that the producer sends. If that header is not set, an exchange
property of the same name replaces this op [...]
"lazyStartProducer": { "index": 6, "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 produc [...]
"fcClient": { "index": 7, "kind": "parameter", "displayName": "FC Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.aliyun.fc_open20210406.Client", "deprecated": false,
"autowired": true, "secret": false, "description": "To use a custom
com.aliyun.fc_open20210406.Client. The producer sends its requests with this
client, and the region, endpoint, accessKey, secretKey and serviceKeys options
are not used. If no client is set or aut [...]
diff --git
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/FCEndpoint.java
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/FCEndpoint.java
index 5b2d47bb05de..9a71eade8d19 100644
---
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/FCEndpoint.java
+++
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/FCEndpoint.java
@@ -66,7 +66,6 @@ public class FCEndpoint extends DefaultEndpoint {
+ " not set, to build the endpoint of Function
Compute. Not used when the fcClient option is set or"
+ " autowired.",
displayName = "Region")
- @Metadata(required = true)
private String region;
@UriParam(description = "The endpoint of Function Compute, which is a host
name without http:// or https://. The producer"
diff --git
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCHeaders.java
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCHeaders.java
index 1684b0e657c4..a9eeedd04c30 100644
---
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCHeaders.java
+++
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCHeaders.java
@@ -20,6 +20,12 @@ import org.apache.camel.spi.Metadata;
public final class FCHeaders {
+ @Metadata(label = "producer",
+ description = "The operation that the producer performs. This
header replaces the operation option. If this"
+ + " header is not set, an exchange property of the
same name replaces the operation option.",
+ javaType = "String")
+ public static final String OPERATION = FCProperties.OPERATION;
+
@Metadata(label = "producer",
description = "The name of the service that contains the
function. This header replaces the serviceName option."
+ " If this header is not set, an exchange
property of the same name replaces the serviceName"
diff --git
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCProperties.java
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCProperties.java
index e8cab1e6bdeb..b8f6f6dd9d1c 100644
---
a/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCProperties.java
+++
b/components/camel-alibaba/camel-alibaba-fc/src/main/java/org/apache/camel/component/alibaba/fc/constants/FCProperties.java
@@ -16,23 +16,16 @@
*/
package org.apache.camel.component.alibaba.fc.constants;
-import org.apache.camel.spi.Metadata;
-
public final class FCProperties {
- @Metadata(label = "producer", description = "Operation to perform",
javaType = "String")
public static final String OPERATION = "CamelAlibabaFcOperation";
- @Metadata(label = "producer", description = "FC service name override",
javaType = "String")
public static final String SERVICE_NAME = "CamelAlibabaFcServiceName";
- @Metadata(label = "producer", description = "FC function name override",
javaType = "String")
public static final String FUNCTION_NAME = "CamelAlibabaFcFunctionName";
- @Metadata(label = "producer", description = "Function qualifier override",
javaType = "String")
public static final String QUALIFIER = "CamelAlibabaFcQualifier";
- @Metadata(label = "producer", description = "Request id returned by FC",
javaType = "String")
public static final String REQUEST_ID = "CamelAlibabaFcRequestId";
private FCProperties() {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
index 5da921562c7e..b50e31605e6b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
@@ -6235,6 +6235,14 @@ empty payload.
A body that does not convert to bytes, such as a `Map` or a POJO, is no longer
sent as its `toString()`: it now fails
with an `InvalidPayloadException`. Marshal such a body first, for example to
JSON with `marshal().json()`.
+=== camel-alibaba-fc - region is no longer marked as required
+
+The `region` option of `alibaba-fc` is no longer marked as required. To create
the client, the Camel endpoint needs
+the `region` or the `endpoint` option. It needs neither when the `fcClient`
option is set or autowired. So the
+endpoint validation of the catalog no longer reports a URI without `region` as
missing a required option. The behavior
+of the component at runtime does not change. A URI with neither option still
fails at the first message with
+`Region or endpoint is required`, unless the `fcClient` option is set or
autowired.
+
=== camel-dropbox - search and get read every page of the result
The `search` operation (producer and consumer) now returns every match that
the service gives. Previously it returned
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FCEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FCEndpointBuilderFactory.java
index 8acebef988ae..08553c50affc 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FCEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FCEndpointBuilderFactory.java
@@ -105,7 +105,6 @@ public interface FCEndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Required: true
* Group: producer
*
* @param region the value to set
@@ -378,6 +377,20 @@ public interface FCEndpointBuilderFactory {
*/
public static final FCHeaderNameBuilder INSTANCE = new
FCHeaderNameBuilder();
+ /**
+ * The operation that the producer performs. This header replaces the
+ * operation option. If this header is not set, an exchange property of
+ * the same name replaces the operation option.
+ *
+ * The option is a: {@code String} type.
+ *
+ * Group: producer
+ *
+ * @return the name of the header {@code AlibabaFcOperation}.
+ */
+ public String alibabaFcOperation() {
+ return "CamelAlibabaFcOperation";
+ }
/**
* The name of the service that contains the function. This header
* replaces the serviceName option. If this header is not set, an