Updated dependencies

Author: Igor Lozynskyi

external-service/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.1.0.RELEASE'
+		springBootVersion = '2.1.3.RELEASE'
 	}
 	repositories {
 		// gradle-docker-plugin does not work with mavenCentral(), so using jcenter()
@@ -30,7 +30,7 @@ repositories {
 }
 
 ext {
-	springBootAdminVersion = '2.1.0'
+	springBootAdminVersion = '2.1.3'
 }
 
 dependencies {

super-application/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.1.0.RELEASE'
+		springBootVersion = '2.1.3.RELEASE'
 	}
 	repositories {
 		// gradle-docker-plugin does not work with mavenCentral(), so using jcenter()
@@ -42,8 +42,8 @@ dependencies {
 
 	// Persistence
 	implementation('org.springframework.boot:spring-boot-starter-data-jdbc')
-	implementation('org.springframework.data:spring-data-r2dbc:1.0.0.BUILD-SNAPSHOT')
-	implementation('io.r2dbc:r2dbc-postgresql:1.0.0.M6')
+	implementation('org.springframework.data:spring-data-r2dbc:1.0.0.M1')
+	implementation('io.r2dbc:r2dbc-postgresql:1.0.0.M7')
 	implementation('org.springframework.boot:spring-boot-starter-data-cassandra-reactive')
 	implementation('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
 	implementation('org.springframework.boot:spring-boot-starter-data-couchbase-reactive')

super-application/src/main/java/org/coinen/reactive/persistence/CouchbaseConfig.java

@@ -1,6 +1,3 @@
-/**
- * Copyright (C) Zoomdata, Inc. 2012-2018. All rights reserved.
- */
 package org.coinen.reactive.persistence;
 
 

super-application/src/main/java/org/coinen/reactive/persistence/ReactivePersistenceApplication.java

@@ -35,21 +35,6 @@
 import static org.springframework.web.reactive.function.server.ServerResponse.ok;
 
 
-// Done: Put data into Postgres
-// Done: Repository for loading data form JDBC Postgres
-// Done: Repository for loading data form R2DBC Postgres
-// Done: Put data into Cassandra
-// Done: Repository for loading data form Cassandra
-// Done: Put data into Mongo
-// Done: Repository for loading data form Mongo
-// Done: Put data into CouchBase
-// Done: Repository for loading data form CouchBase
-// TODO: Dedicated ADBA example
-// TODO: Dedicated R2DBC example (fix configuration)
-// TODO: MongoDB transactions: Fix ports for mongo in docker-compose here (omit conflicts)!
-// TODO: UI to call for all states on hot key
-// TODO: Pictures for layers of Cassandra/Mongo/etc...
-
 @EnableJdbcRepositories("org.coinen.reactive.persistence.db.jdbc")
 @EnableR2dbcRepositories
 @RequiredArgsConstructor

super-application/src/main/java/org/coinen/reactive/persistence/Studies.java

@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-// TODO: Use it somehow
+// TODO: Use this enum instead of hard-coded values
 @RequiredArgsConstructor
 public enum Studies {
     UKRAINE_WEATHR_4_SYNC("uk-sync"),

super-application/src/main/java/org/coinen/reactive/persistence/db/DatabaseFacade.java

@@ -60,7 +60,7 @@ private Mono<Object> worldPopDensityCouch(String region) {
         if (batchedRequest) {
             return worldPopDensityCouchbaseRepository
                 .findByDensityLessThan10000()
-                .doOnNext(r -> log.debug(" [Couchbase -> App]: {}", r))
+                //.doOnNext(r -> log.debug(" [Couchbase -> App]: {}", r))
                 .filter(dto -> region.equals(dto.getId()))
                 .next()
                 .map(WorldPopDensityDto::getDensity);
@@ -111,9 +111,16 @@ private Mono<Object> usSalesJdbc(String region) {
     }
 
     private Mono<Object> usSalesR2Dbc(String region) {
+        // Can not use findById as Binding parameters is not supported yet for Postgres R2DBC
+
+        // return usSalesR2dbcRepository
+        //   .findById(region)
+        //   .map(UsSalesDataDto::getSales);
+
         // Used for batched & non-batched mode
         return usSalesR2dbcRepository
             .findAll()
+            //.doOnNext(r -> log.debug(" [R2DBC -> App]: {}", r))
             .filter(data -> region.equals(data.getCode()))
             .next()
             .map(UsSalesDataDto::getSales);

super-application/src/main/java/org/coinen/reactive/persistence/db/WorldGdpCassandraRepository.java

@@ -2,7 +2,6 @@
 
 
 import org.springframework.data.cassandra.repository.ReactiveCassandraRepository;
-import org.springframework.data.repository.query.Param;
 import org.springframework.lang.NonNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

super-application/src/main/java/org/coinen/reactive/persistence/db/WorldGdpDto.java

@@ -1,6 +1,3 @@
-/**
- * Copyright (C) Zoomdata, Inc. 2012-2018. All rights reserved.
- */
 package org.coinen.reactive.persistence.db;
 
 import lombok.AllArgsConstructor;

super-application/src/main/java/org/coinen/reactive/persistence/db/WorldPopDensityDto.java

@@ -1,6 +1,3 @@
-/**
- * Copyright (C) Zoomdata, Inc. 2012-2018. All rights reserved.
- */
 package org.coinen.reactive.persistence.db;
 
 import lombok.AllArgsConstructor;

super-application/src/main/java/org/coinen/reactive/persistence/utils/MonitoringUtils.java

@@ -1,6 +1,3 @@
-/**
- * Copyright (C) Zoomdata, Inc. 2012-2018. All rights reserved.
- */
 package org.coinen.reactive.persistence.utils;
 
 import org.coinen.reactive.persistence.external.ExternalServiceMetricsDto;