import getDefaults

3 files changed, 11 insertions, 11 deletions

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())));
     }
 }