We read every piece of feedback, and take your input very seriously.
1 parent 415406e commit 59205e2Copy full SHA for 59205e2
hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java
@@ -5,12 +5,6 @@
5
*/
6
package org.hibernate.reactive.context.impl;
7
8
-import org.hibernate.reactive.context.Context;
9
-
10
-import io.vertx.core.impl.ContextInternal;
11
-import io.vertx.core.spi.context.storage.AccessMode;
12
-import java.util.Map;
13
-import java.util.concurrent.ConcurrentHashMap;
14
import java.util.concurrent.ConcurrentMap;
15
16
import io.vertx.core.impl.VertxBuilder;
@@ -23,18 +17,9 @@
23
17
public class ContextualDataStorage implements VertxServiceProvider {
24
18
25
19
@SuppressWarnings("rawtypes")
26
- private final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );
20
+ final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );
27
21
28
22
@Override
29
public void init(VertxBuilder vertxBuilder) {
30
}
31
32
- @SuppressWarnings({ "unchecked" })
33
- public static <T> Map<Context.Key<T>, T> contextualDataMap(ContextInternal vertxContext) {
34
- return vertxContext.getLocal(
35
- ContextualDataStorage.CONTEXTUAL_DATA_KEY,
36
- AccessMode.CONCURRENT,
37
- ConcurrentHashMap::new
38
- );
39
- }
40
hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java
@@ -6,9 +6,12 @@
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;
@@ -17,8 +20,6 @@
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}.
*
@@ -41,7 +42,7 @@ public <T> void put(Key<T> key, T instance) {
41
42
final ContextInternal context = ContextInternal.current();
43
if ( context != null ) {
44
if ( trace ) LOG.tracef( "Putting key,value in context: [%1$s, %2$s]", key, instance );
- ContextualDataStorage.<T>contextualDataMap( context ).put( key, instance );
45
+ VertxContext.<T>contextualDataMap( context ).put( key, instance );
46
47
else {
48
if ( trace ) LOG.tracef( "Context is null for key,value: [%1$s, %2$s]", key, instance );
@@ -53,7 +54,7 @@ public <T> void put(Key<T> key, T instance) {
53
54
public <T> T get(Key<T> key) {
55
56
- T local = ContextualDataStorage.<T>contextualDataMap( context ).get( key );
57
+ T local = VertxContext.<T>contextualDataMap( context ).get( key );
58
if ( trace ) LOG.tracef( "Getting value %2$s from context for key %1$s", key, local );
59
return local;
60
@@ -93,4 +94,13 @@ public void execute(Runnable runnable) {
93
94
runnable.run();
95
96
97
+
98
+ @SuppressWarnings({ "unchecked" })
99
+ private static <T> ConcurrentMap<Key<T>, T> contextualDataMap(ContextInternal vertxContext) {
100
+ return vertxContext.getLocal(
101
+ ContextualDataStorage.CONTEXTUAL_DATA_KEY,
102
+ AccessMode.CONCURRENT,
103
+ ConcurrentHashMap::new
104
+ );
105
+ }
106