fix : issue with starting application

rajadilipkolli · Jan 5, 2024 · 3f11332 · 3f11332
1 parent 67d9dde
commit 3f11332
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/...ancy/src/main/java/com/example/multitenancy/config/multitenant/MultiDatasourceConfig.java b/...ancy/src/main/java/com/example/multitenancy/config/multitenant/MultiDatasourceConfig.java
@@ -2,12 +2,13 @@
 
 import com.zaxxer.hikari.HikariDataSource;
 import javax.sql.DataSource;
+import liquibase.UpdateSummaryEnum;
+import liquibase.UpdateSummaryOutputEnum;
 import liquibase.integration.spring.SpringLiquibase;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -39,7 +40,6 @@ LiquibaseProperties primaryLiquibaseProperties() {
     }
 
     @Bean
-    @DependsOnDatabaseInitialization
     SpringLiquibase primaryLiquibase(
             @Qualifier("primaryDataSource") DataSource primaryDataSource,
             @Qualifier("primaryLiquibaseProperties")
@@ -68,7 +68,6 @@ LiquibaseProperties secondaryLiquibaseProperties() {
     }
 
     @Bean
-    @DependsOnDatabaseInitialization
     SpringLiquibase secondaryLiquibase(
             @Qualifier("secondaryDataSource") DataSource secondaryDataSource,
             @Qualifier("secondaryLiquibaseProperties")
@@ -95,6 +94,13 @@ private SpringLiquibase springLiquibase(DataSource dataSource, LiquibaseProperti
         liquibase.setRollbackFile(properties.getRollbackFile());
         liquibase.setTestRollbackOnUpdate(properties.isTestRollbackOnUpdate());
         liquibase.setTag(properties.getTag());
+        if (properties.getShowSummary() != null) {
+            liquibase.setShowSummary(UpdateSummaryEnum.valueOf(properties.getShowSummary().name()));
+        }
+        if (properties.getShowSummaryOutput() != null) {
+            liquibase.setShowSummaryOutput(
+                    UpdateSummaryOutputEnum.valueOf(properties.getShowSummaryOutput().name()));
+        }
         return liquibase;
     }
 }
diff --git a/...b/src/main/java/com/example/multitenancy/db/config/multitenant/MultiDatasourceConfig.java b/...b/src/main/java/com/example/multitenancy/db/config/multitenant/MultiDatasourceConfig.java
@@ -2,12 +2,13 @@
 
 import com.zaxxer.hikari.HikariDataSource;
 import javax.sql.DataSource;
+import liquibase.UpdateSummaryEnum;
+import liquibase.UpdateSummaryOutputEnum;
 import liquibase.integration.spring.SpringLiquibase;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -39,7 +40,6 @@ LiquibaseProperties primaryLiquibaseProperties() {
     }
 
     @Bean
-    @DependsOnDatabaseInitialization
     SpringLiquibase primaryLiquibase(
             @Qualifier("primaryDataSource") DataSource primaryDataSource,
             @Qualifier("primaryLiquibaseProperties")
@@ -68,7 +68,6 @@ LiquibaseProperties secondaryLiquibaseProperties() {
     }
 
     @Bean
-    @DependsOnDatabaseInitialization
     SpringLiquibase secondaryLiquibase(
             @Qualifier("secondaryDataSource") DataSource secondaryDataSource,
             @Qualifier("secondaryLiquibaseProperties")
@@ -95,6 +94,13 @@ private SpringLiquibase springLiquibase(DataSource dataSource, LiquibaseProperti
         liquibase.setRollbackFile(properties.getRollbackFile());
         liquibase.setTestRollbackOnUpdate(properties.isTestRollbackOnUpdate());
         liquibase.setTag(properties.getTag());
+        if (properties.getShowSummary() != null) {
+            liquibase.setShowSummary(UpdateSummaryEnum.valueOf(properties.getShowSummary().name()));
+        }
+        if (properties.getShowSummaryOutput() != null) {
+            liquibase.setShowSummaryOutput(
+                    UpdateSummaryOutputEnum.valueOf(properties.getShowSummaryOutput().name()));
+        }
         return liquibase;
     }
 }