Merge pull request #4969 from eshabakhov/#4967

fix(#4967): make Catalogs thread-safe

Author: yegor256

eo-maven-plugin/src/main/java/org/eolang/maven/Catalogs.java

@@ -18,17 +18,14 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.cactoos.scalar.Sticky;
+import org.cactoos.scalar.Synced;
 import org.cactoos.scalar.Unchecked;
 
 /**
  * All catalogs in one place, to avoid making multiple objects.
  *
  * @since 0.29
- * @todo #4884:30min Use ReentranLock instead of synchronized block in the code.
- *  It will be more efficient and will not cause deadlocks.
- *  Don't forget to remove the PMD suppression after that.
  */
-@SuppressWarnings("PMD.AvoidSynchronizedStatement")
 final class Catalogs {
 
     /**
@@ -40,9 +37,9 @@ final class Catalogs {
      * Singleton.
      */
     private static final Unchecked<Boolean> TESTING = new Unchecked<>(
-        new Sticky<>(
-            () -> {
-                synchronized (Catalogs.class) {
+        new Synced<>(
+            new Sticky<>(
+                () -> {
                     boolean tests;
                     try {
                         Class.forName("org.junit.jupiter.api.Test");
@@ -52,7 +49,7 @@ final class Catalogs {
                     }
                     return tests;
                 }
-            }
+            )
         )
     );
 

eo-maven-plugin/src/test/java/org/eolang/maven/CatalogsTest.java

@@ -13,7 +13,7 @@
 import java.util.UUID;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
@@ -25,7 +25,7 @@
 @ExtendWith(MktmpResolver.class)
 @SuppressWarnings("PMD.JUnit5TestShouldBePackagePrivate")
 public final class CatalogsTest {
-    @Test
+    @RepeatedTest(10)
     void readsFromTojosConcurrently(@Mktmp final Path tmp) {
         final Tojos tojos = Catalogs.INSTANCE.make(tmp.resolve("foreign"), "json");
         MatcherAssert.assertThat(

eo-maven-plugin/src/test/resources/junit-platform.properties

@@ -2,3 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 junit.jupiter.execution.timeout.test.method.default = 3m
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent