refactor spring boot app, refactor lambda, update dependencies

Author: tinyg210

pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.1</version>
+    <version>3.2.4</version>
   </parent>
 
   <groupId>dev.ancaghenade</groupId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20220924</version>
+      <version>20231013</version>
     </dependency>
 
   </dependencies>
@@ -82,7 +82,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.22.12</version>
+        <version>2.26.28</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sample-pictures/wrong-format-file.txt sample-pictures/wrongformat.txt

@@ -141,7 +141,7 @@ function Dropzone(
               (
                   <div>
                     <h3 style={{margin: 0}}>Size (Banana for scale):</h3>
-                    <h5 style={{margin: 0}}>click to add new image</h5>
+                    <h5 className="add-button">Click to add new image</h5>
                   </div>)
 
         }
@@ -154,7 +154,7 @@ function App() {
       <div className="App" style={{
         paddingBottom: "100px"
       }}>
-        <h1>Shipments you can see and edit</h1>
+        <h1>Shipment List</h1>
         <Shipments/>
       </div>
   );

shipment-list-demo-cloud-pod

@@ -3,16 +3,16 @@ body {
   margin-top: 100px;
 
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
+  'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+  sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   background-color: #eaeaea;
 }
 
 code {
   font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+  monospace;
 }
 body {
   font-family: 'Open Sans', sans-serif;
@@ -74,3 +74,13 @@ p {
 .btn:hover {
   background-color: #e72525;
 }
+
+.add-button {
+  background-color: #e5e023;
+  padding: 5px 10px;
+  display: inline-block;
+  border: 2px solid black;
+  border-radius: 50px;
+  cursor: pointer;
+  margin: 0; /* Ensure there's no margin */
+}

src/main/shipment-list-frontend/README.md shipment-list-frontend/README.md

@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
-      <version>2.7.0</version>
+      <version>2.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -67,7 +67,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.22.12</version>
+        <version>2.26.27</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/shipment-list-frontend/package-lock.json shipment-list-frontend/package-lock.json

@@ -3,16 +3,6 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.jayway.jsonpath.JsonPath;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import javax.imageio.ImageIO;
 import org.apache.http.entity.ContentType;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -23,141 +13,163 @@
 import software.amazon.awssdk.services.sns.SnsClient;
 import software.amazon.awssdk.services.sns.model.PublishRequest;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 public class ServiceHandler implements RequestStreamHandler {
 
   private static final String BUCKET_NAME = System.getenv("BUCKET");
-  public ServiceHandler() {
-  }
 
   @Override
-  public void handleRequest(InputStream inputStream, OutputStream outputStream,
-      Context context) throws IOException {
-    var isValid = true;
-
-    var s3Client = acquireS3Client();
-    var snsClient = acquireSnsClient();
-    var objectKey = getObjectKey(inputStream, context);
+  public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+    S3Client s3Client = acquireS3Client();
+    SnsClient snsClient = acquireSnsClient();
+    String objectKey = getObjectKey(inputStream, context);
 
-    if (Objects.isNull(objectKey)) {
+    if (objectKey == null) {
       context.getLogger().log("Object key is null");
       return;
     }
 
     context.getLogger().log("Object key: " + objectKey);
+    processObject(s3Client, snsClient, objectKey, context);
+  }
 
-    var getObjectRequest = GetObjectRequest.builder()
-        .bucket(BUCKET_NAME)
-        .key(objectKey)
-        .build();
-
-    ResponseInputStream<GetObjectResponse> s3ObjectResponse;
+  private void processObject(S3Client s3Client, SnsClient snsClient, String objectKey, Context context) {
     try {
-      s3ObjectResponse = s3Client.getObject(
-          getObjectRequest);
+      GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+              .bucket(BUCKET_NAME)
+              .key(objectKey)
+              .build();
+
+      ResponseInputStream<GetObjectResponse> s3ObjectResponse = s3Client.getObject(getObjectRequest);
+      context.getLogger().log("Object fetched.");
+
+      if (isObjectAlreadyProcessed(s3ObjectResponse)) {
+        context.getLogger().log("Object already present.");
+        return;
+      }
+
+      boolean isValid = validateObject(s3ObjectResponse, context);
+      byte[] objectData = s3ObjectResponse.readAllBytes();
+      String newObjectKey = objectKey;
+      if (!isValid) {
+       newObjectKey = handleInvalidObject(s3Client, objectKey, context);
+      } else {
+        handleValidObject(s3Client, objectKey, s3ObjectResponse, objectData, context);
+      }
+
+      publishToSns(snsClient, newObjectKey, context);
+
     } catch (Exception e) {
-      e.printStackTrace();
       context.getLogger().log(e.getMessage());
-      return;
+    } finally {
+      closeClients(s3Client, snsClient);
     }
-    context.getLogger().log("Object fetched");
+  }
 
-    // Check if the image was already processed
-    if (s3ObjectResponse.response().metadata().entrySet().stream().anyMatch(
-        entry -> entry.getKey().equals("skip-processing") && entry.getValue().equals("true"))) {
-      context.getLogger().log("Object already present.");
-      return;
-    }
+  private boolean isObjectAlreadyProcessed(ResponseInputStream<GetObjectResponse> s3ObjectResponse) {
+    return s3ObjectResponse.response().metadata().entrySet().stream()
+            .anyMatch(entry -> entry.getKey().equals("skip-processing") && entry.getValue().equals("true"));
+  }
 
-    // Check the file extension to determine the image format
-    if (!List.of(ContentType.IMAGE_JPEG.getMimeType(),
+  private boolean validateObject(ResponseInputStream<GetObjectResponse> s3ObjectResponse, Context context) {
+    String contentType = s3ObjectResponse.response().contentType();
+    boolean isValid = List.of(
+            ContentType.IMAGE_JPEG.getMimeType(),
             ContentType.IMAGE_PNG.getMimeType(),
-            ContentType.IMAGE_BMP.getMimeType())
-        .contains(s3ObjectResponse.response().contentType())) {
-      isValid = false;
-      context.getLogger().log("Object invalid due to wrong format.");
+            ContentType.IMAGE_BMP.getMimeType()
+    ).contains(contentType);
 
+    if (!isValid) {
+      context.getLogger().log("Object invalid due to wrong format.");
     }
 
-    // Get the object data as a byte array
-    var objectData = s3Client.getObject(getObjectRequest).readAllBytes();
+    return isValid;
+  }
 
-    if (!isValid) {
-      try {
-        File imageFile = new File("placeholder.jpg");
-        BufferedImage image = ImageIO.read(imageFile);
+  private String handleInvalidObject(S3Client s3Client, String objectKey, Context context) {
+    try {
+      File imageFile = new File("placeholder.jpg");
+      BufferedImage image = ImageIO.read(imageFile);
 
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
         ImageIO.write(image, "jpg", baos);
         byte[] imageBytes = baos.toByteArray();
 
-        objectKey = TextParser.replaceSufix(objectKey, "placeholder.jpg");
+        objectKey = TextParser.replaceSuffix(objectKey, "placeholder.jpg");
+        context.getLogger().log("NEW IMAGE LINK: " + objectKey);
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                .bucket(BUCKET_NAME)
+                .key(objectKey)
+                .metadata(Collections.singletonMap("skip-processing", "true"))
+                .build();
+
+        s3Client.putObject(putObjectRequest, RequestBody.fromBytes(imageBytes));
+      }
+    } catch (IOException e) {
+      context.getLogger().log("Error handling invalid object: " + e.getMessage());
+    }
+
+    return objectKey;
+  }
 
-        System.out.println("NEW IMAGE LINK: " + objectKey);
+  private void handleValidObject(S3Client s3Client, String objectKey, ResponseInputStream<GetObjectResponse> s3ObjectResponse, byte[] objectData, Context context) throws IOException {
+    String extension = s3ObjectResponse.response().contentType();
 
-        var putObjectRequest = PutObjectRequest.builder()
+    PutObjectRequest putObjectRequest = PutObjectRequest.builder()
             .bucket(BUCKET_NAME)
             .key(objectKey)
             .metadata(Collections.singletonMap("skip-processing", "true"))
             .build();
 
-        s3Client.putObject(putObjectRequest, RequestBody.fromBytes(imageBytes));
-
-        baos.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-
-    } else {
-      var extension = s3ObjectResponse.response().contentType();
+    s3Client.putObject(putObjectRequest, RequestBody.fromBytes(Watermark.watermarkImage(objectData, extension.substring(extension.lastIndexOf("/") + 1))));
+    context.getLogger().log("Watermark has been added.");
+  }
 
-      var putObjectRequest = PutObjectRequest.builder()
-          .bucket(BUCKET_NAME)
-          .key(objectKey)
-          .metadata(Collections.singletonMap("skip-processing", "true"))
-          .build();
+  private void publishToSns(SnsClient snsClient, String objectKey, Context context) {
+    PublishRequest request = PublishRequest.builder()
+            .message(objectKey)
+            .topicArn(SNSClientHelper.topicARN())
+            .build();
 
-      s3Client.putObject(putObjectRequest, RequestBody.fromBytes(
-          Watermark.watermarkImage(objectData,
-              extension.substring(extension.lastIndexOf("/") + 1))));
-      context.getLogger().log("Watermark has been added.");
-    }
-    var request = PublishRequest
-        .builder()
-        .message(objectKey)
-        .topicArn(SNSClientHelper.topicARN())
-        .build();
     snsClient.publish(request);
     context.getLogger().log("Published to topic: " + request.topicArn());
+  }
 
-    // Close clients
+  private void closeClients(S3Client s3Client, SnsClient snsClient) {
     s3Client.close();
     snsClient.close();
-
   }
 
   private String getObjectKey(InputStream inputStream, Context context) {
     try {
       List<String> keys = JsonPath.read(inputStream, "$.Records[*].s3.object.key");
-      if (keys.iterator().hasNext()) {
-        return keys.iterator().next();
-      }
+      return keys.isEmpty() ? null : keys.get(0);
     } catch (IOException ioe) {
-      context.getLogger().log("caught IOException reading input stream: " + ioe.getMessage());
+      context.getLogger().log("Caught IOException reading input stream: " + ioe.getMessage());
+      return null;
     }
-    return null;
   }
 
   private S3Client acquireS3Client() {
     try {
       return S3ClientHelper.getS3Client();
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      throw new RuntimeException("Failed to acquire S3 client", e);
     }
   }
 
   private SnsClient acquireSnsClient() {
     return SNSClientHelper.getSnsClient();
   }
 }
-

src/main/shipment-list-frontend/package.json shipment-list-frontend/package.json

@@ -1,32 +1,17 @@
 package dev.ancaghenade.shipmentpicturelambdavalidator;
 
-import java.util.regex.Pattern;
-
 public class TextParser {
 
-  public static String replaceSufix(String input, String replacement) {
-    String[] parts = input.split("-");
-
-    // Find the last UUID
-    String lastUUID = "";
-    for (int i = parts.length - 1; i >= 0; i--) {
-      if (isUUID(parts[i])) {
-        lastUUID = parts[i];
-        break;
-      }
-    }
+    public static String replaceSuffix(String input, String replacement) {
+        int lastSlashIndex = input.lastIndexOf('/');
+        int lastDashIndex = input.lastIndexOf('-');
 
-    // Extract the part before the last UUID
-    String partBeforeLastUUID = input.substring(0, input.lastIndexOf(lastUUID) - 1);
+        if (lastSlashIndex == -1 || lastDashIndex == -1 || lastDashIndex < lastSlashIndex) {
+            return input;
+        }
 
-    // Replace the part after the last UUID with a new string
-    String result = partBeforeLastUUID + "-" + replacement;
-    return result;
-  }
+        String basePath = input.substring(0, lastDashIndex + 1);
 
-  // Check if a string is a valid UUID
-  public static boolean isUUID(String input) {
-    String uuidPattern = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
-    return Pattern.matches(uuidPattern, input);
-  }
-}
+        return basePath + replacement;
+    }
+}