Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-823 - Move spring.modulith.republish-outstanding-events-on-restart into spring.modulith.events namespace.

Browse Source
This commit is contained in:
Oliver Drotbohm
2024-09-13 17:51:22 +02:00
parent bec0a35da2
commit db4ab8f55d
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java
View File

@@ -19,6 +19,7 @@ import java.lang.reflect.Method;
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -68,7 +69,8 @@ public class PersistentApplicationEventMulticaster extends AbstractApplicationEv
private static final Method SHOULD_HANDLE = ReflectionUtils.findMethod(ApplicationListenerMethodAdapter.class,
"shouldHandle", ApplicationEvent.class);
static final String REPUBLISH_ON_RESTART = "spring.modulith.republish-outstanding-events-on-restart";
static final String REPUBLISH_ON_RESTART = "spring.modulith.events.republish-outstanding-events-on-restart";
static final String REPUBLISH_ON_RESTART_LEGACY = "spring.modulith.republish-outstanding-events-on-restart";
private final @NonNull Supplier<EventPublicationRegistry> registry;
private final @NonNull Supplier<Environment> environment;
@@ -169,7 +171,12 @@ public class PersistentApplicationEventMulticaster extends AbstractApplicationEv
@Override
public void afterSingletonsInstantiated() {
if (!Boolean.TRUE.equals(environment.get().getProperty(REPUBLISH_ON_RESTART, Boolean.class))) {
var env = environment.get();
Boolean republishOnRestart = Optional.ofNullable(env.getProperty(REPUBLISH_ON_RESTART, Boolean.class))
.orElseGet(() -> env.getProperty(REPUBLISH_ON_RESTART_LEGACY, Boolean.class));
if (!Boolean.TRUE.equals(republishOnRestart)) {
return;
}

13
spring-modulith-events/spring-modulith-events-core/src/main/resources/META-INF/spring-configuration-metadata.json
View File

@@ -10,7 +10,12 @@
"name": "spring.modulith.republish-outstanding-events-on-restart",
"type": "java.lang.Boolean",
"description": "Whether to republish outstanding event publications on restarts of the application.",
"defaultValue": "false"
"defaultValue": "false",
"deprecation": {
"replacement": "spring.modulith.events.republish-outstanding-events-on-restart",
"reason": "Moved to spring.modulit.events namespace. To be removed in 1.4.",
"since" : "1.3"
}
},
{
"name": "spring.modulith.events.externalization.enabled",
@@ -23,6 +28,12 @@
"type": "org.springframework.modulith.events.support.CompletionMode",
"description": "How to complete event publications.",
"defaultValue": "update"
},
{
"name": "spring.modulith.events.republish-outstanding-events-on-restart",
"type": "java.lang.Boolean",
"description": "Whether to republish outstanding event publications on restarts of the application.",
"defaultValue": "false"
}
]
}

12
spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterUnitTests.java
View File

@@ -76,6 +76,18 @@ class PersistentApplicationEventMulticasterUnitTests {
verify(registry).processIncompletePublications(any(), any(), any());
}
@Test // GH-240, GH-251, GH-823
void triggersRepublicationIfLegacyConfigExplicitlyEnabled() {
var source = new MapPropertySource("test",
Map.of(PersistentApplicationEventMulticaster.REPUBLISH_ON_RESTART_LEGACY, "true"));
environment.getPropertySources().addFirst(source);
multicaster.afterSingletonsInstantiated();
verify(registry).processIncompletePublications(any(), any(), any());
}
@Test // GH-277
void honorsListenerCondition() throws Exception {