fix(test): fix test cases with cloudant SDK

Also migrate some functions from DatabaseConnectorCloudant to LuceneAwareCouchDbConnector which are specific to Lucene Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
eclipse-sw360 · Sep 10, 2024 · 322068c · 322068c
1 parent c97502c
commit 322068c
Show file tree

Hide file tree

Showing 69 changed files with 776 additions and 697 deletions.
diff --git a/.../src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java b/.../src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java
@@ -17,6 +17,7 @@
 import com.ibm.cloud.cloudant.v1.model.DesignDocumentViewsMapReduce;
 import com.ibm.cloud.cloudant.v1.model.PostViewOptions;
 import com.ibm.cloud.cloudant.v1.model.ViewResult;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.cloudantclient.DatabaseRepositoryCloudantClient;
 import org.eclipse.sw360.datahandler.thrift.attachments.AttachmentUsage;
@@ -67,7 +68,7 @@ public List<AttachmentUsage> getUsageForAttachment(String ownerId, String attach
                 .getPostViewQueryBuilder(AttachmentUsage.class, "usagesByAttachment")
                 .includeDocs(true)
                 .reduce(false)
-                .keys(List.of(new String[] { ownerId, attachmentContentId }))
+                .keys(List.of(List.of(ownerId, attachmentContentId)))
                 .build();
         return queryView(viewQuery);
     }
@@ -97,7 +98,7 @@ public List<AttachmentUsage> getUsageForAttachment(String ownerId, String attach
                 .getPostViewQueryBuilder(AttachmentUsage.class, "usagesByAttachmentUsageType")
                 .includeDocs(true)
                 .reduce(false)
-                .keys(List.of(new String[] { ownerId, attachmentContentId, filter }))
+                .keys(List.of(List.of(ownerId, attachmentContentId, filter)))
                 .build();
         return queryView(viewQuery);
     }
@@ -107,7 +108,7 @@ public List<AttachmentUsage> getUsedAttachments(String usedById, String filter)
                 .getPostViewQueryBuilder(AttachmentUsage.class, "usedAttachmentsUsageType")
                 .includeDocs(true)
                 .reduce(false)
-                .keys(List.of(new String[] { usedById, filter }))
+                .keys(List.of(List.of(usedById, filter)))
                 .build();
         return queryView(viewQuery);
     }
@@ -125,9 +126,9 @@ public Map<Map<String, String>, Integer> getAttachmentUsageCount(Map<String, Set
         return result.getRows().stream().collect(Collectors.toMap(key -> {
             String json = key.getKey().toString();
             String replace = json.replace("[", "").replace("]", "").replaceAll("\"", "");
-            List<String> relIdAttachmentToUsageType = new ArrayList<>(Arrays.asList(replace.split(",")));
+            List<String> relIdAttachmentToUsageType = Arrays.stream(StringUtils.stripAll(replace.split(","))).toList();
             return ImmutableMap.of(relIdAttachmentToUsageType.get(0), relIdAttachmentToUsageType.get(1));
-        }, val -> ((Double) val.getValue()).intValue()));
+        }, val -> (Double.valueOf(val.getValue().toString())).intValue()));
     }
 
     public List<AttachmentUsage> getUsageForAttachments(Map<String, Set<String>> attachments, String filter) {

diff --git a/...end/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java b/...end/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java
@@ -42,7 +42,7 @@ public class ComponentSearchHandler {
 
     private static final Logger log = LogManager.getLogger(ComponentSearchHandler.class);
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("components",

diff --git a/...nd/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ModerationSearchHandler.java b/...nd/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ModerationSearchHandler.java
@@ -28,7 +28,7 @@
 
 public class ModerationSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("moderations",

diff --git a/...common/src/main/java/org/eclipse/sw360/datahandler/db/ObligationElementSearchHandler.java b/...common/src/main/java/org/eclipse/sw360/datahandler/db/ObligationElementSearchHandler.java
@@ -29,7 +29,7 @@
 
 public class ObligationElementSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("obligationelements",

diff --git a/...nd/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ObligationSearchHandler.java b/...nd/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ObligationSearchHandler.java
@@ -28,7 +28,7 @@
 
 public class ObligationSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("obligations",

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/PackageSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/PackageSearchHandler.java
@@ -29,7 +29,7 @@
 
 public class PackageSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("packages",

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java
@@ -35,7 +35,7 @@
 
 public class ProjectSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("projects",

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java
@@ -31,7 +31,7 @@
  */
 public class ReleaseSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("releases",

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java
@@ -28,7 +28,7 @@
 
 public class UserSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("users",

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java
@@ -15,7 +15,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.cloudantclient.DatabaseRepositoryCloudantClient;

diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java
@@ -33,7 +33,7 @@
  */
 public class VendorSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("vendors",

diff --git a/...c/main/java/org/eclipse/sw360/datahandler/db/spdx/document/SpdxDocumentSearchHandler.java b/...c/main/java/org/eclipse/sw360/datahandler/db/spdx/document/SpdxDocumentSearchHandler.java
@@ -27,7 +27,7 @@
 
 public class SpdxDocumentSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("SPDXDocument",

diff --git a/...sw360/datahandler/db/spdx/documentcreationinfo/SpdxDocumentCreationInfoSearchHandler.java b/...sw360/datahandler/db/spdx/documentcreationinfo/SpdxDocumentCreationInfoSearchHandler.java
@@ -27,7 +27,7 @@
 
 public class SpdxDocumentCreationInfoSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("documentCreationInformation",

diff --git a/.../java/org/eclipse/sw360/datahandler/db/spdx/packageinfo/SpdxPackageInfoSearchHandler.java b/.../java/org/eclipse/sw360/datahandler/db/spdx/packageinfo/SpdxPackageInfoSearchHandler.java
@@ -27,7 +27,7 @@
 
 public class SpdxPackageInfoSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("packageInformation",

diff --git a/.../src/src-components/src/test/java/org/eclipse/sw360/components/db/BulkDeleteUtilTest.java b/.../src/src-components/src/test/java/org/eclipse/sw360/components/db/BulkDeleteUtilTest.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.sw360.common.utils.BackendUtils;
 import org.eclipse.sw360.datahandler.TestUtils;
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.CommonUtils;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.db.ComponentDatabaseHandler;
@@ -96,8 +97,8 @@ public class BulkDeleteUtilTest {
 
     private Map<String, Vendor> vendors;
     private ComponentDatabaseHandler handler;
-    private DatabaseConnector databaseConnector;
-    private DatabaseConnector changeLogsDatabaseConnector;
+    private DatabaseConnectorCloudant databaseConnector;
+    private DatabaseConnectorCloudant changeLogsDatabaseConnector;
     private BulkDeleteUtil bulkDeleteUtil;
 
     private int nextReleaseVersion = 0;
@@ -126,8 +127,8 @@ public void setUp() throws Exception {
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), changeLogsDbName);
 
         // Prepare the database
-        databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
-        changeLogsDatabaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), changeLogsDbName);
+        databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), dbName);
+        changeLogsDatabaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), changeLogsDbName);
 
         // Prepare vendors
         for (Vendor vendor : vendors.values()) {

diff --git a/...omponents/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java b/...omponents/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java
@@ -15,6 +15,7 @@
 
 import org.eclipse.sw360.common.utils.BackendUtils;
 import org.eclipse.sw360.datahandler.TestUtils;
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.SW360Constants;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.db.ComponentDatabaseHandler;
@@ -140,7 +141,7 @@ public void setUp() throws Exception {
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         // Prepare the database
-        DatabaseConnector databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
+        DatabaseConnectorCloudant databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         for (Vendor vendor : vendors.values()) {
             databaseConnector.add(vendor);

diff --git a/...-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java b/...-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java
@@ -12,6 +12,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import org.eclipse.sw360.datahandler.TestUtils;
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.db.ComponentSearchHandler;
 import org.eclipse.sw360.datahandler.thrift.ThriftClients;
@@ -75,7 +76,7 @@ public void setUp() throws Exception {
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         // Prepare the database
-        DatabaseConnector databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
+        DatabaseConnectorCloudant databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         for (Component component : components) {
             databaseConnector.add(component);

diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java
@@ -176,7 +176,7 @@ private void updateFossologyProcessInRelease(ExternalToolProcess fossologyProces
         // because our workflow in between might have taken some time, we have to
         // refetch the release to get the current version (as another thread might have
         // written changes to the release which results in a new version so that we
-        // would get a org.ektorp.UpdateConflictException on trying to write)
+        // would get a conflict error on trying to write)
         release = componentClient.getReleaseById(release.getId(), user);
         Iterator<ExternalToolProcess> oldFossologyProcessIterator = SW360Utils
                 .getNotOutdatedExternalToolProcessesForTool(release, ExternalTool.FOSSOLOGY).iterator();

diff --git a/backend/src/src-health/src/test/java/org/eclipse/sw360/health/HealthHandlerTest.java b/backend/src/src-health/src/test/java/org/eclipse/sw360/health/HealthHandlerTest.java
@@ -33,7 +33,7 @@ public class HealthHandlerTest {
     @Test
     public void testGetHealthFailsUponMissingDB() throws MalformedURLException {
         TestUtils.deleteAllDatabases();
-        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredHttpClient());
+        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredClient());
         final Health health = healthHandler.getHealthOfSpecificDbs(DATABASES_TO_CHECK);
         assertEquals(Status.DOWN, health.status);
         assertEquals(DATABASES_TO_CHECK.size(), health.getDetails().size());
@@ -45,7 +45,7 @@ public void testGetHealth() throws MalformedURLException {
             TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), database);
         }
 
-        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredHttpClient());
+        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredClient());
         final Health health = healthHandler.getHealthOfSpecificDbs(DATABASES_TO_CHECK);
         assertEquals(Status.UP, health.status);
         assertEquals(new HashMap<>(), health.getDetails());
@@ -60,7 +60,7 @@ public void testGetHealthWithPartialDBMissing() throws MalformedURLException {
         final String couchDbDatabase = DatabaseSettingsTest.COUCH_DB_DATABASE;
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), couchDbDatabase);
 
-        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredHttpClient());
+        HealthHandler healthHandler = new HealthHandler(DatabaseSettingsTest.getConfiguredClient());
         final Health health = healthHandler.getHealthOfSpecificDbs(DATABASES_TO_CHECK);
         assertEquals(Status.ERROR, health.getStatus());
         assertEquals(DATABASES_TO_CHECK.size() -1, health.getDetails().size());

diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java
@@ -25,14 +25,11 @@
 import org.eclipse.sw360.licenses.db.LicenseDatabaseHandler;
 import org.eclipse.sw360.datahandler.db.ObligationElementSearchHandler;
 
-import com.cloudant.client.api.CloudantClient;
-
 import org.apache.thrift.TException;
 import java.nio.ByteBuffer;
 
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 import java.io.IOException;
 
 import static org.eclipse.sw360.datahandler.common.SW360Assert.*;

diff --git a/...src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java b/...src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java
@@ -10,6 +10,7 @@
 
 package org.eclipse.sw360.moderation.testutil;
 
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.thrift.moderation.DocumentType;
 import org.eclipse.sw360.datahandler.thrift.moderation.ModerationRequest;
@@ -25,7 +26,7 @@ public class DatabaseTestSetup {
 
     public static void main(String[] args) throws MalformedURLException {
 
-        DatabaseConnector db = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), DatabaseSettingsTest.COUCH_DB_DATABASE);
+        DatabaseConnectorCloudant db = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), DatabaseSettingsTest.COUCH_DB_DATABASE);
 
         Project project = new Project().setName("Test Project");
         project.addToModerators("user1");

diff --git a/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java b/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java
@@ -12,6 +12,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.eclipse.sw360.datahandler.TestUtils;
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.common.SW360Utils;
 import org.eclipse.sw360.datahandler.db.AttachmentDatabaseHandler;
@@ -68,7 +69,7 @@ public void setUp() throws Exception {
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         // Prepare the database
-        DatabaseConnector databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
+        DatabaseConnectorCloudant databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), dbName);
         for (Project project : projects) {
             databaseConnector.add(project);
         }

diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.sw360.search;
 
-import com.cloudant.client.api.CloudantClient;
 import com.google.common.collect.ImmutableMap;
 
 import com.ibm.cloud.cloudant.v1.Cloudant;
@@ -33,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 

diff --git a/...c/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java b/...c/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java
@@ -41,7 +41,7 @@
  */
 public abstract class AbstractDatabaseSearchHandler {
 
-    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "/lucene";
+    private static final String DDOC_NAME = DEFAULT_DESIGN_PREFIX + "lucene";
 
     private static final NouveauIndexDesignDocument luceneSearchView
         = new NouveauIndexDesignDocument("all", new NouveauIndexFunction(

diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java
@@ -19,7 +19,7 @@
 import static org.eclipse.sw360.search.common.SearchConstants.NAME_MAX_LENGTH;
 
 /**
- * Helper class to help parse JSON documents from lucene-ektorp
+ * Helper class to help parse JSON documents from lucene
  *
  * @author cedric.bodet@tngtech.com
  */

diff --git a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java
@@ -9,6 +9,7 @@
  */
 package org.eclipse.sw360.vendors;
 
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.thrift.vendors.Vendor;
 import org.eclipse.sw360.datahandler.thrift.vendors.VendorService;
@@ -30,7 +31,7 @@ public class TestVendorClient {
 
     @SuppressWarnings("unused")
     public static void InitDatabase() throws MalformedURLException {
-        DatabaseConnector databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), DatabaseSettingsTest.COUCH_DB_DATABASE);
+        DatabaseConnectorCloudant databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), DatabaseSettingsTest.COUCH_DB_DATABASE);
 
         databaseConnector.add(new Vendor().setShortname("Microsoft").setFullname("Microsoft Corporation").setUrl("http://www.microsoft.com"));
         databaseConnector.add(new Vendor().setShortname("Apache").setFullname("The Apache Software Foundation").setUrl("http://www.apache.org"));

diff --git a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java
@@ -10,6 +10,7 @@
 package org.eclipse.sw360.vendors;
 
 import org.eclipse.sw360.datahandler.TestUtils;
+import org.eclipse.sw360.datahandler.cloudantclient.DatabaseConnectorCloudant;
 import org.eclipse.sw360.datahandler.common.DatabaseSettingsTest;
 import org.eclipse.sw360.datahandler.thrift.AddDocumentRequestSummary;
 import org.eclipse.sw360.datahandler.thrift.vendors.Vendor;
@@ -38,7 +39,7 @@ public void setUp() throws Exception {
         TestUtils.createDatabase(DatabaseSettingsTest.getConfiguredClient(), dbName);
 
         // Prepare the database
-        DatabaseConnector databaseConnector = new DatabaseConnector(DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
+        DatabaseConnectorCloudant databaseConnector = new DatabaseConnectorCloudant(DatabaseSettingsTest.getConfiguredClient(), dbName);
         vendorList = new ArrayList<>();
         vendorList.add(new Vendor().setShortname("Microsoft").setFullname("Microsoft Corporation").setUrl("http://www.microsoft.com"));
         vendorList.add(new Vendor().setShortname("Apache").setFullname("The Apache Software Foundation").setUrl("http://www.apache.org"));
@@ -48,7 +49,7 @@ public void setUp() throws Exception {
             databaseConnector.add(vendor);
         }
 
-        vendorHandler = new VendorHandler(DatabaseSettingsTest.getConfiguredClient(), DatabaseSettingsTest.getConfiguredHttpClient(), dbName);
+        vendorHandler = new VendorHandler(DatabaseSettingsTest.getConfiguredClient(), dbName);
     }
 
     @After