Inject DocumentTypeManager into FeedHandler

4 files changed, 8 insertions, 8 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
index 2a774995601..f99274d3f2b 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
@@ -7,7 +7,7 @@ import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.container.jdisc.messagebus.SessionCache;
-import com.yahoo.document.config.DocumentmanagerConfig;
+import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.documentapi.metrics.DocumentApiMetrics;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.Request;
@@ -45,12 +45,12 @@ public class FeedHandler extends ThreadedHttpRequestHandler {
     @Inject
     public FeedHandler(ContainerThreadPool threadpool,
                        Metric metric,
-                       DocumentmanagerConfig documentManagerConfig,
+                       DocumentTypeManager documentTypeManager,
                        SessionCache sessionCache,
                        MetricReceiver metricReceiver) {
         super(threadpool.executor(), metric);
         metricsHelper = new DocumentApiMetrics(metricReceiver, "vespa.http.server");
-        feedHandlerV3 = new FeedHandlerV3(threadpool.executor(), metric, documentManagerConfig, sessionCache, metricsHelper);
+        feedHandlerV3 = new FeedHandlerV3(threadpool.executor(), metric, documentTypeManager, sessionCache, metricsHelper);
         feedReplyHandler = new FeedReplyReader(metric, metricsHelper);
     }
 
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
index 95e98f325e1..c8828df6d54 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java
@@ -7,7 +7,6 @@ import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.container.jdisc.messagebus.SessionCache;
 import com.yahoo.document.DocumentTypeManager;
-import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.documentapi.metrics.DocumentApiMetrics;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.ReferencedResource;
@@ -45,11 +44,11 @@ public class FeedHandlerV3 extends ThreadedHttpRequestHandler {
 
     public FeedHandlerV3(Executor executor,
                          Metric metric,
-                         DocumentmanagerConfig documentManagerConfig,
+                         DocumentTypeManager documentTypeManager,
                          SessionCache sessionCache,
                          DocumentApiMetrics metricsHelper) {
         super(executor, metric);
-        docTypeManager = new DocumentTypeManager(documentManagerConfig);
+        docTypeManager = documentTypeManager;
         this.sessionCache = sessionCache;
         feedReplyHandler = new FeedReplyReader(metric, metricsHelper);
         cron = new ScheduledThreadPoolExecutor(1, ThreadFactoryFactory.getThreadFactory("feed-handler-v3-janitor"));
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerTest.java
index 00df7c8b6fa..f3ea8fb5a80 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.http.server;
 import com.yahoo.container.handler.threadpool.ContainerThreadPool;
 import com.yahoo.container.jdisc.RequestHandlerTestDriver;
+import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.jdisc.handler.OverloadException;
 import com.yahoo.metrics.simple.MetricReceiver;
@@ -24,7 +25,7 @@ public class FeedHandlerTest {
         FeedHandler handler = new FeedHandler(
                 new RejectingContainerThreadpool(),
                 new CollectingMetric(),
-                new DocumentmanagerConfig(new DocumentmanagerConfig.Builder().enablecompression(true)),
+                new DocumentTypeManager(new DocumentmanagerConfig.Builder().enablecompression(true).build()),
                 null /* session cache */,
                 MetricReceiver.nullImplementation);
         var responseHandler = new RequestHandlerTestDriver.MockResponseHandler();
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerV3Test.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerV3Test.java
index 2f4afb0c2a5..a5a8f4cb5bd 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerV3Test.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/FeedHandlerV3Test.java
@@ -112,7 +112,7 @@ public class FeedHandlerV3Test {
     }
 
     private FeedHandlerV3 setupFeederHandler(Executor threadPool) {
-        DocumentmanagerConfig docMan = new DocumentmanagerConfig(new DocumentmanagerConfig.Builder().enablecompression(true));
+        DocumentTypeManager docMan = new DocumentTypeManager(new DocumentmanagerConfig.Builder().enablecompression(true).build());
         FeedHandlerV3 feedHandlerV3 = new FeedHandlerV3(
                 threadPool,
                 metric,