Refactoring

alfonsof · alfonsof · commit ec8b9969cf85 · 2021-03-20T18:54:44.000+01:00
diff --git a/awsec2instances/pom.xml b/awsec2instances/pom.xml
@@ -20,19 +20,14 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.14.5</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.30</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>ec2</artifactId>
diff --git a/awss3copy/pom.xml b/awss3copy/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.18</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3copy/src/main/java/example/S3Copy.java b/awss3copy/src/main/java/example/S3Copy.java
@@ -9,7 +9,6 @@
 
 package example;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -21,17 +20,20 @@
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
 
+
 public class S3Copy {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         String sourceBucketName;       // Source bucket name
         String sourceKey;              // Source key
         String destinationBucketName;  // Destination bucket name
         String destinationKey;         // Destination key
 
         if (args.length < 3) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3copy.jar <SOURCE_BUCKET> <SOURCE_OBJECT> <DESTINATION_BUCKET>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3copy.jar " +
+                    "<SOURCE_BUCKET> <SOURCE_OBJECT> <DESTINATION_BUCKET>");
             System.exit(1);
         }
 
diff --git a/awss3create/pom.xml b/awss3create/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.14</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3create/src/main/java/example/S3Create.java b/awss3create/src/main/java/example/S3Create.java
@@ -7,7 +7,6 @@
 
 package example;
 
-import java.io.IOException;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.core.waiters.WaiterResponse;
@@ -25,10 +24,11 @@ public class S3Create {
 
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         if (args.length < 1) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3create.jar <BUCKET_NAME>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3create.jar <BUCKET_NAME>");
             System.exit(1);
         }
 
@@ -44,6 +44,7 @@ public static void main(String[] args) throws IOException {
 
         try {
             System.out.println("Creating bucket ...");
+
             S3Waiter s3Waiter = s3client.waiter();
             CreateBucketRequest bucketRequest = CreateBucketRequest.builder()
                     .bucket(bucketName)
@@ -62,7 +63,9 @@ public static void main(String[] args) throws IOException {
             // Get Bucket location
             GetBucketLocationRequest bucketLocationRequest = GetBucketLocationRequest.builder().bucket(bucketName).build();
             GetBucketLocationResponse bucketLocationResponse = s3client.getBucketLocation(bucketLocationRequest);
+            
             System.out.println("Bucket location: " + bucketLocationResponse.locationConstraintAsString());
+
         } catch (S3Exception e) {
             if (e.statusCode() == 409) {
                 System.out.println("Error: Bucket already exists!!");
diff --git a/awss3delete/pom.xml b/awss3delete/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.14</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3delete/src/main/java/example/S3Delete.java b/awss3delete/src/main/java/example/S3Delete.java
@@ -7,21 +7,22 @@
 
 package example;
 
-import java.io.IOException;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.S3Exception;
 import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
 
+
 public class S3Delete {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         if (args.length < 1) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3delete.jar <BUCKET_NAME>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3delete.jar <BUCKET_NAME>");
             System.exit(1);
         }
 
@@ -37,10 +38,13 @@ public static void main(String[] args) throws IOException {
 
         try {
             System.out.println("Deleting bucket ...");
+
             // Delete bucket
             DeleteBucketRequest deleteBucketRequest = DeleteBucketRequest.builder().bucket(bucketName).build();
             s3client.deleteBucket(deleteBucketRequest);
+            
             System.out.println("Deleted");
+
         } catch (S3Exception e) {
             if (e.statusCode() == 404) {
                 System.out.println("Error: Bucket does not exist!!");
diff --git a/awss3deleteobject/pom.xml b/awss3deleteobject/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.18</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3deleteobject/src/main/java/example/S3DeleteObject.java b/awss3deleteobject/src/main/java/example/S3DeleteObject.java
@@ -8,7 +8,6 @@
 
 package example;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
@@ -19,13 +18,16 @@
 import software.amazon.awssdk.services.s3.model.ObjectIdentifier;
 import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
 
+
 public class S3DeleteObject {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         if (args.length < 2) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3deleteobject.jar <BUCKET_NAME> <OBJECT_NAME>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3deleteobject.jar " +
+                    "<BUCKET_NAME> <OBJECT_NAME>");
             System.exit(1);
         }
 
@@ -45,6 +47,7 @@ public static void main(String[] args) throws IOException {
 
         try {
             System.out.println("Deleting object ...");
+
             ArrayList<ObjectIdentifier> toDelete = new ArrayList<ObjectIdentifier>();
             toDelete.add(ObjectIdentifier.builder().key(keyName).build());
 
@@ -54,7 +57,9 @@ public static void main(String[] args) throws IOException {
                     .delete(Delete.builder().objects(toDelete).build())
                     .build();
             s3client.deleteObjects(delReq);
+
             System.out.println("Deleted");
+            
         } catch (S3Exception e) {
             if (e.statusCode() == 404) {
                 System.out.println("Error: Bucket does not exist!!");
diff --git a/awss3download/pom.xml b/awss3download/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.14</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3download/src/main/java/example/S3Download.java b/awss3download/src/main/java/example/S3Download.java
@@ -22,16 +22,19 @@
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 
+
 public class S3Download {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         String bucketName;            // Source bucket name
         String keyName;               // Key name, it is the object name
         String localFileName;         // Local file name
 
         if (args.length < 3) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3download.jar <BUCKET_NAME> <OBJECT_NAME> <LOCAL_FILE_NAME>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3download.jar " +
+                    "<BUCKET_NAME> <OBJECT_NAME> <LOCAL_FILE_NAME>");
             System.exit(1);
         }
 
@@ -66,8 +69,11 @@ public static void main(String[] args) throws IOException {
             OutputStream os = new FileOutputStream(myFile);
             os.write(data);
             os.close();
+
             System.out.println("Downloaded");
 
+        } catch (IOException ee) {
+            System.err.println(ee.getMessage());
         } catch (S3Exception e) {
             if (e.statusCode() == 404) {
                 System.out.println("Error: Bucket/Object \"" + bucketName + "/" + keyName + "\" does not exist!!");
diff --git a/awss3list/pom.xml b/awss3list/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.14</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3list/src/main/java/example/S3List.java b/awss3list/src/main/java/example/S3List.java
@@ -7,7 +7,6 @@
 
 package example;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.ListIterator;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -19,15 +18,17 @@
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
+
 public class S3List {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         String bucketName;  // Bucket name
 
         if (args.length < 1) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3list.jar <BUCKET_NAME>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3list.jar <BUCKET_NAME>");
             System.exit(1);
         }
 
@@ -43,6 +44,7 @@ public static void main(String[] args) throws IOException {
 
         try {
             System.out.println("Listing objects ...");
+            
             ListObjectsRequest listObjects = ListObjectsRequest
                     .builder()
                     .bucket(bucketName)
@@ -57,6 +59,7 @@ public static void main(String[] args) throws IOException {
                         " (size = " + myValue.size() + " bytes)" +
                         " (owner = " + myValue.owner());
             }
+
             System.out.println("Listed");
 
         } catch (S3Exception e) {
diff --git a/awss3listall/pom.xml b/awss3listall/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.14</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3listall/src/main/java/example/S3ListAll.java b/awss3listall/src/main/java/example/S3ListAll.java
@@ -5,7 +5,6 @@
 
 package example;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.ListIterator;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -20,10 +19,11 @@
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
+
 public class S3ListAll {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         // Instantiates a client
         S3Client s3client = S3Client.builder()
@@ -32,6 +32,7 @@ public static void main(String[] args) throws IOException {
 
         try {
             System.out.println("Listing S3 buckets and objects ...");
+
             // List Buckets
             ListBucketsRequest listBucketsRequest = ListBucketsRequest.builder().build();
             ListBucketsResponse listBucketsResponse = s3client.listBuckets(listBucketsRequest);
@@ -55,7 +56,9 @@ public static void main(String[] args) throws IOException {
                             " (owner = " + myValue.owner());
                 }
             }
+
             System.out.println("Listed");
+            
         } catch (S3Exception e) {
             System.out.println("S3Exception: " + e);
             System.out.println("HTTP Status Code:  " + e.statusCode());
diff --git a/awss3move/pom.xml b/awss3move/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.16.18</version>
+                <version>2.16.23</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/awss3move/src/main/java/example/S3Move.java b/awss3move/src/main/java/example/S3Move.java
@@ -9,7 +9,6 @@
 
 package example;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.net.URLEncoder;
@@ -25,17 +24,20 @@
 import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
 import software.amazon.awssdk.services.s3.model.Delete;
 
+
 public class S3Move {
     private static final Region REGION = Region.of("eu-west-1");      // Region name
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         String sourceBucketName;       // Source bucket name
         String sourceKey;              // Source key
         String destinationBucketName;  // Destination bucket name
         String destinationKey;         // Destination key
 
         if (args.length < 3) {
-            System.out.println("Not enough parameters.\nProper Usage is: java -jar s3move.jar <SOURCE_BUCKET> <SOURCE_OBJECT> <DESTINATION_BUCKET>");
+            System.out.println("Not enough parameters.\n" +
+                    "Proper Usage is: java -jar s3move.jar " +
+                    "<SOURCE_BUCKET> <SOURCE_OBJECT> <DESTINATION_BUCKET>");
             System.exit(1);
         }
 
diff --git a/awss3upload/pom.xml b/awss3upload/pom.xml
diff --git a/awss3upload/src/main/java/example/S3Upload.java b/awss3upload/src/main/java/example/S3Upload.java
