This is an automated email from the ASF dual-hosted git repository.
acosentino 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 d0fd1bbc807 CAMEL-21262 - Camel-AWS2-S3: Explicitly add Producer
operations HeadObject and HeadBucket (#15902)
d0fd1bbc807 is described below
commit d0fd1bbc807ac882a5dd39dddb7112cb458e4bc0
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Oct 9 16:25:57 2024 +0200
CAMEL-21262 - Camel-AWS2-S3: Explicitly add Producer operations HeadObject
and HeadBucket (#15902)
* CAMEL-21262 - Camel-AWS2-S3: Explicitly add Producer operations
HeadObject and HeadBucket - HeadBucket
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-21262 - Camel-AWS2-S3: Explicitly add Producer operations
HeadObject and HeadBucket - HeadObject
Signed-off-by: Andrea Cosentino <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../camel/component/aws2/s3/AWS2S3Operations.java | 4 +-
.../camel/component/aws2/s3/AWS2S3Producer.java | 55 +++++++++-------
.../aws2/s3/integration/S3HeadBucketIT.java | 59 +++++++++++++++++
.../aws2/s3/integration/S3HeadObjectIT.java | 73 ++++++++++++++++++++++
4 files changed, 167 insertions(+), 24 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
index 0b723b18958..b4e12b1ef85 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
@@ -25,5 +25,7 @@ public enum AWS2S3Operations {
listBuckets,
getObject,
getObjectRange,
- createDownloadLink
+ createDownloadLink,
+ headBucket,
+ headObject
}
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index 368875fb0f3..b7edba14061 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -49,29 +49,7 @@ import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
-import software.amazon.awssdk.services.s3.model.BucketCannedACL;
-import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
-import
software.amazon.awssdk.services.s3.model.CompleteMultipartUploadResponse;
-import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
-import software.amazon.awssdk.services.s3.model.CompletedPart;
-import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
-import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
-import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
-import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteBucketResponse;
-import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import software.amazon.awssdk.services.s3.model.ListBucketsResponse;
-import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
-import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.services.s3.model.PutObjectResponse;
-import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
-import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.model.*;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import
software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
import
software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
@@ -123,6 +101,12 @@ public class AWS2S3Producer extends DefaultProducer {
case createDownloadLink:
createDownloadLink(exchange);
break;
+ case headBucket:
+ headBucket(getEndpoint().getS3Client(), exchange);
+ break;
+ case headObject:
+ headObject(getEndpoint().getS3Client(), exchange);
+ break;
default:
throw new IllegalArgumentException("Unsupported
operation");
}
@@ -719,6 +703,31 @@ public class AWS2S3Producer extends DefaultProducer {
}
}
+ private void headBucket(S3Client s3Client, Exchange exchange) {
+ String bucketName =
exchange.getIn().getHeader(AWS2S3Constants.BUCKET_NAME, String.class);
+ if (ObjectHelper.isEmpty(bucketName)) {
+ throw new IllegalArgumentException(
+ "Head Bucket operation requires to specify a bucket name
via Header");
+ }
+ HeadBucketResponse headBucketResponse =
s3Client.headBucket(HeadBucketRequest.builder().bucket(bucketName).build());
+
+ Message message = getMessageForResponse(exchange);
+ message.setBody(headBucketResponse);
+ }
+
+ private void headObject(S3Client s3Client, Exchange exchange) {
+ String key = exchange.getIn().getHeader(AWS2S3Constants.KEY,
String.class);
+ if (ObjectHelper.isEmpty(key)) {
+ throw new IllegalArgumentException(
+ "Head Object operation requires to specify a bucket name
via Header");
+ }
+ HeadObjectResponse headObjectResponse =
s3Client.headObject(HeadObjectRequest.builder()
+ .bucket(AWS2S3Utils.determineBucketName(exchange,
getConfiguration())).key(key).build());
+
+ Message message = getMessageForResponse(exchange);
+ message.setBody(headObjectResponse);
+ }
+
private AWS2S3Operations determineOperation(Exchange exchange) {
AWS2S3Operations operation =
exchange.getIn().getHeader(AWS2S3Constants.S3_OPERATION,
AWS2S3Operations.class);
if (operation == null) {
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
new file mode 100644
index 00000000000..4bc0b7427c9
--- /dev/null
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.s3.integration;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.aws2.s3.AWS2S3Operations;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class S3HeadBucketIT extends Aws2S3Base {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendInHeadBucket() throws InterruptedException {
+ result.expectedMessageCount(1);
+
+ template.send("direct:headBucket", exchange -> {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION,
AWS2S3Operations.headBucket);
+ exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME, "mycamel");
+ });
+
+ result.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ String awsEndpoint = "aws2-s3://test-ss3-s3";
+
+
from("direct:headBucket").to(awsEndpoint).log("${body}").to("mock:result");
+
+ }
+ };
+ }
+}
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadObjectIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadObjectIT.java
new file mode 100644
index 00000000000..34b170f3d69
--- /dev/null
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadObjectIT.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.s3.integration;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.aws2.s3.AWS2S3Operations;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class S3HeadObjectIT extends Aws2S3Base {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendInHeadObject() throws InterruptedException {
+ result.expectedMessageCount(1);
+
+ template.send("direct:putObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "camel.txt");
+ exchange.getIn().setHeader(AWS2S3Constants.CONTENT_TYPE,
"application/text");
+ exchange.getIn().setBody("Camel rocks!");
+ }
+ });
+
+ template.send("direct:headObject", exchange -> {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION,
AWS2S3Operations.headObject);
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "camel.txt");
+ });
+
+ result.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ String awsEndpoint = "aws2-s3://" + name.get();
+ String awsEndpointCreate = "aws2-s3://" + name.get() +
"?autoCreateBucket=true";
+
+ from("direct:putObject").to(awsEndpointCreate);
+
from("direct:headObject").to(awsEndpoint).log("${body}").to("mock:result");
+
+ }
+ };
+ }
+}
