Merge pull request #4 from vinscom/develop

Minor refactoring

Author: vinscom

src/main/java/in/erail/amazon/lambda/AWSLambda.java

@@ -16,6 +16,7 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import in.erail.model.RequestEvent;
+import in.erail.model.ResponseEvent;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -69,7 +70,8 @@ public Single<String> handleMessage(JsonObject pRequest) {
             .subscribeOn(Schedulers.computation())
             .map(this::convertBodyToBase64)
             .map(reqJson -> reqJson.mapTo(RequestEvent.class))
-            .map(req -> getService().process(req))
+            .flatMapMaybe(req -> getService().process(req))
+            .toSingle(new ResponseEvent())
             .map(resp -> JsonObject.mapFrom(resp))
             .map(this::sanatizeResponse)
             .map(respJson -> respJson.toString());
@@ -78,7 +80,7 @@ public Single<String> handleMessage(JsonObject pRequest) {
   protected JsonObject sanatizeResponse(JsonObject pResp) {
     Preconditions.checkNotNull(pResp);
 
-    Set<String> keys = new HashSet(pResp.fieldNames());
+    Set<String> keys = new HashSet<>(pResp.fieldNames());
 
     keys
             .stream()

src/test/java/in/erail/service/SessionGetService.java

@@ -3,6 +3,7 @@
 import com.google.common.net.MediaType;
 import in.erail.model.RequestEvent;
 import in.erail.model.ResponseEvent;
+import io.reactivex.Maybe;
 import io.vertx.core.json.JsonArray;
 
 public class SessionGetService extends RESTServiceImpl {
@@ -18,10 +19,10 @@ public SessionGetService() {
   }
 
   @Override
-  public ResponseEvent process(RequestEvent pRequest) {
-      return new ResponseEvent()
+  public Maybe<ResponseEvent> process(RequestEvent pRequest) {
+      return Maybe.just(new ResponseEvent()
               .setBody(getSessions().toString().getBytes())
-              .setContentType(MediaType.JSON_UTF_8);
+              .setContentType(MediaType.JSON_UTF_8));
   }
 
   public JsonArray getSessions() {