diff options
4 files changed, 9 insertions, 7 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index faeac12f508..0db52bf8eb5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -328,7 +328,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { assertTrue(actualBindings.isEmpty()); ConnectorFactory connectorFactory = http.getHttpServer().get().getConnectorFactories().stream() - .filter(cf -> cf.getListenPort() == Defaults.getDefaults().vespaWebServicePort()) + .filter(cf -> cf.getListenPort() == getDefaults().vespaWebServicePort()) .findAny() .get(); 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 cf6b6365792..562b1c25b6c 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 @@ -123,7 +123,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { "</container>"); createModel(root, clusterElem); AbstractService container = (AbstractService) root.getProducer("container/container.0"); - assertEquals(Defaults.getDefaults().vespaWebServicePort(), container.getRelativePort(0)); + assertEquals(getDefaults().vespaWebServicePort(), container.getRelativePort(0)); } @Test @@ -153,7 +153,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } catch (IllegalArgumentException e) { // Success - assertEquals("Illegal port 9000 in http server 'foo': Port must be set to " + Defaults.getDefaults().vespaWebServicePort(), + assertEquals("Illegal port 9000 in http server 'foo': Port must be set to " + getDefaults().vespaWebServicePort(), e.getMessage()); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java index 169923210cb..bf9c7bddda1 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java @@ -42,6 +42,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; +import static com.yahoo.vespa.defaults.Defaults.getDefaults; + /** * An implementation of the metrics Db backed by Quest: * This provides local persistent storage of metrics with fast, multi-threaded lookup and write, @@ -65,14 +67,14 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { @Inject public QuestMetricsDb() { - this(Defaults.getDefaults().underVespaHome("var/db/vespa/autoscaling"), Clock.systemUTC()); + this(getDefaults().underVespaHome("var/db/vespa/autoscaling"), Clock.systemUTC()); } public QuestMetricsDb(String dataDir, Clock clock) { this.clock = clock; - if (dataDir.startsWith(Defaults.getDefaults().vespaHome()) - && ! new File(Defaults.getDefaults().vespaHome()).exists()) + if (dataDir.startsWith(getDefaults().vespaHome()) + && ! new File(getDefaults().vespaHome()).exists()) dataDir = "data"; // We're injected, but not on a node with Vespa installed // silence Questdb's custom logging system diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index f9019b1baf1..9a7a79793f3 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -164,7 +164,7 @@ public class Configurator { if (path.isAbsolute()) return path; else - return Paths.get(Defaults.getDefaults().underVespaHome(filename)); + return Paths.get(getDefaults().underVespaHome(filename)); } private interface TlsConfig { |