- Upgrade to ratpack 1.6 (#4609)

- Use rx java 2
- Upgrade to reactive-pg-client 0.10.9

frameworks/Java/ratpack/README.md

@@ -37,8 +37,8 @@ There are two repository implementations.
 ## Versions
 
 * [Java OpenJDK 1.8](http://openjdk.java.net/)
-* [Ratpack 1.5.4](http://ratpack.io/)
-* [reactive-pg-client 0.10.5](https://github.com/reactiverse/reactive-pg-client)
+* [Ratpack 1.6.0](http://ratpack.io/)
+* [reactive-pg-client 0.10.9](https://github.com/reactiverse/reactive-pg-client)
 
 ## Test URLs
 

frameworks/Java/ratpack/build.gradle

@@ -18,12 +18,12 @@ repositories {
 }
 
 dependencies {
-    compile 'io.ratpack:ratpack-guice:1.5.4'
-    compile 'io.ratpack:ratpack-hikari:1.5.4'
-    compile 'io.ratpack:ratpack-handlebars:1.5.4'
-    compile 'io.ratpack:ratpack-rx:1.5.4'
-    compile 'io.reactiverse:reactive-pg-client:0.10.5'
-    compile 'io.vertx:vertx-rx-java:3.5.3'
+    compile 'io.ratpack:ratpack-guice:1.6.0'
+    compile 'io.ratpack:ratpack-hikari:1.6.0'
+    compile 'io.ratpack:ratpack-handlebars:1.6.0'
+    compile 'io.ratpack:ratpack-rx2:1.6.0'
+    compile 'io.reactiverse:reactive-pg-client:0.10.9'
+    compile 'io.vertx:vertx-rx-java2:3.5.4'
 
     // Default SLF4J binding.  Note that this is a blocking implementation.
     // See here for a non blocking appender http://logging.apache.org/log4j/2.x/manual/async.html

frameworks/Java/ratpack/src/main/java/Main.java

@@ -11,7 +11,7 @@ import module.PgClientRepositoryModule;
 import ratpack.guice.Guice;
 import ratpack.handlebars.HandlebarsModule;
 import ratpack.hikari.HikariModule;
-import ratpack.rx.RxRatpack;
+import ratpack.rx2.RxRatpack;
 import ratpack.server.RatpackServer;
 
 public class Main {

frameworks/Java/ratpack/src/main/java/models/PgClientRepository.java

@@ -1,13 +1,13 @@
 package models;
 
-import io.reactiverse.rxjava.pgclient.PgClient;
-import io.reactiverse.rxjava.pgclient.PgIterator;
-import io.reactiverse.rxjava.pgclient.Row;
-import io.reactiverse.rxjava.pgclient.Tuple;
+import io.reactiverse.reactivex.pgclient.PgClient;
+import io.reactiverse.reactivex.pgclient.PgIterator;
+import io.reactiverse.reactivex.pgclient.Row;
+import io.reactiverse.reactivex.pgclient.Tuple;
 import module.PgClients;
 import ratpack.exec.Promise;
-import ratpack.rx.RxRatpack;
-import rx.Observable;
+import ratpack.rx2.RxRatpack;
+import io.reactivex.Observable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,14 +60,12 @@ public class PgClientRepository implements DbRepository {
     }
 
     private Promise<List<World>> getPromise(Observable<World>[] observables) {
-        return RxRatpack.promiseSingle(
-                Observable.merge(observables)
-                        .collect(() -> new ArrayList<World>(), (worlds, world) -> worlds.add(world)));
+        return RxRatpack.promiseAll(Observable.mergeArray(observables));
     }
 
     @Override
     public Promise<List<Fortune>> fortunes() {
-        return RxRatpack.promise(pgClients.getOne().rxPreparedQuery("SELECT * FROM fortune").flatMapObservable(pgRowSet -> {
+        return RxRatpack.promiseAll(pgClients.getOne().rxPreparedQuery("SELECT * FROM fortune").flatMapObservable(pgRowSet -> {
             PgIterator resultSet = pgRowSet.iterator();
             List<Fortune> fortunes = new ArrayList<>(pgRowSet.size());
             while (resultSet.hasNext()) {
@@ -75,7 +73,7 @@ public class PgClientRepository implements DbRepository {
                 fortunes.add(new Fortune(row.getInteger(0), row.getString(1)));
             }
 
-            return Observable.from(fortunes);
+            return Observable.fromIterable(fortunes);
         }));
     }
 }

frameworks/Java/ratpack/src/main/java/module/PgClientModule.java

@@ -3,8 +3,8 @@ package module;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import io.reactiverse.pgclient.PgPoolOptions;
-import io.reactiverse.rxjava.pgclient.PgClient;
-import io.vertx.rxjava.core.Vertx;
+import io.reactiverse.reactivex.pgclient.PgClient;
+import io.vertx.reactivex.core.Vertx;
 import ratpack.guice.ConfigurableModule;
 
 import java.util.ArrayList;

frameworks/Java/ratpack/src/main/java/module/PgClients.java

@@ -1,6 +1,6 @@
 package module;
 
-import io.reactiverse.rxjava.pgclient.PgClient;
+import io.reactiverse.reactivex.pgclient.PgClient;
 
 import java.util.Collection;
 import java.util.Iterator;