Skip to content

Commit 0fbd776

Browse files
committed
GH-194 - Switch to spring.modulith.events.jdbc.… namspace for data initialization properties.
The legacy ones are still supported but the data initialization properties have been moved to a new spring.modulith.events.jdbc.… namespace.
1 parent 646722b commit 0fbd776

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import javax.sql.DataSource;
1919

20+
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
2021
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2122
import org.springframework.boot.jdbc.DatabaseDriver;
2223
import org.springframework.context.annotation.Bean;
24+
import org.springframework.context.annotation.Conditional;
2325
import org.springframework.context.annotation.Configuration;
2426
import org.springframework.core.io.ResourceLoader;
2527
import org.springframework.jdbc.core.JdbcTemplate;
@@ -47,10 +49,28 @@ JdbcEventPublicationRepository jdbcEventPublicationRepository(JdbcTemplate jdbcT
4749
}
4850

4951
@Bean
50-
@ConditionalOnProperty(name = "spring.modulith.events.jdbc-schema-initialization.enabled", havingValue = "true")
52+
@Conditional(SchemaInitializationEnabled.class)
5153
DatabaseSchemaInitializer databaseSchemaInitializer(JdbcTemplate jdbcTemplate, ResourceLoader resourceLoader,
5254
DatabaseType databaseType) {
5355

5456
return new DatabaseSchemaInitializer(jdbcTemplate, resourceLoader, databaseType);
5557
}
58+
59+
/**
60+
* Combined condition to support the legacy schema initialization property as well as the new one.
61+
*
62+
* @author Oliver Drotbohm
63+
*/
64+
static class SchemaInitializationEnabled extends AnyNestedCondition {
65+
66+
public SchemaInitializationEnabled() {
67+
super(ConfigurationPhase.PARSE_CONFIGURATION);
68+
}
69+
70+
@ConditionalOnProperty(name = "spring.modulith.events.jdbc-schema-initialization.enabled", havingValue = "true")
71+
static class LegacyPropertyEnabled {}
72+
73+
@ConditionalOnProperty(name = "spring.modulith.events.jdbc.schema-initialization.enabled", havingValue = "true")
74+
static class NewPropertyEnabled {}
75+
}
5676
}

0 commit comments

Comments
 (0)