Remove filedistributorservice

4 files changed, 8 insertions, 67 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 83e905929d2..64cbcaafd9f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -37,16 +37,14 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
     private final ApplicationType applicationType;
     private final List<ConfigServerSpec> configServerSpecs;
     private final FileRegistry fileRegistry;
-    private final boolean disableFiledistributor;
     protected final boolean multitenant;
 
     DomAdminBuilderBase(ApplicationType applicationType, FileRegistry fileRegistry, boolean multitenant,
-                        List<ConfigServerSpec> configServerSpecs, boolean disableFiledistributor) {
+                        List<ConfigServerSpec> configServerSpecs) {
         this.applicationType = applicationType;
         this.fileRegistry = fileRegistry;
         this.multitenant = multitenant;
         this.configServerSpecs = configServerSpecs;
-        this.disableFiledistributor = disableFiledistributor;
     }
 
     List<Configserver> getConfigServersFromSpec(AbstractConfigProducer parent) {
@@ -71,7 +69,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
                 .buildMetrics(XML.getChild(adminElement, "metrics"));
         Map<String, MetricsConsumer> legacyMetricsConsumers = DomMetricBuilderHelper
                 .buildMetricsConsumers(XML.getChild(adminElement, "metric-consumers"));
-        FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent, adminElement);
+        FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent);
 
         Admin admin = new Admin(parent, monitoring, metrics, legacyMetricsConsumers, multitenant, fileDistributionConfigProducer);
         doBuildAdmin(admin, adminElement);
@@ -80,11 +78,8 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
         return admin;
     }
 
-    private FileDistributionConfigProducer getFileDistributionConfigProducer(AbstractConfigProducer parent, Element adminElement) {
-        FileDistributionOptions fileDistributionOptions = FileDistributionOptions.defaultOptions();
-        fileDistributionOptions.disableFiledistributor(disableFiledistributor);
-        fileDistributionOptions = new DomFileDistributionOptionsBuilder(fileDistributionOptions).build(XML.getChild(adminElement, "filedistribution"));
-        return new FileDistributionConfigProducer.Builder(fileDistributionOptions).build(parent, fileRegistry, configServerSpecs);
+    private FileDistributionConfigProducer getFileDistributionConfigProducer(AbstractConfigProducer parent) {
+        return new FileDistributionConfigProducer.Builder().build(parent, fileRegistry, configServerSpecs);
     }
 
     private Element getChildWithFallback(Element parent, String childName, String alternativeChildName) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
index d966f3b49f6..da8c73c0958 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
@@ -37,9 +37,8 @@ public class DomAdminV2Builder extends DomAdminBuilderBase {
     public DomAdminV2Builder(ConfigModelContext.ApplicationType applicationType,
                              FileRegistry fileRegistry,
                              boolean multitenant,
-                             List<ConfigServerSpec> configServerSpecs,
-                             boolean disableFiledistributor) {
-        super(applicationType, fileRegistry, multitenant, configServerSpecs, disableFiledistributor);
+                             List<ConfigServerSpec> configServerSpecs) {
+        super(applicationType, fileRegistry, multitenant, configServerSpecs);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 1f7c1ba676c..cc9957144f3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -32,9 +32,9 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     private final ConfigModelContext context;
 
     public DomAdminV4Builder(ConfigModelContext context, boolean multitenant, List<ConfigServerSpec> configServerSpecs,
-                             Collection<ContainerModel> containerModels, boolean disableFiledistributor) {
+                             Collection<ContainerModel> containerModels) {
         super(context.getApplicationType(), context.getDeployState().getFileRegistry(), multitenant,
-              configServerSpecs, disableFiledistributor);
+              configServerSpecs);
         this.containerModels = containerModels;
         this.context = context;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java
deleted file mode 100644
index 9cbdd00899b..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomFileDistributionOptionsBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.builder.xml.dom;
-
-import com.yahoo.binaryprefix.BinaryScaledAmount;
-import com.yahoo.text.XML;
-import com.yahoo.vespa.model.admin.FileDistributionOptions;
-import org.w3c.dom.Element;
-
-import java.util.Optional;
-
-/**
- * Builds file distribution options.
- *
- * @author Tony Vaagenes
- * @author hmusum
- */
-public class DomFileDistributionOptionsBuilder {
-    private final FileDistributionOptions fileDistributionOptions;
-
-    public DomFileDistributionOptionsBuilder(FileDistributionOptions fileDistributionOptions) {
-        this.fileDistributionOptions = fileDistributionOptions;
-    }
-
-    private static void throwExceptionForElementInFileDistribution(String subElement, String reason) {
-        throw new RuntimeException("In element '" + subElement + "' contained in 'filedistribution': " + reason);
-    }
-
-    private Optional<BinaryScaledAmount> getAmount(String name, Element fileDistributionElement) {
-        Element optionElement = XML.getChild(fileDistributionElement, name);
-        try {
-            if (optionElement != null) {
-                String valueString = XML.getValue(optionElement);
-                return Optional.of(BinaryScaledAmountParser.parse(valueString));
-            }
-        } catch (NumberFormatException e) {
-            throwExceptionForElementInFileDistribution(name, "Expected a valid number. (Message = " + e.getMessage() + ").");
-        }
-        return Optional.empty();
-    }
-
-    public FileDistributionOptions build(Element fileDistributionElement) {
-        if (fileDistributionElement != null) {
-            getAmount("uploadbitrate", fileDistributionElement).ifPresent(fileDistributionOptions::uploadBitRate);
-            getAmount("downloadbitrate", fileDistributionElement).ifPresent(fileDistributionOptions::downloadBitRate);
-            Element disable = XML.getChild(fileDistributionElement, "disabled");
-            if (disable == null) disable = XML.getChild(fileDistributionElement, "disableFiledistributor");
-            if (disable != null) {
-                fileDistributionOptions.disableFiledistributor(Boolean.valueOf(XML.getValue(disable)));
-            }
-        }
-        return fileDistributionOptions;
-    }
-}