Related to vert-x3#247

Renamed modules
Fix links
Update code to use Flowable

Author: cescoffier

rx-examples/README.adoc renamed to rxjava-1-examples/README.adoc

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.vertx</groupId>
-  <artifactId>rx-examples</artifactId>
+  <artifactId>rx-java1-examples</artifactId>
   <version>3.5.0</version>
 
   <dependencies>

rx-examples/pom.xml renamed to rxjava-1-examples/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.vertx</groupId>
-  <artifactId>rxjava2-examples</artifactId>
+  <artifactId>rxjava-2-examples</artifactId>
   <version>3.5.0</version>
 
   <dependencies>

rx-examples/src/main/java/io/vertx/example/rxjava/database/jdbc/Client.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/database/jdbc/Client.java

@@ -1,6 +1,6 @@
 package io.vertx.example.reactivex.database.mongo;
 
-import io.reactivex.Observable;
+import io.reactivex.Flowable;
 import io.vertx.core.json.JsonObject;
 import io.vertx.example.util.Runner;
 import io.vertx.reactivex.core.AbstractVerticle;
@@ -43,7 +43,7 @@ public void start() throws Exception {
 
   private void insertAndFind() {
     // Documents to insert
-    Observable<JsonObject> documents = Observable.just(
+    Flowable<JsonObject> documents = Flowable.just(
       new JsonObject().put("username", "temporalfox").put("firstname", "Julien").put("password", "bilto"),
       new JsonObject().put("username", "purplefox").put("firstname", "Tim").put("password", "wibble")
     );
@@ -52,7 +52,7 @@ private void insertAndFind() {
       .rxCreateCollection("users")
       .andThen(
         // After collection is created we insert each document
-        documents.flatMap(doc -> mongo.rxInsert("users", doc).toObservable())
+        documents.flatMap(doc -> mongo.rxInsert("users", doc).toFlowable())
       )
       .doOnNext(id -> {
         System.out.println("Inserted document " + id);

rx-examples/src/main/java/io/vertx/example/rxjava/database/jdbc/Streaming.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/database/jdbc/Streaming.java

@@ -19,7 +19,7 @@ public void start() throws Exception {
         EventBus eb = vertx.eventBus();
 
         eb.consumer(ADDRESS)
-                .toObservable()
+                .toFlowable()
                 .subscribe(message -> {
                     System.out.println("Received " + message.body());
                     message.reply("PONG");

rx-examples/src/main/java/io/vertx/example/rxjava/database/mongo/Client.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/database/mongo/Client.java

@@ -20,9 +20,9 @@ public void start() throws Exception {
 
     EventBus eb = vertx.eventBus();
 
-    eb.consumer("news-feed").
-        toObservable().
-        subscribe(message -> System.out.println("Received news: " + message.body()));
+    eb.consumer("news-feed")
+      .toFlowable()
+      .subscribe(message -> System.out.println("Received news: " + message.body()));
 
     System.out.println("Ready!");
   }

rx-examples/src/main/java/io/vertx/example/rxjava/eventbus/pingpong/PingPong.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/eventbus/pingpong/PingPong.java

@@ -24,13 +24,13 @@ public void start() throws Exception {
     EventBus eb = vertx.eventBus();
 
     eb.consumer("heatsensor1").
-        toObservable().
+        toFlowable().
         subscribe(message -> {
           message.reply(9 + random1.nextInt(5));
         });
 
     eb.consumer("heatsensor2").
-        toObservable().
+      toFlowable().
         subscribe(message -> {
           message.reply(10 + random1.nextInt(3));
         });

rx-examples/src/main/java/io/vertx/example/rxjava/eventbus/pubsub/Receiver.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/eventbus/pubsub/Receiver.java

@@ -1,12 +1,12 @@
 package io.vertx.example.reactivex.http.client.reduce;
 
+import io.reactivex.Flowable;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.example.util.Runner;
 import io.vertx.reactivex.core.AbstractVerticle;
 import io.vertx.reactivex.core.buffer.Buffer;
 import io.vertx.reactivex.core.http.HttpClient;
 import io.vertx.reactivex.core.http.HttpClientRequest;
-import io.reactivex.Observable;
 
 /*
  * @author <a href="mailto:[email protected]">Julien Viet</a>
@@ -22,23 +22,23 @@ public static void main(String[] args) {
   public void start() throws Exception {
     HttpClient client = vertx.createHttpClient();
     HttpClientRequest req = client.request(HttpMethod.GET, 8080, "localhost", "/");
-    req.toObservable().
+    req.toFlowable().
 
-        // Status code check and -> Observable<Buffer>
+      // Status code check and -> Flowable<Buffer>
         flatMap(resp -> {
-          if (resp.statusCode() != 200) {
-            throw new RuntimeException("Wrong status code " + resp.statusCode());
-          }
-          return Observable.just(Buffer.buffer()).mergeWith(resp.toObservable());
-        }).
+        if (resp.statusCode() != 200) {
+          throw new RuntimeException("Wrong status code " + resp.statusCode());
+        }
+        return Flowable.just(Buffer.buffer()).mergeWith(resp.toFlowable());
+      }).
 
-        // Reduce all buffers in a single buffer
+      // Reduce all buffers in a single buffer
         reduce(Buffer::appendBuffer).
 
-        // Turn in to a string
+      // Turn in to a string
         map(buffer -> buffer.toString("UTF-8")).
 
-        // Get a single buffer
+      // Get a single buffer
         subscribe(data -> System.out.println("Server content " + data));
 
     // End request

rx-examples/src/main/java/io/vertx/example/rxjava/eventbus/pubsub/Sender.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/eventbus/pubsub/Sender.java

@@ -17,7 +17,7 @@ public static void main(String[] args) {
   @Override
   public void start() throws Exception {
     HttpServer server = vertx.createHttpServer();
-    server.requestStream().toObservable().subscribe(req -> {
+    server.requestStream().toFlowable().subscribe(req -> {
       req.response().putHeader("content-type", "text/html").end("<html><body><h1>Hello from vert.x!</h1></body></html>");
     });
     server.listen(8080);

rx-examples/src/main/java/io/vertx/example/rxjava/eventbus/zipreplies/Receiver.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/eventbus/zipreplies/Receiver.java

@@ -20,14 +20,14 @@ public static void main(String[] args) {
   public void start() throws Exception {
     HttpClient client = vertx.createHttpClient();
     HttpClientRequest req = client.request(HttpMethod.GET, 8080, "localhost", "/");
-    req.toObservable().
+    req.toFlowable().
 
-        // Status code check and -> Observable<Buffer>
+        // Status code check and -> Flowable<Buffer>
         flatMap(resp -> {
           if (resp.statusCode() != 200) {
             throw new RuntimeException("Wrong status code " + resp.statusCode());
           }
-          return resp.toObservable();
+          return resp.toFlowable();
         }).
 
         subscribe(data -> System.out.println("Server content " + data.toString("UTF-8")));

rx-examples/src/main/java/io/vertx/example/rxjava/eventbus/zipreplies/Sender.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/eventbus/zipreplies/Sender.java

@@ -17,7 +17,7 @@ public static void main(String[] args) {
   @Override
   public void start() throws Exception {
     HttpServer server = vertx.createHttpServer();
-    server.requestStream().toObservable().subscribe(req -> {
+    server.requestStream().toFlowable().subscribe(req -> {
       req.response().putHeader("content-type", "text/html").end("<html><body><h1>Hello from vert.x!</h1></body></html>");
     });
     server.listen(8080);

rx-examples/src/main/java/io/vertx/example/rxjava/http/client/reduce/Client.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/http/client/reduce/Client.java

@@ -28,8 +28,8 @@ static class Data {
   public void start() throws Exception {
     HttpClient client = vertx.createHttpClient();
     HttpClientRequest req = client.request(HttpMethod.GET, 8080, "localhost", "/");
-    req.toObservable().
-      flatMap(HttpClientResponse::toObservable)
+    req.toFlowable().
+      flatMap(HttpClientResponse::toFlowable)
       .map(buffer -> buffer.toJsonObject().mapTo(Data.class))
       .subscribe(
         data -> System.out.println("Got response " + data.message));

rx-examples/src/main/java/io/vertx/example/rxjava/http/client/reduce/Server.java renamed to rxjava-1-examples/src/main/java/io/vertx/example/rxjava/http/client/reduce/Server.java

@@ -17,7 +17,7 @@ public static void main(String[] args) {
   @Override
   public void start() throws Exception {
     HttpServer server = vertx.createHttpServer();
-    server.requestStream().toObservable().subscribe(req -> {
+    server.requestStream().toFlowable().subscribe(req -> {
       req.response().putHeader("content-type", "application/json").end("{\"message\":\"Hello World\"}");
     });
     server.listen(8080);