Merge branch 'r2dbc-new' into r2dbc

humblehound · humblehound · commit f7485a215a26 · 2019-01-12T23:49:21.000+01:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -2,6 +2,13 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 description = "Testcontainers Core"
 
+repositories {
+    mavenCentral()
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 sourceSets {
     jarFileTest
 }
@@ -58,6 +65,8 @@ shadowJar {
         include(dependency('com.squareup.okio:.*'))
         include(dependency('org.scala-sbt.ipcsocket:ipcsocket'))
         include(dependency('org.glassfish.main.external:trilead-ssh2-repackaged'))
+        include(dependency('io.r2dbc:r2dbc-spi'))
+
     }
 }
 
@@ -72,6 +81,7 @@ task jarFileTest(type: Test) {
 project.tasks.check.dependsOn(jarFileTest)
 
 dependencies {
+    compile 'io.r2dbc:r2dbc-spi:1.0.0.M6'
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'org.jetbrains:annotations:16.0.3'
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
@@ -1,5 +1,11 @@
 description = "TestContainers :: Cassandra"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(":database-commons")
     compile "com.datastax.cassandra:cassandra-driver-core:3.5.1"
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: JDBC :: ClickHouse"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
     compile project(':jdbc')
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactory;
+import org.apache.commons.lang.NotImplementedException;
 import org.testcontainers.containers.wait.HttpWaitStrategy;
 
 import java.time.Duration;
@@ -54,6 +56,11 @@ public String getJdbcUrl() {
         return JDBC_URL_PREFIX + getContainerIpAddress() + ":" + getMappedPort(HTTP_PORT) + "/" + databaseName;
     }
 
+    @Override
+    public ConnectionFactory getR2dbcConnectionFactory() {
+        throw new NotImplementedException("ClickHouse is not yet supported by R2DBC");
+    }
+
     @Override
     public String getUsername() {
         return username;
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: Couchbase"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
     compile 'com.couchbase.client:java-client:2.7.2'
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: Database-Commons"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: Dynalite"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -1,5 +1,11 @@
 description = "TestContainers :: elasticsearch"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:6.5.4"
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: InfluxDB"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -2,6 +2,9 @@ repositories {
     maven {
         url "https://maven.atlassian.com/3rdparty/"
     }
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
 }
 
 dependencies {
@@ -20,6 +23,10 @@ dependencies {
     testCompile 'com.microsoft.sqlserver:mssql-jdbc:6.1.0.jre8'
     testCompile 'ru.yandex.clickhouse:clickhouse-jdbc:0.1.41'
 
+    testCompile 'io.r2dbc:r2dbc-client:1.0.0.M6'
+    testCompile 'io.r2dbc:r2dbc-mssql:1.0.0.M6'
+    testCompile 'io.r2dbc:r2dbc-postgresql:1.0.0.M6'
+
     testCompile 'com.zaxxer:HikariCP-java6:2.3.8'
     testCompile 'org.apache.tomcat:tomcat-jdbc:8.5.4'
     testCompile 'org.vibur:vibur-dbcp:9.0'
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMSSQLServerTest.java
@@ -2,6 +2,7 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import io.r2dbc.client.R2dbc;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
@@ -37,6 +38,13 @@ public void testSimple() throws SQLException {
         assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
     }
 
+    @Test
+    public void testR2dbcConnectionSuccessful() {
+        R2dbc r2dbc = new R2dbc(mssqlServer.getR2dbcConnectionFactory());
+        Object resultSetInt =  r2dbc.inTransaction(handle -> handle.createQuery("SELECT 1").mapRow(row -> row.get(""))).blockFirst();
+        assertEquals("A basic SELECT query succeeds", 1, resultSetInt);
+    }
+
     @Test
     public void testSetupDatabase() throws SQLException {
         HikariConfig hikariConfig = new HikariConfig();
diff --git a/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java b/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java
@@ -2,6 +2,7 @@
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import io.r2dbc.client.R2dbc;
 import org.junit.Test;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
@@ -42,6 +43,20 @@ public void testExplicitInitScript() throws SQLException {
         }
     }
 
+    @Test
+    public void testR2dbcConnectionSuccessful() {
+        try (PostgreSQLContainer postgres = new PostgreSQLContainer<>()
+            .withInitScript("somepath/init_postgresql.sql")) {
+            postgres.start();
+
+            R2dbc r2dbc = new R2dbc(postgres.getR2dbcConnectionFactory());
+            String queryResult = (String) r2dbc.inTransaction(handle ->
+                handle.createQuery("SELECT foo FROM bar").mapResult(result -> result.map((row, metadata) -> row.get("foo")))
+            ).blockFirst();
+            assertEquals("Value from init script should equal real value", "hello world", queryResult);
+        }
+    }
+
     private ResultSet performQuery(JdbcDatabaseContainer container, String sql) throws SQLException {
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setJdbcUrl(container.getJdbcUrl());
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: JDBC"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':database-commons')
 }
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -1,7 +1,8 @@
 package org.testcontainers.containers;
 
-import lombok.NonNull;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import io.r2dbc.spi.ConnectionFactory;
+import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
@@ -59,6 +60,11 @@ public JdbcDatabaseContainer(@NonNull final Future<String> image) {
      */
     public abstract String getJdbcUrl();
 
+    /**
+     * @return a R2DBC connection factory
+     */
+    public abstract ConnectionFactory getR2dbcConnectionFactory();
+
     /**
      * @return the database name
      */
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -1,5 +1,12 @@
 description = "Testcontainers :: JUnit Jupiter Extension"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
+
 dependencies {
     compile project(':testcontainers')
     compile 'org.junit.jupiter:junit-jupiter-api:5.3.2'
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: Kafka"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: Localstack"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':jdbc')
 
diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
@@ -1,5 +1,8 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactory;
+import org.apache.commons.lang.NotImplementedException;
+
 /**
  * Container implementation for the MariaDB project.
  *
@@ -59,6 +62,11 @@ public String getJdbcUrl() {
         return "jdbc:mariadb://" + getContainerIpAddress() + ":" + getMappedPort(MARIADB_PORT) + "/" + databaseName;
     }
 
+    @Override
+    public ConnectionFactory getR2dbcConnectionFactory() {
+        throw new NotImplementedException("MariaDB is not yet supported by R2DBC");
+    }
+
     @Override
     public String getDatabaseName() {
     	return databaseName;
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: MockServer"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':testcontainers')
 
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -1,5 +1,12 @@
 description = "Testcontainers :: MS SQL Server"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':jdbc')
+    compile 'io.r2dbc:r2dbc-mssql:1.0.0.M6'
 }
diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
@@ -1,5 +1,8 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.mssql.MssqlConnectionConfiguration;
+import io.r2dbc.mssql.MssqlConnectionFactory;
+import io.r2dbc.spi.ConnectionFactory;
 import org.testcontainers.utility.LicenseAcceptance;
 
 /**
@@ -52,6 +55,16 @@ public String getJdbcUrl() {
         return "jdbc:sqlserver://" + getContainerIpAddress() + ":" + getMappedPort(MS_SQL_SERVER_PORT);
     }
 
+    @Override
+    public ConnectionFactory getR2dbcConnectionFactory() {
+        return new MssqlConnectionFactory(MssqlConnectionConfiguration.builder()
+            .host(getContainerIpAddress())
+            .password(password)
+            .username(username)
+            .port(getFirstMappedPort())
+            .build());
+    }
+
     @Override
     public String getUsername() {
         return username;
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -1,5 +1,11 @@
 description = "Testcontainers :: JDBC :: MySQL"
 
+repositories{
+    maven {
+        url("https://repo.spring.io/milestone")
+    }
+}
+
 dependencies {
     compile project(':jdbc')
 
diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactory;
+import org.apache.commons.lang.NotImplementedException;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -64,6 +66,11 @@ public String getJdbcUrl() {
         return "jdbc:mysql://" + getContainerIpAddress() + ":" + getMappedPort(MYSQL_PORT) + "/" + databaseName;
     }
 
+    @Override
+    public ConnectionFactory getR2dbcConnectionFactory() {
+        throw new NotImplementedException("MySQL is not yet supported by R2DBC");
+    }
+
     @Override
     protected String constructUrlForConnection(String queryString) {
         String url = super.constructUrlForConnection(queryString);
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
