From 5b3f718031f403a9f6626fe3ed14dccab09aa1a0 Mon Sep 17 00:00:00 2001
From: Alejandro Revilla <apr@jpos.org>
Date: Thu, 30 Aug 2018 17:08:52 -0300
Subject: [PATCH] Added 'content' property (optially stores content in Context)

---
 modules/qrest/src/dist/deploy/30_qrest_txnmgr.xml  |  2 +-
 modules/qrest/src/dist/deploy/50_qrest.xml         |  1 +
 .../src/main/java/org/jpos/qrest/RestSession.java  |  5 +++++
 .../src/test/java/org/jpos/qrest/RestTest.java     | 14 ++++++++++++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/qrest/src/dist/deploy/30_qrest_txnmgr.xml b/modules/qrest/src/dist/deploy/30_qrest_txnmgr.xml
index b209ab7649..eafd8b1b54 100644
--- a/modules/qrest/src/dist/deploy/30_qrest_txnmgr.xml
+++ b/modules/qrest/src/dist/deploy/30_qrest_txnmgr.xml
@@ -6,6 +6,7 @@
 
   <participant class="org.jpos.qrest.participant.Router">
     <route path="/q2**" method="GET" name="q2"/>
+    <route path="/q2**" method="POST" name="q2"/>
   </participant>
 
   <group name="q2">
@@ -15,4 +16,3 @@
     <!--<property name="content-type" value="application/json" />-->
   </participant>
 </txnmgr>
-
diff --git a/modules/qrest/src/dist/deploy/50_qrest.xml b/modules/qrest/src/dist/deploy/50_qrest.xml
index 097859b18f..20877dbed1 100644
--- a/modules/qrest/src/dist/deploy/50_qrest.xml
+++ b/modules/qrest/src/dist/deploy/50_qrest.xml
@@ -1,6 +1,7 @@
 <qrest class='org.jpos.qrest.RestServer' logger='Q2'>
     <property name='port' value='8081' />
     <property name='queue' value='TXNMGR' />
+    <property name='content' value='JSON_REQUEST' />
 
     <!--
     <property name="TLS" value="true" />
diff --git a/modules/qrest/src/main/java/org/jpos/qrest/RestSession.java b/modules/qrest/src/main/java/org/jpos/qrest/RestSession.java
index 4c19ed9855..577a80f7c2 100644
--- a/modules/qrest/src/main/java/org/jpos/qrest/RestSession.java
+++ b/modules/qrest/src/main/java/org/jpos/qrest/RestSession.java
@@ -23,6 +23,7 @@
 import io.netty.handler.codec.http.*;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.util.CharsetUtil;
 import org.jpos.transaction.Context;
 import org.jpos.util.LogEvent;
 import org.jpos.util.Logger;
@@ -31,9 +32,11 @@
 
 public class RestSession extends ChannelInboundHandlerAdapter {
     private RestServer server;
+    private String contentKey;
 
     RestSession(RestServer server) {
         this.server = server;
+        contentKey = server.getConfiguration().get("content", null);
     }
 
     @Override
@@ -43,6 +46,8 @@ public void channelRead(ChannelHandlerContext ch, Object msg) throws Exception {
             final FullHttpRequest request = (FullHttpRequest) msg;
             ctx.put(Constants.SESSION, ch);
             ctx.put(Constants.REQUEST, request);
+            if (contentKey != null)
+                ctx.put(contentKey, request.content().toString(CharsetUtil.UTF_8));
             server.queue(ctx);
         } else {
             super.channelRead(ch, msg);
diff --git a/modules/qrest/src/test/java/org/jpos/qrest/RestTest.java b/modules/qrest/src/test/java/org/jpos/qrest/RestTest.java
index 93905ea42d..7dcafd5f31 100644
--- a/modules/qrest/src/test/java/org/jpos/qrest/RestTest.java
+++ b/modules/qrest/src/test/java/org/jpos/qrest/RestTest.java
@@ -27,7 +27,6 @@
 import static com.jayway.restassured.RestAssured.given;
 import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
 
-import static com.jayway.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 public class RestTest  {
@@ -76,5 +75,16 @@ public void testAll()  {
             )
           ));
     }
-}
 
+    @Test
+    public void testPost()  {
+        given().and().body("{ \"test\": \"Test JSON\" }")
+          .log().all().post("q2")
+          .then().statusCode(200).assertThat()
+          .body("version", equalTo(
+            String.format("jPOS %s %s/%s (%s)",
+              Q2.getVersion(), Q2.getBranch(), Q2.getRevision(), Q2.getBuildTimestamp()
+            )
+          ));
+    }
+}