[#2234] Revert "[#2207] Provide access to the contextual data map"

This reverts commit 80a9cfe.

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java

@@ -5,12 +5,6 @@
  */
 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;
@@ -23,18 +17,9 @@
 public class ContextualDataStorage implements VertxServiceProvider {
 
 	@SuppressWarnings("rawtypes")
-	private final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );
+	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
-		);
-	}
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java

@@ -6,9 +6,12 @@
 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;
@@ -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) {
 		final ContextInternal context = ContextInternal.current();
 		if ( context != null ) {
 			if ( trace ) LOG.tracef( "Putting key,value in context: [%1$s, %2$s]", key, instance );
-			ContextualDataStorage.<T>contextualDataMap( context ).put( key, instance );
+			VertxContext.<T>contextualDataMap( context ).put( key, instance );
 		}
 		else {
 			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) {
 	public <T> T get(Key<T> key) {
 		final ContextInternal context = ContextInternal.current();
 		if ( context != null ) {
-			T local = ContextualDataStorage.<T>contextualDataMap( context ).get( key );
+			T local = VertxContext.<T>contextualDataMap( context ).get( key );
 			if ( trace ) LOG.tracef( "Getting value %2$s from context for key %1$s", key, local  );
 			return local;
 		}
@@ -93,4 +94,13 @@ 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
+		);
+	}
 }