Skip to content

Commit 359d9d4

Browse files
committed
fixes ES API
1 parent aa869c2 commit 359d9d4

11 files changed

+5
-639
lines changed

elasticsearch-driver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<description>The Eclipse JNoSQL communication layer, Diana, implementation to Eclasticsearch</description>
2929

3030
<properties>
31-
<es.version>7.5.1</es.version>
31+
<es.version>7.6.2</es.version>
3232
</properties>
3333
<dependencies>
3434
<dependency>

elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManagerAsync.java

Lines changed: 0 additions & 201 deletions
This file was deleted.

elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerAsync.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactory.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.eclipse.jnosql.diana.elasticsearch.document;
1616

1717

18-
import jakarta.nosql.document.DocumentCollectionManagerAsyncFactory;
1918
import jakarta.nosql.document.DocumentCollectionManagerFactory;
2019
import org.apache.http.HttpEntity;
2120
import org.apache.http.entity.ContentType;
@@ -43,13 +42,12 @@
4342

4443
/**
4544
* The elasticsearch implementation to {@link DocumentCollectionManagerFactory} that returns:
46-
* {@link ElasticsearchDocumentCollectionManager} and {@link ElasticsearchDocumentCollectionManagerAsync}.
45+
* {@link ElasticsearchDocumentCollectionManager}
4746
* If the database does not exist, it tries to read a json mapping from the database name.
4847
* Eg: {@link ElasticsearchDocumentCollectionManagerFactory#get(String)} with database, if does not exist it tries to
4948
* read a "/database.json" file. The file must have the mapping to elasticsearch.
5049
*/
51-
public class ElasticsearchDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory,
52-
DocumentCollectionManagerAsyncFactory {
50+
public class ElasticsearchDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory{
5351

5452

5553
private final RestHighLevelClient client;
@@ -58,11 +56,6 @@ public class ElasticsearchDocumentCollectionManagerFactory implements DocumentCo
5856
this.client = client;
5957
}
6058

61-
@Override
62-
public ElasticsearchDocumentCollectionManagerAsync getAsync(String database) throws UnsupportedOperationException, NullPointerException {
63-
initDatabase(database);
64-
return new DefaultElasticsearchDocumentCollectionManagerAsync(client, database);
65-
}
6659

6760

6861
@Override

elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import jakarta.nosql.Settings;
2020
import jakarta.nosql.Settings.SettingsBuilder;
2121
import jakarta.nosql.document.DocumentConfiguration;
22-
import jakarta.nosql.document.DocumentConfigurationAsync;
2322
import org.apache.http.Header;
2423
import org.apache.http.HttpHost;
2524
import org.apache.http.auth.AuthScope;
@@ -41,13 +40,13 @@
4140
import static java.util.Objects.requireNonNull;
4241

4342
/**
44-
* The implementation of {@link DocumentConfiguration} and {@link DocumentConfigurationAsync}
43+
* The implementation of {@link DocumentConfiguration}
4544
* that returns {@link ElasticsearchDocumentCollectionManagerFactory}.
4645
* It tries to read the configuration properties from diana-elasticsearch.properties file. To get some information:
4746
* <p>elasticsearch.host.n: the host to client connection, if necessary to define a different port than default just
4847
* use colon, ':' eg: elasticsearch-host-1=172.17.0.2:1234</p>
4948
*/
50-
public class ElasticsearchDocumentConfiguration implements DocumentConfiguration, DocumentConfigurationAsync {
49+
public class ElasticsearchDocumentConfiguration implements DocumentConfiguration {
5150

5251
private static final String FILE_CONFIGURATION = "diana-elasticsearch.properties";
5352
private static final int DEFAULT_PORT = 9200;

0 commit comments

Comments
 (0)