Merge pull request #155 from eclipse/updates_driver

otaviojava · web-flow · commit 2f473e459f6a · 2020-01-26T06:21:18.000-03:00
Updates driver
diff --git a/arangodb-driver/pom.xml b/arangodb-driver/pom.xml
@@ -28,7 +28,7 @@
     <description>The Eclipse JNoSQL communication layer, Diana, to AranboDB</description>
 
     <properties>
-        <arango.driver>5.0.4</arango.driver>
+        <arango.driver>6.0.0</arango.driver>
     </properties>
     <dependencies>
         <dependency>
diff --git a/couchbase-driver/pom.xml b/couchbase-driver/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.couchbase.client</groupId>
             <artifactId>java-client</artifactId>
-            <version>2.7.4</version>
+            <version>2.7.11</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/couchdb-driver/pom.xml b/couchdb-driver/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-cache</artifactId>
-            <version>4.5.8</version>
+            <version>4.5.10</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/elasticsearch-driver/pom.xml b/elasticsearch-driver/pom.xml
@@ -28,7 +28,7 @@
     <description>The Eclipse JNoSQL communication layer, Diana, implementation to Eclasticsearch</description>
 
     <properties>
-        <es.version>6.7.1</es.version>
+        <es.version>7.5.1</es.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/CountActionListener.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/CountActionListener.java
@@ -33,7 +33,7 @@ final class CountActionListener implements ActionListener<SearchResponse> {
 
     @Override
     public void onResponse(SearchResponse response) {
-        callback.accept(response.getHits().getTotalHits());
+        callback.accept(response.getHits().getTotalHits().value);
     }
 
     @Override
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManager.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManager.java
@@ -63,7 +63,7 @@ public DocumentEntity insert(DocumentEntity entity) {
         Document id = entity.find(EntityConverter.ID_FIELD)
                 .orElseThrow(() -> new ElasticsearchKeyFoundException(entity.toString()));
         Map<String, Object> jsonObject = EntityConverter.getMap(entity);
-        IndexRequest request = new IndexRequest(index, entity.getName(), id.get(String.class)).source(jsonObject);
+        IndexRequest request = new IndexRequest(index).id(id.get(String.class)).source(jsonObject);
         try {
             client.index(request, RequestOptions.DEFAULT);
         } catch (IOException e) {
@@ -123,7 +123,7 @@ public void delete(DocumentDeleteQuery query) throws NullPointerException {
 
         entities.stream()
                 .map(entity -> entity.find(EntityConverter.ID_FIELD).get().get(String.class))
-                .map(id -> new DeleteRequest(index, query.getDocumentCollection(), id))
+                .map(id -> new DeleteRequest(index, id))
                 .forEach(bulk::add);
 
         try {
@@ -144,26 +144,24 @@ public Stream<DocumentEntity> select(DocumentQuery query) throws NullPointerExce
     public long count(String documentCollection) {
         Objects.requireNonNull(documentCollection, "query is required");
         SearchRequest searchRequest = new SearchRequest(index);
-        searchRequest.types(documentCollection);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         searchSourceBuilder.size(0);
         try {
             SearchResponse search = client.search(searchRequest, RequestOptions.DEFAULT);
-            return search.getHits().getTotalHits();
+            return search.getHits().getTotalHits().value;
         } catch (IOException e) {
             throw new CommunicationException("Error on ES when try to execute count to document collection:" + documentCollection, e);
         }
     }
 
     @Override
-    public Stream<DocumentEntity> search(QueryBuilder query, String... types) throws NullPointerException {
+    public Stream<DocumentEntity> search(QueryBuilder query) throws NullPointerException {
         Objects.requireNonNull(query, "query is required");
 
         try {
             SearchRequest searchRequest = new SearchRequest(index);
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
             searchSourceBuilder.query(query);
-            searchRequest.types(types);
             searchRequest.source(searchSourceBuilder);
             SearchResponse search = client.search(searchRequest, RequestOptions.DEFAULT);
 
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManagerAsync.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManagerAsync.java
@@ -171,7 +171,6 @@ public void count(String documentCollection, Consumer<Long> callback) {
         requireNonNull(documentCollection, "documentCollection is required");
         requireNonNull(callback, "callback is required");
         SearchRequest searchRequest = new SearchRequest(index);
-        searchRequest.types(documentCollection);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         searchSourceBuilder.size(0);
         ActionListener<SearchResponse> listener = new CountActionListener(callback, documentCollection);
@@ -187,7 +186,6 @@ public void search(QueryBuilder query, Consumer<Stream<DocumentEntity>> callBack
         SearchRequest searchRequest = new SearchRequest(index);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         searchSourceBuilder.query(query);
-        searchRequest.types(types);
         searchRequest.source(searchSourceBuilder);
         client.searchAsync(searchRequest, RequestOptions.DEFAULT, new FindQueryBuilderListener(callBack));
     }
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManager.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManager.java
@@ -30,11 +30,10 @@ public interface ElasticsearchDocumentCollectionManager extends DocumentCollecti
      * Find entities from {@link QueryBuilder}
      *
      * @param query the query
-     * @param types the types
      * @return the objects from query
      * @throws NullPointerException when query is null
      */
-     Stream<DocumentEntity> search(QueryBuilder query, String... types) throws NullPointerException;
+     Stream<DocumentEntity> search(QueryBuilder query) throws NullPointerException;
 
 
 }
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactory.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactory.java
@@ -37,6 +37,7 @@
 import java.nio.file.Paths;
 import java.util.Objects;
 
+import static java.lang.Boolean.TRUE;
 import static java.nio.file.Files.readAllBytes;
 
 
@@ -94,6 +95,7 @@ private void createIndex(String database) {
                 RestClient lowLevelClient = client.getLowLevelClient();
                 HttpEntity entity = new NStringEntity(getMappging(stream), ContentType.APPLICATION_JSON);
                 Request request = new Request("PUT", database);
+                request.addParameter("include_type_name", TRUE.toString());
                 request.setEntity(entity);
 
                 lowLevelClient.performRequest(request);
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchEntry.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchEntry.java
@@ -29,6 +29,7 @@
 import static java.util.Objects.isNull;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
+import static org.eclipse.jnosql.diana.elasticsearch.document.EntityConverter.ENTITY;
 import static org.eclipse.jnosql.diana.elasticsearch.document.EntityConverter.ID_FIELD;
 
 class ElasticsearchEntry {
@@ -43,9 +44,9 @@ class ElasticsearchEntry {
             Document.of(entry.getKey().toString(), entry.getValue());
 
 
-    private ElasticsearchEntry(String id, String collection, Map<String, Object> map) {
+    private ElasticsearchEntry(String id, Map<String, Object> map) {
         this.id = id;
-        this.collection = collection;
+        this.collection = map == null ? null : map.getOrDefault(ENTITY, "_doc").toString();
         this.map = map;
     }
 
@@ -97,13 +98,11 @@ private boolean isADocumentIterable(Object value) {
 
     static ElasticsearchEntry of(SearchHit searchHit) {
         return new ElasticsearchEntry(searchHit.getId(),
-                searchHit.getType(),
                 searchHit.getSourceAsMap());
     }
 
     static ElasticsearchEntry of(GetResponse searchHit) {
         return new ElasticsearchEntry(searchHit.getId(),
-                searchHit.getType(),
                 searchHit.getSourceAsMap());
     }
 }
diff --git a/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/EntityConverter.java b/elasticsearch-driver/src/main/java/org/eclipse/jnosql/diana/elasticsearch/document/EntityConverter.java
@@ -42,6 +42,7 @@ final class EntityConverter {
 
     static final String ID_FIELD = "_id";
 
+    static final String ENTITY = "@entity";
 
     private EntityConverter() {
     }
@@ -53,18 +54,18 @@ static Map<String, Object> getMap(DocumentEntity entity) {
         entity.getDocuments().stream()
                 .filter(d -> !d.getName().equals(ID_FIELD))
                 .forEach(feedJSON(jsonObject));
+        jsonObject.put(ENTITY, entity.getName());
         return jsonObject;
     }
 
     static Stream<DocumentEntity> query(DocumentQuery query, RestHighLevelClient client, String index) {
         QueryConverterResult select = QueryConverter.select(query);
 
-
         try {
             Stream<DocumentEntity> idQueryStream = Stream.empty();
             Stream<DocumentEntity> statementQueryStream = Stream.empty();
             if (select.hasId()) {
-                idQueryStream = executeId(query, client, index, select);
+                idQueryStream = executeId(client, index, select);
             }
             if (select.hasStatement()) {
                 statementQueryStream = executeStatement(query, client, index, select);
@@ -78,7 +79,6 @@ static Stream<DocumentEntity> query(DocumentQuery query, RestHighLevelClient cli
     private static Stream<DocumentEntity> executeStatement(DocumentQuery query, RestHighLevelClient client, String index,
                                                            QueryConverterResult select) throws IOException {
         SearchRequest searchRequest = new SearchRequest(index);
-        searchRequest.types(query.getDocumentCollection());
         if (select.hasQuery()) {
             setQueryBuilder(query, select, searchRequest);
         }
@@ -109,7 +109,6 @@ static void queryAsync(DocumentQuery query, RestHighLevelClient client, String i
 
         if (select.hasStatement()) {
             SearchRequest searchRequest = new SearchRequest(index);
-            searchRequest.types(query.getDocumentCollection());
             if (select.hasQuery()) {
                 setQueryBuilder(query, select, searchRequest);
             }
@@ -153,14 +152,13 @@ private static boolean isSudDocumentList(Object value) {
                 allMatch(d -> d instanceof Iterable && isSudDocument(d));
     }
 
-    private static Stream<DocumentEntity> executeId(DocumentQuery query, RestHighLevelClient client, String index,
+    private static Stream<DocumentEntity> executeId(RestHighLevelClient client, String index,
                                                     QueryConverterResult select) throws IOException {
 
-        String type = query.getDocumentCollection();
         MultiGetRequest multiGetRequest = new MultiGetRequest();
 
         select.getIds().stream()
-                .map(id -> new MultiGetRequest.Item(index, type, id))
+                .map(id -> new MultiGetRequest.Item(index, id))
                 .forEach(multiGetRequest::add);
 
         MultiGetResponse responses = client.mget(multiGetRequest, RequestOptions.DEFAULT);
diff --git a/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerAsyncTest.java b/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerAsyncTest.java
@@ -50,12 +50,11 @@ public class ElasticsearchDocumentCollectionManagerAsyncTest {
 
     @BeforeEach
     public void setUp() {
-        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         entityManagerAsync = managerFactory.getAsync(DocumentEntityGerator.COLLECTION_NAME);
         entityManager = managerFactory.get(DocumentEntityGerator.INDEX);
         DocumentEntity documentEntity = DocumentEntityGerator.getEntity();
         Document id = documentEntity.find("name").get();
-        DocumentQuery query = select().from(DocumentEntityGerator.COLLECTION_NAME).where(id.getName()).eq(id.get()).build();
         DocumentDeleteQuery deleteQuery = delete().from(DocumentEntityGerator.COLLECTION_NAME).where(id.getName()).eq(id.get()).build();
         entityManagerAsync.delete(deleteQuery);
     }
diff --git a/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactorySupplier.java b/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactorySupplier.java
@@ -24,10 +24,10 @@
 
 enum ElasticsearchDocumentCollectionManagerFactorySupplier implements Supplier<ElasticsearchDocumentCollectionManagerFactory> {
 
-INSTACE;
+    INSTANCE;
 
     private final GenericContainer es =
-            new GenericContainer("docker.elastic.co/elasticsearch/elasticsearch:6.4.1")
+            new GenericContainer("elasticsearch:7.5.1")
                     .withExposedPorts(9200, 9300)
                     .withEnv("discovery.type", "single-node")
                     .waitingFor(Wait.forHttp("/")
diff --git a/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactoryTest.java b/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerFactoryTest.java
@@ -23,13 +23,13 @@ public class ElasticsearchDocumentCollectionManagerFactoryTest {
 
     @Test
     public void shouldCreateEntityManager() {
-        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         assertNotNull(factory.get("database"));
     }
 
     @Test
     public void shouldCreateEntityManagerAsync() {
-        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        ElasticsearchDocumentCollectionManagerFactory factory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         assertNotNull(factory.getAsync("database"));
     }
 }
diff --git a/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerTest.java b/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentCollectionManagerTest.java
@@ -51,7 +51,7 @@ public class ElasticsearchDocumentCollectionManagerTest {
 
     @BeforeEach
     public void setUp() {
-        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        ElasticsearchDocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         entityManager = managerFactory.get(DocumentEntityGerator.INDEX);
 
     }
@@ -100,7 +100,7 @@ public void shouldUserSearchBuilder() throws InterruptedException {
         entityManager.insert(entity);
         TermQueryBuilder query = termQuery("name", "Poliana");
         SECONDS.sleep(1L);
-        List<DocumentEntity> account = entityManager.search(query, "person").collect(Collectors.toList());
+        List<DocumentEntity> account = entityManager.search(query).collect(Collectors.toList());
         assertFalse(account.isEmpty());
     }
 
@@ -156,6 +156,8 @@ public void shouldFindDocumentById() {
 
         List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
         assertFalse(entities.isEmpty());
+        entity.remove(EntityConverter.ENTITY);
+        entities.get(0).remove(EntityConverter.ENTITY);
         assertThat(entities, contains(entity));
     }
 
diff --git a/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentConfigurationTest.java b/elasticsearch-driver/src/test/java/org/eclipse/jnosql/diana/elasticsearch/document/ElasticsearchDocumentConfigurationTest.java
@@ -26,13 +26,13 @@ public class ElasticsearchDocumentConfigurationTest {
 
     @Test
     public void shouldCreateDocumentCollectionManagerFactoryByMap() {
-        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         assertNotNull(managerFactory);
     }
 
     @Test
     public void shouldCreateDocumentCollectionManagerFactoryByFile() {
-        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTACE.get();
+        DocumentCollectionManagerFactory managerFactory = ElasticsearchDocumentCollectionManagerFactorySupplier.INSTANCE.get();
         assertNotNull(managerFactory);
     }
 
diff --git a/elasticsearch-driver/src/test/resources/database.json b/elasticsearch-driver/src/test/resources/database.json
@@ -21,7 +21,7 @@
     }
   },
   "mappings": {
-    "person": {
+    "_doc": {
       "properties": {
         "name": {
           "type": "keyword"
diff --git a/elasticsearch-driver/src/test/resources/person.json b/elasticsearch-driver/src/test/resources/person.json
@@ -21,7 +21,7 @@
     }
   },
   "mappings": {
-    "person": {
+    "_doc": {
       "properties": {
         "username": {
           "type": "keyword"
diff --git a/mongodb-driver/pom.xml b/mongodb-driver/pom.xml
@@ -27,7 +27,7 @@
     <description>The Eclipse JNoSQL communication layer, Diana, implementation to MongoDB</description>
 
     <properties>
-        <monbodb.driver>3.10.2</monbodb.driver>
+        <monbodb.driver>3.12.0</monbodb.driver>
     </properties>
     <dependencies>
         <dependency>
diff --git a/mongodb-driver/src/test/java/org/eclipse/jnosql/diana/mongodb/document/MongoAuthenticationTest.java b/mongodb-driver/src/test/java/org/eclipse/jnosql/diana/mongodb/document/MongoAuthenticationTest.java
@@ -31,6 +31,7 @@
 import static org.eclipse.jnosql.diana.mongodb.document.MongoDBDocumentConfigurations.PASSWORD;
 import static org.eclipse.jnosql.diana.mongodb.document.MongoDBDocumentConfigurations.USER;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -57,7 +58,7 @@ public void shouldReturnOneAuthentication() {
         assertEquals("database", credential.getSource());
         assertTrue(Arrays.equals("password".toCharArray(), credential.getPassword()));
         assertEquals("user", credential.getUserName());
-        assertEquals(PLAIN.getMechanismName(), credential.getMechanism());
+        assertNull(credential.getMechanism());
 
     }
 
diff --git a/redis-driver/pom.xml b/redis-driver/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.0.1</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/solr-driver/pom.xml b/solr-driver/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>8.1.1</version>
+            <version>8.4.1</version>
         </dependency>
     </dependencies>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ final class CountActionListener implements ActionListener<SearchResponse> {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public void onResponse(SearchResponse response) {`
`36`		`- callback.accept(response.getHits().getTotalHits());`
	`36`	`+ callback.accept(response.getHits().getTotalHits().value);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,10 @@ public interface ElasticsearchDocumentCollectionManager extends DocumentCollecti`
`30`	`30`	`* Find entities from {@link QueryBuilder}`
`31`	`31`	`*`
`32`	`32`	`* @param query the query`
`33`		`- * @param types the types`
`34`	`33`	`* @return the objects from query`
`35`	`34`	`* @throws NullPointerException when query is null`
`36`	`35`	`*/`
`37`		`- Stream<DocumentEntity> search(QueryBuilder query, String... types) throws NullPointerException;`
	`36`	`+ Stream<DocumentEntity> search(QueryBuilder query) throws NullPointerException;`
`38`	`37`
`39`	`38`
`40`	`39`	`}`