Merge pull request #157 from eclipse/remove_async

Remove async

Author: otaviojava

arangodb-driver/pom.xml

@@ -28,7 +28,7 @@
     <description>The Eclipse JNoSQL communication layer, Diana, to AranboDB</description>
 
     <properties>
-        <arango.driver>6.0.0</arango.driver>
+        <arango.driver>6.6.2</arango.driver>
     </properties>
     <dependencies>
         <dependency>
@@ -51,10 +51,5 @@
             <artifactId>arangodb-java-driver</artifactId>
             <version>${arango.driver}</version>
         </dependency>
-        <dependency>
-            <groupId>com.arangodb</groupId>
-            <artifactId>arangodb-java-driver-async</artifactId>
-            <version>${arango.driver}</version>
-        </dependency>
     </dependencies>
 </project>

arangodb-driver/src/main/java/org/eclipse/jnosql/diana/arangodb/ArangoDBBuilderAsync.java

@@ -16,7 +16,6 @@
 
 
 import com.arangodb.ArangoDB;
-import com.arangodb.ArangoDBAsync;
 import com.arangodb.entity.LoadBalancingStrategy;
 import jakarta.nosql.Settings;
 
@@ -25,15 +24,13 @@
 /**
  * The base to configuration both key-value and document on mongoDB.
  * To each configuration setted, it will change both builder
- * {@link ArangoDB.Builder} and {@link ArangoDBAsync.Builder}
+ * {@link ArangoDB.Builder}
  */
 public abstract class ArangoDBConfiguration {
 
 
     protected ArangoDB.Builder builder = new ArangoDB.Builder();
 
-    protected ArangoDBAsync.Builder builderAsync = new ArangoDBAsync.Builder();
-
     /**
      * Adds a host in the arangodb builder
      *
@@ -44,7 +41,6 @@ public abstract class ArangoDBConfiguration {
     public void addHost(String host, int port) throws NullPointerException {
         requireNonNull(host, "host is required");
         builder.host(host, port);
-        builderAsync.host(host, port);
     }
 
     /**
@@ -56,7 +52,6 @@ public void addHost(String host, int port) throws NullPointerException {
     public void setLoadBalancingStrategy(LoadBalancingStrategy loadBalancingStrategy) throws NullPointerException {
         requireNonNull(loadBalancingStrategy, "loadBalancingStrategy is required");
         builder.loadBalancingStrategy(loadBalancingStrategy);
-        builderAsync.loadBalancingStrategy(loadBalancingStrategy);
     }
 
 
@@ -67,7 +62,6 @@ public void setLoadBalancingStrategy(LoadBalancingStrategy loadBalancingStrategy
      */
     public void setTimeout(int timeout) {
         builder.timeout(timeout);
-        builderAsync.timeout(timeout);
     }
 
     /**
@@ -77,7 +71,6 @@ public void setTimeout(int timeout) {
      */
     public void setUser(String user) {
         builder.user(user);
-        builderAsync.user(user);
     }
 
     /**
@@ -87,7 +80,6 @@ public void setUser(String user) {
      */
     public void setPassword(String password) {
         builder.password(password);
-        builderAsync.password(password);
     }
 
     /**
@@ -97,7 +89,6 @@ public void setPassword(String password) {
      */
     public void setUseSSL(boolean value) {
         builder.useSsl(value);
-        builderAsync.useSsl(value);
     }
 
     /**
@@ -107,7 +98,6 @@ public void setUseSSL(boolean value) {
      */
     public void setChuckSize(int chuckSize) {
         builder.chunksize(chuckSize);
-        builderAsync.chunksize(chuckSize);
     }
 
     /**
@@ -121,27 +111,12 @@ public void syncBuilder(ArangoDB.Builder builder) throws NullPointerException {
         this.builder = builder;
     }
 
-    /**
-     * Defines a new asyncBuilder to ArangoDB
-     *
-     * @param builderAsync the new builderAsync
-     * @throws NullPointerException when builderAsync is null
-     */
-    public void asyncBuilder(ArangoDBAsync.Builder builderAsync) throws NullPointerException {
-        requireNonNull(builderAsync, "asyncBuilder is required");
-        this.builderAsync = builderAsync;
-    }
 
     protected ArangoDB getArangoDB(Settings settings) {
         ArangoDBBuilderSync aragonDB = new ArangoDBBuilderSync(builder);
         ArangoDBBuilders.load(settings, aragonDB);
         return aragonDB.build();
     }
 
-    protected ArangoDBAsync getArangoDBAsync(Settings settings) {
-        ArangoDBBuilderAsync aragonDB = new ArangoDBBuilderAsync(builderAsync);
-        ArangoDBBuilders.load(settings, aragonDB);
-        return aragonDB.build();
-    }
 
 }

arangodb-driver/src/main/java/org/eclipse/jnosql/diana/arangodb/ArangoDBConfiguration.java

@@ -16,21 +16,15 @@
 
 
 import com.arangodb.ArangoDB;
-import com.arangodb.ArangoDBAsync;
-import jakarta.nosql.document.DocumentCollectionManagerAsyncFactory;
 import jakarta.nosql.document.DocumentCollectionManagerFactory;
 
-final class ArangoDBDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory,
-        DocumentCollectionManagerAsyncFactory {
+final class ArangoDBDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory{
 
 
     private final ArangoDB arangoDB;
 
-    private final ArangoDBAsync arangoDBAsync;
-
-    ArangoDBDocumentCollectionManagerFactory(ArangoDB arangoDB, ArangoDBAsync arangoDBAsync) {
+    ArangoDBDocumentCollectionManagerFactory(ArangoDB arangoDB) {
         this.arangoDB = arangoDB;
-        this.arangoDBAsync = arangoDBAsync;
     }
 
     @Override
@@ -39,14 +33,8 @@ public ArangoDBDocumentCollectionManager get(String database) {
         return new DefaultArangoDBDocumentCollectionManager(database, arangoDB);
     }
 
-    @Override
-    public ArangoDBDocumentCollectionManagerAsync getAsync(String database) throws UnsupportedOperationException, NullPointerException {
-        return new DefaultArangoDBDocumentCollectionManagerAsync(database, arangoDB, arangoDBAsync);
-    }
-
     @Override
     public void close() {
         arangoDB.shutdown();
-        arangoDBAsync.shutdown();
     }
 }

arangodb-driver/src/main/java/org/eclipse/jnosql/diana/arangodb/document/ArangoDBDocumentCollectionManagerAsync.java

@@ -16,11 +16,9 @@
 package org.eclipse.jnosql.diana.arangodb.document;
 
 import com.arangodb.ArangoDB;
-import com.arangodb.ArangoDBAsync;
 import jakarta.nosql.Settings;
 import jakarta.nosql.Settings.SettingsBuilder;
 import jakarta.nosql.document.DocumentConfiguration;
-import jakarta.nosql.document.DocumentConfigurationAsync;
 import org.eclipse.jnosql.diana.arangodb.ArangoDBConfiguration;
 import org.eclipse.jnosql.diana.arangodb.ArangoDBConfigurations;
 import org.eclipse.jnosql.diana.driver.ConfigurationReader;
@@ -31,7 +29,7 @@
 import static org.eclipse.jnosql.diana.arangodb.ArangoDBConfigurations.FILE_CONFIGURATION;
 
 /**
- * The implementation of {@link DocumentConfiguration} and {@link DocumentConfigurationAsync}
+ * The implementation of {@link DocumentConfiguration}
  * that returns {@link ArangoDBDocumentCollectionManagerFactory}.
  * It tries to read the configuration properties from diana-arangodb.properties file.
  *
@@ -40,7 +38,7 @@
  *
  */
 public final class ArangoDBDocumentConfiguration extends ArangoDBConfiguration
-        implements DocumentConfiguration, DocumentConfigurationAsync {
+        implements DocumentConfiguration {
 
     @Override
     public ArangoDBDocumentCollectionManagerFactory get() throws UnsupportedOperationException {
@@ -55,8 +53,7 @@ public ArangoDBDocumentCollectionManagerFactory get(Settings settings) throws Nu
         requireNonNull(settings, "settings is required");
 
         ArangoDB arangoDB = getArangoDB(settings);
-        ArangoDBAsync arangoDBAsync = getArangoDBAsync(settings);
-        return new ArangoDBDocumentCollectionManagerFactory(arangoDB, arangoDBAsync);
+        return new ArangoDBDocumentCollectionManagerFactory(arangoDB);
     }
 
 }