Update from deprecated API

AxonFramework · Apr 2, 2021 · 1c43a3d · 1c43a3d
1 parent 5e7d190
commit 1c43a3d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...rg/axonframework/extensions/reactor/eventhandling/gateway/DefaultReactorEventGateway.java b/...rg/axonframework/extensions/reactor/eventhandling/gateway/DefaultReactorEventGateway.java
@@ -9,6 +9,7 @@
 import org.axonframework.messaging.MetaData;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.context.ContextView;
 
 import java.util.List;
 import java.util.Objects;
@@ -66,16 +67,15 @@ public Flux<EventMessage<?>> publish(List<?> events) {
 
     private Mono<EventMessage<?>> createEventMessage(Object event) {
         return Mono.just(event)
-                .zipWith(metaDataFromContext())
-                .map(eventAndMeta -> GenericEventMessage.asEventMessage(eventAndMeta.getT1())
-                        .andMetaData(eventAndMeta.getT2()));
+                .transformDeferredContextual((eventMono,contextView) ->
+                        eventMono.map(ev -> GenericEventMessage.asEventMessage(ev)
+                                .andMetaData(metaDataFromContext(contextView))
+                        ));
+
     }
 
-    private Mono<MetaData> metaDataFromContext() {
-        return Mono.subscriberContext()
-                .handle((ctx,sink) -> sink.next(Objects.requireNonNull(
-                        ctx.getOrDefault(MetaData.class, MetaData.emptyInstance())
-                )));
+    private MetaData metaDataFromContext(ContextView contextView) {
+        return contextView.getOrDefault(MetaData.class, MetaData.emptyInstance());
     }
 
     @Override