From f8da2e86a829d0446f09d6f9ed0c5551eb16a053 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 5 Jul 2023 17:34:23 +0200 Subject: [PATCH] GH-232 - Improve configuration property metadata in Event Publication Registry. --- .../src/main/resources/META-INF/spring.factories | 2 -- .../META-INF/spring-configuration-metadata.json | 2 +- .../mongodb/MongoDbTransactionAutoConfiguration.java | 2 +- .../META-INF/spring-configuration-metadata.json | 10 ++++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories create mode 100644 spring-modulith-events/spring-modulith-events-mongodb/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories b/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 0e2890c4..00000000 --- a/spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.modulith.events.config.EventPublicationConfiguration diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/main/resources/META-INF/spring-configuration-metadata.json b/spring-modulith-events/spring-modulith-events-jdbc/src/main/resources/META-INF/spring-configuration-metadata.json index 28d20319..d7f407f1 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/main/resources/META-INF/spring-configuration-metadata.json @@ -1,7 +1,7 @@ { "properties": [ { - "name": "spring.modulith.events.jdbc-schema-initialization.enabled", + "name": "spring.modulith.events.jdbc.schema-initialization.enabled", "type": "java.lang.boolean", "description": "Whether to initialize the JDBC event publication schema.", "defaultValue": "false" diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java index 2599de46..6f9a40c9 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.transaction.support.TransactionTemplate; */ @AutoConfiguration @AutoConfigureBefore(TransactionAutoConfiguration.class) -@ConditionalOnProperty(// +@ConditionalOnProperty( name = "spring.modulith.events.mongodb.transaction-management.enabled", havingValue = "true", matchIfMissing = true) diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/main/resources/META-INF/spring-configuration-metadata.json b/spring-modulith-events/spring-modulith-events-mongodb/src/main/resources/META-INF/spring-configuration-metadata.json new file mode 100644 index 00000000..22d21078 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/main/resources/META-INF/spring-configuration-metadata.json @@ -0,0 +1,10 @@ +{ + "properties": [ + { + "name": "spring.modulith.events.mongodb.transaction-management.enabled", + "type": "java.lang.boolean", + "description": "Whether to automatically enable transactions for MongoDB. Requires the database to be run with a replica set.", + "defaultValue": "true" + } + ] +}