diff options
author | jonmv <venstad@gmail.com> | 2022-04-08 17:27:39 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-04-08 17:27:39 +0200 |
commit | 0ee94a18e5420f7f77aec110c8ff0a67a661a7ef (patch) | |
tree | d1592c6ed5f01ad1c820c403b8a9590373944b66 /config-provisioning/src | |
parent | 4ffc54339186574491a32b3166223c3fc50ba8fe (diff) |
Revert "Merge pull request #22065 from vespa-engine/revert-22049-jonmv/unify-hostname-classes"
This reverts commit 4ffc54339186574491a32b3166223c3fc50ba8fe, reversing
changes made to db9e570a36decb24e6cb13f44bd0ff444ab762e3.
Diffstat (limited to 'config-provisioning/src')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java | 47 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentity.java | 2 |
2 files changed, 1 insertions, 48 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 deleted file mode 100644 index 04b15af51f2..00000000000 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java +++ /dev/null @@ -1,47 +0,0 @@ -// 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 cd068933923..28ca7cc769a 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.config.provision.HostName; +import com.yahoo.net.HostName; import com.yahoo.config.provision.NodeType; import java.util.Objects; |