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 fe62e22 Regen and polished
fe62e22 is described below
commit fe62e2227803d8b1bae4a88c94841242fe603a57
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Sep 21 07:15:48 2021 +0200
Regen and polished
---
.../camel/catalog/components/hwcloud-image.json | 2 +-
.../services/org/apache/camel/other.properties | 7 --
.../resources/huaweicloud-imagerecognition.json | 14 ---
.../component/huaweicloud/image/hwcloud-image.json | 2 +-
.../docs/hwcloud-image-recognition-component.adoc | 111 +++++----------------
.../image/ImageRecognitionEndpoint.java | 2 +-
.../org/apache/camel/component/hwcloud-image | 1 -
components/camel-huawei/pom.xml | 14 +--
.../component/ComponentsBuilderFactory.java | 2 +-
.../dsl/HwcloudImageComponentBuilderFactory.java | 4 +-
.../src/generated/resources/metadata.json | 2 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../ImageRecognitionEndpointBuilderFactory.java | 6 +-
13 files changed, 42 insertions(+), 129 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json
index 1b873fc..e09e6cb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "hwcloud-image",
"title": "Huawei Cloud Image Recognition",
- "description": "component to connect to image recognition service",
+ "description": "To identify objects, scenes, and concepts in images on
Huawei Cloud",
"deprecated": false,
"firstVersion": "3.12.0",
"label": "cloud,messaging",
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/other.properties
deleted file mode 100644
index a140c58..0000000
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/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=huaweicloud-imagerecognition
-groupId=org.apache.camel
-artifactId=camel-huaweicloud-imagerecognition
-version=3.12.0-SNAPSHOT
-projectName=Camel :: Huawei Cloud :: ImageRecognition Component
-projectDescription=A Camel Huawei Image Recognition component
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/huaweicloud-imagerecognition.json
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/huaweicloud-imagerecognition.json
deleted file mode 100644
index 47ea016..0000000
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/huaweicloud-imagerecognition.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "other": {
- "kind": "other",
- "name": "huaweicloud-imagerecognition",
- "title": "Huaweicloud Imagerecognition",
- "description": "A Camel Huawei Image Recognition component",
- "deprecated": false,
- "firstVersion": "3.12.0",
- "supportLevel": "Preview",
- "groupId": "org.apache.camel",
- "artifactId": "camel-huaweicloud-imagerecognition",
- "version": "3.12.0-SNAPSHOT"
- }
-}
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json
index 1b873fc..e09e6cb 100644
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json
+++
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "hwcloud-image",
"title": "Huawei Cloud Image Recognition",
- "description": "component to connect to image recognition service",
+ "description": "To identify objects, scenes, and concepts in images on
Huawei Cloud",
"deprecated": false,
"firstVersion": "3.12.0",
"label": "cloud,messaging",
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc
index 0f36a67..585a40c 100644
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc
+++
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc
@@ -4,7 +4,7 @@
:artifactId: camel-huaweicloud-imagerecognition
:description: Image Recognition uses deep learning technologies to accurately
identify objects, scenes, and concepts in images using a pool of visual content
tags.
:since: 3.12
-:supportLevel: Stable
+:supportLevel: Preview
:component-header: Only producer is supported
include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/hwcloud-imagerecognition.adoc[opts=optional]
//Manually maintained attributes
@@ -31,86 +31,22 @@ for this component:
== URI format
-To send a notification.
-
-[source,java]
+[source,text]
------------------------
hwcloud-image:operation[?options]
------------------------
-== Options
+// component-configure options: START
+
+// component-configure options: END
// component options: START
-The Huawei Cloud Image Recognition component supports 2 options, which are
listed below.
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *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 starting the
producer may take a little time and prolong the total processing time of the
processing. | false | boolean
-| *autowiredEnabled* (advanced) | 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 then gets configured on the component.
-This can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | boolean
-|===
+include::partial$component-configure-options.adoc[]
+include::partial$component-endpoint-options.adoc[]
// component options: END
// endpoint options: START
-The Huawei Cloud Image Recognition endpoint is configured using URI syntax:
-----
-hwcloud-image:operation
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *operation* | *Required* Name of image recofnition operation, including
tagRecognition and celebrityRecognition | | String
-|===
-
-=== Query Parameters (16 parameters):
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *accessKey* (producer) | *Required* Access key for the cloud user | | String
-| *secretKey* (producer) | *Required* Secret key for the cloud user | | String
-| *serviceKeys* (producer) | Configuration object for cloud service
authentication | | ServiceKeys
-| *projectId* (producer) | *Required* Cloud project ID | | String
-| *endpoint* (producer) | Fully qualified Image Recognition service url.
-Carries higher precedence than region based configuration | | String
-| *region* (producer) | Image Recognition service region.
-Currently only cn-north-1 and cn-north-4 are supported.
-This is lower precedence than endpoint based configuration | | String
-| *ignoreSslVerification* (producer) | Ignore SSL verification | false |
boolean
-| *proxyHost* (producer) | Proxy server ip/hostname | | String
-| *proxyPassword* (producer) | Proxy authentication password | | String
-| *proxyPort* (producer) | Proxy server port | | int
-| *proxyUser* (producer) | Proxy authentication user | | String
-| *imageContent* (producer) | "Indicates the Base64 character string converted
from the image.
-The image size cannot exceed 10 MB and image resolution of the narrow sides
must be greater than 15 pixels, and that of the wide sides cannot exceed 4096
pixels.
-The supported image formats include JPG, PNG, and BMP. Configure either this
parameter or imageUrl.
-Configure either this parameter or imageUrl, and this one carries higher
precedence than imageUrl" | | String
-| *imageUrl* (producer) | "Indicates the URL of an image.
-The options are as follows:
-HTTP/HTTPS URLs on the public network OBS URLs.
-To use OBS data, authorization is required, including service authorization,
temporary authorization, and anonymous public authorization.
-For details, see Configuring the Access Permission of OBS.
-Configure either this parameter or imageContent, and this one carries lower
precedence than imageContent.
-" | | String
-| *tagLanguage* (producer) | Indicates the language of the returned tags when
the operation is tagRecognition, including zh and en | | String
-| *tagLimit* (producer) | Indicates the maximum number of the returned tags
when the operation is tagRecognition | | int
-| *threshold* (producer) | Indicates the threshold of confidence.
-When the operation is tagRecognition, this parameter ranges from 0 to 100.
Tags whose confidence score is lower than the threshold will not be returned.
-The default value is 60.
-When the operation is celebrityRecognition, this parameter ranges from 0 to 1.
Labels whose confidence score is lower than the threshold will not be returned.
-The default value is 0.48.| | int
-|===
// endpoint options: END
[NOTE]
@@ -136,7 +72,6 @@ When using imageContent option, we suggest you use
RAW(image_base64_value) to av
|`CamelHwCloudImageThreshold` |`Integer` |The threshold of confidence.
-
|=======================================================================
== List of Supported Image Recognition Operations
@@ -151,17 +86,17 @@ When using imageContent option, we suggest you use
RAW(image_base64_value) to av
Java DSL
[source,java]
---------------------------------------------------------------------------------
+----
from("direct:triggerRoute")
-.setProperty(ImageRecognitionProperties.IMAGE_URL, constant("https://xxxx";))
-.setProperty(ImageRecognitionProperties.THRESHOLD,constant(0.5))
-.to("hwcloud-image:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4")
---------------------------------------------------------------------------------
+ .setProperty(ImageRecognitionProperties.IMAGE_URL, constant("https://xxxx";))
+ .setProperty(ImageRecognitionProperties.THRESHOLD,constant(0.5))
+
.to("hwcloud-image:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4")
+----
XML DSL
[source,xml]
---------------------------------------------------------------------------------
+----
<route>
<from uri="direct:triggerRoute" />
<setProperty name="CamelHwCloudImageUrl">
@@ -172,26 +107,26 @@ XML DSL
</setProperty>
<to
uri="hwcloud-image:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4"
/>
</route>
---------------------------------------------------------------------------------
+----
=== tagRecognition
Java DSL
[source,java]
---------------------------------------------------------------------------------
+----
from("direct:triggerRoute")
-.setProperty(ImageRecognitionProperties.IMAGE_CONTENT,
constant("/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAA0JCgsKCA0LCgsODg0PEyAVExISEyccHhcgLikxMC4pLSwzOko+MzZGNywtQFdBRkxOUlNSMj5aYVpQYEpRUk//..."))
-.setProperty(ImageRecognitionProperties.THRESHOLD,constant(60))
-.setProperty(ImageRecognitionProperties.TAG_LANGUAGE,constant("en"))
-.setProperty(ImageRecognitionProperties.TAG_LIMIT,constant(50))
-.to("hwcloud-image:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4")
---------------------------------------------------------------------------------
+ .setProperty(ImageRecognitionProperties.IMAGE_CONTENT,
constant("/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAA0JCgsKCA0LCgsODg0PEyAVExISEyccHhcgLikxMC4pLSwzOko+MzZGNywtQFdBRkxOUlNSMj5aYVpQYEpRUk//..."))
+ .setProperty(ImageRecognitionProperties.THRESHOLD,constant(60))
+ .setProperty(ImageRecognitionProperties.TAG_LANGUAGE,constant("en"))
+ .setProperty(ImageRecognitionProperties.TAG_LIMIT,constant(50))
+
.to("hwcloud-image:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4")
+----
XML DSL
[source,xml]
---------------------------------------------------------------------------------
+----
<route>
<from uri="direct:triggerRoute" />
<setProperty name="CamelHwCloudImageContent">
@@ -208,4 +143,4 @@ XML DSL
</setProperty>
<to
uri="hwcloud-image:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4"
/>
</route>
---------------------------------------------------------------------------------
\ No newline at end of file
+----
\ No newline at end of file
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpoint.java
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpoint.java
index c9a6f2e..a57855b 100644
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpoint.java
+++
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
/**
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*/
@UriEndpoint(firstVersion = "3.12.0", scheme = "hwcloud-image", title =
"Huawei Cloud Image Recognition",
syntax = "hwcloud-image:operation",
diff --git
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/resources/META-INF/services/org/apache/camel/component/hwcloud-image
b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/resources/META-INF/services/org/apache/camel/component/hwcloud-image
deleted file mode 100644
index 82e10a0..0000000
---
a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/resources/META-INF/services/org/apache/camel/component/hwcloud-image
+++ /dev/null
@@ -1 +0,0 @@
-class=org.apache.camel.component.huaweicloud.image.ImageRecognitionComponent
diff --git a/components/camel-huawei/pom.xml b/components/camel-huawei/pom.xml
index d57e610..6e2e2a3 100644
--- a/components/camel-huawei/pom.xml
+++ b/components/camel-huawei/pom.xml
@@ -34,13 +34,13 @@
<modules>
- <module>camel-huaweicloud-common</module>
- <module>camel-huaweicloud-dms</module>
- <module>camel-huaweicloud-functiongraph</module>
- <module>camel-huaweicloud-iam</module>
- <module>camel-huaweicloud-obs</module>
- <module>camel-huaweicloud-smn</module>
- <module>camel-huaweicloud-imagerecognition</module>
+ <module>camel-huaweicloud-common</module>
+ <module>camel-huaweicloud-dms</module>
+ <module>camel-huaweicloud-functiongraph</module>
+ <module>camel-huaweicloud-iam</module>
+ <module>camel-huaweicloud-imagerecognition</module>
+ <module>camel-huaweicloud-obs</module>
+ <module>camel-huaweicloud-smn</module>
</modules>
</project>
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index fe6f983..ab51055 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -2053,7 +2053,7 @@ public interface ComponentsBuilderFactory {
}
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImageComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImageComponentBuilderFactory.java
index 5f18b58..bf6f03f 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImageComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImageComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.huaweicloud.image.ImageRecognitionComponent;
/**
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface HwcloudImageComponentBuilderFactory {
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json
b/core/camel-componentdsl/src/generated/resources/metadata.json
index 647850f..f888bd1 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -3352,7 +3352,7 @@
"kind": "component",
"name": "hwcloud-image",
"title": "Huawei Cloud Image Recognition",
- "description": "component to connect to image recognition service",
+ "description": "To identify objects, scenes, and concepts in images on
Huawei Cloud",
"deprecated": false,
"firstVersion": "3.12.0",
"label": "cloud,messaging",
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 062e034..b0d8d98 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -6938,7 +6938,7 @@ public class StaticEndpointBuilders {
}
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
@@ -6959,7 +6959,7 @@ public class StaticEndpointBuilders {
}
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
index 0decbaf..2a73dc7 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -429,7 +429,7 @@ public interface ImageRecognitionEndpointBuilderFactory {
public interface ImageRecognitionBuilders {
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
@@ -450,7 +450,7 @@ public interface ImageRecognitionEndpointBuilderFactory {
}
/**
* Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition)
- * component to connect to image recognition service
+ * To identify objects, scenes, and concepts in images on Huawei Cloud
*
* Category: cloud,messaging
* Since: 3.12
