From 04590cffea5d72e547c3e31bee353f4fbce4d24e Mon Sep 17 00:00:00 2001 From: asjervanasten Date: Fri, 20 Oct 2023 20:48:10 +0200 Subject: [PATCH] Reverts changes made to workaround liquibase issue: https://github.com/liquibase/liquibase/issues/4763 since we've updated to liquibase 4.24.0 --- .../quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java | 5 +---- .../main/java/io/quarkus/liquibase/LiquibaseFactory.java | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java index e98532a448bae6..e8744a52b193a9 100644 --- a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java @@ -3,7 +3,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import io.quarkus.liquibase.mongodb.runtime.LiquibaseMongodbBuildTimeConfig; import io.quarkus.liquibase.mongodb.runtime.LiquibaseMongodbConfig; @@ -92,9 +91,7 @@ public LiquibaseMongodbConfig getConfiguration() { * @return the label expression */ public LabelExpression createLabels() { - // need to join because of https://github.com/liquibase/liquibase/issues/4763 - return new LabelExpression( - liquibaseMongodbConfig.labels.map(labels -> labels.stream().collect(Collectors.joining(","))).orElse(null)); + return new LabelExpression(liquibaseMongodbConfig.labels.orElse(null)); } /** diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java index dd66fe3cb15acf..00b34a5af882cc 100644 --- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java +++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java @@ -1,7 +1,6 @@ package io.quarkus.liquibase; import java.util.Map; -import java.util.stream.Collectors; import javax.sql.DataSource; @@ -72,10 +71,7 @@ public LiquibaseConfig getConfiguration() { * @return the label expression */ public LabelExpression createLabels() { - // need to join because of https://github.com/liquibase/liquibase/issues/4763 - return new LabelExpression(config.labels != null - ? config.labels.stream().collect(Collectors.joining(",")) - : null); + return new LabelExpression(config.labels); } /**