Skip to content

Commit 7c024ed

Browse files
authored
Declarative R2DBC SPI implementation (#9447)
Avoid usage of `com.google.auto.service:auto-service`.
1 parent e7fc113 commit 7c024ed

File tree

21 files changed

+7
-35
lines changed

21 files changed

+7
-35
lines changed

modules/mariadb/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: JDBC :: MariaDB"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.spi.ConnectionFactoryMetadata;
54
import io.r2dbc.spi.ConnectionFactoryOptions;
65
import org.mariadb.r2dbc.MariadbConnectionFactoryProvider;
@@ -9,7 +8,6 @@
98

109
import javax.annotation.Nullable;
1110

12-
@AutoService(R2DBCDatabaseContainerProvider.class)
1311
public class MariaDBR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1412

1513
static final String DRIVER = MariadbConnectionFactoryProvider.MARIADB_DRIVER;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.containers.MariaDBR2DBCDatabaseContainerProvider

modules/mssqlserver/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: MS SQL Server"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.mssql.MssqlConnectionFactoryProvider;
54
import io.r2dbc.spi.ConnectionFactoryMetadata;
65
import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
98

109
import javax.annotation.Nullable;
1110

12-
@AutoService(R2DBCDatabaseContainerProvider.class)
1311
public class MSSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1412

1513
static final String DRIVER = MssqlConnectionFactoryProvider.MSSQL_DRIVER;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.containers.MSSQLR2DBCDatabaseContainerProvider

modules/mysql/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: JDBC :: MySQL"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/mysql/src/main/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import com.google.auto.service.AutoService;
43
import io.asyncer.r2dbc.mysql.MySqlConnectionFactoryProvider;
54
import io.r2dbc.spi.ConnectionFactoryMetadata;
65
import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
98

109
import javax.annotation.Nullable;
1110

12-
@AutoService(R2DBCDatabaseContainerProvider.class)
1311
public class MySQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1412

1513
static final String DRIVER = MySqlConnectionFactoryProvider.MYSQL_DRIVER;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.containers.MySQLR2DBCDatabaseContainerProvider

modules/oracle-free/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: JDBC :: Oracle Database Free"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.testcontainers.oracle;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.spi.ConnectionFactoryMetadata;
54
import io.r2dbc.spi.ConnectionFactoryOptions;
65
import org.jetbrains.annotations.Nullable;
76
import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
87
import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
98

10-
@AutoService(R2DBCDatabaseContainerProvider.class)
119
public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1210

1311
static final String DRIVER = "oracle";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.oracle.OracleR2DBCDatabaseContainerProvider

modules/oracle-xe/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: JDBC :: Oracle XE"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.testcontainers.containers;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.spi.ConnectionFactoryMetadata;
54
import io.r2dbc.spi.ConnectionFactoryOptions;
65
import org.jetbrains.annotations.Nullable;
76
import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
87
import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
98

10-
@AutoService(R2DBCDatabaseContainerProvider.class)
119
public class OracleR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1210

1311
static final String DRIVER = "oracle";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.containers.OracleR2DBCDatabaseContainerProvider

modules/postgresql/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
description = "Testcontainers :: JDBC :: PostgreSQL"
22

33
dependencies {
4-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
5-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
6-
74
api project(':jdbc')
85

96
compileOnly project(':r2dbc')

modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.postgresql.PostgresqlConnectionFactoryProvider;
54
import io.r2dbc.spi.ConnectionFactoryMetadata;
65
import io.r2dbc.spi.ConnectionFactoryOptions;
@@ -9,7 +8,6 @@
98

109
import javax.annotation.Nullable;
1110

12-
@AutoService(R2DBCDatabaseContainerProvider.class)
1311
public final class PostgreSQLR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
1412

1513
static final String DRIVER = PostgresqlConnectionFactoryProvider.POSTGRESQL_DRIVER;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.containers.PostgreSQLR2DBCDatabaseContainerProvider

modules/r2dbc/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ plugins {
55
description = "Testcontainers :: R2DBC"
66

77
dependencies {
8-
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
9-
compileOnly 'com.google.auto.service:auto-service:1.1.1'
10-
118
api project(':testcontainers')
129
api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
1310

modules/r2dbc/src/main/java/org/testcontainers/r2dbc/Hidden.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testcontainers.r2dbc;
22

3-
import com.google.auto.service.AutoService;
43
import io.r2dbc.spi.ConnectionFactory;
54
import io.r2dbc.spi.ConnectionFactoryOptions;
65
import io.r2dbc.spi.ConnectionFactoryProvider;
@@ -10,7 +9,6 @@
109
*/
1110
class Hidden {
1211

13-
@AutoService(ConnectionFactoryProvider.class)
1412
public static final class TestcontainersR2DBCConnectionFactoryProvider implements ConnectionFactoryProvider {
1513

1614
public static final String DRIVER = "tc";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.testcontainers.r2dbc.Hidden$TestcontainersR2DBCConnectionFactoryProvider

0 commit comments

Comments
 (0)