Move HostName -> Hostnames, and DomainName and Hostname to com.yahoo.net

7 files changed, 15 insertions, 9 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
index 1edf8e4edbe..5421bd770bf 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
@@ -2,7 +2,7 @@
 package com.yahoo.concurrent.maintenance;
 
 import com.yahoo.concurrent.UncheckedTimeoutException;
-import com.yahoo.net.HostName;
+import com.yahoo.net.Hostnames;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -45,7 +45,7 @@ public abstract class Maintainer implements Runnable {
         this.ignoreCollision = ignoreCollision;
         Objects.requireNonNull(startedAt);
         Objects.requireNonNull(clusterHostnames);
-        Duration initialDelay = staggeredDelay(interval, startedAt, HostName.getLocalhost(), clusterHostnames)
+        Duration initialDelay = staggeredDelay(interval, startedAt, Hostnames.getLocalhost(), clusterHostnames)
                                 .plus(Duration.ofSeconds(30)); // Let the system  stabilize before maintenance
         service = new ScheduledThreadPoolExecutor(1, r -> new Thread(r, name() + "-worker"));
         service.scheduleAtFixedRate(this, initialDelay.toMillis(), interval.toMillis(), TimeUnit.MILLISECONDS);
diff --git a/vespajlib/src/main/java/ai/vespa/validation/DomainName.java b/vespajlib/src/main/java/com/yahoo/net/DomainName.java
index 52d9acc822c..5ac13d0306c 100644
--- a/vespajlib/src/main/java/ai/vespa/validation/DomainName.java
+++ b/vespajlib/src/main/java/com/yahoo/net/DomainName.java
@@ -1,5 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.validation;
+package com.yahoo.net;
+
+import ai.vespa.validation.StringWrapper;
 
 import java.util.regex.Pattern;
 
diff --git a/vespajlib/src/main/java/ai/vespa/validation/Hostname.java b/vespajlib/src/main/java/com/yahoo/net/Hostname.java
index e53dd501c45..37dc41cbe14 100644
--- a/vespajlib/src/main/java/ai/vespa/validation/Hostname.java
+++ b/vespajlib/src/main/java/com/yahoo/net/Hostname.java
@@ -1,5 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.validation;
+package com.yahoo.net;
+
+import ai.vespa.validation.StringWrapper;
 
 import static ai.vespa.validation.Validation.requireInRange;
 import static ai.vespa.validation.Validation.requireMatch;
diff --git a/vespajlib/src/main/java/com/yahoo/net/HostName.java b/vespajlib/src/main/java/com/yahoo/net/Hostnames.java
index 5b820cd996e..c6e78d778e3 100644
--- a/vespajlib/src/main/java/com/yahoo/net/HostName.java
+++ b/vespajlib/src/main/java/com/yahoo/net/Hostnames.java
@@ -11,7 +11,7 @@ import java.util.Optional;
  *
  * @author arnej
  */
-public class HostName {
+public class Hostnames {
 
     private static String preferredHostName = null;
 
diff --git a/vespajlib/src/test/java/ai/vespa/validation/DomainNameTest.java b/vespajlib/src/test/java/com/yahoo/net/DomainNameTest.java
index dad2086d6ea..d8e76b71d7e 100644
--- a/vespajlib/src/test/java/ai/vespa/validation/DomainNameTest.java
+++ b/vespajlib/src/test/java/com/yahoo/net/DomainNameTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.validation;
+package com.yahoo.net;
 
+import com.yahoo.net.DomainName;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/vespajlib/src/test/java/ai/vespa/validation/HostnameTest.java b/vespajlib/src/test/java/com/yahoo/net/HostnameTest.java
index 7969c2a5f78..ef502aea2cd 100644
--- a/vespajlib/src/test/java/ai/vespa/validation/HostnameTest.java
+++ b/vespajlib/src/test/java/com/yahoo/net/HostnameTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.validation;
+package com.yahoo.net;
 
+import com.yahoo.net.Hostname;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java b/vespajlib/src/test/java/com/yahoo/net/HostnamesTestCase.java
index ee26b357db8..2e942605e3e 100644
--- a/vespajlib/src/test/java/com/yahoo/net/HostNameTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/net/HostnamesTestCase.java
@@ -8,11 +8,11 @@ import static org.junit.Assert.assertFalse;
 /**
  * @author Ulf Lilleengen
  */
-public class HostNameTestCase {
+public class HostnamesTestCase {
 
     @Test
     public void testHostnameIsFound() {
-        assertFalse(HostName.getLocalhost().isEmpty());
+        assertFalse(Hostnames.getLocalhost().isEmpty());
     }
 
 }