Revert "Jonmv/unify hostname classes"

2 files changed, 48 insertions, 1 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
new file mode 100644
index 00000000000..04b15af51f2
--- /dev/null
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
@@ -0,0 +1,47 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision;
+
+import java.util.Objects;
+
+/**
+ * A host name
+ *
+ * @author mortent
+ */
+public class HostName implements Comparable<HostName> {
+
+    private final String name;
+
+    private HostName(String name) {
+        this.name = name;
+    }
+
+    public String value() { return name; }
+
+    /** Create a {@link HostName} with a given name */
+    public static HostName from(String name) {
+        return new HostName(name);
+    }
+    
+    @Override
+    public int hashCode() {
+    	return name.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+    	if (!(obj instanceof HostName)) return false;
+    	return Objects.equals(((HostName)obj).value(), value());
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    @Override
+    public int compareTo(HostName that) {
+        return this.name.compareTo(that.name);
+    }
+
+}
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentity.java
index 28ca7cc769a..cd068933923 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentity.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentity.java
@@ -2,7 +2,7 @@
 package com.yahoo.config.provision.security;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.net.HostName;
+import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
 
 import java.util.Objects;