Merge pull request #5978 from vespa-engine/hmusum/refactor-filedistribution-factory

Minor refactoring

4 files changed, 8 insertions, 27 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
index bfc195cb32e..544451b8e10 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
@@ -9,6 +9,7 @@ import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.StringArray;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
+import com.yahoo.jrt.Transport;
 import com.yahoo.log.LogLevel;
 
 import java.util.Set;
@@ -20,11 +21,7 @@ import java.util.logging.Logger;
 public class FileDistributionImpl implements FileDistribution {
     private final static Logger log = Logger.getLogger(FileDistributionImpl.class.getName());
 
-    private final Supervisor supervisor;
-
-    FileDistributionImpl(Supervisor supervisor) {
-        this.supervisor = supervisor;
-    }
+    private final Supervisor supervisor = new Supervisor(new Transport());
 
     @Override
     public void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
index 9cbc842d8c2..d6751987424 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.filedistribution;
 
 import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.jrt.Supervisor;
 
 import java.io.File;
 
@@ -17,13 +16,11 @@ public class FileDistributionProvider {
     private final FileRegistry fileRegistry;
     private final FileDistribution fileDistribution;
 
-    public FileDistributionProvider(Supervisor supervisor, File applicationDir) {
+    public FileDistributionProvider(File applicationDir, FileDistribution fileDistribution) {
+        this(new FileDBRegistry(new ApplicationFileManager(applicationDir, new FileDirectory())), fileDistribution);
         ensureDirExists(FileDistribution.getDefaultFileDBPath());
-        this.fileDistribution = new FileDistributionImpl(supervisor);
-        this.fileRegistry = new FileDBRegistry(new ApplicationFileManager(applicationDir, new FileDirectory()));
     }
 
-    // For testing only
     FileDistributionProvider(FileRegistry fileRegistry, FileDistribution fileDistribution) {
         this.fileRegistry = fileRegistry;
         this.fileDistribution = fileDistribution;
@@ -37,7 +34,7 @@ public class FileDistributionProvider {
         return fileDistribution;
     }
 
-    private void ensureDirExists(File dir) {
+    private static void ensureDirExists(File dir) {
         if (!dir.exists()) {
             boolean success = dir.mkdirs();
             if (!success)
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
index 531ba388d00..b4ed2352d00 100644
--- 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
@@ -5,8 +5,7 @@ import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class MockFileDistributionProvider extends FileDistributionProvider {
     public int timesCalled = 0;
@@ -20,7 +19,4 @@ public class MockFileDistributionProvider extends FileDistributionProvider {
         return super.getFileDistribution();
     }
 
-    public MockFileDBHandler getMockFileDBHandler() {
-        return (MockFileDBHandler) getFileDistribution();
-    }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
index 32602ab70b8..d3a74486d12 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
@@ -1,8 +1,7 @@
 // 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.session;
 
-import com.yahoo.jrt.Supervisor;
-import com.yahoo.jrt.Transport;
+import com.yahoo.vespa.config.server.filedistribution.FileDistributionImpl;
 import com.yahoo.vespa.config.server.filedistribution.FileDistributionProvider;
 
 import java.io.File;
@@ -15,16 +14,8 @@ import java.io.File;
 @SuppressWarnings("WeakerAccess")
 public class FileDistributionFactory {
 
-    private final Supervisor supervisor = new Supervisor(new Transport());
-
     public FileDistributionProvider createProvider(File applicationPackage) {
-        return new FileDistributionProvider(supervisor, applicationPackage);
+        return new FileDistributionProvider(applicationPackage, new FileDistributionImpl());
     }
 
-    @Override
-    @SuppressWarnings("deprecation")  // finalize() is deprecated from Java 9
-    protected void finalize() throws Throwable {
-        super.finalize();
-        supervisor.transport().shutdown().join();
-    }
 }