1 files changed, 2 insertions, 16 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
index 65e7191e164..2b12c7cd78c 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
@@ -50,7 +50,7 @@ public class OperationHandlerImpl implements OperationHandler {
     }
 
     public interface BucketSpaceResolver {
-        Optional<String> clusterBucketSpaceFromDocumentType(String clusterConfigId, String docType);
+        Optional<String> clusterBucketSpaceFromDocumentType(String clusterId, String docType);
     }
 
     public static class BucketSpaceRoute {
@@ -91,20 +91,6 @@ public class OperationHandlerImpl implements OperationHandler {
 
     private final ConcurrentResourcePool<SyncSession> syncSessions;
 
-    private static ClusterEnumerator defaultClusterEnumerator() {
-        return () -> new ClusterList("client").getStorageClusters();
-    }
-
-    private static BucketSpaceResolver defaultBucketResolver() {
-        return (clusterConfigId, docType) -> Optional.ofNullable(BucketSpaceEnumerator
-                .fromConfig(clusterConfigId).getDoctypeToSpaceMapping()
-                .get(docType));
-    }
-
-    public OperationHandlerImpl(DocumentAccess documentAccess, ClusterEnumerator clusterEnumerator, MetricReceiver metricReceiver) {
-        this(documentAccess, clusterEnumerator, defaultBucketResolver(), metricReceiver);
-    }
-
     public OperationHandlerImpl(DocumentAccess documentAccess, ClusterEnumerator clusterEnumerator,
                                 BucketSpaceResolver bucketSpaceResolver, MetricReceiver metricReceiver) {
         this.documentAccess = documentAccess;
@@ -335,7 +321,7 @@ public class OperationHandlerImpl implements OperationHandler {
         String targetBucketSpace;
         if (!restUri.isRootOnly()) {
             String docType = restUri.getDocumentType();
-            Optional<String> resolvedSpace = bucketSpaceResolver.clusterBucketSpaceFromDocumentType(clusterDef.getConfigId(), docType);
+            Optional<String> resolvedSpace = bucketSpaceResolver.clusterBucketSpaceFromDocumentType(clusterDef.getName(), docType);
             if (!resolvedSpace.isPresent()) {
                 throw new RestApiException(Response.createErrorResponse(400, String.format(
                         "Document type '%s' in cluster '%s' is not mapped to a known bucket space", docType, clusterDef.getName()),