Merge remote-tracking branch 'origin/master'

# Conflicts:
#	async/async-commons/async-commons.gradle
#	async/async-commons/src/test/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcherPerformanceTest.java

Author: Daniel Bustamante Ospina

async/async-commons/async-commons.gradle

@@ -79,8 +79,7 @@ dependencies {
     api ("io.projectreactor.rabbitmq:reactor-rabbitmq")
     api 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation 'io.projectreactor:reactor-test'
-    testCompile group: 'org.databene', name: 'contiperf', version: '2.3.4'
-
+    testCompile group: 'com.github.javatlacati', name: 'contiperf', version: '2.4.3'
 }
 
 configurations.all {

async/async-commons/src/test/java/org/reactivecommons/async/impl/utils/matcher/KeyMatcherPerformanceTest.java

@@ -1,48 +1,51 @@
 package org.reactivecommons.async.impl.utils.matcher;
 
-import org.databene.contiperf.PerfTest;
-import org.databene.contiperf.Required;
-import org.databene.contiperf.junit.ContiPerfRule;
+import com.github.javatlacati.contiperf.PerfTest;
+import com.github.javatlacati.contiperf.Required;
+import com.github.javatlacati.contiperf.junit.ContiPerfRule;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-@ContextConfiguration(classes = KeyMatcher.class)
-@RunWith(SpringJUnit4ClassRunner.class)
 public class KeyMatcherPerformanceTest {
-
     @Rule
     public ContiPerfRule contiPerfRule = new ContiPerfRule();
-    static Map<String, String> candidates = new HashMap<>();
-
+    public static AtomicReference<Map<String, String>> candidates = new AtomicReference<>();
+    public static AtomicBoolean initialized = new AtomicBoolean(false);
     private KeyMatcher keyMatcher = new KeyMatcher();
+    private String DATASET_FILENAME = "candidateNamesForMatching.txt";
 
-
-    @BeforeClass
-    public static void init() {
-        ClassLoader classLoader = KeyMatcherPerformanceTest.class.getClassLoader();
-        File file = new File(classLoader.getResource("candidateNamesForMatching.txt").getFile());
-        try {
-             Set<String> names =  new HashSet<>(Files
-                    .readAllLines(Paths.get(file.getAbsolutePath())));
-            candidates = names.stream()
-                    .collect(Collectors.toMap(name -> name, name -> name));
-        } catch (IOException e) {
-            e.printStackTrace();
+    @Before
+    public void init() {
+        if (!initialized.get()) {
+            initialized.set(true);
+            try {
+                ClassLoader classLoader = KeyMatcherPerformanceTest.class.getClassLoader();
+                File file = new File(Objects.requireNonNull(classLoader.getResource(DATASET_FILENAME))
+                        .getFile());
+                Set<String> names = new HashSet<>(Files
+                        .readAllLines(Paths.get(file.getAbsolutePath())));
+                candidates.set(names.stream()
+                        .collect(Collectors.toMap(name -> name, name -> name)));
+            } catch (IOException e) {
+                e.printStackTrace();
+                candidates.set(new HashMap<>());
+            }
         }
     }
 
@@ -51,14 +54,13 @@ public static void init() {
     @Required(average = 200, max = 10000, throughput = 200)
     public void getFromMapTest() {
         String existentKey = "System.segment.3073.event.action";
-        candidates.get(existentKey);
+        candidates.get().get(existentKey);
     }
 
-
     @Test
     @PerfTest(threads = 4, duration = 4000)
     @Required(average = 200, max = 10000, throughput = 200)
     public void matchNameBeforeTest() {
-        keyMatcher.match(candidates.keySet(), "System.segment.1.event.action");
+        keyMatcher.match(candidates.get().keySet(), "System.segment.1.event.action");
     }
 }