stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debugs for EventBus and fixed unsubscribe all (#266)

Browse Source 
* Added unsubscribe to EventFlow. ListenerHandler now functional. GlobalEventbus now user listenerHandler

* getAllListeners

* Removed nulls

* Fixed stress tests

* Added docs, no more list creation when adding events to the bus.

* Fixed unsubscribe not working.

* Moved away from deprecated functions

* moved from wildcard to typed

* Moved away from deprecated function

* Added debugging to GlobalEventBus

* Fixed cleaning flow

* Fixed unsubscribe all

* Fixed unsubscribe all

* Removed unused import
This commit is contained in:
Bas Antonius de Jong
2025-11-30 17:15:14 +01:00
committed by GitHub
parent 25c02c7ad0
commit 81740acd04
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/org/toop/framework/eventbus/EventFlow.java
View File

@@ -464,14 +464,17 @@ public class EventFlow {
* Unsubscribe all events.
*/
public void unsubscribeAll() {
this.listeners.forEach(this::unsubscribe);
listeners.removeIf(handler -> {
GlobalEventBus.unsubscribe(handler);
return true;
});
}
/**
* Clean and remove everything inside {@link EventFlow}.
*/
private void clean() {
this.listeners.clear();
unsubscribeAll();
this.event = null;
this.result = null;
} // TODO

9
framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
View File

@@ -6,6 +6,9 @@ import com.lmax.disruptor.dsl.ProducerType;
import java.util.Map;
import java.util.concurrent.*;
import java.util.function.Consumer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.eventbus.events.EventType;
import org.toop.framework.eventbus.events.UniqueEvent;
@@ -14,6 +17,7 @@ import org.toop.framework.eventbus.events.UniqueEvent;
* publishing.
*/
public final class GlobalEventBus {
private static final Logger logger = LogManager.getLogger(GlobalEventBus.class);
/** Map of event class to type-specific listeners. */
private static final Map<Class<?>, CopyOnWriteArrayList<ListenerHandler<?>>>
@@ -73,6 +77,7 @@ public final class GlobalEventBus {
// Subscription
// ------------------------------------------------------------------------
public static <T extends EventType> void subscribe(ListenerHandler<T> listener) {
logger.debug("Subscribing to {}: {}", listener.getListenerClass().getSimpleName(), listener.getListener().getClass().getSimpleName());
LISTENERS.computeIfAbsent(listener.getListenerClass(), _ -> new CopyOnWriteArrayList<>()).add(listener);
}
@@ -85,7 +90,7 @@ public final class GlobalEventBus {
}
public static void unsubscribe(ListenerHandler<?> listener) {
// TODO suspicious call
logger.debug("Unsubscribing from {}: {}", listener.getListenerClass().getSimpleName(), listener.getListener().getClass().getSimpleName());
LISTENERS.getOrDefault(listener.getListenerClass(), new CopyOnWriteArrayList<>())
.remove(listener);
LISTENERS.entrySet().removeIf(entry -> entry.getValue().isEmpty());
@@ -129,6 +134,8 @@ public final class GlobalEventBus {
private static void dispatchEvent(EventType event) {
Class<?> clazz = event.getClass();
logger.debug("Triggered event: {}", event.getClass().getSimpleName());
CopyOnWriteArrayList<ListenerHandler<?>> classListeners = LISTENERS.get(clazz);
if (classListeners != null) {
for (ListenerHandler<?> listener : classListeners) {