Added param support in SP web services

sanketsarang · sanketsarang · commit 7ab1316955b0 · 2019-08-14T11:22:02.000+05:30
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@
 
 FROM blobcity/java8-ubuntu
 
-ENV DB_VER=1.7.9-alpha
+ENV DB_VER=1.7.10-alpha
 
 RUN cd / && mkdir data
 
diff --git a/bean-manager/pom.xml b/bean-manager/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib</groupId>
diff --git a/console-end-point/pom.xml b/console-end-point/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     <artifactId>blobcity-db</artifactId>
     <name>BlobCityDB Distribution</name>
diff --git a/engine/pom.xml b/engine/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib.database</groupId>
diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib.database</groupId>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     
     <groupId>com.blobcity.pom</groupId>
     <artifactId>database</artifactId>
-    <version>1.7.9-alpha</version>
+    <version>1.7.10-alpha</version>
     <packaging>pom</packaging>
     
     <name>Kraken [POM]</name>
diff --git a/scripts/blobcity.sh b/scripts/blobcity.sh
@@ -22,7 +22,7 @@
 # The Java implementation to use. This is required.
 #export JAVA_HOME=
 
-VERSION="1.7.9-alpha"
+VERSION="1.7.10-alpha"
 JAVA=""
 if [ "$JAVA_HOME" != "" ]; then
   JAVA=$JAVA_HOME/bin/java
diff --git a/tableau/pom.xml b/tableau/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <artifactId>database</artifactId>
         <groupId>com.blobcity.pom</groupId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tcp-end-point/pom.xml b/tcp-end-point/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib.database</groupId>
diff --git a/web-end-point/pom.xml b/web-end-point/pom.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     
     <groupId>com.blobcity.lib.database</groupId>
diff --git a/web-end-point/src/main/java/com/blobcity/lib/database/web/end/point/db/WebService.java b/web-end-point/src/main/java/com/blobcity/lib/database/web/end/point/db/WebService.java
@@ -65,18 +65,36 @@ public Response handleGet(
     }
 
 
+    /**
+     * Accepts a POST request. The service accepts 2 variations for a POST request. One as a <code>form</code> parameter
+     * and the other as a <code>json</code> parameter. A <code>json</code> parameter is given first preference and a
+     * <code>form</code> parameter is given a second preference.
+     * @param datastore
+     * @param version
+     * @param url
+     * @param queryJson
+     * @param formJson
+     * @param formParamQuery
+     * @param formParamJson
+     * @return
+     */
     @POST
     @Produces("application/json")
     public Response handlePost(
             @PathParam(value ="ds") final String datastore,
             @PathParam(value = "version") final String version,
             @PathParam(value = "url") final String url,
             @QueryParam(value = "json") final String queryJson,
-            @FormParam(value = "json") final String formJson
+            @FormParam(value = "json") final String formJson,
+            @QueryParam(value = "form") final String formParamQuery,
+            @FormParam(value = "form") final String formParamJson
     ) {
         final String wsPath = "/" + version + "/" + url;
         logger.debug("Webservice called [POST]: " + wsPath);
         JSONObject jsonRequest = queryJson != null ? new JSONObject(queryJson) : formJson != null ? new JSONObject(formJson) : new JSONObject();
+        if(jsonRequest.isEmpty()) {
+            jsonRequest = formParamQuery != null ? new JSONObject(formParamQuery) : formParamJson != null ? new JSONObject(formParamJson) : new JSONObject();
+        }
         return Response.ok().header("Access-Control-Allow-Origin", "*").entity(webServiceExecutor.executeGet(datastore, wsPath, jsonRequest).toString()).build();
     }
 }
