Skip to content

Commit 03e4ab7

Browse files
simplify liquibase handling
1 parent 4c7c12a commit 03e4ab7

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/de/tum/cit/aet/artemis/core/config/LiquibaseConfiguration.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.tum.cit.aet.artemis.core.config;
22

33
import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
4-
import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE;
54
import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST;
65

76
import java.sql.SQLException;
@@ -12,6 +11,7 @@
1211
import org.slf4j.Logger;
1312
import org.slf4j.LoggerFactory;
1413
import org.springframework.beans.factory.ObjectProvider;
14+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
1515
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
1616
import org.springframework.boot.autoconfigure.liquibase.LiquibaseDataSource;
1717
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
@@ -36,6 +36,7 @@
3636
@Profile(PROFILE_CORE)
3737
@Configuration
3838
@Lazy
39+
@ConditionalOnBooleanProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true)
3940
public class LiquibaseConfiguration {
4041

4142
private static final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
@@ -74,7 +75,7 @@ public SpringLiquibase liquibase(@LiquibaseDataSource ObjectProvider<DataSource>
7475
this.dataSource = dataSourceObjectProvider.getIfUnique();
7576
this.currentVersionString = buildProperties.getVersion();
7677

77-
if (!env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST)) && !env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE))) {
78+
if (!env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST))) {
7879
this.databaseMigration = new DatabaseMigration(currentVersionString, dataSource, optionalHeliosClient);
7980
databaseMigration.checkMigrationPath();
8081
}
@@ -119,8 +120,8 @@ public SpringLiquibase liquibase(@LiquibaseDataSource ObjectProvider<DataSource>
119120
*/
120121
@EventListener
121122
public void storeCurrentVersionToDatabase(ApplicationReadyEvent event) {
122-
if (env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST)) || env.acceptsProfiles(Profiles.of(SPRING_PROFILE_NO_LIQUIBASE))) {
123-
return; // Do not perform any operations if the application is running in the test or no-liquibase profile.
123+
if (env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST))) {
124+
return; // Do not perform any operations if the application is running in the test profile.
124125
}
125126

126127
String sqlStatement = this.databaseMigration.getPreviousVersionString() == null ? "INSERT INTO artemis_version (latest_version) VALUES(?);"

src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.tum.cit.aet.artemis.core.config.migration;
22

33
import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE_AND_SCHEDULING;
4-
import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE;
54
import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST;
65

76
import java.nio.charset.StandardCharsets;
@@ -21,6 +20,7 @@
2120
import org.slf4j.LoggerFactory;
2221
import org.springframework.beans.factory.annotation.Value;
2322
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
23+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2424
import org.springframework.boot.context.event.ApplicationReadyEvent;
2525
import org.springframework.context.annotation.Lazy;
2626
import org.springframework.context.annotation.Profile;
@@ -38,6 +38,7 @@
3838
@Lazy
3939
@Service
4040
@Profile(PROFILE_CORE_AND_SCHEDULING)
41+
@ConditionalOnBooleanProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true)
4142
public class MigrationService {
4243

4344
private static final Logger log = LoggerFactory.getLogger(MigrationService.class);
@@ -65,7 +66,7 @@ public MigrationService(MigrationChangeRepository migrationChangeRepository, Aut
6566
*/
6667
public void execute(ApplicationReadyEvent event, SortedMap<Integer, Class<? extends MigrationEntry>> entryClassMap) throws MigrationIntegrityException {
6768
Environment env = event.getApplicationContext().getEnvironment();
68-
if (env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST)) || env.acceptsProfiles(Profiles.of(SPRING_PROFILE_NO_LIQUIBASE))) {
69+
if (env.acceptsProfiles(Profiles.of(SPRING_PROFILE_TEST))) {
6970
return;
7071
}
7172

0 commit comments

Comments
 (0)