From b12882855371f5181e3c47734d372176c143b59c Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 15 Dec 2022 15:49:18 +0100 Subject: [PATCH 1/3] Improve warnings and error messages in DevServicesDatasourceProcessor --- .../devservices/DevServicesDatasourceProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java index 627712c359bfa..468fff82eae9d 100644 --- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java +++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java @@ -200,8 +200,8 @@ private RunningDevService startDevDb(String dbName, boolean explicitlyDisabled = !(dataSourceBuildTimeConfig.devservices.enabled.orElse(true)); if (explicitlyDisabled) { //explicitly disabled - log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName) - + " as it has been disabled in the config"); + log.debug("Not starting Dev Services for " + (dbName == null ? "default datasource" : dbName) + + " as it has been disabled in the configuration"); return null; } @@ -222,8 +222,8 @@ private RunningDevService startDevDb(String dbName, List configHandlers = configurationHandlerBuildItems .get(defaultDbKind.get()); if (devDbProvider == null || configHandlers == null) { - log.warn("Unable to start devservices for " + (dbName == null ? "default datasource" : dbName) - + " as this datasource type (" + defaultDbKind.get() + ") does not support devservices"); + log.warn("Unable to start Dev Services for " + (dbName == null ? "default datasource" : dbName) + + " as this datasource type (" + defaultDbKind.get() + ") does not support Dev Services"); return null; } @@ -232,7 +232,7 @@ private RunningDevService startDevDb(String dbName, if (i.getCheckConfiguredFunction().test(dbName)) { //this database has explicit configuration //we don't start the devservices - log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName) + log.debug("Not starting Dev Services for " + (dbName == null ? "default datasource" : dbName) + " as it has explicit configuration"); return null; } From cc6ed44eda63eecda0ceabaa48a16e2fe43890d1 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 15 Dec 2022 16:01:42 +0100 Subject: [PATCH 2/3] Fix the reactive URL for MariaDB Dev Services --- .../mariadb/deployment/MariaDBDevServicesProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java b/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java index 50046b1b90d37..3668d11dcfee4 100644 --- a/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java +++ b/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java @@ -118,7 +118,7 @@ public String getEffectiveJdbcUrl() { } public String getReactiveUrl() { - return getEffectiveJdbcUrl().replaceFirst("jdbc:", "vertx-reactive:"); + return getEffectiveJdbcUrl().replaceFirst("jdbc:mariadb:", "vertx-reactive:mysql:"); } } } From 69eea652c065bd2481009dcb7bef1b6cd474e423 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 15 Dec 2022 16:02:06 +0100 Subject: [PATCH 3/3] Support MariaDB Dev Services in reactive-mysql-client Fixes #29891 --- extensions/reactive-mysql-client/deployment/pom.xml | 4 ++++ .../client/deployment/ReactiveMySQLClientProcessor.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml index 3ea61350604b3..19c3517b65487 100644 --- a/extensions/reactive-mysql-client/deployment/pom.xml +++ b/extensions/reactive-mysql-client/deployment/pom.xml @@ -60,6 +60,10 @@ io.quarkus quarkus-devservices-mysql + + io.quarkus + quarkus-devservices-mariadb + io.quarkus diff --git a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java index b763f424b52d3..2354842e7865c 100644 --- a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java +++ b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java @@ -84,8 +84,9 @@ ServiceStartBuildItem build(BuildProducer feature, } @BuildStep - DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() { - return DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MYSQL); + List devDbHandler() { + return List.of(DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MYSQL), + DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MARIADB)); } @BuildStep