adjust constainer to ES

Author: otaviojava

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerAsyncTest.java

@@ -52,7 +52,7 @@ public class ElasticsearchDocumentCollectionManagerAsyncTest {
 
     @BeforeEach
     public void setUp() {
-        ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
+        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         entityManagerAsync = managerFactory.getAsync(COLLECTION_NAME);
         entityManager = managerFactory.get(INDEX);
         DocumentEntity documentEntity = getEntity();

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/DocumentConfigurationUtils.java renamed to elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactorySupplier.java

@@ -20,35 +20,31 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 
-final class DocumentConfigurationUtils {
+enum ElasticsearchDocumentCollectionManagerFactorySupplier implements Supplier<ElasticsearchDocumentCollectionManagerFactory> {
 
-    private static GenericContainer es =
+INSTACE;
+
+    private GenericContainer es =
             new GenericContainer("docker.elastic.co/elasticsearch/elasticsearch:6.4.1")
                     .withExposedPorts(9200, 9300)
                     .withEnv("discovery.type", "single-node")
                     .waitingFor(Wait.forHttp("/")
                             .forPort(9200)
                             .forStatusCode(200));
-
-    private DocumentConfigurationUtils() {
+    {
+        es.start();
     }
 
-    public static ElasticsearchDocumentCollectionManagerFactory getFactory() {
-        es.start();
+
+    @Override
+    public ElasticsearchDocumentCollectionManagerFactory get() {
         ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
         Map<String, Object> settings = new HashMap<>();
         settings.put("elasticsearch-host-1", es.getContainerIpAddress() + ':' + es.getFirstMappedPort());
         settings.put("elasticsearch-cluster-name", "elasticsearch");
         return configuration.get(Settings.of(settings));
     }
 
-    public static ElasticsearchDocumentCollectionManagerFactory getFactoryAsync() {
-        es.start();
-        ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
-        Map<String, Object> settings = new HashMap<>();
-        settings.put("elasticsearch-host-1", es.getContainerIpAddress() + ':' + es.getFirstMappedPort());
-        settings.put("elasticsearch-cluster-name", "elasticsearch");
-        return configuration.getAsync(Settings.of(settings));
-    }
 }

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactoryTest.java

@@ -23,13 +23,13 @@ public class ElasticsearchDocumentCollectionManagerFactoryTest {
 
     @Test
     public void shouldCreateEntityManager() {
-        ElasticsearchDocumentCollectionManagerFactory factory = DocumentConfigurationUtils.getFactory();
+        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         assertNotNull(factory.get("database"));
     }
 
     @Test
     public void shouldCreateEntityManagerAsync() {
-        ElasticsearchDocumentCollectionManagerFactory factory = DocumentConfigurationUtils.getFactoryAsync();
+        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         assertNotNull(factory.getAsync("database"));
     }
 }

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerTest.java

@@ -54,7 +54,7 @@ public class ElasticsearchDocumentCollectionManagerTest {
 
     @BeforeEach
     public void setUp() {
-        ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
+        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         entityManager = managerFactory.get(INDEX);
 
     }

elasticsearch-driver/src/test/java/org/jnosql/diana/elasticsearch/document/ElasticsearchDocumentConfigurationTest.java

@@ -23,13 +23,13 @@ public class ElasticsearchDocumentConfigurationTest {
 
     @Test
     public void shouldCreateDocumentCollectionManagerFactoryByMap() {
-        DocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
+        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         assertNotNull(managerFactory);
     }
 
     @Test
     public void shouldCreateDocumentCollectionManagerFactoryByFile() {
-        DocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactoryAsync();
+        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
         assertNotNull(managerFactory);
     }
 }