Rename back to HostName, and merge the value class and utilities

5 files changed, 13 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
index f64a1be3251..f8c4627473d 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
@@ -4,7 +4,7 @@ package com.yahoo.search.dispatch.searchcluster;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.math.Quantiles;
 import com.yahoo.container.handler.VipStatus;
-import com.yahoo.net.Hostnames;
+import com.yahoo.net.HostName;
 import com.yahoo.prelude.Pong;
 import com.yahoo.search.cluster.ClusterMonitor;
 import com.yahoo.search.cluster.NodeManager;
@@ -70,7 +70,7 @@ public class SearchCluster implements NodeManager<Node> {
         this.orderedGroups = List.copyOf(groupIntroductionOrder.values());
 
         hitEstimator = new TopKEstimator(30.0, dispatchConfig.topKProbability(), SKEW_FACTOR);
-        this.localCorpusDispatchTarget = findLocalCorpusDispatchTarget(Hostnames.getLocalhost(), nodes, groups);
+        this.localCorpusDispatchTarget = findLocalCorpusDispatchTarget(HostName.getLocalhost(), nodes, groups);
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index fdbcfdab56a..af6374ba245 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -26,7 +26,7 @@ import com.yahoo.jdisc.Request;
 import com.yahoo.language.Linguistics;
 import com.yahoo.language.process.Embedder;
 import com.yahoo.language.provider.DefaultEmbedderProvider;
-import com.yahoo.net.Hostnames;
+import com.yahoo.net.HostName;
 import com.yahoo.net.UriTools;
 import com.yahoo.prelude.query.parser.ParseException;
 import com.yahoo.processing.IllegalInputException;
@@ -105,7 +105,7 @@ public class SearchHandler extends LoggingRequestHandler {
     /** If present, responses from this will set the HTTP response header with this key to the host name of this */
     private final Optional<String> hostResponseHeaderKey;
     
-    private final String selfHostname = Hostnames.getLocalhost();
+    private final String selfHostname = HostName.getLocalhost();
     private final Map<String, Embedder> embedders;
     private final ExecutionFactory executionFactory;
     private final AtomicLong numRequestsLeftToTrace;
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
index 4dc85a4f3db..94df796b370 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
@@ -4,7 +4,7 @@ package com.yahoo.search.dispatch.searchcluster;
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.handler.ClustersStatus;
 import com.yahoo.container.handler.VipStatus;
-import com.yahoo.net.Hostnames;
+import com.yahoo.net.HostName;
 import com.yahoo.prelude.Pong;
 import com.yahoo.search.cluster.ClusterMonitor;
 import com.yahoo.search.dispatch.MockSearchCluster;
@@ -181,7 +181,7 @@ public class SearchClusterTest {
 
     @Test
     public void requireThatVipStatusIsDefaultDownWithLocalDispatch() {
-        try (State test = new State("cluster.1", 1, Hostnames.getLocalhost(), "b")) {
+        try (State test = new State("cluster.1", 1, HostName.getLocalhost(), "b")) {
             assertTrue(test.searchCluster.localCorpusDispatchTarget().isPresent());
 
             assertFalse(test.vipStatus.isInRotation());
@@ -192,7 +192,7 @@ public class SearchClusterTest {
 
     @Test
     public void requireThatVipStatusStaysUpWithLocalDispatchAndClusterSize1() {
-        try (State test = new State("cluster.1", 1, Hostnames.getLocalhost())) {
+        try (State test = new State("cluster.1", 1, HostName.getLocalhost())) {
             assertTrue(test.searchCluster.localCorpusDispatchTarget().isPresent());
 
             assertFalse(test.vipStatus.isInRotation());
@@ -206,7 +206,7 @@ public class SearchClusterTest {
 
     @Test
     public void requireThatVipStatusIsDefaultDownWithLocalDispatchAndClusterSize2() {
-        try (State test = new State("cluster.1", 1, Hostnames.getLocalhost(), "otherhost")) {
+        try (State test = new State("cluster.1", 1, HostName.getLocalhost(), "otherhost")) {
             assertTrue(test.searchCluster.localCorpusDispatchTarget().isPresent());
 
             assertFalse(test.vipStatus.isInRotation());
@@ -220,7 +220,7 @@ public class SearchClusterTest {
 
     @Test
     public void requireThatVipStatusDownWhenLocalIsDown() {
-        try (State test = new State("cluster.1", 1, Hostnames.getLocalhost(), "b")) {
+        try (State test = new State("cluster.1", 1, HostName.getLocalhost(), "b")) {
 
             test.waitOneFullPingRound();
             assertTrue(test.vipStatus.isInRotation());
diff --git a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
index c71c6abd511..b1354106f19 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
@@ -11,7 +11,7 @@ import com.yahoo.io.IOUtils;
 import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.test.MockMetric;
-import com.yahoo.net.Hostnames;
+import com.yahoo.net.HostName;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -52,7 +52,7 @@ public class SearchHandlerTest {
 
     private static final String testDir = "src/test/java/com/yahoo/search/handler/test/config";
     private static final String myHostnameHeader = "my-hostname-header";
-    private static final String selfHostname = Hostnames.getLocalhost();
+    private static final String selfHostname = HostName.getLocalhost();
 
     private static String tempDir = "";
 
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
index 02102251e59..7811336823d 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
@@ -11,7 +11,7 @@ import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.RequestHandlerTestDriver;
 import com.yahoo.container.protect.Error;
 import com.yahoo.io.IOUtils;
-import com.yahoo.net.Hostnames;
+import com.yahoo.net.HostName;
 import com.yahoo.search.handler.SearchHandler;
 import com.yahoo.search.searchchain.config.test.SearchChainConfigurerTestCase;
 import com.yahoo.slime.Inspector;
@@ -48,7 +48,7 @@ public class JSONSearchHandlerTestCase {
 
     private static final String testDir = "src/test/java/com/yahoo/search/handler/test/config";
     private static final String myHostnameHeader = "my-hostname-header";
-    private static final String selfHostname = Hostnames.getLocalhost();
+    private static final String selfHostname = HostName.getLocalhost();
 
     private static String tempDir = "";
     private static String configId = null;