use Defaults.vespaHostname()

* also fix test to be consistent, it would fail on laptop with Wi-Fi

2 files changed, 5 insertions, 6 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
index 110cd1594de..9f3da91e4d3 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.indexinglanguage.expressions;
 import com.yahoo.document.DataType;
 import com.yahoo.document.DocumentType;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.net.HostName;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
 /**
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
@@ -13,7 +13,7 @@ public class HostNameExpression extends Expression {
 
     @Override
     protected void doExecute(ExecutionContext ctx) {
-        ctx.setValue(new StringFieldValue(normalizeHostName(HostName.getLocalhost())));
+        ctx.setValue(new StringFieldValue(normalizeHostName(getDefaults().vespaHostname())));
     }
 
     @Override
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
index e30ac7fa340..27d7b49bb9c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
@@ -7,8 +7,7 @@ import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerify;
 import static org.junit.Assert.*;
@@ -35,13 +34,13 @@ public class HostNameTestCase {
     }
 
     @Test
-    public void requireThatHostnameIsSet() throws UnknownHostException {
+    public void requireThatHostnameIsSet() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new HostNameExpression().execute(ctx);
 
         FieldValue val = ctx.getValue();
         assertTrue(val instanceof StringFieldValue);
-        assertEquals(HostNameExpression.normalizeHostName(InetAddress.getLocalHost().getHostName()),
+        assertEquals(HostNameExpression.normalizeHostName(getDefaults().vespaHostname()),
                      ((StringFieldValue)val).getString());
     }
 }