PR review issues 1

danielkec · Apr 11, 2024 · 6795430 · 6795430
1 parent fe7a16f
commit 6795430
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 29 deletions.
diff --git a/...ayana-client/src/main/java/io/helidon/lra/coordinator/client/narayana/NarayanaClient.java b/...ayana-client/src/main/java/io/helidon/lra/coordinator/client/narayana/NarayanaClient.java
@@ -240,7 +240,7 @@ public Optional<URI> join(URI lraId,
 
     @Override
     public void leave(URI lraId, PropagatedHeaders headers, Participant p) {
-        logF("Leaving LRA " + lraId + " participant: " + p);
+        logF("Leaving LRA {0} participant: {1}", lraId, p);
         retry.invoke(() -> {
             var req = prepareWebClient(lraId)
                     .put()
@@ -267,7 +267,7 @@ public void leave(URI lraId, PropagatedHeaders headers, Participant p) {
 
     @Override
     public LRAStatus status(URI lraId, PropagatedHeaders headers) {
-        logF("Checking status of LRA " + lraId);
+        logF("Checking status of LRA {0}", lraId);
         return retry.invoke(() -> {
             var req = prepareWebClient(lraId)
                     .get()

diff --git a/lra/coordinator/server/src/main/java/io/helidon/lra/coordinator/CoordinatorService.java b/lra/coordinator/server/src/main/java/io/helidon/lra/coordinator/CoordinatorService.java
@@ -155,11 +155,11 @@ public void routing(HttpRules rules) {
      * @param lraId without coordinator uri prefix
      * @return LRA when managed by this coordinator or null
      */
-    public Lra getLra(String lraId) {
+    public Lra lra(String lraId) {
         return this.lraPersistentRegistry.get(lraId);
     }
 
-    LazyValue<URI> getCoordinatorURL() {
+    LazyValue<URI> coordinatorURL() {
         return coordinatorURL;
     }
 

diff --git a/lra/coordinator/server/src/main/java/io/helidon/lra/coordinator/LraImpl.java b/lra/coordinator/server/src/main/java/io/helidon/lra/coordinator/LraImpl.java
@@ -65,15 +65,15 @@ class LraImpl implements Lra {
         lraId = lraUUID;
         this.config = config;
         lraCtr.increment();
-        coordinatorURL = LazyValue.create(coordinatorService.getCoordinatorURL());
+        coordinatorURL = LazyValue.create(coordinatorService.coordinatorURL());
     }
 
     LraImpl(CoordinatorService coordinatorService, String lraUUID, URI parentId, Config config) {
         lraId = lraUUID;
         this.parentId = parentId;
         this.config = config;
         lraCtr.increment();
-        coordinatorURL = LazyValue.create(coordinatorService.getCoordinatorURL());
+        coordinatorURL = LazyValue.create(coordinatorService.coordinatorURL());
     }
 
     @Override

diff --git a/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/LraCdiExtension.java b/microprofile/lra/jax-rs/src/main/java/io/helidon/microprofile/lra/LraCdiExtension.java
@@ -35,6 +35,7 @@
 
 import io.helidon.common.Reflected;
 import io.helidon.config.Config;
+import io.helidon.config.mp.MpConfig;
 import io.helidon.microprofile.server.ServerCdiExtension;
 import io.helidon.webserver.http.HttpService;
 
@@ -109,7 +110,7 @@ public class LraCdiExtension implements Extension {
      * Initialize MicroProfile Long Running Actions CDI extension.
      */
     public LraCdiExtension() {
-        config = ((Config) ConfigProvider.getConfig()).get(CONFIG_PREFIX);
+        config = MpConfig.toHelidonConfig(ConfigProvider.getConfig()).get(CONFIG_PREFIX);
         indexer = new Indexer();
         classLoader = Thread.currentThread().getContextClassLoader();
         // Needs to be always indexed

diff --git a/microprofile/lra/jax-rs/src/main/java/module-info.java b/microprofile/lra/jax-rs/src/main/java/module-info.java
@@ -47,6 +47,7 @@
 
     requires jakarta.cdi;
     requires transitive jersey.common;
+    requires io.helidon.config.mp;
 
     uses io.helidon.lra.coordinator.client.CoordinatorClient;
 

diff --git a/microprofile/lra/testing/pom.xml b/microprofile/lra/testing/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.logging</groupId>
+            <artifactId>helidon-logging-jul</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.testing</groupId>
             <artifactId>helidon-microprofile-testing-junit5</artifactId>

diff --git a/...ile/lra/testing/src/main/java/io/helidon/microprofile/testing/lra/TestLraCoordinator.java b/...ile/lra/testing/src/main/java/io/helidon/microprofile/testing/lra/TestLraCoordinator.java
@@ -93,9 +93,9 @@ public Lra lra(String lraId) {
             return null;
         }
         if (lraId.startsWith(getUrl() + "/")) {
-            return coordinatorService.getLra(lraId.substring(getUrl().toString().length() + 1));
+            return coordinatorService.lra(lraId.substring(getUrl().toString().length() + 1));
         }
-        return coordinatorService.getLra(lraId);
+        return coordinatorService.lra(lraId);
     }
 
     private void ready(@Observes @Priority(PLATFORM_AFTER + 101) @Initialized(ApplicationScoped.class) Object e, BeanManager b) {

diff --git a/microprofile/lra/testing/src/main/java/io/helidon/microprofile/testing/lra/package-info.java b/microprofile/lra/testing/src/main/java/io/helidon/microprofile/testing/lra/package-info.java
@@ -27,13 +27,13 @@
  *     private final WebTarget target;
  *     private final Set<String> completedLras;
  *     private final Set<String> cancelledLras;
+ *     private final TestLraCoordinator coordinator;
  *
  *     @Inject
- *     private TestLraCoordinator coordinator;
- *
- *     @Inject
- *     public LraTest(WebTarget target) {
+ *     public LraTest(WebTarget target,
+ *                    TestLraCoordinator coordinator) {
  *         this.target = target;
+ *         this.coordinator = coordinator;
  *         this.completedLras = new CopyOnWriteArraySet<>();
  *         this.cancelledLras = new CopyOnWriteArraySet<>();
  *     }

diff --git a/microprofile/lra/testing/src/main/java/module-info.java b/microprofile/lra/testing/src/main/java/module-info.java
@@ -35,6 +35,7 @@
 
     exports io.helidon.microprofile.testing.lra;
 
-    provides ConfigSource with io.helidon.microprofile.testing.lra.TestLraCoordinatorConfigSource;
+    provides org.eclipse.microprofile.config.spi.ConfigSource
+            with io.helidon.microprofile.testing.lra.TestLraCoordinatorConfigSource;
 
 }
diff --git a/...g/src/test/java/io/helidon/microprofile/testing/lra/LraDisabledDiscoveryResourceTest.java b/...g/src/test/java/io/helidon/microprofile/testing/lra/LraDisabledDiscoveryResourceTest.java
@@ -60,13 +60,13 @@ public class LraDisabledDiscoveryResourceTest {
     private final WebTarget target;
     private final Set<String> completedLras;
     private final Set<String> cancelledLras;
+    private final TestLraCoordinator coordinator;
 
     @Inject
-    private TestLraCoordinator coordinator;
-
-    @Inject
-    public LraDisabledDiscoveryResourceTest(WebTarget target) {
+    public LraDisabledDiscoveryResourceTest(WebTarget target,
+                                            TestLraCoordinator coordinator) {
         this.target = target;
+        this.coordinator = coordinator;
         this.completedLras = new CopyOnWriteArraySet<>();
         this.cancelledLras = new CopyOnWriteArraySet<>();
     }

diff --git a/...ra/testing/src/test/java/io/helidon/microprofile/testing/lra/LraExternalResourceTest.java b/...ra/testing/src/test/java/io/helidon/microprofile/testing/lra/LraExternalResourceTest.java
@@ -38,14 +38,16 @@
 @AddBean(TestLraCoordinator.class)
 public class LraExternalResourceTest {
 
-    @Inject
-    private WithdrawTestResource withdrawTestResource;
-
-    @Inject
-    private TestLraCoordinator coordinator;
+    private final WithdrawTestResource withdrawTestResource;
+    private final TestLraCoordinator coordinator;
+    private final WebTarget target;
 
     @Inject
-    private WebTarget target;
+    public LraExternalResourceTest(WithdrawTestResource withdrawTestResource, TestLraCoordinator coordinator, WebTarget target) {
+        this.withdrawTestResource = withdrawTestResource;
+        this.coordinator = coordinator;
+        this.target = target;
+    }
 
     @Test
     public void testLraComplete() {

diff --git a/...ofile/lra/testing/src/test/java/io/helidon/microprofile/testing/lra/LraMultiPortTest.java b/...ofile/lra/testing/src/test/java/io/helidon/microprofile/testing/lra/LraMultiPortTest.java
@@ -62,13 +62,14 @@ public class LraMultiPortTest {
     private final WebTarget otherTarget;
     private final Set<String> completedLras;
     private final Set<String> cancelledLras;
+    private final TestLraCoordinator coordinator;
 
     @Inject
-    private TestLraCoordinator coordinator;
-
-    @Inject
-    public LraMultiPortTest(WebTarget target, @Socket("test-route") WebTarget otherTarget) {
+    public LraMultiPortTest(WebTarget target,
+                            TestLraCoordinator coordinator,
+                            @Socket("test-route") WebTarget otherTarget) {
         this.target = target;
+        this.coordinator = coordinator;
         this.otherTarget = otherTarget;
         this.completedLras = new CopyOnWriteArraySet<>();
         this.cancelledLras = new CopyOnWriteArraySet<>();

diff --git a/...ile/lra/testing/src/test/java/io/helidon/microprofile/testing/lra/NonLraResourceTest.java b/...ile/lra/testing/src/test/java/io/helidon/microprofile/testing/lra/NonLraResourceTest.java
@@ -32,8 +32,12 @@
 @Path("/test/non-lra")
 public class NonLraResourceTest {
 
+    private final WebTarget target;
+
     @Inject
-    private WebTarget target;
+    public NonLraResourceTest(WebTarget target) {
+        this.target = target;
+    }
 
     @GET
     @Path("/say-hi")