feat: update and rebase codebase

Signed-off-by: Otavio Santana <[email protected]>

Author: otaviojava

CHANGELOG.adoc

@@ -8,6 +8,56 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+== [1.1.4] - 2024-10-24
+
+== Changes
+
+- Update API using Apache Tinkerpop
+- Update package name of Graph to Tinkerpop
+
+== Fixed
+
+- MongoDB conversions applied also to other databases
+
+== [1.1.3] - 2024-10-24
+
+=== Added
+
+- Added Redis Sentinel and Redis Cluster configuration at JNoSQL Redis Database API
+
+=== Fixed
+
+- Fixed the broken connection issue at JNoSQL Redis Database API
+- Use `getAccessibleDatabases` method to get the databases at JNoSQL ArangoDB Database API
+
+== [1.1.2] - 2023-09-15
+
+=== Added
+
+- Include between query support at MongoDB
+- Include Graph as Apache TinkerPop
+- Include UUID support to MongoDB
+
+=== Changed
+
+- Upgrade AraongDB driver to 7.7.1
+- Upgrade Couchbase to version 3.7.1
+- Upgrade dynamodb to version 2.27.2
+- Upgrade Elasticsearch to version 8.14.3
+- Upgrade Hazelcast to version 5.5.0
+- Upgrade Hbase version to 2.6.0
+- Upgrade Infinispan to version 15.0.7.Final
+- Upgrade MongoDB to version 5.1.3
+- Upgrade Oracle NoSQL to version 5.4.15
+- Upgrade OrientDB to version 3.2.32
+- Upgrade Redis to version 5.1.4
+- Upgrade Solr to version 9.6.1
+
+== Fixed
+
+- Fixed the support to negation queries on the Eclipse JNoSQL layer to MongoDB
+- Fixed the precedence of NOT operator in AQL query generation on the Eclipse JNoSQL layer to ArangoDB
+
 == [1.1.1] - 2023-05-25
 
 === Changed

README.adoc

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.eclipse.jnosql.databases</groupId>
         <artifactId>jnosql-databases-parent</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>jnosql-arangodb</artifactId>
     <description>The Eclipse JNoSQL layer to ArangoDB</description>
 
     <properties>
-        <arango.driver>7.6.0</arango.driver>
+        <arango.driver>7.15.0</arango.driver>
     </properties>
     <dependencies>
         <dependency>
@@ -46,8 +46,14 @@
         </dependency>
         <dependency>
             <groupId>com.arangodb</groupId>
-            <artifactId>arangodb-java-driver</artifactId>
+            <artifactId>arangodb-java-driver-shaded</artifactId>
             <version>${arango.driver}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.16</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

jnosql-arangodb/pom.xml

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Michele Rastelli
+ */
+package org.eclipse.jnosql.databases.arangodb.communication;
+
+import com.arangodb.ArangoDB;
+
+public interface ArangoDBAccessor {
+
+    /**
+     * Accessor for the underlying ArangoDB driver instance.
+     *
+     * @return the {@link ArangoDB} instance
+     */
+    ArangoDB getArangoDB();
+
+}

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBAccessor.java

@@ -11,12 +11,14 @@
  *   Contributors:
  *
  *   Otavio Santana
+ *   Michele Rastelli
  */
 package org.eclipse.jnosql.databases.arangodb.communication;
 
 
 import com.arangodb.ArangoDB;
-import com.arangodb.entity.BaseDocument;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import jakarta.json.bind.Jsonb;
 import org.eclipse.jnosql.communication.Value;
 import org.eclipse.jnosql.communication.driver.JsonbSupplier;
@@ -38,11 +40,12 @@
  * <p>{@link BucketManager#put(Iterable, Duration)}</p>
  * <p>{@link BucketManager#put(Iterable, Duration)}</p>
  */
-public class ArangoDBBucketManager implements BucketManager {
+public class ArangoDBBucketManager implements BucketManager, ArangoDBAccessor {
 
 
+    private static final String KEY = "_key";
     private static final String VALUE = "_value";
-    private static final Function<BaseDocument, String> TO_JSON = e -> e.getAttribute(VALUE).toString();
+    private static final Function<JsonObject, String> TO_JSON = e -> e.getString(VALUE);
     private static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
     private final ArangoDB arangoDB;
@@ -66,14 +69,15 @@ public String name() {
     public <K, V> void put(K key, V value) throws NullPointerException {
         Objects.requireNonNull(key, "Key is required");
         Objects.requireNonNull(value, "value is required");
-        BaseDocument baseDocument = new BaseDocument();
-        baseDocument.setKey(key.toString());
-        baseDocument.addAttribute(VALUE, JSONB.toJson(value));
+        JsonObject jsonObject = Json.createObjectBuilder()
+                .add(KEY, key.toString())
+                .add(VALUE, JSONB.toJson(value))
+                .build();
         if (arangoDB.db(bucketName).collection(namespace).documentExists(key.toString())) {
             arangoDB.db(bucketName).collection(namespace).deleteDocument(key.toString());
         }
         arangoDB.db(bucketName).collection(namespace)
-                .insertDocument(baseDocument);
+                .insertDocument(jsonObject);
     }
 
     @Override
@@ -91,8 +95,8 @@ public  void put(Iterable<KeyValueEntity> keyValueEntities) throws NullPointerEx
     @Override
     public <K> Optional<Value> get(K key) throws NullPointerException {
         Objects.requireNonNull(key, "Key is required");
-        BaseDocument entity = arangoDB.db(bucketName).collection(namespace)
-                .getDocument(key.toString(), BaseDocument.class);
+        JsonObject entity = arangoDB.db(bucketName).collection(namespace)
+                .getDocument(key.toString(), JsonObject.class);
 
         return ofNullable(entity)
                 .map(TO_JSON)
@@ -105,7 +109,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
         return stream(keys.spliterator(), false)
                 .map(Object::toString)
                 .map(k -> arangoDB.db(bucketName).collection(namespace)
-                        .getDocument(k, BaseDocument.class))
+                        .getDocument(k, JsonObject.class))
                 .filter(Objects::nonNull)
                 .map(TO_JSON)
                 .map(ValueJSON::of)
@@ -128,7 +132,7 @@ public <K> void delete(Iterable<K> keys) throws NullPointerException {
 
     @Override
     public void close() {
-
+        arangoDB.shutdown();
     }
 
     @Override
@@ -141,4 +145,9 @@ public void put(KeyValueEntity entity, Duration ttl) throws NullPointerException
         throw new UnsupportedOperationException("ArangoDB does not support TTL");
     }
 
+    @Override
+    public ArangoDB getArangoDB() {
+        return arangoDB;
+    }
+
 }

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBBucketManager.java

@@ -23,21 +23,24 @@
 import java.util.Set;
 
 /**
- * The ArangoDB implementation to {@link BucketManagerFactory}
- * it does not support:
+ * The ArangoDB implementation to {@link BucketManagerFactory}.
+ * It does not support:
  * <p>{@link BucketManagerFactory#getMap(String, Class, Class)}</p>
  * <p>{@link BucketManagerFactory#getSet(String, Class)}</p>
  * <p>{@link BucketManagerFactory#getQueue(String, Class)}</p>
  * <p>{@link BucketManagerFactory#getList(String, Class)}</p>
+ * <br/>
+ * Closing an ArangoDBBucketManagerFactory has no effect. The ArangoDB driver instance will be closed in
+ * ${@link ArangoDBBucketManager}.close().
  */
 public class ArangoDBBucketManagerFactory implements BucketManagerFactory {
 
     private static final String DEFAULT_NAMESPACE = "diana";
 
-    private final ArangoDB arangoDB;
+    private final ArangoDBBuilder arangoDBBuilder;
 
-    ArangoDBBucketManagerFactory(ArangoDB arangoDB) {
-        this.arangoDB = arangoDB;
+    ArangoDBBucketManagerFactory(ArangoDBBuilder arangoDBBuilder) {
+        this.arangoDBBuilder = arangoDBBuilder;
     }
 
     @Override
@@ -46,6 +49,7 @@ public ArangoDBBucketManager apply(String bucketName) throws UnsupportedOperatio
     }
 
     public ArangoDBBucketManager getBucketManager(String bucketName, String namespace) {
+        ArangoDB arangoDB = arangoDBBuilder.build();
         ArangoDBUtil.checkCollection(bucketName, arangoDB, namespace);
         return new ArangoDBBucketManager(arangoDB, bucketName, namespace);
     }
@@ -70,10 +74,13 @@ public List getList(String bucketName, Class clazz) throws UnsupportedOperationE
         throw new UnsupportedOperationException("The ArangoDB does not support getList method");
     }
 
+    /**
+     * Closing an {@link ArangoDBBucketManagerFactory} has no effect.
+     * The ArangoDB driver instance will be closed in ${@link ArangoDBBucketManager}.close().
+     */
     @Override
     public void close() {
-        arangoDB.shutdown();
+        // no-op
     }
 
-
 }

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBBucketManagerFactory.java

@@ -14,29 +14,59 @@
  */
 package org.eclipse.jnosql.databases.arangodb.communication;
 
+import com.arangodb.ArangoDB;
 import com.arangodb.Protocol;
 import com.arangodb.entity.LoadBalancingStrategy;
 
-interface ArangoDBBuilder {
+public class ArangoDBBuilder {
 
+    private final ArangoDB.Builder arangoDB;
 
-    void host(String host, int port);
+    ArangoDBBuilder(ArangoDB.Builder arangoDB) {
+        this.arangoDB = arangoDB;
+    }
 
-    void timeout(int timeout);
+    public void host(String host, int port) {
+        arangoDB.host(host, port);
+    }
 
-    void user(String user);
+    public void timeout(int timeout) {
+        arangoDB.timeout(timeout);
+    }
 
-    void password(String password);
+    public void user(String user) {
+        arangoDB.user(user);
+    }
 
-    void useSsl(boolean useSsl);
+    public void password(String password) {
+        arangoDB.password(password);
+    }
 
-    void chunkSize(int chunkSize);
+    public void useSsl(boolean useSsl) {
+        arangoDB.useSsl(useSsl);
+    }
 
-    void maxConnections(int maxConnections);
+    public void chunkSize(int chunkSize) {
+        arangoDB.chunkSize(chunkSize);
+    }
 
-    void protocol(Protocol protocol);
+    public void maxConnections(int maxConnections) {
+        arangoDB.maxConnections(maxConnections);
+    }
 
-    void acquireHostList(boolean acquireHostList);
+    public void protocol(Protocol protocol) {
+        arangoDB.protocol(protocol);
+    }
 
-    void loadBalancingStrategy(LoadBalancingStrategy loadBalancingStrategy);
+    public void acquireHostList(boolean acquireHostList) {
+        arangoDB.acquireHostList(acquireHostList);
+    }
+
+    public void loadBalancingStrategy(LoadBalancingStrategy loadBalancingStrategy) {
+        arangoDB.loadBalancingStrategy(loadBalancingStrategy);
+    }
+
+    public ArangoDB build() {
+        return arangoDB.build();
+    }
 }