Skip to content

[2.4] Provide access to the contextual data map #2218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged

[2.4] Provide access to the contextual data map #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...eactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
*/
package org.hibernate.reactive.context.impl;

import org.hibernate.reactive.context.Context;

import io.vertx.core.impl.ContextInternal;
import io.vertx.core.spi.context.storage.AccessMode;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import io.vertx.core.impl.VertxBuilder;
Expand All @@ -17,9 +23,18 @@
public class ContextualDataStorage implements VertxServiceProvider {

@SuppressWarnings("rawtypes")
final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );
private final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );

@Override
public void init(VertxBuilder vertxBuilder) {
}

@SuppressWarnings({ "unchecked" })
public static <T> Map<Context.Key<T>, T> contextualDataMap(ContextInternal vertxContext) {
return vertxContext.getLocal(
ContextualDataStorage.CONTEXTUAL_DATA_KEY,
AccessMode.CONCURRENT,
ConcurrentHashMap::new
);
}
}
18 changes: 4 additions & 14 deletions hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
package org.hibernate.reactive.context.impl;

import java.lang.invoke.MethodHandles;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import io.vertx.core.Vertx;
import io.vertx.core.impl.ContextInternal;
import io.vertx.core.spi.context.storage.AccessMode;

import org.hibernate.reactive.context.Context;
import org.hibernate.reactive.logging.impl.Log;
Expand All @@ -20,6 +17,8 @@
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

import static org.hibernate.reactive.context.impl.ContextualDataStorage.contextualDataMap;

/**
* An adaptor for the Vert.x {@link io.vertx.core.Context}.
*
Expand All @@ -42,7 +41,7 @@ public <T> void put(Key<T> key, T instance) {
final ContextInternal context = ContextInternal.current();
if ( context != null ) {
if ( trace ) LOG.tracef( "Putting key,value in context: [%1$s, %2$s]", key, instance );
VertxContext.<T>contextualDataMap( context ).put( key, instance );
ContextualDataStorage.<T>contextualDataMap( context ).put( key, instance );
}
else {
if ( trace ) LOG.tracef( "Context is null for key,value: [%1$s, %2$s]", key, instance );
Expand All @@ -54,7 +53,7 @@ public <T> void put(Key<T> key, T instance) {
public <T> T get(Key<T> key) {
final ContextInternal context = ContextInternal.current();
if ( context != null ) {
T local = VertxContext.<T>contextualDataMap( context ).get( key );
T local = ContextualDataStorage.<T>contextualDataMap( context ).get( key );
if ( trace ) LOG.tracef( "Getting value %2$s from context for key %1$s", key, local );
return local;
}
Expand Down Expand Up @@ -94,13 +93,4 @@ public void execute(Runnable runnable) {
runnable.run();
}
}

@SuppressWarnings({ "unchecked" })
private static <T> ConcurrentMap<Key<T>, T> contextualDataMap(ContextInternal vertxContext) {
return vertxContext.getLocal(
ContextualDataStorage.CONTEXTUAL_DATA_KEY,
AccessMode.CONCURRENT,
ConcurrentHashMap::new
);
}
}
Loading