diff --git a/pom.xml b/pom.xml index efc3c43..0f40dca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.amazonaws.samples aws-java-sample - 1.0 + 1.0-SNAPSHOT jar aws-java-sample @@ -18,7 +18,7 @@ com.amazonaws aws-java-sdk - 1.9.6 + 1.11.348 diff --git a/src/main/java/com/amazonaws/samples/S3Sample.java b/src/main/java/com/amazonaws/samples/S3Sample.java index 39beedd..416d3ea 100644 --- a/src/main/java/com/amazonaws/samples/S3Sample.java +++ b/src/main/java/com/amazonaws/samples/S3Sample.java @@ -14,29 +14,15 @@ */ 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,9 +48,7 @@ public static void main(String[] args) throws IOException { * aws_secret_access_key = YOUR_SECRET_ACCESS_KEY */ - AmazonS3 s3 = new AmazonS3Client(); - 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"; @@ -175,8 +159,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 +180,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));