You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/12/04 07:41:29 UTC
[camel] branch master updated (900f2b7 -> bb73bae)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 900f2b7 Upgrade groovy
new 2fd3c84 CAMEL-15880 - Camel-Minio: Upgrade to Minio 8.x
new fceb5ae CAMEL-15880 - Regen docs and fixed CS
new bb73bae Regen docs and sync deps
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../camel/component/minio/MinioConsumer.java | 6 ++--
.../camel/component/minio/MinioEndpoint.java | 33 +++++++++++-----------
parent/pom.xml | 2 +-
4 files changed, 20 insertions(+), 23 deletions(-)
[camel] 03/03: Regen docs and sync deps
Posted by ac...@apache.org.
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 bb73baed341d0d5c38807a7d6cc598f935663f2b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 4 08:36:05 2020 +0100
Regen docs and sync deps
---
camel-dependencies/pom.xml | 2 +-
.../resources/org/apache/camel/catalog/docs/minio-component.adoc | 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index df2b6a8..9fea38e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -420,7 +420,7 @@
<mina-version>2.1.4</mina-version>
<minidns-version>0.3.4</minidns-version>
<minimal-json-version>0.9.5</minimal-json-version>
- <minio-version>7.1.4</minio-version>
+ <minio-version>8.0.3</minio-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockito-version>3.6.28</mockito-version>
<mockwebserver-version>0.1.8</mockwebserver-version>
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 22c4f5b..69f089f 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
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
+include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc b/docs/components/modules/ROOT/pages/minio-component.adoc
index 365473c..2109582 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
+include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
[camel] 02/03: CAMEL-15880 - Regen docs and fixed CS
Posted by ac...@apache.org.
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 fceb5aeac41ffc5a6fb64b2ce177628b5d85c621
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 4 08:32:34 2020 +0100
CAMEL-15880 - Regen docs and fixed CS
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc | 2 +-
.../src/main/java/org/apache/camel/component/minio/MinioEndpoint.java | 4 ++--
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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 69f089f..22c4f5b 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
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
diff --git a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
index 41ff62f..e85cf8f 100644
--- a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
+++ b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
@@ -29,7 +29,6 @@ import io.minio.MinioClient;
import io.minio.SetBucketPolicyArgs;
import io.minio.StatObjectArgs;
import io.minio.StatObjectResponse;
-
import org.apache.camel.Category;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -106,7 +105,8 @@ public class MinioEndpoint extends ScheduledPollEndpoint {
makeBucket(bucketName);
LOG.trace("Bucket created");
} else {
- throw new IllegalArgumentException("Bucket does not exists, set autoCreateBucket option for bucket auto creation");
+ throw new IllegalArgumentException(
+ "Bucket does not exists, set autoCreateBucket option for bucket auto creation");
}
}
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc b/docs/components/modules/ROOT/pages/minio-component.adoc
index 2109582..365473c 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
[camel] 01/03: CAMEL-15880 - Camel-Minio: Upgrade to Minio 8.x
Posted by ac...@apache.org.
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 2fd3c843d453ad8417a3b4d5e03d8a0d3330f4e0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 4 08:30:29 2020 +0100
CAMEL-15880 - Camel-Minio: Upgrade to Minio 8.x
---
.../camel/component/minio/MinioConsumer.java | 6 ++--
.../camel/component/minio/MinioEndpoint.java | 33 +++++++++++-----------
parent/pom.xml | 2 +-
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConsumer.java b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConsumer.java
index bfa3be1..df0a7d9 100644
--- a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConsumer.java
+++ b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioConsumer.java
@@ -35,7 +35,6 @@ import io.minio.MakeBucketArgs;
import io.minio.MinioClient;
import io.minio.RemoveObjectArgs;
import io.minio.Result;
-import io.minio.errors.InvalidBucketNameException;
import io.minio.errors.MinioException;
import io.minio.messages.Item;
import org.apache.camel.Exchange;
@@ -88,9 +87,8 @@ public class MinioConsumer extends ScheduledBatchPollingConsumer {
makeBucket(destinationBucketName);
LOG.trace("Destination Bucket created");
} else {
- throw new InvalidBucketNameException(
- "Bucket {} does not exists, set autoCreateBucket option for bucket auto creation",
- destinationBucketName);
+ throw new IllegalArgumentException(
+ "Destination Bucket does not exists, set autoCreateBucket option for bucket auto creation");
}
}
} else {
diff --git a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
index 5a3a10b..41ff62f 100644
--- a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
+++ b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioEndpoint.java
@@ -26,10 +26,10 @@ import java.nio.charset.StandardCharsets;
import io.minio.BucketExistsArgs;
import io.minio.MakeBucketArgs;
import io.minio.MinioClient;
-import io.minio.ObjectStat;
import io.minio.SetBucketPolicyArgs;
import io.minio.StatObjectArgs;
-import io.minio.errors.InvalidBucketNameException;
+import io.minio.StatObjectResponse;
+
import org.apache.camel.Category;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -106,8 +106,7 @@ public class MinioEndpoint extends ScheduledPollEndpoint {
makeBucket(bucketName);
LOG.trace("Bucket created");
} else {
- throw new InvalidBucketNameException(
- "Bucket {} does not exists, set autoCreateBucket option for bucket auto creation", bucketName);
+ throw new IllegalArgumentException("Bucket does not exists, set autoCreateBucket option for bucket auto creation");
}
}
@@ -246,22 +245,22 @@ public class MinioEndpoint extends ScheduledPollEndpoint {
MinioChecks.checkIfConfigIsNotEmptyAndSetAndConfig(getConfiguration()::getUnModifiedSince,
statObjectRequest::unmodifiedSince);
- ObjectStat stat = minioClient.statObject(statObjectRequest.build());
+ StatObjectResponse stat = minioClient.statObject(statObjectRequest.build());
// set all stat as message headers
- message.setHeader(MinioConstants.OBJECT_NAME, stat.name());
- message.setHeader(MinioConstants.BUCKET_NAME, stat.bucketName());
+ message.setHeader(MinioConstants.OBJECT_NAME, stat.object());
+ message.setHeader(MinioConstants.BUCKET_NAME, stat.bucket());
message.setHeader(MinioConstants.E_TAG, stat.etag());
- message.setHeader(MinioConstants.LAST_MODIFIED, stat.httpHeaders().get("last-modified"));
- message.setHeader(MinioConstants.VERSION_ID, stat.httpHeaders().get("x-amz-version-id"));
+ message.setHeader(MinioConstants.LAST_MODIFIED, stat.headers().get("last-modified"));
+ message.setHeader(MinioConstants.VERSION_ID, stat.headers().get("x-amz-version-id"));
message.setHeader(MinioConstants.CONTENT_TYPE, stat.contentType());
- message.setHeader(MinioConstants.CONTENT_LENGTH, stat.length());
- message.setHeader(MinioConstants.CONTENT_ENCODING, stat.httpHeaders().get("content-encoding"));
- message.setHeader(MinioConstants.CONTENT_DISPOSITION, stat.httpHeaders().get("content-disposition"));
- message.setHeader(MinioConstants.CACHE_CONTROL, stat.httpHeaders().get("cache-control"));
- message.setHeader(MinioConstants.SERVER_SIDE_ENCRYPTION, stat.httpHeaders().get("x-amz-server-side-encryption"));
- message.setHeader(MinioConstants.EXPIRATION_TIME, stat.httpHeaders().get("x-amz-expiration"));
- message.setHeader(MinioConstants.REPLICATION_STATUS, stat.httpHeaders().get("x-amz-replication-status"));
- message.setHeader(MinioConstants.STORAGE_CLASS, stat.httpHeaders().get("x-amz-storage-class"));
+ message.setHeader(MinioConstants.CONTENT_LENGTH, stat.size());
+ message.setHeader(MinioConstants.CONTENT_ENCODING, stat.headers().get("content-encoding"));
+ message.setHeader(MinioConstants.CONTENT_DISPOSITION, stat.headers().get("content-disposition"));
+ message.setHeader(MinioConstants.CACHE_CONTROL, stat.headers().get("cache-control"));
+ message.setHeader(MinioConstants.SERVER_SIDE_ENCRYPTION, stat.headers().get("x-amz-server-side-encryption"));
+ message.setHeader(MinioConstants.EXPIRATION_TIME, stat.headers().get("x-amz-expiration"));
+ message.setHeader(MinioConstants.REPLICATION_STATUS, stat.headers().get("x-amz-replication-status"));
+ message.setHeader(MinioConstants.STORAGE_CLASS, stat.headers().get("x-amz-storage-class"));
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4363e59..7c1e2e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -406,7 +406,7 @@
<mina-version>2.1.4</mina-version>
<minidns-version>0.3.4</minidns-version>
<minimal-json-version>0.9.5</minimal-json-version>
- <minio-version>7.1.4</minio-version>
+ <minio-version>8.0.3</minio-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>0.1.8</mockwebserver-version>
<mockito-version>3.6.28</mockito-version>