chore(liquibase): handle change in LiquibaseProperties

Contexts and labelFilter are now a collection and not a string anymore
jhipster · Dec 4, 2024 · 3967ecb · 3967ecb
1 parent baa9fa6
commit 3967ecb
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...nerator/server/springboot/dbmigration/liquibase/main/LiquibaseConfiguration.java.mustache b/...nerator/server/springboot/dbmigration/liquibase/main/LiquibaseConfiguration.java.mustache
@@ -15,6 +15,9 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import {{packageName}}.shared.generation.domain.ExcludeFromGeneratedCodeCoverage;
 
 @Configuration
 @EnableConfigurationProperties({ LiquibaseProperties.class })
@@ -32,6 +35,7 @@ class LiquibaseConfiguration {
   }
 
   @Bean
+  @ExcludeFromGeneratedCodeCoverage(reason = "Not testing all liquibase properties configuration")
   public SpringLiquibase liquibase(
     @Qualifier("taskExecutor") Executor executor,
     @LiquibaseDataSource ObjectProvider<DataSource> liquibaseDataSource,
@@ -60,14 +64,18 @@ class LiquibaseConfiguration {
       );
     }
     liquibase.setChangeLog(liquibaseProperties.getChangeLog());
-    liquibase.setContexts(liquibaseProperties.getContexts());
+    if (!CollectionUtils.isEmpty(liquibaseProperties.getContexts())) {
+      liquibase.setContexts(StringUtils.collectionToCommaDelimitedString(liquibaseProperties.getContexts()));
+    }
     liquibase.setDefaultSchema(liquibaseProperties.getDefaultSchema());
     liquibase.setLiquibaseSchema(liquibaseProperties.getLiquibaseSchema());
     liquibase.setLiquibaseTablespace(liquibaseProperties.getLiquibaseTablespace());
     liquibase.setDatabaseChangeLogLockTable(liquibaseProperties.getDatabaseChangeLogLockTable());
     liquibase.setDatabaseChangeLogTable(liquibaseProperties.getDatabaseChangeLogTable());
     liquibase.setDropFirst(liquibaseProperties.isDropFirst());
-    liquibase.setLabelFilter(liquibaseProperties.getLabelFilter());
+    if (!CollectionUtils.isEmpty(liquibaseProperties.getLabelFilter())) {
+      liquibase.setContexts(StringUtils.collectionToCommaDelimitedString(liquibaseProperties.getLabelFilter()));
+    }
     liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
     liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
     liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());