diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java index af77f19a..0de3a211 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java @@ -47,7 +47,7 @@ class JdbcEventPublicationAutoConfiguration implements EventPublicationConfigura } @Bean - @ConditionalOnProperty(name = "spring.modulith.events.schema-initialization.enabled", havingValue = "true") + @ConditionalOnProperty(name = "spring.modulith.events.jdbc-schema-initialization.enabled", havingValue = "true") DatabaseSchemaInitializer databaseSchemaInitializer(JdbcTemplate jdbcTemplate, ResourceLoader resourceLoader, DatabaseType databaseType) { diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java index b8c91edd..674f8b3c 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java @@ -52,7 +52,7 @@ class DatabaseSchemaInitializerIntegrationTests { } @Nested - @JdbcTest(properties = "spring.modulith.events.schema-initialization.enabled=true") + @JdbcTest(properties = "spring.modulith.events.jdbc-schema-initialization.enabled=true") static class WithInitEnabled extends TestBase { @Autowired JdbcOperations operations; @@ -70,7 +70,7 @@ class DatabaseSchemaInitializerIntegrationTests { } @Nested - @JdbcTest(properties = "spring.modulith.events.schema-initialization.enabled=false") + @JdbcTest(properties = "spring.modulith.events.jdbc-schema-initialization.enabled=false") static class WithInitDisabled extends TestBase { @SpyBean JdbcOperations operations; @@ -107,10 +107,12 @@ class DatabaseSchemaInitializerIntegrationTests { @Nested @ActiveProfiles("hsqldb") + @Testcontainers(disabledWithoutDocker = false) class HSQLDB extends WithInitEnabled {} @Nested @ActiveProfiles("h2") + @Testcontainers(disabledWithoutDocker = false) class H2 extends WithInitEnabled {} @Nested diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java index 668459c0..e1966db9 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.modulith.testapp.TestApplication; */ @SpringBootTest( classes = TestApplication.class, - properties = "spring.modulith.events.schema-initialization.enabled=true") + properties = "spring.modulith.events.jdbc-schema-initialization.enabled=true") class JdbcEventPublicationAutoConfigurationIntegrationTests { @Autowired ApplicationContext context; diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-h2.properties b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-h2.properties index aaed5bb6..41a8d9af 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-h2.properties +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-h2.properties @@ -3,4 +3,4 @@ spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1 spring.test.database.replace=NONE -spring.modulith.events.schema-initialization.enabled=true +spring.modulith.jdbc-events.schema-initialization.enabled=true diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-hsqldb.properties b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-hsqldb.properties index d639b426..922d66d6 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-hsqldb.properties +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-hsqldb.properties @@ -3,4 +3,4 @@ spring.datasource.url=jdbc:hsqldb:mem:testdb;DB_CLOSE_DELAY=-1 spring.test.database.replace=NONE -spring.modulith.events.schema-initialization.enabled=true +spring.modulith.events.jdbc-schema-initialization.enabled=true diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-mysql.properties b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-mysql.properties index 555869e3..e2338019 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-mysql.properties +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-mysql.properties @@ -3,4 +3,4 @@ spring.datasource.driverClassName=org.testcontainers.jdbc.ContainerDatabaseDrive spring.test.database.replace=NONE -spring.modulith.events.schema-initialization.enabled=true +spring.modulith.events.jdbc-schema-initialization.enabled=true diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-postgres.properties b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-postgres.properties index eda12d26..02859297 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-postgres.properties +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/resources/application-postgres.properties @@ -3,4 +3,4 @@ spring.datasource.driverClassName=org.testcontainers.jdbc.ContainerDatabaseDrive spring.test.database.replace=NONE -spring.modulith.events.schema-initialization.enabled=true +spring.modulith.events.jdbc-schema-initialization.enabled=true