Merge pull request #8 from vinscom/upgrade-api-framwork

Upgraded API framework

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>

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

@@ -71,7 +71,7 @@ public Single<String> handleMessage(JsonObject pRequest) {
             .map(this::convertBodyToBase64)
             .map(reqJson -> reqJson.mapTo(RequestEvent.class))
             .doOnSuccess(this::populateSystemProperties)
-            .flatMapMaybe(req -> getService().process(req))
+            .flatMapMaybe(req -> getService().handleEvent(req))
             .toSingle(new ResponseEvent())
             .map(resp -> JsonObject.mapFrom(resp))
             .map(this::sanatizeResponse)

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

@@ -6,6 +6,7 @@
 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,8 +76,11 @@ protected String generateURL(RequestEvent pRequest) {
     return sb.toString();
   }
 
-  @Override
-  public Maybe<ResponseEvent> process(RequestEvent proxyRequest) {
+  public MaybeSource<ResponseEvent> process(Maybe<RequestEvent> pRequest) {
+    return pRequest.flatMap(this::handle);
+  }
+
+  public Maybe<ResponseEvent> handle(RequestEvent proxyRequest) {
 
     //Build Request
     HttpRequest<Buffer> clientRequest = getWebClient().requestAbs(proxyRequest.getHttpMethod(), generateURL(proxyRequest));
@@ -109,15 +113,16 @@ public Maybe<ResponseEvent> process(RequestEvent proxyRequest) {
 
               event.setStatusCode(resp.statusCode());
               event.setIsBase64Encoded(true);
-              
+
               Optional
                       .ofNullable(resp.body())
                       .ifPresent(b -> event.setBody(b.getBytes()));
-              
+
               return event;
             })
             .doOnSuccess(e -> getLog().debug(() -> e.toString()))
             .toMaybe();
+
   }
 
   public String getHost() {

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

@@ -4,6 +4,7 @@
 import in.erail.model.RequestEvent;
 import in.erail.model.ResponseEvent;
 import io.reactivex.Maybe;
+import io.reactivex.MaybeSource;
 import io.vertx.core.json.JsonArray;
 
 public class HelloService extends RESTServiceImpl {
@@ -18,8 +19,9 @@ public HelloService() {
     mHelloData.add("S5");
   }
 
+  
   @Override
-  public Maybe<ResponseEvent> process(RequestEvent pRequest) {
+  public MaybeSource<ResponseEvent> process(Maybe<RequestEvent> pRequest) {
       return Maybe.just(new ResponseEvent()
               .setBody(getHelloData().toString().getBytes())
               .setMediaType(MediaType.JSON_UTF_8));