Merge pull request #9 from vinscom/develop

dev-to-master

Author: vinscom

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>in.erail</groupId>
     <artifactId>api-framework-amazon-lambda</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4</version>
     <packaging>jar</packaging>
     <developers>
         <developer>
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <api.framework.version>2.4.3</api.framework.version>
+        <api.framework.version>2.4.4</api.framework.version>
         <layer.api.framework>${settings.localRepository}/in/erail/api-framework/${api.framework.version}/api-framework-${api.framework.version}-common-config.zip</layer.api.framework>
         <layer.api.framework.lambda.common>${project.basedir}/config-layers/common</layer.api.framework.lambda.common>
         <layer.api.framework.lambda.test>${project.basedir}/config-layers/test</layer.api.framework.lambda.test>
@@ -78,6 +78,12 @@
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>

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

@@ -6,6 +6,7 @@
 import com.google.common.base.Strings;
 import com.google.common.io.ByteStreams;
 import in.erail.glue.Glue;
+import in.erail.model.Event;
 import in.erail.service.RESTService;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
@@ -16,7 +17,6 @@
 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,11 +69,11 @@ public Single<String> handleMessage(JsonObject pRequest) {
             .just(pRequest)
             .subscribeOn(Schedulers.computation())
             .map(this::convertBodyToBase64)
-            .map(reqJson -> reqJson.mapTo(RequestEvent.class))
+            .map(reqJson -> reqJson.mapTo(getService().getRequestEventClass()))
             .doOnSuccess(this::populateSystemProperties)
-            .flatMapMaybe(req -> getService().process(req))
-            .toSingle(new ResponseEvent())
-            .map(resp -> JsonObject.mapFrom(resp))
+            .flatMapMaybe(req -> getService().handleEvent(getService().createEvent(req)))
+            .toSingle(new Event())
+            .map(resp -> JsonObject.mapFrom(resp.getResponse()))
             .map(this::sanatizeResponse)
             .map(respJson -> respJson.toString());
   }

src/main/java/in/erail/amazon/lambda/service/ProxyService.java

@@ -1,11 +1,13 @@
 package in.erail.amazon.lambda.service;
 
 import com.google.common.base.Joiner;
+import in.erail.model.Event;
 import in.erail.model.RequestEvent;
 import in.erail.model.ResponseEvent;
 import in.erail.server.Server;
 import in.erail.service.RESTServiceImpl;
 import io.reactivex.Maybe;
+import io.reactivex.MaybeSource;
 import io.vertx.reactivex.core.MultiMap;
 import io.vertx.reactivex.core.buffer.Buffer;
 import io.vertx.reactivex.ext.web.client.HttpRequest;
@@ -75,9 +77,14 @@ protected String generateURL(RequestEvent pRequest) {
     return sb.toString();
   }
 
-  @Override
-  public Maybe<ResponseEvent> process(RequestEvent proxyRequest) {
+  public MaybeSource<Event> process(Maybe<Event> pRequest) {
+    return pRequest.flatMap(this::handle);
+  }
+
+  public Maybe<Event> handle(Event pEvent) {
 
+    RequestEvent proxyRequest = pEvent.getRequest();
+    
     //Build Request
     HttpRequest<Buffer> clientRequest = getWebClient().requestAbs(proxyRequest.getHttpMethod(), generateURL(proxyRequest));
 
@@ -97,27 +104,28 @@ public Maybe<ResponseEvent> process(RequestEvent proxyRequest) {
     return clientRequest
             .rxSendBuffer(Buffer.buffer(body))
             .map((resp) -> {
-              ResponseEvent event = new ResponseEvent();
+              ResponseEvent responseEvent = pEvent.getResponse();
 
               //Add Headers
               Optional
                       .ofNullable(resp.headers())
                       .orElse(MultiMap.caseInsensitiveMultiMap())
                       .entries()
                       .stream()
-                      .forEach((t) -> event.addHeader(t.getKey(), t.getValue()));
+                      .forEach((t) -> responseEvent.addHeader(t.getKey(), t.getValue()));
+
+              responseEvent.setStatusCode(resp.statusCode());
+              responseEvent.setIsBase64Encoded(true);
 
-              event.setStatusCode(resp.statusCode());
-              event.setIsBase64Encoded(true);
-              
               Optional
                       .ofNullable(resp.body())
-                      .ifPresent(b -> event.setBody(b.getBytes()));
-              
-              return event;
+                      .ifPresent(b -> responseEvent.setBody(b.getBytes()));
+
+              return pEvent;
             })
             .doOnSuccess(e -> getLog().debug(() -> e.toString()))
             .toMaybe();
+
   }
 
   public String getHost() {

src/main/java/in/erail/service/HelloService.java

@@ -1,9 +1,9 @@
 package in.erail.service;
 
 import com.google.common.net.MediaType;
-import in.erail.model.RequestEvent;
-import in.erail.model.ResponseEvent;
+import in.erail.model.Event;
 import io.reactivex.Maybe;
+import io.reactivex.MaybeSource;
 import io.vertx.core.json.JsonArray;
 
 public class HelloService extends RESTServiceImpl {
@@ -19,12 +19,13 @@ public HelloService() {
   }
 
   @Override
-  public Maybe<ResponseEvent> process(RequestEvent pRequest) {
-      return Maybe.just(new ResponseEvent()
-              .setBody(getHelloData().toString().getBytes())
-              .setMediaType(MediaType.JSON_UTF_8));
+  public MaybeSource<Event> process(Maybe<Event> pEvent) {
+    return pEvent.doOnSuccess(e -> e
+            .getResponse()
+            .setBody(getHelloData().toString().getBytes())
+            .setMediaType(MediaType.JSON_UTF_8));
   }
-  
+
   public JsonArray getHelloData() {
     return mHelloData;
   }