Skip to content

Commit 5ef3706

Browse files
committed
adjust constainer to ES
1 parent 82983d8 commit 5ef3706

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ElasticsearchDocumentCollectionManagerAsyncTest {
5252

5353
@BeforeEach
5454
public void setUp() {
55-
ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
55+
ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
5656
entityManagerAsync = managerFactory.getAsync(COLLECTION_NAME);
5757
entityManager = managerFactory.get(INDEX);
5858
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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,31 @@
2020

2121
import java.util.HashMap;
2222
import java.util.Map;
23+
import java.util.function.Supplier;
2324

24-
final class DocumentConfigurationUtils {
25+
enum ElasticsearchDocumentCollectionManagerFactorySupplier implements Supplier<ElasticsearchDocumentCollectionManagerFactory> {
2526

26-
private static GenericContainer es =
27+
INSTACE;
28+
29+
private GenericContainer es =
2730
new GenericContainer("docker.elastic.co/elasticsearch/elasticsearch:6.4.1")
2831
.withExposedPorts(9200, 9300)
2932
.withEnv("discovery.type", "single-node")
3033
.waitingFor(Wait.forHttp("/")
3134
.forPort(9200)
3235
.forStatusCode(200));
33-
34-
private DocumentConfigurationUtils() {
36+
{
37+
es.start();
3538
}
3639

37-
public static ElasticsearchDocumentCollectionManagerFactory getFactory() {
38-
es.start();
40+
41+
@Override
42+
public ElasticsearchDocumentCollectionManagerFactory get() {
3943
ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
4044
Map<String, Object> settings = new HashMap<>();
4145
settings.put("elasticsearch-host-1", es.getContainerIpAddress() + ':' + es.getFirstMappedPort());
4246
settings.put("elasticsearch-cluster-name", "elasticsearch");
4347
return configuration.get(Settings.of(settings));
4448
}
4549

46-
public static ElasticsearchDocumentCollectionManagerFactory getFactoryAsync() {
47-
es.start();
48-
ElasticsearchDocumentConfiguration configuration = new ElasticsearchDocumentConfiguration();
49-
Map<String, Object> settings = new HashMap<>();
50-
settings.put("elasticsearch-host-1", es.getContainerIpAddress() + ':' + es.getFirstMappedPort());
51-
settings.put("elasticsearch-cluster-name", "elasticsearch");
52-
return configuration.getAsync(Settings.of(settings));
53-
}
5450
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public class ElasticsearchDocumentCollectionManagerFactoryTest {
2323

2424
@Test
2525
public void shouldCreateEntityManager() {
26-
ElasticsearchDocumentCollectionManagerFactory factory = DocumentConfigurationUtils.getFactory();
26+
ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
2727
assertNotNull(factory.get("database"));
2828
}
2929

3030
@Test
3131
public void shouldCreateEntityManagerAsync() {
32-
ElasticsearchDocumentCollectionManagerFactory factory = DocumentConfigurationUtils.getFactoryAsync();
32+
ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
3333
assertNotNull(factory.getAsync("database"));
3434
}
3535
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ElasticsearchDocumentCollectionManagerTest {
5454

5555
@BeforeEach
5656
public void setUp() {
57-
ElasticsearchDocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
57+
ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
5858
entityManager = managerFactory.get(INDEX);
5959

6060
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public class ElasticsearchDocumentConfigurationTest {
2323

2424
@Test
2525
public void shouldCreateDocumentCollectionManagerFactoryByMap() {
26-
DocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactory();
26+
DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
2727
assertNotNull(managerFactory);
2828
}
2929

3030
@Test
3131
public void shouldCreateDocumentCollectionManagerFactoryByFile() {
32-
DocumentCollectionManagerFactory managerFactory = DocumentConfigurationUtils.getFactoryAsync();
32+
DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
3333
assertNotNull(managerFactory);
3434
}
3535
}

0 commit comments

Comments
 (0)