fies couch

Author: otaviojava

couchdb-driver/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-cache</artifactId>
-            <version>4.5.10</version>
+            <version>4.5.12</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

couchdb-driver/src/main/java/org/eclipse/jnosql/diana/couchdb/document/CouchDBDocumentCollectionManagerAsync.java

@@ -16,13 +16,11 @@
  */
 package org.eclipse.jnosql.diana.couchdb.document;
 
-import jakarta.nosql.document.DocumentCollectionManagerAsyncFactory;
 import jakarta.nosql.document.DocumentCollectionManagerFactory;
 
 import java.util.Objects;
 
-public class CouchDBDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory,
-        DocumentCollectionManagerAsyncFactory {
+public class CouchDBDocumentCollectionManagerFactory implements DocumentCollectionManagerFactory {
 
 
     private final CouchDBHttpConfiguration configuration;
@@ -40,12 +38,6 @@ public CouchDBDocumentCollectionManager get(String database) {
         return new DefaultCouchDBDocumentCollectionManager(client);
     }
 
-    @Override
-    public CouchDBDocumentCollectionManagerAsync getAsync(String database) {
-        Objects.requireNonNull(database, "database is required");
-        CouchDBDocumentCollectionManager manager = get(database);
-        return new DefaultCouchDBDocumentCollectionManagerAsync(manager);
-    }
 
     @Override
     public void close() {

couchdb-driver/src/main/java/org/eclipse/jnosql/diana/couchdb/document/CouchDBDocumentCollectionManagerFactory.java

@@ -20,15 +20,14 @@
 import jakarta.nosql.Settings;
 import jakarta.nosql.Settings.SettingsBuilder;
 import jakarta.nosql.document.DocumentConfiguration;
-import jakarta.nosql.document.DocumentConfigurationAsync;
 import org.eclipse.jnosql.diana.driver.ConfigurationReader;
 
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 
 /**
- * The CouchDB implementation of {@link DocumentConfiguration} and {@link DocumentConfigurationAsync} that returns
+ * The CouchDB implementation of {@link DocumentConfiguration}  that returns
  * {@link CouchDBDocumentCollectionManagerFactory}, settings:
  * <p>couchdb.port: </p>
  * <p>couchdb.max.connections: </p>
@@ -44,7 +43,7 @@
  *
  * @see CouchDBConfigurations
  */
-public class CouchDBDocumentConfiguration implements DocumentConfiguration, DocumentConfigurationAsync {
+public class CouchDBDocumentConfiguration implements DocumentConfiguration {
 
 
     private static final String FILE_CONFIGURATION = "diana-couchdb.properties";

couchdb-driver/src/main/java/org/eclipse/jnosql/diana/couchdb/document/CouchDBDocumentConfiguration.java

@@ -14,17 +14,16 @@
  */
 package org.eclipse.jnosql.diana.couchdb.document;
 
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.cache.CacheConfig;
 import org.apache.http.impl.client.cache.CachingHttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 
+import java.util.Base64;
+import java.util.Optional;
+
 class CouchDBHttpConfiguration {
 
     private final String host;
@@ -42,6 +41,7 @@ class CouchDBHttpConfiguration {
     private final int maxObjectSizeBytes;
     private final int maxCacheEntries;
     private final String url;
+    private String hashPassword;
 
 
     CouchDBHttpConfiguration(String host, int port, int maxConnections,
@@ -103,16 +103,11 @@ private CloseableHttpClient getHttpClient() {
                 .setDefaultRequestConfig(requestConfig);
 
         if (username != null) {
-            CredentialsProvider provider = new BasicCredentialsProvider();
-            UsernamePasswordCredentials credentials
-                    = new UsernamePasswordCredentials(username, password);
-            provider.setCredentials(AuthScope.ANY, credentials);
-            builder.setDefaultCredentialsProvider(provider);
+            this.hashPassword = "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes());
         }
-
         return builder.build();
-
     }
-
-
+    public Optional<String> getHashPassword() {
+        return Optional.ofNullable(hashPassword);
+    }
 }

couchdb-driver/src/main/java/org/eclipse/jnosql/diana/couchdb/document/CouchDBHttpConfiguration.java

@@ -19,6 +19,7 @@
 import jakarta.nosql.document.DocumentQuery;
 import org.apache.commons.codec.net.URLCodec;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
@@ -61,7 +62,6 @@ class HttpExecute {
     }.getClass().getGenericSuperclass();
 
 
-
     private final CouchDBHttpConfiguration configuration;
 
     private final CloseableHttpClient client;
@@ -187,6 +187,8 @@ private <T> T execute(HttpUriRequest request, Type type, int expectedStatus) {
     }
 
     private <T> T execute(HttpUriRequest request, Type type, int expectedStatus, boolean ignoreStatus) {
+
+        configuration.getHashPassword().ifPresent(s -> request.setHeader(HttpHeaders.AUTHORIZATION, s));
         try (CloseableHttpResponse result = client.execute(request)) {
             if (!ignoreStatus && result.getStatusLine().getStatusCode() != expectedStatus) {
                 ByteArrayOutputStream stream = new ByteArrayOutputStream();