Use new file distribution mocks for config server

* Use new mocks without the hardcoded hacks in the old ones
* Let HostSystem avoid using hack for localhost for new file distribution mocks

2 files changed, 1 insertions, 25 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
index 1cfe30270c3..ae18c3e6e95 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionFactory.java
@@ -16,7 +16,7 @@ import java.io.File;
 @SuppressWarnings("WeakerAccess")
 public class FileDistributionFactory {
 
-    private final ConfigserverConfig configserverConfig;
+    protected final ConfigserverConfig configserverConfig;
     private final Supervisor supervisor = new Supervisor(new Transport());
 
     @Inject
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java
deleted file mode 100644
index db70a51b2b4..00000000000
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java
+++ /dev/null
@@ -1,24 +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.config.server.filedistribution;
-
-import com.yahoo.config.model.api.FileDistribution;
-import com.yahoo.config.model.application.provider.MockFileRegistry;
-
-import java.io.File;
-
-/**
- * @author Ulf Lilleengen
- */
-public class MockFileDistributionProvider extends FileDistributionProvider {
-    public int timesCalled = 0;
-
-    public MockFileDistributionProvider(File fileReferencesDir) {
-        super(new MockFileRegistry(), new MockFileDistribution(fileReferencesDir));
-    }
-
-    public FileDistribution getFileDistribution() {
-        timesCalled++;
-        return super.getFileDistribution();
-    }
-
-}