This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5618e863d4eac95141be0ad0ed746f75d5506a0a Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Mar 19 07:29:39 2021 +0100 CAMEL-15963 Create a Google Cloud Functions component - Added to kit --- bom/camel-bom/pom.xml | 10 +++--- camel-dependencies/pom.xml | 2 ++ .../org/apache/camel/catalog/components.properties | 1 + .../camel/catalog/components/google-functions.json | 38 ++++++++++++++++++++++ .../org/apache/camel/catalog/docs.properties | 1 + .../org/apache/camel/catalog/others.properties | 1 + .../camel/catalog/others}/google-functions.json | 0 .../services/org/apache/camel/other.properties | 7 ---- .../org/apache/camel/main/components.properties | 1 + docs/components/modules/ROOT/nav.adoc | 1 + .../EndpointConsumerDeserializersResolver.java | 4 +++ .../EndpointProducerDeserializersResolver.java | 4 +++ 12 files changed, 58 insertions(+), 12 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index e359669..bd15b44 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -779,6 +779,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-google-functions</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-google-mail</artifactId> <version>${project.version}</version> </dependency> @@ -804,11 +809,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-google-functions</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-gora</artifactId> <version>${project.version}</version> </dependency> diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 821f94f..2f595ac 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -231,6 +231,8 @@ <google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version> <google-api-services-sheets-version>v4-rev551-1.22.0</google-api-services-sheets-version> <google-cloud-bom-version>16.3.0</google-cloud-bom-version> + <google-cloud-functions-bom-version>1.0.8</google-cloud-functions-bom-version> + <google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version> <google-cloud-guava-version>30.0-jre</google-cloud-guava-version> <google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version> <google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties index a8bd19f..a594e0a 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties @@ -119,6 +119,7 @@ google-bigquery-sql google-calendar google-calendar-stream google-drive +google-functions google-mail google-mail-stream google-pubsub diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json new file mode 100644 index 0000000..21a6075 --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json @@ -0,0 +1,38 @@ +{ + "component": { + "kind": "component", + "name": "google-functions", + "title": "GoogleCloudFunctions", + "description": "Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library.", + "deprecated": false, + "firstVersion": "3.9.0", + "label": "cloud", + "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsComponent", + "supportLevel": "Preview", + "groupId": "org.apache.camel", + "artifactId": "camel-google-functions", + "version": "3.9.0-SNAPSHOT", + "scheme": "google-functions", + "extendsScheme": "", + "syntax": "google-functions:functionName", + "async": false, + "api": false, + "consumerOnly": false, + "producerOnly": true, + "lenientProperties": false + }, + "componentProperties": { + "lazyStartProducer": { "kind": "property", "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 star [...] + "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] + }, + "properties": { + "functionName": { "kind": "path", "displayName": "Function 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.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The user-defined name of the function" }, + "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Service account key to authenticate an application as a service account" }, + "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 [...] + "location": { "kind": "parameter", "displayName": "Location", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Location (Region) where the Function is located" }, + "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsOperations", "enum": [ "listFunctions", "getFunction", "callFunction", "generateDownloadUrl", "generateUploadUrl", "createFunction", "updateFunction", "deleteFunction" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel [...] + "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Specifies if the request is a pojo request" }, + "project": { "kind": "parameter", "displayName": "Project", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Project name where the Function is located" }, + "client": { "kind": "parameter", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.google.cloud.functions.v1.CloudFunctionsServiceClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The client to use during service invocation." } + } +} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties index 7b6bd57..3daa883 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties @@ -172,6 +172,7 @@ google-bigquery-sql-component google-calendar-component google-calendar-stream-component google-drive-component +google-functions-component google-mail-component google-mail-stream-component google-pubsub-component diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5d7d5d5..6007042 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -6,6 +6,7 @@ csimple-joor cxf-transport elytron etcd3 +google-functions headersmap hystrix jasypt diff --git a/components/camel-google/camel-google-functions/src/generated/resources/google-functions.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/google-functions.json similarity index 100% rename from components/camel-google/camel-google-functions/src/generated/resources/google-functions.json rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/google-functions.json diff --git a/components/camel-google/camel-google-functions/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-google/camel-google-functions/src/generated/resources/META-INF/services/org/apache/camel/other.properties deleted file mode 100644 index 1a8a7e1..0000000 --- a/components/camel-google/camel-google-functions/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -name=google-functions -groupId=org.apache.camel -artifactId=camel-google-functions -version=3.9.0-SNAPSHOT -projectName=Camel :: Google Functions -projectDescription=Camel Component for Google Cloud Platform Functions diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties index a8bd19f..a594e0a 100644 --- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties +++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties @@ -119,6 +119,7 @@ google-bigquery-sql google-calendar google-calendar-stream google-drive +google-functions google-mail google-mail-stream google-pubsub diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index cceb82d..b9a3add 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -127,6 +127,7 @@ *** xref:google-sheets-component.adoc[Google Sheets] *** xref:google-sheets-stream-component.adoc[Google Sheets Stream] *** xref:google-storage-component.adoc[Google Storage] +*** xref:google-functions-component.adoc[GoogleCloudFunctions] ** xref:gora-component.adoc[Gora] ** xref:grape-component.adoc[Grape] ** xref:graphql-component.adoc[GraphQL] diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java index 540182e..30c2a34 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java @@ -43,6 +43,10 @@ public final class EndpointConsumerDeserializersResolver implements YamlDeserial case "box": case "browse": case "cmis": + case "coap": + case "coap+tcp": + case "coaps": + case "coaps+tcp": case "cometd": case "cometds": case "consul": diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java index 5885f8b..de69824 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java @@ -73,6 +73,10 @@ public final class EndpointProducerDeserializersResolver implements YamlDeserial case "class": case "cm-sms": case "cmis": + case "coap": + case "coap+tcp": + case "coaps": + case "coaps+tcp": case "cometd": case "cometds": case "consul":