Updated CommandInterceptor with special code to handle async calls coming from the RestClient implementation in Jersey due to an issue with the default invocation context in Weld. See issue 6580. New integration test that is currently disabled until the next integration with Jersey. (helidon-io#6665)

Author: spericas

microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/CommandInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,20 @@
 import jakarta.interceptor.InvocationContext;
 
 /**
- * Intercepts calls to FT methods and implements annotation semantics.
+ * <p>Intercepts calls to FT methods and implements annotation semantics.</p>
+ *
+ * <p>There is special code to handle async calls coming from the RestClient
+ * implementation in Jersey due to an issue with the default invocation context
+ * in Weld. See issue https://github.com/helidon-io/helidon/issues/6580.</p>
  */
 @Interceptor
 @CommandBinding
 @Priority(Interceptor.Priority.PLATFORM_AFTER + 10)
 class CommandInterceptor {
 
     private static final Logger LOGGER = Logger.getLogger(CommandInterceptor.class.getName());
+    private static final String INVOCATION_CONTEXT_KEY =
+            "org.glassfish.jersey.microprofile.restclient.InterceptorInvocationContext";
 
     /**
      * Intercepts a call to bean method annotated by any of the fault tolerance
@@ -44,16 +50,25 @@ class CommandInterceptor {
     @AroundInvoke
     public Object interceptCommand(InvocationContext context) throws Throwable {
         try {
-            LOGGER.fine("Interceptor called for '" + context.getTarget().getClass()
+            LOGGER.fine(() -> "Interceptor called for '" + context.getTarget().getClass()
                         + "::" + context.getMethod().getName() + "'");
 
             // Create method introspector and executer retrier
             MethodIntrospector introspector = new MethodIntrospector(context.getTarget().getClass(),
                     context.getMethod());
-            MethodInvoker runner = new MethodInvoker(context, introspector);
-            return runner.get();
+
+            // If async call triggered by RestClient, use its invocation context instead
+            if (introspector.isAsynchronous() && context.getContextData().containsKey(INVOCATION_CONTEXT_KEY)) {
+                InvocationContext override = (InvocationContext) context.getContextData().get(INVOCATION_CONTEXT_KEY);
+                LOGGER.fine(() -> "Overriding invocation context from map " + override);
+                MethodInvoker runner = new MethodInvoker(override, introspector);
+                return runner.get();
+            } else {
+                MethodInvoker runner = new MethodInvoker(context, introspector);
+                return runner.get();
+            }
         } catch (Throwable t) {
-            LOGGER.fine("Throwable caught by interceptor '" + t.getMessage() + "'");
+            LOGGER.fine(() -> "Throwable caught by interceptor '" + t.getMessage() + "'");
             throw t;
         }
     }

tests/integration/restclient/src/main/java/io/helidon/tests/integration/restclient/GreetResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 
 package io.helidon.tests.integration.restclient;
 
+import java.util.Collections;
+
 import jakarta.json.Json;
 import jakarta.json.JsonBuilderFactory;
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-import java.util.Collections;
 
 /**
  * A typical greet resource that only handles a single GET for a default message.
@@ -39,6 +40,13 @@ public JsonObject getDefaultMessage() {
         return createResponse("World");
     }
 
+    @GET
+    @Path("async")
+    @Produces(MediaType.APPLICATION_JSON)
+    public JsonObject getDefaultMessageAsync() {
+        return createResponse("World");
+    }
+
     private JsonObject createResponse(String who) {
         String msg = String.format("%s %s!", "Hello", who);
 

tests/integration/restclient/src/main/java/io/helidon/tests/integration/restclient/GreetResourceClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 package io.helidon.tests.integration.restclient;
 
+import java.util.concurrent.CompletionStage;
+
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-
+import org.eclipse.microprofile.faulttolerance.Asynchronous;
 import org.eclipse.microprofile.faulttolerance.Retry;
 import org.eclipse.microprofile.faulttolerance.Timeout;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
@@ -40,4 +42,10 @@ public interface GreetResourceClient {
     @Timeout(value = 3000)
     @Produces(MediaType.APPLICATION_JSON)
     JsonObject getDefaultMessage();
+
+    @GET
+    @Path("async")
+    @Asynchronous
+    @Produces(MediaType.APPLICATION_JSON)
+    CompletionStage<JsonObject> getDefaultMessageAsync();
 }

tests/integration/restclient/src/main/java/io/helidon/tests/integration/restclient/GreetResourceProxy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package io.helidon.tests.integration.restclient;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.json.JsonObject;
@@ -25,7 +29,6 @@
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.UriInfo;
-
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
@@ -75,4 +78,23 @@ public JsonObject getDefaultMessage() {
         }
         return msg1;
     }
+
+    /**
+     * Test both clients and compares responses before returning one. Async version.
+     *
+     * @return JSON response.
+     */
+    @GET
+    @Path("async")
+    @Produces(MediaType.APPLICATION_JSON)
+    public JsonObject getDefaultMessageAsync() throws ExecutionException, InterruptedException, TimeoutException {
+        JsonObject msg1 = injectedClient.getDefaultMessageAsync()
+                .toCompletableFuture().get(5, TimeUnit.SECONDS);
+        JsonObject msg2 = builderClient.getDefaultMessageAsync()
+                .toCompletableFuture().get(5, TimeUnit.SECONDS);
+        if (!msg1.getString("message").equals(msg2.getString("message"))) {
+            throw new IllegalStateException("Oops");
+        }
+        return msg1;
+    }
 }

tests/integration/restclient/src/test/java/io/helidon/tests/integration/restclient/MainTest.java

@@ -16,16 +16,16 @@
 
 package io.helidon.tests.integration.restclient;
 
+import io.helidon.microprofile.tests.junit5.HelidonTest;
 import jakarta.inject.Inject;
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.client.WebTarget;
-
-import io.helidon.microprofile.tests.junit5.HelidonTest;
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.MetricID;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.eclipse.microprofile.metrics.Tag;
 import org.eclipse.microprofile.metrics.annotation.RegistryType;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -67,4 +67,15 @@ void testHelloWorld() {
         counter = registry.getCounters().get(metricID);
         assertThat(counter.getCount(), is(2L));
     }
+
+    @Test
+    @Disabled
+    void testHelloWorldAsync() {
+        JsonObject jsonObject = target
+                .path("proxy")
+                .path("async")
+                .request()
+                .get(JsonObject.class);
+        assertThat(jsonObject.getString("message"), is("Hello World!"));
+    }
 }