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 b2274e1 Regen
b2274e1 is described below
commit b2274e182f2ec2959181bc7259cb63f55ab94894
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jun 10 06:32:04 2021 +0200
Regen
---
.../org/apache/camel/catalog/components/hwcloud-functiongraph.json | 2 +-
.../apache/camel/catalog/docs/hwcloud-functiongraph-component.adoc | 2 +-
.../resources/org/apache/camel/hwcloud-functiongraph.json | 2 +-
.../src/main/docs/hwcloud-functiongraph-component.adoc | 2 +-
.../src/main/java/org/apache/camel/FunctionGraphEndpoint.java | 3 ++-
.../src/main/java/org/apache/camel/FunctionGraphProducer.java | 7 -------
.../builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java | 1 +
.../modules/ROOT/pages/hwcloud-functiongraph-component.adoc | 2 +-
8 files changed, 8 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
index 9aff16d..9c40a29 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
@@ -29,7 +29,7 @@
"operation": { "kind": "path", "displayName": "Operation", "group":
"producer", "label": "producer", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Operation to be performed"
},
"endpoint": { "kind": "parameter", "displayName": "Service endpoint",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "FunctionGraph url. Carries
higher precedence than region parameter based client initialization" },
"functionName": { "kind": "parameter", "displayName": "Function name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Name of the function to
invoke" },
- "functionPackage": { "kind": "parameter", "displayName": "Function
package", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Functions that can be logically grouped together" },
+ "functionPackage": { "kind": "parameter", "displayName": "Function
package", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
"default", "description": "Functions that can be logically grouped together" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"projectId": { "kind": "parameter", "displayName": "Project ID", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Cloud project ID" },
"region": { "kind": "parameter", "displayName": "Service region", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "FunctionGraph service region. This is
lower precedence than endpoint based configuration" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/hwcloud-functiongraph-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/hwcloud-functiongraph-component.adoc
index a03cec2..c1e7620 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/hwcloud-functiongraph-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/hwcloud-functiongraph-component.adoc
@@ -76,7 +76,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *endpoint* (producer) | FunctionGraph url. Carries higher precedence than
region parameter based client initialization | | String
| *functionName* (producer) | Name of the function to invoke | | String
-| *functionPackage* (producer) | Functions that can be logically grouped
together | | String
+| *functionPackage* (producer) | Functions that can be logically grouped
together | default | String
| *lazyStartProducer* (producer) | 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 producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *projectId* (producer) | *Required* Cloud project ID | | String
| *region* (producer) | *Required* FunctionGraph service region. This is lower
precedence than endpoint based configuration | | String
diff --git
a/components/camel-huaweicloud-functiongraph/src/generated/resources/org/apache/camel/hwcloud-functiongraph.json
b/components/camel-huaweicloud-functiongraph/src/generated/resources/org/apache/camel/hwcloud-functiongraph.json
index 9aff16d..9c40a29 100644
---
a/components/camel-huaweicloud-functiongraph/src/generated/resources/org/apache/camel/hwcloud-functiongraph.json
+++
b/components/camel-huaweicloud-functiongraph/src/generated/resources/org/apache/camel/hwcloud-functiongraph.json
@@ -29,7 +29,7 @@
"operation": { "kind": "path", "displayName": "Operation", "group":
"producer", "label": "producer", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Operation to be performed"
},
"endpoint": { "kind": "parameter", "displayName": "Service endpoint",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "FunctionGraph url. Carries
higher precedence than region parameter based client initialization" },
"functionName": { "kind": "parameter", "displayName": "Function name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Name of the function to
invoke" },
- "functionPackage": { "kind": "parameter", "displayName": "Function
package", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Functions that can be logically grouped together" },
+ "functionPackage": { "kind": "parameter", "displayName": "Function
package", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
"default", "description": "Functions that can be logically grouped together" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"projectId": { "kind": "parameter", "displayName": "Project ID", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Cloud project ID" },
"region": { "kind": "parameter", "displayName": "Service region", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "FunctionGraph service region. This is
lower precedence than endpoint based configuration" },
diff --git
a/components/camel-huaweicloud-functiongraph/src/main/docs/hwcloud-functiongraph-component.adoc
b/components/camel-huaweicloud-functiongraph/src/main/docs/hwcloud-functiongraph-component.adoc
index a03cec2..c1e7620 100644
---
a/components/camel-huaweicloud-functiongraph/src/main/docs/hwcloud-functiongraph-component.adoc
+++
b/components/camel-huaweicloud-functiongraph/src/main/docs/hwcloud-functiongraph-component.adoc
@@ -76,7 +76,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *endpoint* (producer) | FunctionGraph url. Carries higher precedence than
region parameter based client initialization | | String
| *functionName* (producer) | Name of the function to invoke | | String
-| *functionPackage* (producer) | Functions that can be logically grouped
together | | String
+| *functionPackage* (producer) | Functions that can be logically grouped
together | default | String
| *lazyStartProducer* (producer) | 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 producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *projectId* (producer) | *Required* Cloud project ID | | String
| *region* (producer) | *Required* FunctionGraph service region. This is lower
precedence than endpoint based configuration | | String
diff --git
a/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphEndpoint.java
b/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphEndpoint.java
index b445e01..43d06eb 100644
---
a/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphEndpoint.java
+++
b/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphEndpoint.java
@@ -20,6 +20,7 @@ import com.huaweicloud.sdk.core.auth.BasicCredentials;
import com.huaweicloud.sdk.core.http.HttpConfig;
import com.huaweicloud.sdk.functiongraph.v2.FunctionGraphClient;
import com.huaweicloud.sdk.functiongraph.v2.region.FunctionGraphRegion;
+import org.apache.camel.constants.FunctionGraphConstants;
import org.apache.camel.models.ServiceKeys;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
@@ -50,7 +51,7 @@ public class FunctionGraphEndpoint extends DefaultEndpoint {
private String projectId;
@UriParam(description = "Functions that can be logically grouped together",
- displayName = "Function package", secret = false)
+ displayName = "Function package", secret = false, defaultValue =
FunctionGraphConstants.DEFAULT_FUNCTION_PACKAGE)
@Metadata(required = false)
private String functionPackage;
diff --git
a/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphProducer.java
b/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphProducer.java
index b3117b2..da04682 100644
---
a/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphProducer.java
+++
b/components/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphProducer.java
@@ -86,12 +86,6 @@ public class FunctionGraphProducer extends DefaultProducer {
if (ObjectHelper.isEmpty(clientConfigurations.getFunctionName())) {
throw new IllegalArgumentException("Function name is mandatory for
invokeFunction.");
}
- if
(ObjectHelper.isEmpty(exchange.getProperty(FunctionGraphProperties.FUNCTION_PACKAGE))
- && ObjectHelper.isEmpty(endpoint.getFunctionPackage())) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Function package not found. Continuing to invoke
function with 'default' function package");
- }
- }
// invoke the function
InvokeFunctionRequest invokeFunctionRequest = new
InvokeFunctionRequest()
@@ -145,7 +139,6 @@ public class FunctionGraphProducer extends DefaultProducer {
// checking for optional function package (exchange overrides endpoint
function package)
if
(ObjectHelper.isEmpty(exchange.getProperty(FunctionGraphProperties.FUNCTION_PACKAGE))
&& ObjectHelper.isEmpty(endpoint.getFunctionPackage())) {
- LOG.warn("No function package given. Defaulting to 'default'.");
clientConfigurations.setFunctionPackage(FunctionGraphConstants.DEFAULT_FUNCTION_PACKAGE);
} else {
clientConfigurations.setFunctionPackage(
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
index 6d45a9d..19490d6 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
@@ -70,6 +70,7 @@ public interface FunctionGraphEndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
+ * Default: default
* Group: producer
*
* @param functionPackage the value to set
diff --git
a/docs/components/modules/ROOT/pages/hwcloud-functiongraph-component.adoc
b/docs/components/modules/ROOT/pages/hwcloud-functiongraph-component.adoc
index eb693bd..c412ac6 100644
--- a/docs/components/modules/ROOT/pages/hwcloud-functiongraph-component.adoc
+++ b/docs/components/modules/ROOT/pages/hwcloud-functiongraph-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *endpoint* (producer) | FunctionGraph url. Carries higher precedence than
region parameter based client initialization | | String
| *functionName* (producer) | Name of the function to invoke | | String
-| *functionPackage* (producer) | Functions that can be logically grouped
together | | String
+| *functionPackage* (producer) | Functions that can be logically grouped
together | default | String
| *lazyStartProducer* (producer) | 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 producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *projectId* (producer) | *Required* Cloud project ID | | String
| *region* (producer) | *Required* FunctionGraph service region. This is lower
precedence than endpoint based configuration | | String
