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 b4ae09f CAMEL-16944: Rename component name as it was wrong b4ae09f is described below commit b4ae09f4ffb1ecc7a6ed486c7aced9d4f4d0ff3d Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Sep 21 08:46:37 2021 +0200 CAMEL-16944: Rename component name as it was wrong --- .../org/apache/camel/catalog/components.properties | 2 +- .../components/hwcloud-imagerecognition.json | 6 +-- .../org/apache/camel/catalog/others.properties | 1 - .../others/huaweicloud-imagerecognition.json | 14 ------- .../image/ImageRecognitionEndpointUriFactory.java | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../{hwcloud-image => hwcloud-imagerecognition} | 0 ...omponent => hwcloud-imagerecognition-component} | 0 ...-endpoint => hwcloud-imagerecognition-endpoint} | 0 ...-endpoint => hwcloud-imagerecognition-endpoint} | 0 .../image/hwcloud-imagerecognition.json | 6 +-- ...doc => hwcloud-imagerecognition-component.adoc} | 17 ++++---- .../image/ImageRecognitionComponent.java | 2 +- .../image/ImageRecognitionEndpoint.java | 4 +- .../image/CelebrityRecognitionWithImagUrlTest.java | 3 +- ...cognitionWithImageContentAndMockClientTest.java | 3 +- .../CelebrityRecognitionWithImageContentTest.java | 3 +- ...tyRecognitionWithImageUrlAndMockClientTest.java | 3 +- ...cognitionWithImageContentAndMockClientTest.java | 2 +- .../image/TagRecognitionWithImageContentTest.java | 2 +- ...agRecognitionWithImageUrlAndMockClientTest.java | 2 +- .../image/TagRecognitionWithImageUrlTest.java | 2 +- .../src/main/docs/hwcloud-summary.adoc | 6 +-- .../component/ComponentsBuilderFactory.java | 4 +- ...udImagerecognitionComponentBuilderFactory.java} | 16 ++++---- .../src/generated/resources/metadata.json | 8 ++-- .../builder/endpoint/StaticEndpointBuilders.java | 45 ++++++++++++++++++++++ .../ImageRecognitionEndpointBuilderFactory.java | 11 +++--- .../org/apache/camel/main/components.properties | 2 +- .../modules/ROOT/examples/json/hwcloud-image.json | 1 - .../examples/json/hwcloud-imagerecognition.json | 1 + docs/components/modules/ROOT/nav.adoc | 4 +- .../pages/hwcloud-image-recognition-component.adoc | 1 - .../pages/hwcloud-imagerecognition-component.adoc | 1 + .../json/huaweicloud-imagerecognition.json | 1 - .../EndpointProducerDeserializersResolver.java | 2 +- 36 files changed, 107 insertions(+), 72 deletions(-) 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 fe8cde7..45f83a8 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 @@ -148,7 +148,7 @@ https hwcloud-dms hwcloud-functiongraph hwcloud-iam -hwcloud-image +hwcloud-imagerecognition hwcloud-obs hwcloud-smn iec60870-client diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json similarity index 98% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json index e09e6cb..f8395dd 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json @@ -1,7 +1,7 @@ { "component": { "kind": "component", - "name": "hwcloud-image", + "name": "hwcloud-imagerecognition", "title": "Huawei Cloud Image Recognition", "description": "To identify objects, scenes, and concepts in images on Huawei Cloud", "deprecated": false, @@ -12,9 +12,9 @@ "groupId": "org.apache.camel", "artifactId": "camel-huaweicloud-imagerecognition", "version": "3.12.0-SNAPSHOT", - "scheme": "hwcloud-image", + "scheme": "hwcloud-imagerecognition", "extendsScheme": "", - "syntax": "hwcloud-image:operation", + "syntax": "hwcloud-imagerecognition:operation", "async": false, "api": false, "consumerOnly": false, 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 06f80d6..128d3a1 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 @@ -7,7 +7,6 @@ cxf-transport elytron etcd3 headersmap -huaweicloud-imagerecognition hystrix jasypt jfr diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/huaweicloud-imagerecognition.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/huaweicloud-imagerecognition.json deleted file mode 100644 index 47ea016..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/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/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpointUriFactory.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpointUriFactory.java index cc1b2fd..6ea1d1d 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpointUriFactory.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionEndpointUriFactory.java @@ -51,7 +51,7 @@ public class ImageRecognitionEndpointUriFactory extends org.apache.camel.support @Override public boolean isEnabled(String scheme) { - return "hwcloud-image".equals(scheme); + return "hwcloud-imagerecognition".equals(scheme); } @Override diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 8b78f3f..ab99f6d 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=hwcloud-image +components=hwcloud-imagerecognition 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/META-INF/services/org/apache/camel/component/hwcloud-image b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component/hwcloud-imagerecognition similarity index 100% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component/hwcloud-image rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/component/hwcloud-imagerecognition diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-image-component b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-imagerecognition-component similarity index 100% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-image-component rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-imagerecognition-component diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-image-endpoint b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-imagerecognition-endpoint similarity index 100% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-image-endpoint rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/configurer/hwcloud-imagerecognition-endpoint diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hwcloud-image-endpoint b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hwcloud-imagerecognition-endpoint similarity index 100% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hwcloud-image-endpoint rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hwcloud-imagerecognition-endpoint diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-imagerecognition.json similarity index 98% rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-imagerecognition.json index e09e6cb..f8395dd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-image.json +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-imagerecognition.json @@ -1,7 +1,7 @@ { "component": { "kind": "component", - "name": "hwcloud-image", + "name": "hwcloud-imagerecognition", "title": "Huawei Cloud Image Recognition", "description": "To identify objects, scenes, and concepts in images on Huawei Cloud", "deprecated": false, @@ -12,9 +12,9 @@ "groupId": "org.apache.camel", "artifactId": "camel-huaweicloud-imagerecognition", "version": "3.12.0-SNAPSHOT", - "scheme": "hwcloud-image", + "scheme": "hwcloud-imagerecognition", "extendsScheme": "", - "syntax": "hwcloud-image:operation", + "syntax": "hwcloud-imagerecognition:operation", "async": false, "api": false, "consumerOnly": false, 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-imagerecognition-component.adoc similarity index 83% rename from components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc rename to components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-imagerecognition-component.adoc index 23398ad..c284262 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-imagerecognition-component.adoc @@ -1,8 +1,9 @@ -[[hwcloud-image-recognitioncomponent]] +[[hwcloud-imagerecognition-component]] = Huawei Cloud Image Recognition Component :docTitle: Huawei Cloud Image Recognition +:shortName: hwcloud-imagerecognition :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. +:description: To identify objects, scenes, and concepts in images on Huawei Cloud :since: 3.12 :supportLevel: Preview :component-header: Only producer is supported @@ -33,7 +34,7 @@ for this component: [source,text] ------------------------ -hwcloud-image:operation[?options] +hwcloud-imagerecognition:operation[?options] ------------------------ // component-configure options: START @@ -90,7 +91,7 @@ Java DSL 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") + .to("hwcloud-imagerecognition:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4") ---- XML DSL @@ -105,7 +106,7 @@ XML DSL <setProperty name="CamelHwCloudImageThreshold"> <constant>0.5</constant> </setProperty> - <to uri="hwcloud-image:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4" /> + <to uri="hwcloud-imagerecognition:celebrityRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4" /> </route> ---- @@ -120,7 +121,7 @@ from("direct:triggerRoute") .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") + .to("hwcloud-imagerecognition:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc®ion=cn-north-4") ---- XML DSL @@ -141,8 +142,8 @@ XML DSL <setProperty name="CamelHwCloudImageTagLimit"> <constant>50</constant> </setProperty> - <to uri="hwcloud-image:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4" /> + <to uri="hwcloud-imagerecognition:tagRecognition?accessKey=*********&secretKey=********&projectId=9071a38e7f6a4ba7b7bcbeb7d4ea6efc&region=cn-north-4" /> </route> ---- -include::{page-component-version}@camel-spring-boot::page$huaweicloud-imagerecognition-starter.adoc[] \ No newline at end of file +include::{page-component-version}@camel-spring-boot::page$huaweicloud-imagerecognition-starter.adoc[] diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java index 1217436..40159c3b 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-image") +@org.apache.camel.spi.annotations.Component("hwcloud-imagerecognition") public class ImageRecognitionComponent extends DefaultComponent { protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { 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 a57855b..d033fcf 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 @@ -32,8 +32,8 @@ import org.apache.camel.support.DefaultEndpoint; /** * 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", +@UriEndpoint(firstVersion = "3.12.0", scheme = "hwcloud-imagerecognition", title = "Huawei Cloud Image Recognition", + syntax = "hwcloud-imagerecognition:operation", category = { Category.CLOUD, Category.MESSAGING }, producerOnly = true) public class ImageRecognitionEndpoint extends DefaultEndpoint { @UriPath( diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java index bed102a..c382846 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java @@ -39,7 +39,8 @@ public class CelebrityRecognitionWithImagUrlTest extends CamelTestSupport { constant(testConfiguration.getProperty("imageUrl"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("celebrityThreshold"))) - .to("hwcloud-image:celebrityRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:celebrityRecognition?accessKey=" + + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true") diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java index df965a3..6080161 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java @@ -45,7 +45,8 @@ public class CelebrityRecognitionWithImageContentAndMockClientTest extends Camel constant(testConfiguration.getProperty("imageContent"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("celebrityThreshold"))) - .to("hwcloud-image:celebrityRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:celebrityRecognition?accessKey=" + + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true" diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java index 9c67fff..a00bcbf 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java @@ -39,7 +39,8 @@ public class CelebrityRecognitionWithImageContentTest extends CamelTestSupport { constant(testConfiguration.getProperty("imageContent"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("celebrityThreshold"))) - .to("hwcloud-image:celebrityRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:celebrityRecognition?accessKey=" + + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true") diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java index bbe9e01..7ff27a8 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java @@ -45,7 +45,8 @@ public class CelebrityRecognitionWithImageUrlAndMockClientTest extends CamelTest constant(testConfiguration.getProperty("imageUrl"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("celebrityThreshold"))) - .to("hwcloud-image:celebrityRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:celebrityRecognition?accessKey=" + + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true" diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java index 5cb7d6e..f4b198d 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java @@ -43,7 +43,7 @@ public class TagRecognitionWithImageContentAndMockClientTest extends CamelTestSu constant(testConfiguration.getProperty("imageContent"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("tagThreshold"))) - .to("hwcloud-image:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true" diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java index 5208c23..6789d52 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java @@ -39,7 +39,7 @@ public class TagRecognitionWithImageContentTest extends CamelTestSupport { constant(testConfiguration.getProperty("imageContent"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("tagThreshold"))) - .to("hwcloud-image:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true") diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java index 918e269..f7da2b6 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java @@ -43,7 +43,7 @@ public class TagRecognitionWithImageUrlAndMockClientTest extends CamelTestSuppor constant(testConfiguration.getProperty("imageUrl"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("tagThreshold"))) - .to("hwcloud-image:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true" diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java index a9d6cd0..3ed82d7 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java @@ -39,7 +39,7 @@ public class TagRecognitionWithImageUrlTest extends CamelTestSupport { constant(testConfiguration.getProperty("imageUrl"))) .setProperty(ImageRecognitionProperties.THRESHOLD, constant(testConfiguration.getProperty("tagThreshold"))) - .to("hwcloud-image:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + .to("hwcloud-imagerecognition:tagRecognition?accessKey=" + testConfiguration.getProperty("accessKey") + "&secretKey=" + testConfiguration.getProperty("secretKey") + "&projectId=" + testConfiguration.getProperty("projectId") + "®ion=" + testConfiguration.getProperty("region") + "&ignoreSslVerification=true") diff --git a/components/camel-huawei/src/main/docs/hwcloud-summary.adoc b/components/camel-huawei/src/main/docs/hwcloud-summary.adoc index 30ee0cc..2cffa7d 100644 --- a/components/camel-huawei/src/main/docs/hwcloud-summary.adoc +++ b/components/camel-huawei/src/main/docs/hwcloud-summary.adoc @@ -1,10 +1,10 @@ = Huawei Cloud Component -:docTitle: Huawei Cloud +:doctitle: Huawei Cloud The Camel components for https://www.huaweicloud.com/intl/en-us/[Huawei Cloud Services] which provides connectivity to Huawei Cloud services from Camel. -== {docTitle} components +== {doctitle} components See the following for usage of each component: -indexDescriptionList::[attributes='group={docTitle}',descAttribute=description] \ No newline at end of file +indexDescriptionList::[attributes='group={doctitle}',descAttribute=description] \ No newline at end of file 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 ab51055..89b153d 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 @@ -2061,8 +2061,8 @@ public interface ComponentsBuilderFactory { * * @return the dsl builder */ - static org.apache.camel.builder.component.dsl.HwcloudImageComponentBuilderFactory.HwcloudImageComponentBuilder hwcloudImage() { - return org.apache.camel.builder.component.dsl.HwcloudImageComponentBuilderFactory.hwcloudImage(); + static org.apache.camel.builder.component.dsl.HwcloudImagerecognitionComponentBuilderFactory.HwcloudImagerecognitionComponentBuilder hwcloudImagerecognition() { + return org.apache.camel.builder.component.dsl.HwcloudImagerecognitionComponentBuilderFactory.hwcloudImagerecognition(); } /** * Huawei Object Storage Service (OBS) (camel-huaweicloud-obs) 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/HwcloudImagerecognitionComponentBuilderFactory.java similarity index 89% rename from core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImageComponentBuilderFactory.java rename to core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImagerecognitionComponentBuilderFactory.java index bf6f03f..8656d77 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/HwcloudImagerecognitionComponentBuilderFactory.java @@ -28,7 +28,7 @@ import org.apache.camel.component.huaweicloud.image.ImageRecognitionComponent; * Generated by camel-package-maven-plugin - do not edit this file! */ @Generated("org.apache.camel.maven.packaging.ComponentDslMojo") -public interface HwcloudImageComponentBuilderFactory { +public interface HwcloudImagerecognitionComponentBuilderFactory { /** * Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition) @@ -40,14 +40,14 @@ public interface HwcloudImageComponentBuilderFactory { * * @return the dsl builder */ - static HwcloudImageComponentBuilder hwcloudImage() { - return new HwcloudImageComponentBuilderImpl(); + static HwcloudImagerecognitionComponentBuilder hwcloudImagerecognition() { + return new HwcloudImagerecognitionComponentBuilderImpl(); } /** * Builder for the Huawei Cloud Image Recognition component. */ - interface HwcloudImageComponentBuilder + interface HwcloudImagerecognitionComponentBuilder extends ComponentBuilder<ImageRecognitionComponent> { /** @@ -69,7 +69,7 @@ public interface HwcloudImageComponentBuilderFactory { * @param lazyStartProducer the value to set * @return the dsl builder */ - default HwcloudImageComponentBuilder lazyStartProducer( + default HwcloudImagerecognitionComponentBuilder lazyStartProducer( boolean lazyStartProducer) { doSetProperty("lazyStartProducer", lazyStartProducer); return this; @@ -90,18 +90,18 @@ public interface HwcloudImageComponentBuilderFactory { * @param autowiredEnabled the value to set * @return the dsl builder */ - default HwcloudImageComponentBuilder autowiredEnabled( + default HwcloudImagerecognitionComponentBuilder autowiredEnabled( boolean autowiredEnabled) { doSetProperty("autowiredEnabled", autowiredEnabled); return this; } } - class HwcloudImageComponentBuilderImpl + class HwcloudImagerecognitionComponentBuilderImpl extends AbstractComponentBuilder<ImageRecognitionComponent> implements - HwcloudImageComponentBuilder { + HwcloudImagerecognitionComponentBuilder { @Override protected ImageRecognitionComponent buildConcreteComponent() { return new ImageRecognitionComponent(); diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json index f888bd1..140946e 100644 --- a/core/camel-componentdsl/src/generated/resources/metadata.json +++ b/core/camel-componentdsl/src/generated/resources/metadata.json @@ -3348,9 +3348,9 @@ "producerOnly": true, "lenientProperties": false }, - "HwcloudImageComponentBuilderFactory": { + "HwcloudImagerecognitionComponentBuilderFactory": { "kind": "component", - "name": "hwcloud-image", + "name": "hwcloud-imagerecognition", "title": "Huawei Cloud Image Recognition", "description": "To identify objects, scenes, and concepts in images on Huawei Cloud", "deprecated": false, @@ -3361,9 +3361,9 @@ "groupId": "org.apache.camel", "artifactId": "camel-huaweicloud-imagerecognition", "version": "3.12.0-SNAPSHOT", - "scheme": "hwcloud-image", + "scheme": "hwcloud-imagerecognition", "extendsScheme": "", - "syntax": "hwcloud-image:operation", + "syntax": "hwcloud-imagerecognition:operation", "async": false, "api": false, "consumerOnly": false, 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 b0d8d98..8d68758 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 @@ -6982,6 +6982,51 @@ public class StaticEndpointBuilders { return org.apache.camel.builder.endpoint.dsl.ImageRecognitionEndpointBuilderFactory.endpointBuilder(componentName, path); } /** + * Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition) + * To identify objects, scenes, and concepts in images on Huawei Cloud + * + * Category: cloud,messaging + * Since: 3.12 + * Maven coordinates: org.apache.camel:camel-huaweicloud-imagerecognition + * + * Syntax: <code>hwcloud-imagerecognition:operation</code> + * + * Path parameter: operation (required) + * Name of Image Recognition operation to perform, including + * celebrityRecognition and tagRecognition + * + * @param path operation + * @return the dsl builder + */ + public static org.apache.camel.builder.endpoint.dsl.ImageRecognitionEndpointBuilderFactory.ImageRecognitionEndpointBuilder hwcloudImagerecognition( + String path) { + return org.apache.camel.builder.endpoint.dsl.ImageRecognitionEndpointBuilderFactory.endpointBuilder("hwcloud-imagerecognition", path); + } + /** + * Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition) + * To identify objects, scenes, and concepts in images on Huawei Cloud + * + * Category: cloud,messaging + * Since: 3.12 + * Maven coordinates: org.apache.camel:camel-huaweicloud-imagerecognition + * + * Syntax: <code>hwcloud-imagerecognition:operation</code> + * + * Path parameter: operation (required) + * Name of Image Recognition operation to perform, including + * celebrityRecognition and tagRecognition + * + * @param componentName to use a custom component name for the endpoint + * instead of the default name + * @param path operation + * @return the dsl builder + */ + public static org.apache.camel.builder.endpoint.dsl.ImageRecognitionEndpointBuilderFactory.ImageRecognitionEndpointBuilder hwcloudImagerecognition( + String componentName, + String path) { + return org.apache.camel.builder.endpoint.dsl.ImageRecognitionEndpointBuilderFactory.endpointBuilder(componentName, path); + } + /** * Huawei Object Storage Service (OBS) (camel-huaweicloud-obs) * To provide stable, secure, efficient, and easy-to-use cloud storage * service on Huawei Cloud 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 2a73dc7..648de0a 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 @@ -436,7 +436,7 @@ public interface ImageRecognitionEndpointBuilderFactory { * Maven coordinates: * org.apache.camel:camel-huaweicloud-imagerecognition * - * Syntax: <code>hwcloud-image:operation</code> + * Syntax: <code>hwcloud-imagerecognition:operation</code> * * Path parameter: operation (required) * Name of Image Recognition operation to perform, including @@ -445,8 +445,9 @@ public interface ImageRecognitionEndpointBuilderFactory { * @param path operation * @return the dsl builder */ - default ImageRecognitionEndpointBuilder hwcloudImage(String path) { - return ImageRecognitionEndpointBuilderFactory.endpointBuilder("hwcloud-image", path); + default ImageRecognitionEndpointBuilder hwcloudImagerecognition( + String path) { + return ImageRecognitionEndpointBuilderFactory.endpointBuilder("hwcloud-imagerecognition", path); } /** * Huawei Cloud Image Recognition (camel-huaweicloud-imagerecognition) @@ -457,7 +458,7 @@ public interface ImageRecognitionEndpointBuilderFactory { * Maven coordinates: * org.apache.camel:camel-huaweicloud-imagerecognition * - * Syntax: <code>hwcloud-image:operation</code> + * Syntax: <code>hwcloud-imagerecognition:operation</code> * * Path parameter: operation (required) * Name of Image Recognition operation to perform, including @@ -468,7 +469,7 @@ public interface ImageRecognitionEndpointBuilderFactory { * @param path operation * @return the dsl builder */ - default ImageRecognitionEndpointBuilder hwcloudImage( + default ImageRecognitionEndpointBuilder hwcloudImagerecognition( String componentName, String path) { return ImageRecognitionEndpointBuilderFactory.endpointBuilder(componentName, path); 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 fe8cde7..45f83a8 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 @@ -148,7 +148,7 @@ https hwcloud-dms hwcloud-functiongraph hwcloud-iam -hwcloud-image +hwcloud-imagerecognition hwcloud-obs hwcloud-smn iec60870-client diff --git a/docs/components/modules/ROOT/examples/json/hwcloud-image.json b/docs/components/modules/ROOT/examples/json/hwcloud-image.json deleted file mode 120000 index 28abf1f..0000000 --- a/docs/components/modules/ROOT/examples/json/hwcloud-image.json +++ /dev/null @@ -1 +0,0 @@ -../../../../../../components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-image.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/json/hwcloud-imagerecognition.json b/docs/components/modules/ROOT/examples/json/hwcloud-imagerecognition.json new file mode 120000 index 0000000..54a1258 --- /dev/null +++ b/docs/components/modules/ROOT/examples/json/hwcloud-imagerecognition.json @@ -0,0 +1 @@ +../../../../../../components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/org/apache/camel/component/huaweicloud/image/hwcloud-imagerecognition.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 5d9e577..c069de8 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -149,13 +149,13 @@ ** xref:hbase-component.adoc[HBase] ** xref:hdfs-component.adoc[HDFS] ** xref:http-component.adoc[HTTP] -** xref:hwcloud-summary.adoc[Huawei Cloud] -*** xref:hwcloud-image-recognition-component.adoc[Huawei Cloud Image Recognition] +*** xref:hwcloud-imagerecognition-component.adoc[Huawei Cloud Image Recognition] *** xref:hwcloud-dms-component.adoc[Huawei Distributed Message Service (DMS)] *** xref:hwcloud-functiongraph-component.adoc[Huawei FunctionGraph] *** xref:hwcloud-iam-component.adoc[Huawei Identity and Access Management (IAM)] *** xref:hwcloud-obs-component.adoc[Huawei Object Storage Service (OBS)] *** xref:hwcloud-smn-component.adoc[Huawei Simple Message Notification (SMN)] +** xref:hwcloud-summary.adoc[Huawei Cloud Component] ** xref:iec60870-client-component.adoc[IEC 60870 Client] ** xref:iec60870-server-component.adoc[IEC 60870 Server] ** xref:ignite-summary.adoc[Ignite] diff --git a/docs/components/modules/ROOT/pages/hwcloud-image-recognition-component.adoc b/docs/components/modules/ROOT/pages/hwcloud-image-recognition-component.adoc deleted file mode 120000 index 5ef2c0b..0000000 --- a/docs/components/modules/ROOT/pages/hwcloud-image-recognition-component.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-image-recognition-component.adoc \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/hwcloud-imagerecognition-component.adoc b/docs/components/modules/ROOT/pages/hwcloud-imagerecognition-component.adoc new file mode 120000 index 0000000..21b54c8 --- /dev/null +++ b/docs/components/modules/ROOT/pages/hwcloud-imagerecognition-component.adoc @@ -0,0 +1 @@ +../../../../../components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/docs/hwcloud-imagerecognition-component.adoc \ No newline at end of file diff --git a/docs/components/modules/others/examples/json/huaweicloud-imagerecognition.json b/docs/components/modules/others/examples/json/huaweicloud-imagerecognition.json deleted file mode 120000 index 0d913d4..0000000 --- a/docs/components/modules/others/examples/json/huaweicloud-imagerecognition.json +++ /dev/null @@ -1 +0,0 @@ -../../../../../../components/camel-huawei/camel-huaweicloud-imagerecognition/src/generated/resources/huaweicloud-imagerecognition.json \ No newline at end of file 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 a898e74..7e9b067 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 @@ -152,7 +152,7 @@ public final class EndpointProducerDeserializersResolver implements YamlDeserial case "hwcloud-dms": case "hwcloud-functiongraph": case "hwcloud-iam": - case "hwcloud-image": + case "hwcloud-imagerecognition": case "hwcloud-obs": case "hwcloud-smn": case "iec60870-client":