fixes factory supplier at arangodb

Author: otaviojava

arangodb-driver/src/test/java/org/jnosql/diana/arangodb/document/ArangoDBDocumentCollectionManagerAsyncTest.java

@@ -35,8 +35,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.delete;
 import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.select;
-import static org.jnosql.diana.arangodb.document.DocumentConfigurationUtils.getConfiguration;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.jnosql.diana.arangodb.document.ArangoDBDocumentCollectionManagerFactorySupplier.INSTANCE;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -52,8 +51,8 @@ public class ArangoDBDocumentCollectionManagerAsyncTest {
     @BeforeEach
     public void setUp() {
         random = new Random();
-        entityManagerAsync = getConfiguration().getAsync("database");
-        entityManager = getConfiguration().get("database");
+        entityManagerAsync = INSTANCE.get().getAsync("database");
+        entityManager = INSTANCE.get().get("database");
     }
 
 

arangodb-driver/src/test/java/org/jnosql/diana/arangodb/document/ArangoDBDocumentCollectionManagerFactorySupplier.java

@@ -19,19 +19,21 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
-public final class DocumentConfigurationUtils {
+import java.util.function.Supplier;
 
-    private static GenericContainer arangodb =
+enum  ArangoDBDocumentCollectionManagerFactorySupplier implements Supplier<ArangoDBDocumentCollectionManagerFactory> {
+
+    INSTANCE;
+
+    private GenericContainer arangodb =
             new GenericContainer("arangodb/arangodb:latest")
                     .withExposedPorts(8529)
                     .withEnv("ARANGO_NO_AUTH", "1")
                     .waitingFor(Wait.forHttp("/")
                             .forStatusCode(200));
 
-    private DocumentConfigurationUtils() {
-    }
-
-    public static ArangoDBDocumentCollectionManagerFactory getConfiguration() {
+    @Override
+    public ArangoDBDocumentCollectionManagerFactory get() {
         arangodb.start();
         ArangoDBDocumentConfiguration configuration = new ArangoDBDocumentConfiguration();
         configuration.addHost(arangodb.getContainerIpAddress(), arangodb.getFirstMappedPort());

arangodb-driver/src/test/java/org/jnosql/diana/arangodb/document/ArangoDBDocumentCollectionManagerFactoryTest.java

@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.jnosql.diana.arangodb.document.ArangoDBDocumentCollectionManagerFactorySupplier.INSTANCE;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ArangoDBDocumentCollectionManagerFactoryTest {
@@ -28,7 +29,7 @@ public class ArangoDBDocumentCollectionManagerFactoryTest {
 
     @BeforeEach
     public void setUp() {
-        managerFactory = DocumentConfigurationUtils.getConfiguration();
+        managerFactory = INSTANCE.get();
     }
 
     @Test

arangodb-driver/src/test/java/org/jnosql/diana/arangodb/document/ArangoDBDocumentCollectionManagerTest.java

@@ -38,8 +38,11 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.delete;
 import static org.jnosql.diana.api.document.query.DocumentQueryBuilder.select;
-import static org.jnosql.diana.arangodb.document.DocumentConfigurationUtils.getConfiguration;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.jnosql.diana.arangodb.document.ArangoDBDocumentCollectionManagerFactorySupplier.INSTANCE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ArangoDBDocumentCollectionManagerTest {
 
@@ -51,7 +54,7 @@ public class ArangoDBDocumentCollectionManagerTest {
     @BeforeEach
     public void setUp() {
         random = new Random();
-        entityManager = getConfiguration().get("database");
+        entityManager = INSTANCE.get().get("database");
     }
 
     @Test

arangodb-driver/src/test/java/org/jnosql/diana/arangodb/key/ArangoDBKeyValueEntityManagerTest.java

@@ -45,7 +45,7 @@ public class ArangoDBKeyValueEntityManagerTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = ArangoDBTestUtils.get();
+        keyValueEntityManagerFactory = BucketManagerFactorySupplier.INSTANCE.get();
         keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager("users-entity");
     }
 

…iana/arangodb/key/ArangoDBTestUtils.java …db/key/BucketManagerFactorySupplier.javaarangodb-driver/src/test/java/org/jnosql/diana/arangodb/key/ArangoDBTestUtils.java renamed to arangodb-driver/src/test/java/org/jnosql/diana/arangodb/key/BucketManagerFactorySupplier.java arangodb-driver/src/test/java/org/jnosql/diana/arangodb/key/ArangoDBTestUtils.java renamed to arangodb-driver/src/test/java/org/jnosql/diana/arangodb/key/BucketManagerFactorySupplier.java

@@ -19,17 +19,22 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
-public final class ArangoDBTestUtils {
+import java.util.function.Supplier;
 
-    private static GenericContainer arangodb =
+enum BucketManagerFactorySupplier implements Supplier<BucketManagerFactory> {
+
+    INSTANCE;
+
+    private GenericContainer arangodb =
             new GenericContainer("arangodb/arangodb:latest")
                     .withExposedPorts(8529)
                     .withEnv("ARANGO_NO_AUTH", "1")
                     .waitingFor(Wait.forHttp("/")
                             .forStatusCode(200));
 
 
-    public static BucketManagerFactory get() {
+    @Override
+    public BucketManagerFactory get() {
         arangodb.start();
         ArangoDBKeyValueConfiguration configuration = new ArangoDBKeyValueConfiguration();
         configuration.addHost(arangodb.getContainerIpAddress(), arangodb.getFirstMappedPort());