Use the correct method in context storage context duplication.

Motivation:

gRPC IO context storage requires to copy the vertx context, at the moment the copy is hand rolled and only affects the context local map.

Instead it should use the copying variant of duplicate.

Changes:

Replace the hand rolled duplication by the copying variant of ContexInternal#duplicate

Author: vietj

vertx-grpcio-context-storage/src/main/java/io/grpc/override/ContextStorageOverride.java

@@ -21,20 +21,12 @@ public ContextStorageOverride() {
     // Do not remove, empty constructor required by gRPC
   }
 
-  private static ContextInternal duplicate(ContextInternal context) {
-    ContextInternal dup = context.duplicate();
-    if (context.isDuplicate()) {
-      dup.localContextData().putAll(context.localContextData()); // For now hand rolled  but should be handled by context duplication
-    }
-    return dup;
-  }
-
   @Override
   public Context doAttach(Context toAttach) {
     ContextInternal vertxContext = vertxContext();
     Context toRestoreLater;
     if (vertxContext != null) {
-      ContextInternal next = duplicate(vertxContext);
+      ContextInternal next = vertxContext.duplicate(true);
       ContextInternal prev = next.beginDispatch();
       next.putLocal(ContextStorageService.CONTEXT_LOCAL, SAME_THREAD, new GrpcStorage(toAttach, prev));
       GrpcStorage local = next.getLocal(ContextStorageService.CONTEXT_LOCAL, SAME_THREAD);

vertx-grpcio-context-storage/src/test/java/io/vertx/grpc/context/storage/ContextStorageTest.java

@@ -153,21 +153,28 @@ public void testNonVertxThread(TestContext should) {
     should.assertNull(key2.get());
   }
 
+  @SuppressWarnings("removal")
   @Test
   public void testNestedDuplicate(TestContext should) {
     Async async = should.async();
     io.vertx.core.internal.ContextInternal context = ((ContextInternal)vertx.getOrCreateContext()).duplicate();
     context.putLocal("local", "local-value-1");
+    CopiableObject value = new CopiableObject();
+    context.putLocal(MockContextStorage.CONTEXT_LOCAL, value);
     context.runOnContext(v1 -> {
       should.assertEquals("local-value-1", context.getLocal("local"));
+      should.assertEquals(value, context.getLocal(MockContextStorage.CONTEXT_LOCAL));
       Context ctx1 = Context.ROOT.withValue(key1, "value-1");
       ctx1.run(() -> {
         io.vertx.core.internal.ContextInternal current = (ContextInternal) vertx.getOrCreateContext();
         should.assertNotEquals(context, current);
         should.assertEquals("local-value-1", current.getLocal("local"));
+        should.assertEquals(value, current.getLocal(MockContextStorage.CONTEXT_LOCAL).ref);
         current.putLocal("local", "local-value-2");
+        current.putLocal(MockContextStorage.CONTEXT_LOCAL, new CopiableObject());
       });
       should.assertEquals("local-value-1", context.getLocal("local"));
+      should.assertEquals(value, context.getLocal(MockContextStorage.CONTEXT_LOCAL));
       async.complete();
     });
     async.awaitSuccess();

vertx-grpcio-context-storage/src/test/java/io/vertx/grpc/context/storage/CopiableObject.java

@@ -0,0 +1,14 @@
+package io.vertx.grpc.context.storage;
+
+public class CopiableObject {
+
+  public final CopiableObject ref;
+
+  public CopiableObject(CopiableObject ref) {
+    this.ref = ref;
+  }
+
+  public CopiableObject() {
+    this.ref = null;
+  }
+}

vertx-grpcio-context-storage/src/test/java/io/vertx/grpc/context/storage/MockContextStorage.java

@@ -0,0 +1,22 @@
+package io.vertx.grpc.context.storage;
+
+import io.vertx.core.internal.VertxBootstrap;
+import io.vertx.core.spi.VertxServiceProvider;
+import io.vertx.core.spi.context.storage.ContextLocal;
+import io.vertx.grpc.contextstorage.GrpcStorage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Register the local storage.
+ */
+public class MockContextStorage implements VertxServiceProvider {
+
+  public static final ContextLocal<CopiableObject> CONTEXT_LOCAL = ContextLocal.registerLocal(CopiableObject.class,
+    CopiableObject::new);
+
+  @Override
+  public void init(VertxBootstrap builder) {
+  }
+}

vertx-grpcio-context-storage/src/test/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider

@@ -0,0 +1 @@
+io.vertx.grpc.context.storage.MockContextStorage