From dedb8514253955095ca1dffc4152493cccab9814 Mon Sep 17 00:00:00 2001
From: Christian Schlichtherle <christian@schlichtherle.de>
Date: Sat, 16 Jun 2018 07:47:48 +0400
Subject: [PATCH 1/2] Ugrades to `aws-java-sdk` version 1.11.348.

---
 pom.xml                                       |  4 +--
 .../java/com/amazonaws/samples/S3Sample.java  | 29 ++++---------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index efc3c43..0f40dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.amazonaws.samples</groupId>
     <artifactId>aws-java-sample</artifactId>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>aws-java-sample</name>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk</artifactId>
-            <version>1.9.6</version>
+            <version>1.11.348</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/amazonaws/samples/S3Sample.java b/src/main/java/com/amazonaws/samples/S3Sample.java
index 39beedd..5d86cf3 100644
--- a/src/main/java/com/amazonaws/samples/S3Sample.java
+++ b/src/main/java/com/amazonaws/samples/S3Sample.java
@@ -14,29 +14,16 @@
  */
 package com.amazonaws.samples;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.UUID;
-
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.*;
+
+import java.io.*;
+import java.util.UUID;
 
 /**
  * This sample demonstrates how to make basic requests to Amazon S3 using
@@ -62,7 +49,7 @@ public static void main(String[] args) throws IOException {
          * aws_secret_access_key = YOUR_SECRET_ACCESS_KEY
          */
 
-        AmazonS3 s3 = new AmazonS3Client();
+        AmazonS3 s3 = AmazonS3ClientBuilder.defaultClient();
         Region usWest2 = Region.getRegion(Regions.US_WEST_2);
         s3.setRegion(usWest2);
 
@@ -175,8 +162,6 @@ public static void main(String[] args) throws IOException {
      * to Amazon S3
      *
      * @return A newly created temporary file with text data.
-     *
-     * @throws IOException
      */
     private static File createSampleFile() throws IOException {
         File file = File.createTempFile("aws-java-sdk-", ".txt");
@@ -198,8 +183,6 @@ private static File createSampleFile() throws IOException {
      *
      * @param input
      *            The input stream to display as text.
-     *
-     * @throws IOException
      */
     private static void displayTextInputStream(InputStream input) throws IOException {
         BufferedReader reader = new BufferedReader(new InputStreamReader(input));

From f3509d6f51e240970a578edb24ba18d634cf2650 Mon Sep 17 00:00:00 2001
From: Christian Schlichtherle <christian@schlichtherle.de>
Date: Sun, 17 Jun 2018 16:18:57 +0400
Subject: [PATCH 2/2] Fixes usage of client builder.

---
 src/main/java/com/amazonaws/samples/S3Sample.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/com/amazonaws/samples/S3Sample.java b/src/main/java/com/amazonaws/samples/S3Sample.java
index 5d86cf3..416d3ea 100644
--- a/src/main/java/com/amazonaws/samples/S3Sample.java
+++ b/src/main/java/com/amazonaws/samples/S3Sample.java
@@ -16,7 +16,6 @@
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
-import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
@@ -49,9 +48,7 @@ public static void main(String[] args) throws IOException {
          * aws_secret_access_key = YOUR_SECRET_ACCESS_KEY
          */
 
-        AmazonS3 s3 = AmazonS3ClientBuilder.defaultClient();
-        Region usWest2 = Region.getRegion(Regions.US_WEST_2);
-        s3.setRegion(usWest2);
+        AmazonS3 s3 = AmazonS3ClientBuilder.standard().withRegion(Regions.US_WEST_2).build();
 
         String bucketName = "my-first-s3-bucket-" + UUID.randomUUID();
         String key = "MyObjectKey";