You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/06/03 18:02:53 UTC

[01/11] incubator-quarks git commit: Added postJson() method in HttpStreams

Repository: incubator-quarks
Updated Branches:
  refs/heads/master 46dc587cf -> 3c0bd4985


Added postJson() method in HttpStreams


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/10fc616d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/10fc616d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/10fc616d

Branch: refs/heads/master
Commit: 10fc616dd390a1e9e72d2052af696b0b0e89695d
Parents: 59503f1
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Wed May 4 11:46:26 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Wed May 4 11:46:26 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/quarks/connectors/http/HttpStreams.java     | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/10fc616d/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index f2d8e90..6a22c88 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -21,6 +21,7 @@ package quarks.connectors.http;
 
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import com.google.gson.JsonObject;
@@ -46,6 +47,12 @@ public class HttpStreams {
                 t -> HttpGet.METHOD_NAME, uri, HttpResponders.json());
     }
     
+    public static TStream<JsonObject> postJson(TStream<JsonObject> stream, 
+            Supplier<CloseableHttpClient> clientCreator,
+            Function<JsonObject, String> uri) {
+        return HttpStreams.<JsonObject, JsonObject> requests(stream, clientCreator, 
+                t -> HttpPost.METHOD_NAME, uri, HttpResponders.json());
+    }
     /**
      * Make an HTTP request for each tuple on a stream.
      * <UL>


[07/11] incubator-quarks git commit: implemented review comments

Posted by dl...@apache.org.
implemented review comments


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3794d465
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3794d465
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3794d465

Branch: refs/heads/master
Commit: 3794d46554f6a3623442fdc866e0f716601999bc
Parents: caeab78
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Thu May 12 23:30:29 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Thu May 12 23:30:29 2016 -0700

----------------------------------------------------------------------
 .../quarks/connectors/http/HttpStreams.java     | 113 ++++++++++++++++---
 .../quarks/test/connectors/http/HttpTest.java   |  65 ++++++-----
 2 files changed, 129 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3794d465/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index a22c760..954b1b3 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -56,20 +56,25 @@ public class HttpStreams {
      * 
      * <pre>
      * {@code
+     *     DirectProvider ep = new DirectProvider();
+     *     Topology topology = ep.newTopology();
      *     final String url = "http://httpbin.org/get?";
+     * 
      *     JsonObject request1 = new JsonObject();
      *     request1.addProperty("a", "abc");
      *     request1.addProperty("b", "42");
-     *     TStream<JsonObject> rc = HttpStreams.getJson(
-     *             topology.collection(Arrays.asList(request1)),
+     * 
+     *     TStream<JsonObject> stream = topology.collection(Arrays.asList(request1));
+     *     TStream<JsonObject> rc = HttpStreams.getJson(stream,
      *             HttpClients::noAuthentication,
      *             t -> url + "a=" + t.get("a").getAsString() + "&b="
      *                     + t.get("b").getAsString());
      * }
      * </pre>
+     * 
      * <br>
-     * See <i>HttpTest</i> for example.
-     * <br>
+     * See <i>HttpTest</i> for example. <br>
+     * 
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string
@@ -85,6 +90,43 @@ public class HttpStreams {
             t -> HttpGet.METHOD_NAME, uri, HttpResponders.json());
     }
     
+    /**
+     * Make an HTTP DELETE request with JsonObject. <br>
+     * 
+     * Method specifically works with JsonObjects. For each JsonObject in the
+     * stream, HTTP DELETE request is executed on provided uri. As a result,
+     * Response is added to the response TStream. <br>
+     * 
+     * Sample usage:<br>
+     * 
+     * <pre>
+     * {@code
+     *     DirectProvider ep = new DirectProvider();
+     *     Topology topology = ep.newTopology();
+     *     final String url = "http://httpbin.org/delete?";
+     * 
+     *     JsonObject request = new JsonObject();
+     *     request.addProperty("a", "abc");
+     *     request.addProperty("b", "42");
+     * 
+     *     TStream<JsonObject> stream = topology.collection(Arrays.asList(request));
+     *     TStream<JsonObject> rc = HttpStreams.deleteJson(stream,
+     *             HttpClients::noAuthentication,
+     *             t -> url + "a=" + t.get("a").getAsString() + "&b="
+     *                     + t.get("b").getAsString());
+     * }
+     * </pre>
+     * 
+     * <br>
+     * See <i>HttpTest</i> for example. <br>
+     * 
+     * @param stream - JsonObject TStream.
+     * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
+     * @param uri - URI function which returns URI string
+     * @return TStream of JsonObject which contains responses of DELETE requests
+     * 
+     * @see HttpStreams#requests(TStream, Supplier, Function, Function, BiFunction)
+     */
     public static TStream<JsonObject> deleteJson(TStream<JsonObject> stream,
             Supplier<CloseableHttpClient> clientCreator,
             Function<JsonObject,String> uri) {
@@ -105,26 +147,28 @@ public class HttpStreams {
      * 
      * <pre>
      * {@code
+     *     DirectProvider ep = new DirectProvider();
+     *     Topology topology = ep.newTopology();
      *     final String url = "http://httpbin.org/post";
-     *     JsonObject request = new JsonObject();
-     *     request.addProperty("a", "abc");
-     *     request.addProperty("b", "42");
-     *     TStream<JsonObject> rc = HttpStreams.postJson(
-     *         topology.collection(Arrays.asList(request1)),
-     *         HttpClients::noAuthentication,
-     *         t -> url,
-     *         t -> new ByteArrayEntity(request1.toString().getBytes())
-     *     );
+     * 
+     *     JsonObject body = new JsonObject();
+     *     body.addProperty("foo", "abc");
+     *     body.addProperty("bar", 42);
+     * 
+     *     TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
+     *     TStream<JsonObject> rc = HttpStreams.postJson(stream,
+     *             HttpClients::noAuthentication, t -> url, t -> body);
      * }
      * </pre>
+     * 
      * <br>
-     * See HttpTest for example.
-     * <br>
+     * See HttpTest for example. <br>
+     * 
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string
      * @param body - Function that returns HttpEntity which will be set as a body for the request.
-     * @return TStream of JsonObject which contains responses of GET requests
+     * @return TStream of JsonObject which contains responses of POST requests
      * 
      * @see HttpStreams#requestsWithBody(TStream, Supplier, Function, Function, Function, BiFunction)
      */
@@ -139,6 +183,43 @@ public class HttpStreams {
                 HttpResponders.json());
     }
     
+    /**
+     * Make an HTTP PUT request with JsonObject. <br>
+     * 
+     * Method specifically works with JsonObjects. For each JsonObject in the
+     * stream, HTTP PUT request is executed on provided uri. Request body is
+     * filled using HttpEntity provided by body function. As a result, Response
+     * is added to the response TStream.<br>
+     * 
+     * Sample usage:<br>
+     * 
+     * <pre>
+     * {@code
+     *     DirectProvider ep = new DirectProvider();
+     *     Topology topology = ep.newTopology();
+     *     final String url = "http://httpbin.org/put";
+     * 
+     *     JsonObject body = new JsonObject();
+     *     body.addProperty("foo", "abc");
+     *     body.addProperty("bar", 42);
+     * 
+     *     TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
+     *     TStream<JsonObject> rc = HttpStreams.putJson(stream,
+     *             HttpClients::noAuthentication, t -> url, t -> body);
+     * }
+     * </pre>
+     * 
+     * <br>
+     * See HttpTest for example. <br>
+     * 
+     * @param stream - JsonObject TStream.
+     * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
+     * @param uri - URI function which returns URI string
+     * @param body - Function that returns HttpEntity which will be set as a body for the request.
+     * @return TStream of JsonObject which contains responses of PUT requests
+     * 
+     * @see HttpStreams#requestsWithBody(TStream, Supplier, Function, Function, Function, BiFunction)
+     */
     public static TStream<JsonObject> putJson(TStream<JsonObject> stream,
             Supplier<CloseableHttpClient> clientCreator,
             Function<JsonObject, String> uri,

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3794d465/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
index c30e3ea..32d2fb0 100644
--- a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
+++ b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
@@ -59,12 +59,11 @@ public class HttpTest {
         
         String url = "http://httpbin.org/get";
         
+        TStream<String> stream = topology.strings(url);
         TStream<String> rc = HttpStreams.<String,String>requests(
-                topology.strings(url),
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t-> HttpGet.METHOD_NAME,
-                t->t,
-                HttpResponders.inputOn200());
+                t->t, HttpResponders.inputOn200());
         
         Tester tester =  topology.getTester();
         
@@ -83,9 +82,9 @@ public class HttpTest {
         
         String url = "http://httpbin.org/post";
         
+        TStream<String> stream = topology.strings(url);
         TStream<String> rc = HttpStreams.<String, String>requestsWithBody(
-                topology.strings(url), 
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t -> HttpPost.METHOD_NAME, 
                 t-> t, t-> new ByteArrayEntity(t.getBytes()),
                 HttpResponders.inputOn200());
@@ -107,9 +106,9 @@ public class HttpTest {
         
         String url = "http://httpbin.org/put";
         
+        TStream<String> stream = topology.strings(url);
         TStream<String> rc = HttpStreams.<String, String>requestsWithBody(
-                topology.strings(url), 
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t -> HttpPut.METHOD_NAME, 
                 t-> t, t-> new ByteArrayEntity(t.getBytes()),
                 HttpResponders.inputOn200());
@@ -131,9 +130,9 @@ public class HttpTest {
         
         String url = "http://httpbin.org/delete";
         
+        TStream<String> stream = topology.strings(url);
         TStream<String> rc = HttpStreams.<String, String>requests(
-                topology.strings(url), 
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t -> HttpDelete.METHOD_NAME, 
                 t-> t, HttpResponders.inputOn200());
         
@@ -155,9 +154,9 @@ public class HttpTest {
         
         String url = "http://httpbin.org/status/";
         
+        TStream<Integer> stream = topology.collection(Arrays.asList(200, 404, 202));
         TStream<Integer> rc = HttpStreams.<Integer,Integer>requests(
-                topology.collection(Arrays.asList(200, 404, 202)),
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t-> HttpGet.METHOD_NAME,
                 t-> url + Integer.toString(t),
                 (t,resp) -> resp.getStatusLine().getStatusCode());
@@ -185,9 +184,9 @@ public class HttpTest {
         
         String url = "http://httpbin.org/basic-auth/";
         
+        TStream<String> stream = topology.strings("A", "B");
         TStream<Integer> rc = HttpStreams.<String,Integer>requests(
-                topology.strings("A", "B"),
-                () -> HttpClients.basic("usA", "pwdA4"),
+                stream, () -> HttpClients.basic("usA", "pwdA4"),
                 t-> HttpGet.METHOD_NAME,
                 t-> url + "us" + t + "/pwd" + t + "4",
                 (t,resp) -> resp.getStatusLine().getStatusCode());
@@ -215,9 +214,9 @@ public class HttpTest {
         request1.addProperty("a", "abc");
         request1.addProperty("b", "42");
         
+        TStream<JsonObject> stream = topology.collection(Arrays.asList(request1));
         TStream<JsonObject> rc = HttpStreams.getJson(
-                topology.collection(Arrays.asList(request1)),
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t-> url + "a=" + t.get("a").getAsString() + "&b=" + t.get("b").getAsString()
                 );
         
@@ -255,13 +254,13 @@ public class HttpTest {
         
         final String url = "http://httpbin.org/delete?";
         
-        JsonObject request1 = new JsonObject();
-        request1.addProperty("a", "abc");
-        request1.addProperty("b", "42");
+        JsonObject request = new JsonObject();
+        request.addProperty("a", "abc");
+        request.addProperty("b", "42");
         
+        TStream<JsonObject> stream = topology.collection(Arrays.asList(request));
         TStream<JsonObject> rc = HttpStreams.deleteJson(
-                topology.collection(Arrays.asList(request1)),
-                HttpClients::noAuthentication,
+                stream, HttpClients::noAuthentication,
                 t-> url + "a=" + t.get("a").getAsString() + "&b=" + t.get("b").getAsString()
                 );
         
@@ -299,14 +298,14 @@ public class HttpTest {
 
         final String url = "http://httpbin.org/post";
 
-        JsonObject request = new JsonObject();
-        request.addProperty("foo", "abc");
-        request.addProperty("bar", 42);
+        JsonObject body = new JsonObject();
+        body.addProperty("foo", "abc");
+        body.addProperty("bar", 42);
 
+        TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
         TStream<JsonObject> rc = HttpStreams.postJson(
-                topology.collection(Arrays.asList(request)),
-                HttpClients::noAuthentication, t -> url,
-                t -> request);
+                stream, HttpClients::noAuthentication, t -> url,
+                t -> body);
 
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));
@@ -337,14 +336,14 @@ public class HttpTest {
 
         final String url = "http://httpbin.org/put";
 
-        JsonObject request = new JsonObject();
-        request.addProperty("foo", "abc");
-        request.addProperty("bar", 42);
+        JsonObject body = new JsonObject();
+        body.addProperty("foo", "abc");
+        body.addProperty("bar", 42);
 
+        TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
         TStream<JsonObject> rc = HttpStreams.putJson(
-                topology.collection(Arrays.asList(request)),
-                HttpClients::noAuthentication, t -> url,
-                t -> request);
+                stream, HttpClients::noAuthentication, t -> url,
+                t -> body);
 
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));


[04/11] incubator-quarks git commit: implemented review comments

Posted by dl...@apache.org.
implemented review comments


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3c4cd8fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3c4cd8fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3c4cd8fc

Branch: refs/heads/master
Commit: 3c4cd8fc008f93b367620e9958de50c1686a10a2
Parents: c9d9342
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Wed May 11 01:09:44 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Wed May 11 01:09:44 2016 -0700

----------------------------------------------------------------------
 .../quarks/connectors/http/HttpStreams.java     |  30 +++-
 .../connectors/http/runtime/HttpRequester.java  |   1 +
 .../quarks/test/connectors/http/HttpTest.java   | 164 ++++++++++++++++++-
 3 files changed, 189 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3c4cd8fc/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index 2b7e088..a22c760 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -21,8 +21,11 @@ package quarks.connectors.http;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import com.google.gson.JsonObject;
@@ -31,6 +34,7 @@ import quarks.connectors.http.runtime.HttpRequester;
 import quarks.function.BiFunction;
 import quarks.function.Function;
 import quarks.function.Supplier;
+import quarks.function.UnaryOperator;
 import quarks.topology.TStream;
 
 
@@ -52,6 +56,7 @@ public class HttpStreams {
      * 
      * <pre>
      * {@code
+     *     final String url = "http://httpbin.org/get?";
      *     JsonObject request1 = new JsonObject();
      *     request1.addProperty("a", "abc");
      *     request1.addProperty("b", "42");
@@ -80,6 +85,14 @@ public class HttpStreams {
             t -> HttpGet.METHOD_NAME, uri, HttpResponders.json());
     }
     
+    public static TStream<JsonObject> deleteJson(TStream<JsonObject> stream,
+            Supplier<CloseableHttpClient> clientCreator,
+            Function<JsonObject,String> uri) {
+        
+        return HttpStreams.<JsonObject,JsonObject>requests(stream, clientCreator,
+            t -> HttpDelete.METHOD_NAME, uri, HttpResponders.json());
+    }
+    
     /**
      * Make an HTTP POST request with JsonObject. <br>
      * 
@@ -92,6 +105,7 @@ public class HttpStreams {
      * 
      * <pre>
      * {@code
+     *     final String url = "http://httpbin.org/post";
      *     JsonObject request = new JsonObject();
      *     request.addProperty("a", "abc");
      *     request.addProperty("b", "42");
@@ -117,10 +131,22 @@ public class HttpStreams {
     public static TStream<JsonObject> postJson(TStream<JsonObject> stream,
             Supplier<CloseableHttpClient> clientCreator,
             Function<JsonObject, String> uri,
-            Function<JsonObject, HttpEntity> body) {
+            UnaryOperator<JsonObject> body) {
+
+        return HttpStreams.<JsonObject, JsonObject> requestsWithBody(stream,
+                clientCreator, t -> HttpPost.METHOD_NAME, uri, 
+                t -> new ByteArrayEntity(body.apply(t).toString().getBytes()),
+                HttpResponders.json());
+    }
+    
+    public static TStream<JsonObject> putJson(TStream<JsonObject> stream,
+            Supplier<CloseableHttpClient> clientCreator,
+            Function<JsonObject, String> uri,
+            UnaryOperator<JsonObject> body) {
 
         return HttpStreams.<JsonObject, JsonObject> requestsWithBody(stream,
-                clientCreator, t -> HttpPost.METHOD_NAME, uri, body,
+                clientCreator, t -> HttpPut.METHOD_NAME, uri, 
+                t -> new ByteArrayEntity(body.apply(t).toString().getBytes()),
                 HttpResponders.json());
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3c4cd8fc/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
index 36b5411..88b560a 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
@@ -99,6 +99,7 @@ public class HttpRequester<T,R> implements Function<T,R>{
         case HttpPut.METHOD_NAME:
             request = new HttpPut(uri);
             break;
+            
         default:
             throw new IllegalArgumentException();
         }

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3c4cd8fc/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
index ddad71e..c30e3ea 100644
--- a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
+++ b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
@@ -25,7 +25,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 import org.junit.Test;
 
@@ -73,6 +76,77 @@ public class HttpTest {
     }
     
     @Test
+    public void testPost() throws Exception {
+        DirectProvider ep = new DirectProvider();
+        
+        Topology topology = ep.newTopology();
+        
+        String url = "http://httpbin.org/post";
+        
+        TStream<String> rc = HttpStreams.<String, String>requestsWithBody(
+                topology.strings(url), 
+                HttpClients::noAuthentication,
+                t -> HttpPost.METHOD_NAME, 
+                t-> t, t-> new ByteArrayEntity(t.getBytes()),
+                HttpResponders.inputOn200());
+        
+        Tester tester = topology.getTester();
+        
+        Condition<List<String>> endCondition = tester.streamContents(rc, url);
+        
+        tester.complete(ep, new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
+        
+        assertTrue(endCondition.valid());
+    }
+    
+    @Test
+    public void testPut() throws Exception {
+        DirectProvider ep = new DirectProvider();
+        
+        Topology topology = ep.newTopology();
+        
+        String url = "http://httpbin.org/put";
+        
+        TStream<String> rc = HttpStreams.<String, String>requestsWithBody(
+                topology.strings(url), 
+                HttpClients::noAuthentication,
+                t -> HttpPut.METHOD_NAME, 
+                t-> t, t-> new ByteArrayEntity(t.getBytes()),
+                HttpResponders.inputOn200());
+        
+        Tester tester = topology.getTester();
+        
+        Condition<List<String>> endCondition = tester.streamContents(rc, url);
+        
+        tester.complete(ep, new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
+        
+        assertTrue(endCondition.valid());
+    }
+    
+    @Test
+    public void testDelete() throws Exception {
+        DirectProvider ep = new DirectProvider();
+        
+        Topology topology = ep.newTopology();
+        
+        String url = "http://httpbin.org/delete";
+        
+        TStream<String> rc = HttpStreams.<String, String>requests(
+                topology.strings(url), 
+                HttpClients::noAuthentication,
+                t -> HttpDelete.METHOD_NAME, 
+                t-> t, HttpResponders.inputOn200());
+        
+        Tester tester = topology.getTester();
+        
+        Condition<List<String>> endCondition = tester.streamContents(rc, url);
+        
+        tester.complete(ep, new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
+        
+        assertTrue(endCondition.valid());
+    }
+    
+    @Test
     public void testStatusCode() throws Exception {
         
         DirectProvider ep = new DirectProvider();
@@ -173,22 +247,104 @@ public class HttpTest {
     }
     
     @Test
+    public void testJsonDelete() throws Exception {
+        
+        DirectProvider ep = new DirectProvider();
+        
+        Topology topology = ep.newTopology();
+        
+        final String url = "http://httpbin.org/delete?";
+        
+        JsonObject request1 = new JsonObject();
+        request1.addProperty("a", "abc");
+        request1.addProperty("b", "42");
+        
+        TStream<JsonObject> rc = HttpStreams.deleteJson(
+                topology.collection(Arrays.asList(request1)),
+                HttpClients::noAuthentication,
+                t-> url + "a=" + t.get("a").getAsString() + "&b=" + t.get("b").getAsString()
+                );
+        
+        TStream<Boolean> resStream = rc.map(j -> {
+            assertTrue(j.has("request"));
+            assertTrue(j.has("response"));
+            JsonObject req = j.getAsJsonObject("request");
+            JsonObject res = j.getAsJsonObject("response");
+            
+            assertTrue(res.has("status"));
+            assertTrue(res.has("entity"));           
+            
+            assertEquals(req, res.getAsJsonObject("entity").getAsJsonObject("args"));
+            return true;
+        }
+        );
+        
+        rc.print();
+         
+        Tester tester =  topology.getTester();
+        
+        Condition<List<Boolean>> endCondition = tester.streamContents(resStream, true);
+        
+        tester.complete(ep,  new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
+        
+        assertTrue(endCondition.getResult().toString(), endCondition.valid());
+    }
+    
+    @Test
     public void testJsonPost() throws Exception {
 
         DirectProvider ep = new DirectProvider();
 
         Topology topology = ep.newTopology();
 
-        final String url = "http://httpbin.org/post?";
+        final String url = "http://httpbin.org/post";
 
         JsonObject request = new JsonObject();
-        request.addProperty("a", "abc");
-        request.addProperty("b", 42);
+        request.addProperty("foo", "abc");
+        request.addProperty("bar", 42);
 
         TStream<JsonObject> rc = HttpStreams.postJson(
                 topology.collection(Arrays.asList(request)),
                 HttpClients::noAuthentication, t -> url,
-                t -> new ByteArrayEntity(request.toString().getBytes()));
+                t -> request);
+
+        TStream<Boolean> resStream = rc.map(j -> {
+            assertTrue(j.has("request"));
+            assertTrue(j.has("response"));
+            JsonObject req = j.getAsJsonObject("request");
+            JsonObject res = j.getAsJsonObject("response");
+
+            assertTrue(res.has("status"));
+            assertTrue(res.has("entity"));
+
+            assertEquals(req, res.getAsJsonObject("entity").getAsJsonObject("json"));
+            return true;
+        });
+
+        rc.print();
+        Tester tester = topology.getTester();
+        Condition<List<Boolean>> endCondition = tester.streamContents(resStream, true);
+        tester.complete(ep, new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
+        assertTrue(endCondition.getResult().toString(), endCondition.valid());
+    }
+
+    @Test
+    public void testJsonPut() throws Exception {
+
+        DirectProvider ep = new DirectProvider();
+
+        Topology topology = ep.newTopology();
+
+        final String url = "http://httpbin.org/put";
+
+        JsonObject request = new JsonObject();
+        request.addProperty("foo", "abc");
+        request.addProperty("bar", 42);
+
+        TStream<JsonObject> rc = HttpStreams.putJson(
+                topology.collection(Arrays.asList(request)),
+                HttpClients::noAuthentication, t -> url,
+                t -> request);
 
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));


[11/11] incubator-quarks git commit: Merge pull request #106

Posted by dl...@apache.org.
Merge pull request #106

This closes #106


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3c0bd498
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3c0bd498
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3c0bd498

Branch: refs/heads/master
Commit: 3c0bd4985557f5b226204d63e0aa04428b56e49f
Parents: 46dc587 9212be3
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Jun 3 14:02:54 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Jun 3 14:02:54 2016 -0400

----------------------------------------------------------------------
 .../quarks/connectors/http/HttpStreams.java     | 212 ++++++++++++++++++-
 .../connectors/http/runtime/HttpRequester.java  |  54 ++++-
 .../quarks/test/connectors/http/HttpTest.java   | 193 +++++++++++++++++
 3 files changed, 448 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



[03/11] incubator-quarks git commit: Formatting and javadoc related changes

Posted by dl...@apache.org.
Formatting and javadoc related changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/c9d9342e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/c9d9342e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/c9d9342e

Branch: refs/heads/master
Commit: c9d9342efdffddcb4f2ca8d8c7f6d076937f32fc
Parents: 3336952
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Sun May 8 17:51:56 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Sun May 8 17:51:56 2016 -0700

----------------------------------------------------------------------
 .../quarks/connectors/http/HttpStreams.java     | 20 ++++++++--------
 .../quarks/test/connectors/http/HttpTest.java   | 24 +++++++-------------
 2 files changed, 18 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c9d9342e/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index a3dcb6f..2b7e088 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -45,7 +45,7 @@ public class HttpStreams {
      * 
      * Method specifically works with JsonObjects. For each JsonObject in the stream, 
      * HTTP GET request is executed on provided uri. As a result, Response is added to
-     * response TStream.
+     * the response TStream.
      * <br>
      * 
      * Sample usage:<br>
@@ -62,9 +62,9 @@ public class HttpStreams {
      *                     + t.get("b").getAsString());
      * }
      * </pre>
-     * 
-     * See HttpTest for example.
-     * 
+     * <br>
+     * See <i>HttpTest</i> for example.
+     * <br>
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string
@@ -86,15 +86,15 @@ public class HttpStreams {
      * Method specifically works with JsonObjects. For each JsonObject in the stream, 
      * HTTP POST request is executed on provided uri. Request body is filled using
      * HttpEntity provided by body function. As a result, Response is added to
-     * response TStream.<br>
+     * the response TStream.<br>
      * 
      * Sample usage:<br>
      * 
      * <pre>
      * {@code
-     *     JsonObject request1 = new JsonObject();
-     *     request1.addProperty("a", "abc");
-     *     request1.addProperty("b", "42");
+     *     JsonObject request = new JsonObject();
+     *     request.addProperty("a", "abc");
+     *     request.addProperty("b", "42");
      *     TStream<JsonObject> rc = HttpStreams.postJson(
      *         topology.collection(Arrays.asList(request1)),
      *         HttpClients::noAuthentication,
@@ -103,9 +103,9 @@ public class HttpStreams {
      *     );
      * }
      * </pre>
-     * 
+     * <br>
      * See HttpTest for example.
-     * 
+     * <br>
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c9d9342e/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
index a34382c..ddad71e 100644
--- a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
+++ b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
@@ -181,14 +181,14 @@ public class HttpTest {
 
         final String url = "http://httpbin.org/post?";
 
-        JsonObject request1 = new JsonObject();
-        request1.addProperty("a", "abc");
-        request1.addProperty("b", "42");
+        JsonObject request = new JsonObject();
+        request.addProperty("a", "abc");
+        request.addProperty("b", 42);
 
         TStream<JsonObject> rc = HttpStreams.postJson(
-                topology.collection(Arrays.asList(request1)),
+                topology.collection(Arrays.asList(request)),
                 HttpClients::noAuthentication, t -> url,
-                t -> new ByteArrayEntity(request1.toString().getBytes()));
+                t -> new ByteArrayEntity(request.toString().getBytes()));
 
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));
@@ -199,22 +199,14 @@ public class HttpTest {
             assertTrue(res.has("status"));
             assertTrue(res.has("entity"));
 
-            assertEquals(req,
-                    res.getAsJsonObject("entity").getAsJsonObject("json"));
+            assertEquals(req, res.getAsJsonObject("entity").getAsJsonObject("json"));
             return true;
         });
 
         rc.print();
-
         Tester tester = topology.getTester();
-
-        Condition<List<Boolean>> endCondition = tester.streamContents(resStream,
-                true);
-
-        tester.complete(ep, new JsonObject(), endCondition, 10,
-                TimeUnit.SECONDS);
-
+        Condition<List<Boolean>> endCondition = tester.streamContents(resStream, true);
+        tester.complete(ep, new JsonObject(), endCondition, 10, TimeUnit.SECONDS);
         assertTrue(endCondition.getResult().toString(), endCondition.valid());
     }
-
 }


[05/11] incubator-quarks git commit: Merge pull request #3 from apache/master

Posted by dl...@apache.org.
Merge pull request #3 from apache/master

merger

Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/30d6552f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/30d6552f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/30d6552f

Branch: refs/heads/master
Commit: 30d6552f064693c11e8acc7b5282c413494425f8
Parents: 59503f1 dc0ce29
Author: Saurabh Jinturkar <sa...@users.noreply.github.com>
Authored: Thu May 12 11:23:02 2016 -0700
Committer: Saurabh Jinturkar <sa...@users.noreply.github.com>
Committed: Thu May 12 11:23:02 2016 -0700

----------------------------------------------------------------------
 .../java/quarks/execution/mbeans/JobMXBean.java |  95 +---
 .../src/main/java/quarks/oplet/core/FanIn.java  | 114 +++++
 .../src/main/java/quarks/oplet/core/Union.java  |  19 +-
 .../java/quarks/oplet/plumbing/Barrier.java     | 113 +++++
 .../java/quarks/oplet/plumbing/Isolate.java     |  28 +-
 .../src/main/java/quarks/topology/TStream.java  |  17 +
 .../mbeans/ApplicationServiceMXBean.java        |   5 +
 .../topology/plumbing/LoadBalancedSplitter.java |  90 ++++
 .../topology/plumbing/PlumbingStreams.java      | 451 +++++++++++++++++-
 .../java/quarks/topology/plumbing/Valve.java    |  18 +
 .../java/quarks/test/topology/PlumbingTest.java | 455 ++++++++++++++++++-
 .../java/quarks/connectors/iotf/IotfDevice.java |  16 +-
 .../console/servlets/ConsoleJobServlet.java     |   6 +-
 .../java/quarks/console/servlets/JobUtil.java   |  14 +-
 .../quarks/console/servlets/MetricsUtil.java    |  27 +-
 .../development/DevelopmentProvider.java        |  48 ++
 .../java/quarks/providers/iot/IotProvider.java  |   4 -
 .../java/quarks/providers/iot/package-info.java |  46 +-
 .../quarks/runtime/appservice/AppService.java   |   6 +
 .../runtime/etiao/mbeans/EtiaoJobBean.java      |  19 +-
 .../runtime/jsoncontrol/JsonControlService.java |  22 +-
 .../runtime/jsoncontrol/package-info.java       |  20 +-
 samples/.classpath                              |   2 +-
 .../scenarios/iotf/IotfFullScenario.java        |   2 +-
 .../topology/spi/graph/ConnectorStream.java     |  30 +-
 25 files changed, 1520 insertions(+), 147 deletions(-)
----------------------------------------------------------------------



[08/11] incubator-quarks git commit: Merge pull request #4 from apache/master

Posted by dl...@apache.org.
Merge pull request #4 from apache/master

merger

Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/24cd6574
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/24cd6574
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/24cd6574

Branch: refs/heads/master
Commit: 24cd6574a4b5b42e75903ea9606302f17682f1d3
Parents: 30d6552 358969d
Author: Saurabh Jinturkar <sa...@users.noreply.github.com>
Authored: Tue May 31 00:50:31 2016 -0700
Committer: Saurabh Jinturkar <sa...@users.noreply.github.com>
Committed: Tue May 31 00:50:31 2016 -0700

----------------------------------------------------------------------
 .../java/quarks/oplet/core/PeriodicSource.java  |   4 +
 .../main/java/quarks/oplet/functional/Peek.java |   4 +
 api/topology/build.xml                          |   1 +
 .../java/quarks/test/topology/PlumbingTest.java |   3 +-
 build.xml                                       |   4 +-
 .../connectors/common/ConnectorTestBase.java    |   6 +-
 .../connectors/file/FileStreamsGlobalTest.java  |  35 ++
 .../test/connectors/file/FileStreamsTest.java   |  10 +-
 .../FileStreamsTextFileWriterGlobalTest.java    |  42 ++
 .../file/FileStreamsTextFileWriterTest.java     |  48 ++-
 .../test/connectors/http/HttpGlobalTest.java    |  39 ++
 .../quarks/test/connectors/http/HttpTest.java   |  26 +-
 .../connectors/jdbc/JdbcStreamsGlobalTest.java  |  61 +++
 .../test/connectors/jdbc/JdbcStreamsTest.java   |  72 ++--
 .../kafka/KafkaStreamsGlobalTestManual.java     |  36 ++
 .../kafka/KafkaStreamsTestManual.java           |  24 +-
 .../mqtt/MqttStreamsGlobalTestManual.java       |  44 ++
 .../connectors/mqtt/MqttStreamsTestManual.java  |  61 +--
 .../connectors/pubsub/PubSubGlobalTest.java     |  32 ++
 .../test/connectors/pubsub/PubSubTest.java      |  24 +-
 .../websocket/WebSocketClientGlobalTest.java    |  46 ++
 .../javax/websocket/WebSocketClientTest.java    |  87 ++--
 console/.classpath                              |   1 +
 console/servlets/build.xml                      |   1 +
 .../console/servlets/StreamScopeUtil.java       |  81 ++++
 .../servlets/webapp_content/js/ext/d3.legend.js |  16 +-
 console/servlets/webapp_content/js/graph.js     | 158 ++++++-
 console/servlets/webapp_content/js/index.js     |   8 +-
 providers/development/build.xml                 |   2 +
 .../development/DevelopmentProvider.java        |  18 +
 .../providers/dev/DevelopmentProviderTest.java  |  55 ++-
 .../streamscope/DevelopmentStreamScopeTest.java | 132 ++++++
 .../quarks/providers/direct/DirectTopology.java |  25 +-
 .../java/quarks/providers/iot/package-info.java |  13 +
 .../java/quarks/runtime/etiao/EtiaoJob.java     |  13 +-
 .../java/quarks/runtime/etiao/Executable.java   |  55 ++-
 .../quarks/runtime/etiao/graph/DirectGraph.java |  14 +-
 .../quarks/test/fvt/iot/IotProviderTest.java    |  77 ++++
 utils/.classpath                                |   2 +
 utils/streamscope/build.xml                     |  44 ++
 .../java/quarks/streamscope/StreamScope.java    | 425 +++++++++++++++++++
 .../quarks/streamscope/StreamScopeBean.java     |  93 ++++
 .../quarks/streamscope/StreamScopeRegistry.java | 196 +++++++++
 .../streamscope/StreamScopeRegistryBean.java    |  94 ++++
 .../quarks/streamscope/StreamScopeSetup.java    | 231 ++++++++++
 .../streamscope/mbeans/StreamScopeMXBean.java   | 152 +++++++
 .../mbeans/StreamScopeRegistryMXBean.java       |  47 ++
 .../quarks/streamscope/mbeans/package-info.java |  24 ++
 .../quarks/streamscope/oplets/StreamScope.java  |  72 ++++
 .../java/quarks/streamscope/package-info.java   |  35 ++
 .../test/streamscope/StreamScopeTest.java       | 338 +++++++++++++++
 51 files changed, 2925 insertions(+), 206 deletions(-)
----------------------------------------------------------------------



[02/11] incubator-quarks git commit: Added postJson() support for HttpStreams

Posted by dl...@apache.org.
Added postJson() support for HttpStreams


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/33369529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/33369529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/33369529

Branch: refs/heads/master
Commit: 3336952993f6c237675400debfa46bdd4cd3caa5
Parents: 10fc616
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Sun May 8 01:29:59 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Sun May 8 01:29:59 2016 -0700

----------------------------------------------------------------------
 .../quarks/connectors/http/HttpStreams.java     | 107 ++++++++++++++++++-
 .../connectors/http/runtime/HttpRequester.java  |  53 +++++++--
 .../quarks/test/connectors/http/HttpTest.java   |  47 ++++++++
 3 files changed, 192 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/33369529/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index 6a22c88..a3dcb6f 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -19,6 +19,7 @@ under the License.
 
 package quarks.connectors.http;
 
+import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -39,20 +40,90 @@ import quarks.topology.TStream;
  */
 public class HttpStreams {
     
+    /**
+     * Make an HTTP GET request with JsonObject. <br>
+     * 
+     * Method specifically works with JsonObjects. For each JsonObject in the stream, 
+     * HTTP GET request is executed on provided uri. As a result, Response is added to
+     * response TStream.
+     * <br>
+     * 
+     * Sample usage:<br>
+     * 
+     * <pre>
+     * {@code
+     *     JsonObject request1 = new JsonObject();
+     *     request1.addProperty("a", "abc");
+     *     request1.addProperty("b", "42");
+     *     TStream<JsonObject> rc = HttpStreams.getJson(
+     *             topology.collection(Arrays.asList(request1)),
+     *             HttpClients::noAuthentication,
+     *             t -> url + "a=" + t.get("a").getAsString() + "&b="
+     *                     + t.get("b").getAsString());
+     * }
+     * </pre>
+     * 
+     * See HttpTest for example.
+     * 
+     * @param stream - JsonObject TStream.
+     * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
+     * @param uri - URI function which returns URI string
+     * @return TStream of JsonObject which contains responses of GET requests
+     * 
+     * @see HttpStreams#requests(TStream, Supplier, Function, Function, BiFunction)
+     */
     public static TStream<JsonObject> getJson(TStream<JsonObject> stream,
             Supplier<CloseableHttpClient> clientCreator,
             Function<JsonObject,String> uri) {
         
         return HttpStreams.<JsonObject,JsonObject>requests(stream, clientCreator,
-                t -> HttpGet.METHOD_NAME, uri, HttpResponders.json());
+            t -> HttpGet.METHOD_NAME, uri, HttpResponders.json());
     }
     
-    public static TStream<JsonObject> postJson(TStream<JsonObject> stream, 
+    /**
+     * Make an HTTP POST request with JsonObject. <br>
+     * 
+     * Method specifically works with JsonObjects. For each JsonObject in the stream, 
+     * HTTP POST request is executed on provided uri. Request body is filled using
+     * HttpEntity provided by body function. As a result, Response is added to
+     * response TStream.<br>
+     * 
+     * Sample usage:<br>
+     * 
+     * <pre>
+     * {@code
+     *     JsonObject request1 = new JsonObject();
+     *     request1.addProperty("a", "abc");
+     *     request1.addProperty("b", "42");
+     *     TStream<JsonObject> rc = HttpStreams.postJson(
+     *         topology.collection(Arrays.asList(request1)),
+     *         HttpClients::noAuthentication,
+     *         t -> url,
+     *         t -> new ByteArrayEntity(request1.toString().getBytes())
+     *     );
+     * }
+     * </pre>
+     * 
+     * See HttpTest for example.
+     * 
+     * @param stream - JsonObject TStream.
+     * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
+     * @param uri - URI function which returns URI string
+     * @param body - Function that returns HttpEntity which will be set as a body for the request.
+     * @return TStream of JsonObject which contains responses of GET requests
+     * 
+     * @see HttpStreams#requestsWithBody(TStream, Supplier, Function, Function, Function, BiFunction)
+     */
+    public static TStream<JsonObject> postJson(TStream<JsonObject> stream,
             Supplier<CloseableHttpClient> clientCreator,
-            Function<JsonObject, String> uri) {
-        return HttpStreams.<JsonObject, JsonObject> requests(stream, clientCreator, 
-                t -> HttpPost.METHOD_NAME, uri, HttpResponders.json());
+            Function<JsonObject, String> uri,
+            Function<JsonObject, HttpEntity> body) {
+
+        return HttpStreams.<JsonObject, JsonObject> requestsWithBody(stream,
+                clientCreator, t -> HttpPost.METHOD_NAME, uri, body,
+                HttpResponders.json());
     }
+    
     /**
      * Make an HTTP request for each tuple on a stream.
      * <UL>
@@ -99,5 +170,31 @@ public class HttpStreams {
         
         return stream.map(new HttpRequester<T,R>(clientCreator, method, uri, response));
     }
+    
+    /**
+     * Make an HTTP request with body for each tuple.<br>
+     * 
+     * @param stream Stream to invoke HTTP requests.
+     * @param clientCreator Function to create a HTTP client.
+     * @param method Function to define the HTTP method.
+     * @param uri Function to define the URI.
+     * @param body Function to define the HTTP request body
+     * @param response Function to process the response.
+     * @return Stream containing HTTP responses processed by the {@code response} function.
+     * 
+     * @see HttpStreams#requests(TStream, Supplier, Function, Function, BiFunction)
+     * @see HttpClients
+     * @see HttpResponders
+     * 
+     */
+    public static <T, R> TStream<R> requestsWithBody(TStream<T> stream,
+            Supplier<CloseableHttpClient> clientCreator,
+            Function<T, String> method, 
+            Function<T, String> uri,
+            Function<T, HttpEntity> body,
+            BiFunction<T, CloseableHttpResponse, R> response) {
+
+        return stream.map(new HttpRequester<T, R>(clientCreator, method, uri, body, response));
+    }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/33369529/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
index 2f6f880..36b5411 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/runtime/HttpRequester.java
@@ -21,9 +21,13 @@ package quarks.connectors.http.runtime;
 
 import java.io.IOException;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.impl.client.CloseableHttpClient;
 
@@ -36,18 +40,16 @@ import quarks.function.Supplier;
  */
 public class HttpRequester<T,R> implements Function<T,R>{
     
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1L;
     
     private final Supplier<CloseableHttpClient> clientCreator;
     private final Function<T,String> method;
     private final Function<T,String> url;
     private final BiFunction<T,CloseableHttpResponse,R> responseProcessor;
+    private final Function<T, HttpEntity> entity;
     
     private CloseableHttpClient client;
-       
+    
     public HttpRequester(
             Supplier<CloseableHttpClient> clientCreator,
             Function<T,String> method,
@@ -57,8 +59,21 @@ public class HttpRequester<T,R> implements Function<T,R>{
         this.method = method;
         this.url = url;
         this.responseProcessor = responseProcessor;
+        this.entity = null;
     }
     
+    public HttpRequester(
+            Supplier<CloseableHttpClient> clientCreator,
+            Function<T,String> method,
+            Function<T,String> url,
+            Function<T, HttpEntity> entity,
+            BiFunction<T,CloseableHttpResponse,R> responseProcessor) {
+        this.clientCreator = clientCreator;
+        this.method = method;
+        this.url = url;
+        this.entity = entity;
+        this.responseProcessor = responseProcessor;
+    }
 
     @Override
     public R apply(T t) {
@@ -69,16 +84,35 @@ public class HttpRequester<T,R> implements Function<T,R>{
         String m = method.apply(t);
         String uri = url.apply(t);
         HttpUriRequest request;
+        
         switch (m) {
-        case HttpGet.METHOD_NAME:          
+        
+        case HttpGet.METHOD_NAME:
             request = new HttpGet(uri);
             break;
-        case HttpDelete.METHOD_NAME:          
+        case HttpDelete.METHOD_NAME:
             request = new HttpDelete(uri);
             break;
+        case HttpPost.METHOD_NAME:
+            request = new HttpPost(uri);
+            break;
+        case HttpPut.METHOD_NAME:
+            request = new HttpPut(uri);
+            break;
+        default:
+            throw new IllegalArgumentException();
+        }
+        
+        // If entity is not null means http request should have a body
+        if (entity != null) {
+            
+            HttpEntity body = entity.apply(t);
 
-            default:
-                throw new IllegalArgumentException();
+            if (request instanceof HttpEntityEnclosingRequest == false) {
+                throw new IllegalArgumentException("Http request does not support body");
+            }
+            
+            ((HttpEntityEnclosingRequest) request).setEntity(body);
         }
         
         try {
@@ -90,5 +124,4 @@ public class HttpRequester<T,R> implements Function<T,R>{
             throw new RuntimeException(e);
         }
     }
-
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/33369529/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
index e30f483..a34382c 100644
--- a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
+++ b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.entity.ByteArrayEntity;
 import org.junit.Test;
 
 import com.google.gson.JsonObject;
@@ -170,4 +171,50 @@ public class HttpTest {
         
         assertTrue(endCondition.getResult().toString(), endCondition.valid());
     }
+    
+    @Test
+    public void testJsonPost() throws Exception {
+
+        DirectProvider ep = new DirectProvider();
+
+        Topology topology = ep.newTopology();
+
+        final String url = "http://httpbin.org/post?";
+
+        JsonObject request1 = new JsonObject();
+        request1.addProperty("a", "abc");
+        request1.addProperty("b", "42");
+
+        TStream<JsonObject> rc = HttpStreams.postJson(
+                topology.collection(Arrays.asList(request1)),
+                HttpClients::noAuthentication, t -> url,
+                t -> new ByteArrayEntity(request1.toString().getBytes()));
+
+        TStream<Boolean> resStream = rc.map(j -> {
+            assertTrue(j.has("request"));
+            assertTrue(j.has("response"));
+            JsonObject req = j.getAsJsonObject("request");
+            JsonObject res = j.getAsJsonObject("response");
+
+            assertTrue(res.has("status"));
+            assertTrue(res.has("entity"));
+
+            assertEquals(req,
+                    res.getAsJsonObject("entity").getAsJsonObject("json"));
+            return true;
+        });
+
+        rc.print();
+
+        Tester tester = topology.getTester();
+
+        Condition<List<Boolean>> endCondition = tester.streamContents(resStream,
+                true);
+
+        tester.complete(ep, new JsonObject(), endCondition, 10,
+                TimeUnit.SECONDS);
+
+        assertTrue(endCondition.getResult().toString(), endCondition.valid());
+    }
+
 }


[09/11] incubator-quarks git commit: merged

Posted by dl...@apache.org.
merged


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/f96c8e04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/f96c8e04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/f96c8e04

Branch: refs/heads/master
Commit: f96c8e043e4ec0bc864d6034e8127393ae886f56
Parents: 3794d46 24cd657
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Tue May 31 00:57:47 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Tue May 31 00:57:47 2016 -0700

----------------------------------------------------------------------
 .../java/quarks/oplet/core/PeriodicSource.java  |   4 +
 .../main/java/quarks/oplet/functional/Peek.java |   4 +
 api/topology/build.xml                          |   1 +
 .../java/quarks/test/topology/PlumbingTest.java |   3 +-
 build.xml                                       |   4 +-
 .../connectors/common/ConnectorTestBase.java    |   6 +-
 .../connectors/file/FileStreamsGlobalTest.java  |  35 ++
 .../test/connectors/file/FileStreamsTest.java   |  10 +-
 .../FileStreamsTextFileWriterGlobalTest.java    |  42 ++
 .../file/FileStreamsTextFileWriterTest.java     |  48 ++-
 .../test/connectors/http/HttpGlobalTest.java    |  39 ++
 .../quarks/test/connectors/http/HttpTest.java   |  43 +-
 .../connectors/jdbc/JdbcStreamsGlobalTest.java  |  61 +++
 .../test/connectors/jdbc/JdbcStreamsTest.java   |  72 ++--
 .../kafka/KafkaStreamsGlobalTestManual.java     |  36 ++
 .../kafka/KafkaStreamsTestManual.java           |  24 +-
 .../mqtt/MqttStreamsGlobalTestManual.java       |  44 ++
 .../connectors/mqtt/MqttStreamsTestManual.java  |  61 +--
 .../connectors/pubsub/PubSubGlobalTest.java     |  32 ++
 .../test/connectors/pubsub/PubSubTest.java      |  24 +-
 .../websocket/WebSocketClientGlobalTest.java    |  46 ++
 .../javax/websocket/WebSocketClientTest.java    |  87 ++--
 console/.classpath                              |   1 +
 console/servlets/build.xml                      |   1 +
 .../console/servlets/StreamScopeUtil.java       |  81 ++++
 .../servlets/webapp_content/js/ext/d3.legend.js |  16 +-
 console/servlets/webapp_content/js/graph.js     | 158 ++++++-
 console/servlets/webapp_content/js/index.js     |   8 +-
 providers/development/build.xml                 |   2 +
 .../development/DevelopmentProvider.java        |  18 +
 .../providers/dev/DevelopmentProviderTest.java  |  55 ++-
 .../streamscope/DevelopmentStreamScopeTest.java | 132 ++++++
 .../quarks/providers/direct/DirectTopology.java |  25 +-
 .../java/quarks/providers/iot/package-info.java |  13 +
 .../java/quarks/runtime/etiao/EtiaoJob.java     |  13 +-
 .../java/quarks/runtime/etiao/Executable.java   |  55 ++-
 .../quarks/runtime/etiao/graph/DirectGraph.java |  14 +-
 .../quarks/test/fvt/iot/IotProviderTest.java    |  77 ++++
 utils/.classpath                                |   2 +
 utils/streamscope/build.xml                     |  44 ++
 .../java/quarks/streamscope/StreamScope.java    | 425 +++++++++++++++++++
 .../quarks/streamscope/StreamScopeBean.java     |  93 ++++
 .../quarks/streamscope/StreamScopeRegistry.java | 196 +++++++++
 .../streamscope/StreamScopeRegistryBean.java    |  94 ++++
 .../quarks/streamscope/StreamScopeSetup.java    | 231 ++++++++++
 .../streamscope/mbeans/StreamScopeMXBean.java   | 152 +++++++
 .../mbeans/StreamScopeRegistryMXBean.java       |  47 ++
 .../quarks/streamscope/mbeans/package-info.java |  24 ++
 .../quarks/streamscope/oplets/StreamScope.java  |  72 ++++
 .../java/quarks/streamscope/package-info.java   |  35 ++
 .../test/streamscope/StreamScopeTest.java       | 338 +++++++++++++++
 51 files changed, 2934 insertions(+), 214 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/f96c8e04/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------


[06/11] incubator-quarks git commit: Merge branch 'master' of https://github.com/saurabhjinturkar/incubator-quarks into QUARKS-96_postJson

Posted by dl...@apache.org.
Merge branch 'master' of https://github.com/saurabhjinturkar/incubator-quarks into QUARKS-96_postJson


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/caeab780
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/caeab780
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/caeab780

Branch: refs/heads/master
Commit: caeab780d9afae94f538ca78488deea9b08b26c0
Parents: 3c4cd8f 30d6552
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Thu May 12 22:25:55 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Thu May 12 22:25:55 2016 -0700

----------------------------------------------------------------------
 .../java/quarks/execution/mbeans/JobMXBean.java |  95 +---
 .../src/main/java/quarks/oplet/core/FanIn.java  | 114 +++++
 .../src/main/java/quarks/oplet/core/Union.java  |  19 +-
 .../java/quarks/oplet/plumbing/Barrier.java     | 113 +++++
 .../java/quarks/oplet/plumbing/Isolate.java     |  28 +-
 .../src/main/java/quarks/topology/TStream.java  |  17 +
 .../mbeans/ApplicationServiceMXBean.java        |   5 +
 .../topology/plumbing/LoadBalancedSplitter.java |  90 ++++
 .../topology/plumbing/PlumbingStreams.java      | 451 +++++++++++++++++-
 .../java/quarks/topology/plumbing/Valve.java    |  18 +
 .../java/quarks/test/topology/PlumbingTest.java | 455 ++++++++++++++++++-
 .../java/quarks/connectors/iotf/IotfDevice.java |  16 +-
 .../console/servlets/ConsoleJobServlet.java     |   6 +-
 .../java/quarks/console/servlets/JobUtil.java   |  14 +-
 .../quarks/console/servlets/MetricsUtil.java    |  27 +-
 .../development/DevelopmentProvider.java        |  48 ++
 .../java/quarks/providers/iot/IotProvider.java  |   4 -
 .../java/quarks/providers/iot/package-info.java |  46 +-
 .../quarks/runtime/appservice/AppService.java   |   6 +
 .../runtime/etiao/mbeans/EtiaoJobBean.java      |  19 +-
 .../runtime/jsoncontrol/JsonControlService.java |  22 +-
 .../runtime/jsoncontrol/package-info.java       |  20 +-
 samples/.classpath                              |   2 +-
 .../scenarios/iotf/IotfFullScenario.java        |   2 +-
 .../topology/spi/graph/ConnectorStream.java     |  30 +-
 25 files changed, 1520 insertions(+), 147 deletions(-)
----------------------------------------------------------------------



[10/11] incubator-quarks git commit: Implemented review comments

Posted by dl...@apache.org.
Implemented review comments


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/9212be33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/9212be33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/9212be33

Branch: refs/heads/master
Commit: 9212be33bb97a70e2ba6d16bd91c97d0a58685da
Parents: f96c8e0
Author: Saurabh Jinturkar <sa...@sjsu.edu>
Authored: Tue May 31 01:39:01 2016 -0700
Committer: Saurabh Jinturkar <sa...@sjsu.edu>
Committed: Tue May 31 01:39:01 2016 -0700

----------------------------------------------------------------------
 .../java/quarks/connectors/http/HttpStreams.java  |  9 ++++-----
 .../quarks/test/connectors/http/HttpTest.java     | 18 ++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9212be33/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
index 954b1b3..fff7f46 100644
--- a/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/quarks/connectors/http/HttpStreams.java
@@ -157,7 +157,7 @@ public class HttpStreams {
      * 
      *     TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
      *     TStream<JsonObject> rc = HttpStreams.postJson(stream,
-     *             HttpClients::noAuthentication, t -> url, t -> body);
+     *             HttpClients::noAuthentication, t -> url, t -> t);
      * }
      * </pre>
      * 
@@ -167,7 +167,7 @@ public class HttpStreams {
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string
-     * @param body - Function that returns HttpEntity which will be set as a body for the request.
+     * @param body - Function that returns JsonObject which will be set as a body for the request.
      * @return TStream of JsonObject which contains responses of POST requests
      * 
      * @see HttpStreams#requestsWithBody(TStream, Supplier, Function, Function, Function, BiFunction)
@@ -205,7 +205,7 @@ public class HttpStreams {
      * 
      *     TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
      *     TStream<JsonObject> rc = HttpStreams.putJson(stream,
-     *             HttpClients::noAuthentication, t -> url, t -> body);
+     *             HttpClients::noAuthentication, t -> url, t -> t);
      * }
      * </pre>
      * 
@@ -215,7 +215,7 @@ public class HttpStreams {
      * @param stream - JsonObject TStream.
      * @param clientCreator - CloseableHttpClient supplier preferably created using {@link HttpClients}
      * @param uri - URI function which returns URI string
-     * @param body - Function that returns HttpEntity which will be set as a body for the request.
+     * @param body - Function that returns JsonObject which will be set as a body for the request.
      * @return TStream of JsonObject which contains responses of PUT requests
      * 
      * @see HttpStreams#requestsWithBody(TStream, Supplier, Function, Function, Function, BiFunction)
@@ -224,7 +224,6 @@ public class HttpStreams {
             Supplier<CloseableHttpClient> clientCreator,
             Function<JsonObject, String> uri,
             UnaryOperator<JsonObject> body) {
-
         return HttpStreams.<JsonObject, JsonObject> requestsWithBody(stream,
                 clientCreator, t -> HttpPut.METHOD_NAME, uri, 
                 t -> new ByteArrayEntity(body.apply(t).toString().getBytes()),

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9212be33/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
index 47214d5..d72773f 100644
--- a/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
+++ b/connectors/http/src/test/java/quarks/test/connectors/http/HttpTest.java
@@ -270,8 +270,8 @@ public class HttpTest {
         final String url = "http://httpbin.org/delete?";
         
         JsonObject request = new JsonObject();
-        request.addProperty("a", "abc");
-        request.addProperty("b", "42");
+        request.addProperty("a", getProp1());
+        request.addProperty("b", getProp2());
         
         TStream<JsonObject> stream = topology.collection(Arrays.asList(request));
         TStream<JsonObject> rc = HttpStreams.deleteJson(
@@ -314,14 +314,13 @@ public class HttpTest {
         final String url = "http://httpbin.org/post";
 
         JsonObject body = new JsonObject();
-        body.addProperty("foo", "abc");
-        body.addProperty("bar", 42);
+        body.addProperty("foo", getProp1());
+        body.addProperty("bar", getProp2());
 
         TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
         TStream<JsonObject> rc = HttpStreams.postJson(
                 stream, HttpClients::noAuthentication, t -> url,
-                t -> body);
-
+                t -> t);
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));
             assertTrue(j.has("response"));
@@ -352,14 +351,13 @@ public class HttpTest {
         final String url = "http://httpbin.org/put";
 
         JsonObject body = new JsonObject();
-        body.addProperty("foo", "abc");
-        body.addProperty("bar", 42);
+        body.addProperty("foo", getProp1());
+        body.addProperty("bar", getProp2());
 
         TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
         TStream<JsonObject> rc = HttpStreams.putJson(
                 stream, HttpClients::noAuthentication, t -> url,
-                t -> body);
-
+                t -> t);
         TStream<Boolean> resStream = rc.map(j -> {
             assertTrue(j.has("request"));
             assertTrue(j.has("response"));