You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/11/27 09:10:44 UTC

[camel] branch master updated: CAMEL-15836: Add autowired metadata to camel-minio minioClient option

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 0addeb0  CAMEL-15836: Add autowired metadata to camel-minio minioClient option
0addeb0 is described below

commit 0addeb0da4c77837ade865e237aefde4cee4b50e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Nov 27 08:57:29 2020 +0000

    CAMEL-15836: Add autowired metadata to camel-minio minioClient option
---
 .../resources/org/apache/camel/catalog/components/minio.json         | 4 ++--
 .../resources/org/apache/camel/catalog/docs/minio-component.adoc     | 4 ++--
 .../org/apache/camel/component/minio/MinioComponentConfigurer.java   | 5 +++++
 .../org/apache/camel/component/minio/MinioEndpointConfigurer.java    | 5 +++++
 .../generated/resources/org/apache/camel/component/minio/minio.json  | 4 ++--
 components/camel-minio/src/main/docs/minio-component.adoc            | 4 ++--
 .../java/org/apache/camel/component/minio/MinioConfiguration.java    | 1 +
 docs/components/modules/ROOT/pages/minio-component.adoc              | 4 ++--
 8 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
index 20c08c9..49592ac 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
@@ -26,7 +26,7 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.minio.MinioConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" },
     "customHttpClient": { "kind": "property", "displayName": "Custom Http Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "okhttp3.OkHttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set custom HTTP client for authenticated access." },
     "endpoint": { "kind": "property", "displayName": "Endpoint", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Endpoint can be an URL, domain name, IPv4 address or IPv6 address." },
-    "minioClient": { "kind": "property", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
+    "minioClient": { "kind": "property", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
     "objectLock": { "kind": "property", "displayName": "Object Lock", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set when creating new bucket." },
     "policy": { "kind": "property", "displayName": "Policy", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "The policy for this queue to set in the method." },
     "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "TCP\/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS." },
@@ -75,7 +75,7 @@
     "autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the bucket if bucket name not exist." },
     "customHttpClient": { "kind": "parameter", "displayName": "Custom Http Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "okhttp3.OkHttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set custom HTTP client for authenticated access." },
     "endpoint": { "kind": "parameter", "displayName": "Endpoint", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Endpoint can be an URL, domain name, IPv4 address or IPv6 address." },
-    "minioClient": { "kind": "parameter", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
+    "minioClient": { "kind": "parameter", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
     "objectLock": { "kind": "parameter", "displayName": "Object Lock", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set when creating new bucket." },
     "policy": { "kind": "parameter", "displayName": "Policy", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "The policy for this queue to set in the method." },
     "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "TCP\/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS." },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index c731a0a..1fa9ee4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -53,7 +53,7 @@ The Minio component supports 47 options, which are listed below.
 | *configuration* (common) | The component configuration |  | MinioConfiguration
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer
@@ -127,7 +127,7 @@ with the following path and query parameters:
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket if bucket name not exist. | true | boolean
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioComponentConfigurer.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioComponentConfigurer.java
index 600665e..1247d9f 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioComponentConfigurer.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioComponentConfigurer.java
@@ -116,6 +116,11 @@ public class MinioComponentConfigurer extends PropertyConfigurerSupport implemen
     }
 
     @Override
+    public String[] getAutowiredNames() {
+        return new String[]{"minioClient"};
+    }
+
+    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointConfigurer.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointConfigurer.java
index a11aee5..e57994f 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointConfigurer.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointConfigurer.java
@@ -140,6 +140,11 @@ public class MinioEndpointConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
+    public String[] getAutowiredNames() {
+        return new String[]{"minioClient"};
+    }
+
+    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-minio/src/generated/resources/org/apache/camel/component/minio/minio.json b/components/camel-minio/src/generated/resources/org/apache/camel/component/minio/minio.json
index 20c08c9..49592ac 100644
--- a/components/camel-minio/src/generated/resources/org/apache/camel/component/minio/minio.json
+++ b/components/camel-minio/src/generated/resources/org/apache/camel/component/minio/minio.json
@@ -26,7 +26,7 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.minio.MinioConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" },
     "customHttpClient": { "kind": "property", "displayName": "Custom Http Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "okhttp3.OkHttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set custom HTTP client for authenticated access." },
     "endpoint": { "kind": "property", "displayName": "Endpoint", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Endpoint can be an URL, domain name, IPv4 address or IPv6 address." },
-    "minioClient": { "kind": "property", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
+    "minioClient": { "kind": "property", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
     "objectLock": { "kind": "property", "displayName": "Object Lock", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set when creating new bucket." },
     "policy": { "kind": "property", "displayName": "Policy", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "The policy for this queue to set in the method." },
     "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "TCP\/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS." },
@@ -75,7 +75,7 @@
     "autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the bucket if bucket name not exist." },
     "customHttpClient": { "kind": "parameter", "displayName": "Custom Http Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "okhttp3.OkHttpClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set custom HTTP client for authenticated access." },
     "endpoint": { "kind": "parameter", "displayName": "Endpoint", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Endpoint can be an URL, domain name, IPv4 address or IPv6 address." },
-    "minioClient": { "kind": "parameter", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
+    "minioClient": { "kind": "parameter", "displayName": "Minio Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "io.minio.MinioClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Reference to a Minio Client object in the registry." },
     "objectLock": { "kind": "parameter", "displayName": "Object Lock", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "Set when creating new bucket." },
     "policy": { "kind": "parameter", "displayName": "Policy", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "The policy for this queue to set in the method." },
     "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.minio.MinioConfiguration", "configurationField": "configuration", "description": "TCP\/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS." },
diff --git a/components/camel-minio/src/main/docs/minio-component.adoc b/components/camel-minio/src/main/docs/minio-component.adoc
index c731a0a..1fa9ee4 100644
--- a/components/camel-minio/src/main/docs/minio-component.adoc
+++ b/components/camel-minio/src/main/docs/minio-component.adoc
@@ -53,7 +53,7 @@ The Minio component supports 47 options, which are listed below.
 | *configuration* (common) | The component configuration |  | MinioConfiguration
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer
@@ -127,7 +127,7 @@ with the following path and query parameters:
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket if bucket name not exist. | true | boolean
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer
diff --git a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConfiguration.java b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConfiguration.java
index 364dc5f..7c9ca35 100644
--- a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConfiguration.java
+++ b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConfiguration.java
@@ -62,6 +62,7 @@ public class MinioConfiguration implements Cloneable {
     @UriParam(label = "common")
     private ServerSideEncryption serverSideEncryption;
     @UriParam(label = "common")
+    @Metadata(autowired = true)
     private MinioClient minioClient;
 
     @UriParam(label = "consumer", defaultValue = "10")
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc b/docs/components/modules/ROOT/pages/minio-component.adoc
index f4a82d0..e29d509 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -55,7 +55,7 @@ The Minio component supports 47 options, which are listed below.
 | *configuration* (common) | The component configuration |  | MinioConfiguration
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer
@@ -129,7 +129,7 @@ with the following path and query parameters:
 | *autoCreateBucket* (common) | Setting the autocreation of the bucket if bucket name not exist. | true | boolean
 | *customHttpClient* (common) | Set custom HTTP client for authenticated access. |  | OkHttpClient
 | *endpoint* (common) | Endpoint can be an URL, domain name, IPv4 address or IPv6 address. |  | String
-| *minioClient* (common) | Reference to a Minio Client object in the registry. |  | MinioClient
+| *minioClient* (common) | *Autowired* Reference to a Minio Client object in the registry. |  | MinioClient
 | *objectLock* (common) | Set when creating new bucket. | false | boolean
 | *policy* (common) | The policy for this queue to set in the method. |  | String
 | *proxyPort* (common) | TCP/IP port number. 80 and 443 are used as defaults for HTTP and HTTPS. |  | Integer