Changed to proper response format.

Author: burkat

src/main/java/Handler.java

@@ -3,6 +3,9 @@
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.util.IOUtils;
 import com.google.gson.Gson;
+import payloads.Event;
+import payloads.Request;
+import payloads.Response;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -23,30 +26,30 @@ public Response handleRequest(Event event, Context context) {
         logger.log("body:       " + event.getBody());
 
         Gson gson = new Gson();
-        Body body = gson.fromJson(event.getBody(), Body.class);
+        Request request = gson.fromJson(event.getBody(), Request.class);
 
         try {
-            logger.log("executable: " + body.getExecutable());
-            logger.log("args:       " + body.getArgs());
-            logger.log("inputs:     " + body.getInputs());
-            logger.log("outputs:    " + body.getOutputs());
-            logger.log("bucket:     " + body.getOptions().get(BUCKET_KEY));
-            logger.log("prefix:     " + body.getOptions().get(PREFIX_KEY));
-
-            downloadData(body, logger);
-            downloadExecutable(body, logger);
-            execute(body.getExecutable(), String.join(" ", body.getArgs()), logger);
-            uploadData(body, logger);
+            logger.log("executable: " + request.getExecutable());
+            logger.log("args:       " + request.getArgs());
+            logger.log("inputs:     " + request.getInputs());
+            logger.log("outputs:    " + request.getOutputs());
+            logger.log("bucket:     " + request.getOptions().get(BUCKET_KEY));
+            logger.log("prefix:     " + request.getOptions().get(PREFIX_KEY));
+
+            downloadData(request, logger);
+            downloadExecutable(request, logger);
+            execute(request.getExecutable(), String.join(" ", request.getArgs()), logger);
+            uploadData(request, logger);
         } catch (Exception e) {
-            return handleException(e, body);
+            return handleException(e, request);
         }
         Response response = new Response();
         response.setStatusCode(HttpURLConnection.HTTP_OK);
-        response.setMessage("Execution of " + body.getExecutable() + " successful, duration: " + Duration.between(instant1, Instant.now()).getSeconds() + " seconds");
+        response.setBody("Execution of " + request.getExecutable() + " successful, duration: " + Duration.between(instant1, Instant.now()).getSeconds() + " seconds");
         return response;
     }
 
-    private void downloadData(Body request, LambdaLogger logger) throws IOException {
+    private void downloadData(Request request, LambdaLogger logger) throws IOException {
         for (Map<String, Object> input : request.getInputs()) {
             String fileName = input.get("name").toString();
             String key = request.getOptions().get(PREFIX_KEY) + "/" + fileName;
@@ -71,17 +74,17 @@ private void execute(String executable, String args, LambdaLogger logger) throws
         logger.log("Stderr: " + errorMsg);
     }
 
-    private void uploadData(Body body, LambdaLogger logger) {
-        for (Map<String, String> input : body.getOutputs()) {
+    private void uploadData(Request request, LambdaLogger logger) {
+        for (Map<String, String> input : request.getOutputs()) {
             String fileName = input.get("name");
             String filePath = FOLDER_PATH + fileName;
-            String key = body.getOptions().get(PREFIX_KEY) + "/" + fileName;
-            logger.log("Uploading " + body.getOptions().get(BUCKET_KEY) + "/" + key);
-            S3Utils.putObject(body.getOptions().get(BUCKET_KEY), key, filePath);
+            String key = request.getOptions().get(PREFIX_KEY) + "/" + fileName;
+            logger.log("Uploading " + request.getOptions().get(BUCKET_KEY) + "/" + key);
+            S3Utils.putObject(request.getOptions().get(BUCKET_KEY), key, filePath);
         }
     }
 
-    private Response handleException(Exception e, Body body) {
+    private Response handleException(Exception e, Request request) {
         Throwable cause;
         if (e.getCause() != null) {
             cause = e.getCause();
@@ -93,15 +96,15 @@ private Response handleException(Exception e, Body body) {
         }
         Response response = new Response();
         response.setStatusCode(HttpURLConnection.HTTP_INTERNAL_ERROR);
-        response.setMessage("Execution of " + body.getExecutable() + " failed, cause: " + cause.getMessage());
+        response.setBody("Execution of " + request.getExecutable() + " failed, cause: " + cause.getMessage());
         return response;
     }
 
-    private void downloadExecutable(Body body, LambdaLogger logger) throws IOException {
-        logger.log("Downloading executable" + body.getExecutable());
-        String key = body.getOptions().get(PREFIX_KEY) + "/" + body.getExecutable();
-        S3Object s3Object = S3Utils.getObject(body.getOptions().get(BUCKET_KEY), key);
-        S3Utils.saveToFile(s3Object, FOLDER_PATH + body.getExecutable());
+    private void downloadExecutable(Request request, LambdaLogger logger) throws IOException {
+        logger.log("Downloading executable" + request.getExecutable());
+        String key = request.getOptions().get(PREFIX_KEY) + "/" + request.getExecutable();
+        S3Object s3Object = S3Utils.getObject(request.getOptions().get(BUCKET_KEY), key);
+        S3Utils.saveToFile(s3Object, FOLDER_PATH + request.getExecutable());
     }
 
 }

src/main/java/Response.java

@@ -1,3 +1,5 @@
+package payloads;
+
 public class Event {
 
     private String body;

src/main/java/Event.java renamed to src/main/java/payloads/Event.java

@@ -1,7 +1,9 @@
+package payloads;
+
 import java.util.List;
 import java.util.Map;
 
-public class Body {
+public class Request {
 
     private String executable;
     private List<String> args;

src/main/java/Body.java renamed to src/main/java/payloads/Request.java

@@ -0,0 +1,23 @@
+package payloads;
+
+public class Response {
+
+    private int statusCode;
+    private String body;
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+}