import getDefaults

11 files changed, 39 insertions, 39 deletions

diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index fd060f3419f..cfe8532d250 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -22,7 +22,7 @@ import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.handler.SearchHandler;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -164,7 +164,7 @@ public class ApplicationTest {
             RequestHandler handler = app.getRequestHandlerById(MockHttpHandler.class.getName());
             assertNotNull(handler);
 
-            Request request = new Request("http://localhost:" + Defaults.getDefaults().vespaWebServicePort() + "/");
+            Request request = new Request("http://localhost:" + getDefaults().vespaWebServicePort() + "/");
             Response response = app.handleRequest(request);
             assertNotNull(response);
             assertEquals(response.getStatus(), 200);
@@ -191,7 +191,7 @@ public class ApplicationTest {
                         .renderer("mock", MockRenderer.class))))
         ) {
 
-            Request request = new Request("http://localhost:" + Defaults.getDefaults().vespaWebServicePort() + "/search/?format=mock");
+            Request request = new Request("http://localhost:" + getDefaults().vespaWebServicePort() + "/search/?format=mock");
             Response response = app.handleRequest(request);
             assertNotNull(response);
             assertEquals(response.getStatus(), 200);
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
index 338afe0eb7c..f5c5206d75c 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
@@ -11,7 +11,7 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.io.IOUtils;
 import com.yahoo.io.reader.NamedReader;
 import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.yolean.Exceptions;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
@@ -160,9 +160,9 @@ public class SchemaValidator {
                 if (bundle == null) {
                     File schemaPath;
                     if (vespaVersion.getMajor() == 5) {
-                        schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/version/5.x/schema/"));
+                        schemaPath = new File(getDefaults().underVespaHome("share/vespa/schema/version/5.x/schema/"));
                     } else {
-                        schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/"));
+                        schemaPath = new File(getDefaults().underVespaHome("share/vespa/schema/"));
                     }
                     log.log(LogLevel.DEBUG, "Using schemas found in " + schemaPath);
                     copySchemas(schemaPath, tmpDir);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 69fe47fdba8..ed36fad1ac6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.config.storage.StorDevicesConfig;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
@@ -126,7 +126,7 @@ public class SearchNode extends AbstractService implements
     }
 
     private String getBaseDir() {
-        return Defaults.getDefaults().underVespaHome("var/db/vespa/search/cluster." + getClusterName()) + "/n" + distributionKey;
+        return getDefaults().underVespaHome("var/db/vespa/search/cluster." + getClusterName()) + "/n" + distributionKey;
     }
 
     public void updatePartition(int partitionId) {
@@ -307,7 +307,7 @@ public class SearchNode extends AbstractService implements
 
     @Override
     public Optional<String> getPreShutdownCommand() {
-        return Optional.ofNullable(flushOnShutdown ? Defaults.getDefaults().underVespaHome("bin/vespa-proton-cmd ") + getRpcPort() + " prepareRestart" : null);
+        return Optional.ofNullable(flushOnShutdown ? getDefaults().underVespaHome("bin/vespa-proton-cmd ") + getRpcPort() + " prepareRestart" : null);
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 8c003db43c0..63d5d37598b 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -20,7 +20,7 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.HostSystem;
 import com.yahoo.vespa.model.admin.Admin;
@@ -110,9 +110,9 @@ public class ModelProvisioningTest {
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getJvmArgs(), is(""));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
         assertThat(model.getContainerClusters().get("mydisc").getMemoryPercentage(), is(Optional.empty()));
 
         assertThat(model.getContainerClusters().get("mydisc2").getContainers().get(0).getJvmArgs(), is("-verbosegc"));
@@ -1117,7 +1117,7 @@ public class ModelProvisioningTest {
                 "<?xml version='1.0' encoding='utf-8' ?>" +
                 "<jdisc id='foo' version='1.0'>" +
                 "  <http>" +
-                "    <server id='server1' port='" + Defaults.getDefaults().vespaWebServicePort() + "' />" +
+                "    <server id='server1' port='" + getDefaults().vespaWebServicePort() + "' />" +
                 "  </http>" +
                 "</jdisc>";
         VespaModelTester tester = new VespaModelTester();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 225ff9c91a3..0e6bce73867 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -26,7 +26,7 @@ import com.yahoo.container.servlet.ServletConfigConfig;
 import com.yahoo.container.usability.BindingsOverviewHandler;
 import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.prelude.cluster.QrMonitorConfig;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.Container;
@@ -73,7 +73,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                 "</jdisc>" );
         createModel(root, clusterElem);
         AbstractService container = (AbstractService)root.getProducer("jdisc/container.0");
-        assertThat(container.getRelativePort(0), is(Defaults.getDefaults().vespaWebServicePort()));
+        assertThat(container.getRelativePort(0), is(getDefaults().vespaWebServicePort()));
     }
 
     @Test
@@ -435,7 +435,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <http>",
-                "    <server port='" + Defaults.getDefaults().vespaWebServicePort() + "' id='main' />",
+                "    <server port='" + getDefaults().vespaWebServicePort() + "' id='main' />",
                 "  </http>",
                 "  <nodes cpu-socket-affinity='true'>",
                 "    <node hostalias='node1' />",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 38584c4e110..0fae6c6d751 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.config.storage.StorDevicesConfig;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.documentmodel.NewDocumentType;
 import com.yahoo.text.XML;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
@@ -250,7 +250,7 @@ public class StorageClusterTest {
             StorDevicesConfig.Builder builder = new StorDevicesConfig.Builder();
             node.getConfig(builder);
             StorDevicesConfig config = new StorDevicesConfig(builder);
-            assertEquals(Defaults.getDefaults().underVespaHome("var/db/vespa/vds/storage/storage/0"), config.root_folder());
+            assertEquals(getDefaults().underVespaHome("var/db/vespa/vds/storage/storage/0"), config.root_folder());
         }
 
         {
@@ -258,7 +258,7 @@ public class StorageClusterTest {
             cluster.getStorageNodes().getConfig(builder);
             node.getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
-            assertEquals(Defaults.getDefaults().underVespaHome("var/db/vespa/vds/storage/storage/0"), config.root_folder());
+            assertEquals(getDefaults().underVespaHome("var/db/vespa/vds/storage/storage/0"), config.root_folder());
         }
 
         {
@@ -266,7 +266,7 @@ public class StorageClusterTest {
             cluster.getDistributorNodes().getConfig(builder);
             cluster.getDistributorNodes().getChildren().get("0").getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
-            assertEquals(Defaults.getDefaults().underVespaHome("var/db/vespa/vds/storage/distributor/0"), config.root_folder());
+            assertEquals(getDefaults().underVespaHome("var/db/vespa/vds/storage/distributor/0"), config.root_folder());
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
index 0230b271cac..868e68d9c73 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java
@@ -5,7 +5,7 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.log.LogLevel;
 import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
 import java.io.File;
 import java.util.Optional;
@@ -23,11 +23,11 @@ public class PermanentApplicationPackage {
     private final Optional<ApplicationPackage> applicationPackage;
 
     public PermanentApplicationPackage(ConfigserverConfig config) {
-        File app = new File(Defaults.getDefaults().underVespaHome(config.applicationDirectory()));
+        File app = new File(getDefaults().underVespaHome(config.applicationDirectory()));
         applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ? FilesApplicationPackage.fromFile(app) : null);
         if (applicationPackage.isPresent()) {
             log.log(LogLevel.DEBUG, "Detected permanent application package in '" +
-                                    Defaults.getDefaults().underVespaHome(config.applicationDirectory()) +
+                                    getDefaults().underVespaHome(config.applicationDirectory()) +
                                     "'. This might add extra services to config models");
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/restapi/resources/StatusInformation.java b/configserver/src/main/java/com/yahoo/vespa/config/server/restapi/resources/StatusInformation.java
index 699b2d612ac..5acd56c252e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/restapi/resources/StatusInformation.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/restapi/resources/StatusInformation.java
@@ -1,7 +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.restapi.resources;
 
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
 import java.util.Collection;
 import java.util.List;
@@ -48,16 +48,16 @@ public class StatusInformation {
         public ConfigserverConfig(com.yahoo.cloud.config.ConfigserverConfig configserverConfig) {
             this.rpcport = configserverConfig.rpcport();
             this.numthreads = configserverConfig.numthreads();
-            this.zookeepercfg = Defaults.getDefaults().underVespaHome(configserverConfig.zookeepercfg());
+            this.zookeepercfg = getDefaults().underVespaHome(configserverConfig.zookeepercfg());
             this.zookeeeperserver = configserverConfig.zookeeperserver().stream()
                     .map(zks -> new ZooKeeperServer(zks.hostname(), zks.port()))
                     .collect(Collectors.toList());
             this.zookeeperBarrierTimeout = configserverConfig.zookeeper().barrierTimeout();
             this.configModelPluginDir = configserverConfig.configModelPluginDir();
-            this.configServerDBDir = Defaults.getDefaults().underVespaHome(configserverConfig.configServerDBDir());
+            this.configServerDBDir = getDefaults().underVespaHome(configserverConfig.configServerDBDir());
             this.maxgetconfigclients = configserverConfig.maxgetconfigclients();
             this.sessionLifetime = configserverConfig.sessionLifetime();
-            this.applicationDirectory = Defaults.getDefaults().underVespaHome(configserverConfig.applicationDirectory());
+            this.applicationDirectory = getDefaults().underVespaHome(configserverConfig.applicationDirectory());
             this.masterGeneration = configserverConfig.masterGeneration();
             this.multitenant = configserverConfig.multitenant();
             this.numDelayedResponseThreads = configserverConfig.numDelayedResponseThreads();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/restapi/impl/StatusResourceTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/restapi/impl/StatusResourceTest.java
index f7f31c749ce..b912b67c7db 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/restapi/impl/StatusResourceTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/restapi/impl/StatusResourceTest.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.restapi.impl;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.vespa.config.server.TestComponentRegistry;
 import com.yahoo.vespa.config.server.restapi.resources.StatusInformation;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -28,11 +28,11 @@ public class StatusResourceTest {
     public void require_that_generated_config_is_converted() {
         ConfigserverConfig orig = new ConfigserverConfig(new ConfigserverConfig.Builder());
         StatusInformation.ConfigserverConfig conv = new StatusInformation.ConfigserverConfig(orig);
-        assertThat(conv.applicationDirectory, is(Defaults.getDefaults().underVespaHome(orig.applicationDirectory())));
+        assertThat(conv.applicationDirectory, is(getDefaults().underVespaHome(orig.applicationDirectory())));
         assertThat(conv.configModelPluginDir.size(), is(orig.configModelPluginDir().size()));
         assertThat(conv.zookeeeperserver.size(), is(orig.zookeeperserver().size()));
         assertThat(conv.zookeeperBarrierTimeout, is(orig.zookeeper().barrierTimeout()));
-        assertThat(conv.configServerDBDir, is(Defaults.getDefaults().underVespaHome(orig.configServerDBDir())));
+        assertThat(conv.configServerDBDir, is(getDefaults().underVespaHome(orig.configServerDBDir())));
         assertThat(conv.masterGeneration, is(orig.masterGeneration()));
         assertThat(conv.maxgetconfigclients, is(orig.maxgetconfigclients()));
         assertThat(conv.multitenant, is(orig.multitenant()));
@@ -41,6 +41,6 @@ public class StatusResourceTest {
         assertThat(conv.payloadCompressionType, is(orig.payloadCompressionType()));
         assertThat(conv.rpcport, is(orig.rpcport()));
         assertThat(conv.sessionLifetime, is(orig.sessionLifetime()));
-        assertThat(conv.zookeepercfg, is(Defaults.getDefaults().underVespaHome(orig.zookeepercfg())));
+        assertThat(conv.zookeepercfg, is(getDefaults().underVespaHome(orig.zookeepercfg())));
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index a659d7d825a..9dd593ade0f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -1,7 +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.hosted.node.admin.docker;
 
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.hosted.dockerapi.Container;
 import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.Docker;
@@ -35,7 +35,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  * @author dybis
  */
 public class DockerOperationsImpl implements DockerOperations {
-    public static final String NODE_PROGRAM = Defaults.getDefaults().underVespaHome("bin/vespa-nodectl");
+    public static final String NODE_PROGRAM = getDefaults().underVespaHome("bin/vespa-nodectl");
 
     private static final String[] RESUME_NODE_COMMAND = new String[]{NODE_PROGRAM, "resume"};
     private static final String[] SUSPEND_NODE_COMMAND = new String[]{NODE_PROGRAM, "suspend"};
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
index 3bce176b505..76666d8e71e 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
@@ -6,7 +6,7 @@ import com.google.inject.Inject;
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -64,7 +64,7 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
     
     private void writeConfigToDisk(ZookeeperServerConfig config) {
        String cfg = transformConfigToString(config);
-       try (FileWriter writer = new FileWriter(Defaults.getDefaults().underVespaHome(config.zooKeeperConfigFile()))) {
+       try (FileWriter writer = new FileWriter(getDefaults().underVespaHome(config.zooKeeperConfigFile()))) {
            writer.write(cfg);
            writeMyIdFile(config);
        } catch (IOException e) {
@@ -79,7 +79,7 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
         sb.append("syncLimit=").append(config.syncLimit()).append("\n");
         sb.append("maxClientCnxns=").append(config.maxClientConnections()).append("\n");
         sb.append("snapCount=").append(config.snapshotCount()).append("\n");
-        sb.append("dataDir=").append(Defaults.getDefaults().underVespaHome(config.dataDir())).append("\n");
+        sb.append("dataDir=").append(getDefaults().underVespaHome(config.dataDir())).append("\n");
         sb.append("clientPort=").append(config.clientPort()).append("\n");
         sb.append("autopurge.purgeInterval=").append(config.autopurge().purgeInterval()).append("\n");
         sb.append("autopurge.snapRetainCount=").append(config.autopurge().snapRetainCount()).append("\n");
@@ -94,7 +94,7 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
 
     private void writeMyIdFile(ZookeeperServerConfig config) throws IOException {
         if (config.server().size() > 1) {
-            try (FileWriter writer = new FileWriter(Defaults.getDefaults().underVespaHome(config.myidFile()))) {
+            try (FileWriter writer = new FileWriter(getDefaults().underVespaHome(config.myidFile()))) {
                 writer.write(config.myid() + "\n");
             }
         }
@@ -129,7 +129,7 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
     @Override
     public void run() {
         System.setProperty(ZOOKEEPER_JMX_LOG4J_DISABLE, "true");
-        String[] args = new String[]{Defaults.getDefaults().underVespaHome(config.zooKeeperConfigFile())};
+        String[] args = new String[]{getDefaults().underVespaHome(config.zooKeeperConfigFile())};
         log.log(LogLevel.DEBUG, "Starting ZooKeeper server with config: " + args[0]);
         org.apache.zookeeper.server.quorum.QuorumPeerMain.main(args);
     }