Merge pull request #5 from HubSpot/implement-more

bump AWS SDK version to 1.11.628 + fix build + implement more methods
HubSpot · Sep 12, 2019 · c006daf · c006daf
2 parents a9049bd + c7ad12d
commit c006daf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>25.3</version>
+    <version>25.5</version>
   </parent>
 
   <artifactId>s3-decorators</artifactId>
@@ -20,9 +20,10 @@
   </modules>
 
   <properties>
-    <aws.sdk.version>1.11.461</aws.sdk.version>
-    <dep.httpclient.version>4.5.5</dep.httpclient.version>
-    <dep.httpcore.version>4.4.9</dep.httpcore.version>
+    <aws.sdk.version>1.11.628</aws.sdk.version>
+    <dep.httpclient.version>4.5.9</dep.httpclient.version>
+    <dep.httpcore.version>4.4.11</dep.httpcore.version>
+    <dep.commons-codec.version>1.11</dep.commons-codec.version>
   </properties>
 
   <dependencyManagement>
@@ -35,12 +36,12 @@
       <dependency>
         <groupId>com.hubspot</groupId>
         <artifactId>hystrix-s3-decorator</artifactId>
-        <version>${project.version</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.hubspot</groupId>
         <artifactId>metrics-s3-decorator</artifactId>
-        <version>${project.version</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.netflix.hystrix</groupId>

diff --git a/s3-decorators-core/src/main/java/com/hubspot/s3/S3Decorator.java b/s3-decorators-core/src/main/java/com/hubspot/s3/S3Decorator.java
@@ -121,6 +121,10 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.Owner;
 import com.amazonaws.services.s3.model.PartListing;
+import com.amazonaws.services.s3.model.PresignedUrlDownloadRequest;
+import com.amazonaws.services.s3.model.PresignedUrlDownloadResult;
+import com.amazonaws.services.s3.model.PresignedUrlUploadRequest;
+import com.amazonaws.services.s3.model.PresignedUrlUploadResult;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.services.s3.model.PutObjectResult;
 import com.amazonaws.services.s3.model.RestoreObjectRequest;
@@ -1063,4 +1067,19 @@ public SetObjectRetentionResult setObjectRetention(SetObjectRetentionRequest set
   public GetObjectRetentionResult getObjectRetention(GetObjectRetentionRequest getObjectRetentionRequest) {
     return call(() -> getDelegate().getObjectRetention(getObjectRetentionRequest));
   }
+
+  @Override
+  public PresignedUrlDownloadResult download(PresignedUrlDownloadRequest presignedUrlDownloadRequest) {
+    return call(() -> getDelegate().download(presignedUrlDownloadRequest));
+  }
+
+  @Override
+  public void download(PresignedUrlDownloadRequest presignedUrlDownloadRequest, File destinationFile) {
+    run(() -> getDelegate().download(presignedUrlDownloadRequest, destinationFile));
+  }
+
+  @Override
+  public PresignedUrlUploadResult upload(PresignedUrlUploadRequest presignedUrlUploadRequest) {
+    return call(() -> getDelegate().upload(presignedUrlUploadRequest));
+  }
 }