Remove filedistributorservice

2 files changed, 3 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
index 5912b476783..d2ffe10677b 100644
--- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
+++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
@@ -78,8 +78,7 @@ public class AdminModel extends ConfigModel {
             DomAdminV2Builder domBuilder = new DomAdminV2Builder(modelContext.getApplicationType(),
                                                                  modelContext.getDeployState().getFileRegistry(),
                                                                  properties.multitenant(),
-                                                                 properties.configServerSpecs(),
-                                                                 modelContext.getDeployState().disableFiledistributor());
+                                                                 properties.configServerSpecs());
             model.admin = domBuilder.build(parent, adminElement);
             // TODO: Is required since other models depend on admin.
             if (parent instanceof ApplicationConfigProducerRoot) {
@@ -108,8 +107,7 @@ public class AdminModel extends ConfigModel {
             DomAdminV4Builder domBuilder = new DomAdminV4Builder(modelContext,
                                                                  properties.multitenant(),
                                                                  properties.configServerSpecs(),
-                                                                 model.getContainerModels(),
-                                                                 modelContext.getDeployState().disableFiledistributor());
+                                                                 model.getContainerModels());
             model.admin = domBuilder.build(parent, adminElement);
             // TODO: Is required since other models depend on admin.
             if (parent instanceof ApplicationConfigProducerRoot) {
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
index da034619d94..a3429c0471d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
@@ -149,7 +149,7 @@ public class MockRoot extends AbstractConfigProducerRoot {
         try {
             Document doc = XmlHelper.getDocumentBuilder().parse(new InputSource(new StringReader(servicesXml)));
             setAdmin(new DomAdminV2Builder(ConfigModelContext.ApplicationType.DEFAULT, deployState.getFileRegistry(),
-                                           false, new ArrayList<>(), deployState.disableFiledistributor()).
+                                           false, new ArrayList<>()).
                     build(this, XML.getChildren(doc.getDocumentElement(), "admin").get(0)));
         } catch (SAXException | IOException e) {
             throw new RuntimeException(e);