reorder to get all defaults in the same place

2 files changed, 26 insertions, 11 deletions

diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
index c32a80e6639..0fce5d654fb 100644
--- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
+++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
@@ -32,20 +32,20 @@ public class Defaults {
     private final int vespaPortConfigProxyRpc;
 
     private Defaults() {
-        vespaHome = findVespaHome();
-        vespaUser = findVespaUser();
-        vespaHost = findVespaHostname();
+        vespaHome = findVespaHome("/opt/vespa");
+        vespaUser = findVespaUser("vespa");
+        vespaHost = findVespaHostname("localhost");
         vespaWebServicePort = findWebServicePort(8080);
         vespaPortBase = findVespaPortBase(19000);
         vespaPortConfigServerRpc = findConfigServerPort(vespaPortBase + 70);
         vespaPortConfigServerHttp = vespaPortConfigServerRpc + 1;
         vespaPortConfigProxyRpc = findConfigProxyPort(vespaPortBase + 90);
     }
-    static private String findVespaHome() {
+    static private String findVespaHome(String defHome) {
         Optional<String> vespaHomeEnv = Optional.ofNullable(System.getenv("VESPA_HOME"));
         if ( ! vespaHomeEnv.isPresent() || vespaHomeEnv.get().trim().isEmpty()) {
-            log.info("VESPA_HOME not set, using /opt/vespa");
-            return "/opt/vespa";
+            log.info("VESPA_HOME not set, using " + defHome);
+            return defHome;
         }
         String vespaHome = vespaHomeEnv.get().trim();
         if (vespaHome.endsWith("/")) {
@@ -55,19 +55,19 @@ public class Defaults {
         return vespaHome;
     }
 
-    static private String findVespaHostname() {
+    static private String findVespaHostname(String defHost) {
         Optional<String> vespaHostEnv = Optional.ofNullable(System.getenv("VESPA_HOSTNAME"));
         if (vespaHostEnv.isPresent() && ! vespaHostEnv.get().trim().isEmpty()) {
             return vespaHostEnv.get().trim();
         }
-        return "localhost";
+        return defHost;
     }
 
-    static private String findVespaUser() {
+    static private String findVespaUser(String defUser) {
         Optional<String> vespaUserEnv = Optional.ofNullable(System.getenv("VESPA_USER"));
         if (! vespaUserEnv.isPresent()) {
-            log.fine("VESPA_USER not set, using vespa");
-            return "vespa";
+            log.fine("VESPA_USER not set, using "+defUser);
+            return defUser;
         }
         return vespaUserEnv.get().trim();
     }
diff --git a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
index c9b7326758d..07d3c39fc9c 100644
--- a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
+++ b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
@@ -32,4 +32,19 @@ public class DefaultsTestCase {
         assertEquals(true, d.vespaConfigProxyRpcPort() > 0);
     }
 
+    @Test
+    public void dumpAllVars() {
+        Defaults d = Defaults.getDefaults();
+        System.out.println("vespa user = '" + d.vespaUser() + "'");
+        System.out.println("vespa hostname = '" + d.vespaHostname() + "'");
+        System.out.println("vespa home = '" + d.vespaHome() + "'");
+        System.out.println("underVespaHome(foo) = '" + d.underVespaHome("foo") + "'");
+
+        System.out.println("web service port = '" + d.vespaWebServicePort() + "'");
+        System.out.println("vespa port base = '" + d.vespaPortBase() + "'");
+        System.out.println("config server RPC port = '" + d.vespaConfigServerRpcPort() + "'");
+        System.out.println("config server HTTP port = '" + d.vespaConfigServerHttpPort() + "'");
+        System.out.println("config proxy RPC port = '" + d.vespaConfigProxyRpcPort() + "'");
+    }
+
 }