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 <anco...@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>
