Skip to content

Commit

Permalink
Reverts changes made to workaround liquibase issue: liquibase/liquiba…
Browse files Browse the repository at this point in the history
…se#4763 since we've updated to liquibase 4.24.0
  • Loading branch information
appiepollo14 committed Oct 23, 2023
1 parent 40f7bc9 commit d0f28ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.quarkus.liquibase;

import java.util.Map;
import java.util.stream.Collectors;

import javax.sql.DataSource;

Expand Down Expand Up @@ -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);
}

/**
Expand Down

0 comments on commit d0f28ac

Please sign in to comment.