diff options
author | gjoranv <gv@verizonmedia.com> | 2023-02-17 13:40:51 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2023-02-17 13:40:51 +0100 |
commit | d0a29336502507e506c0846dc9ad79807d2200cf (patch) | |
tree | 8ef51db311a7b0744f86d16ead820e06d04b24f1 /node-admin | |
parent | d3bfe633c12b6efd34b23b4c2572fc23c3ad3283 (diff) |
Make VersionedIpAddress comparable, with IPv6 first.
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java index 987a8909142..4e11b050d38 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java @@ -9,7 +9,7 @@ import java.net.InetAddress; /** * @author gjoranv */ -public class VersionedIpAddress { +public class VersionedIpAddress implements Comparable<VersionedIpAddress> { private final InetAddress address; private final IPVersion version; @@ -46,4 +46,10 @@ public class VersionedIpAddress { } } + @Override + public int compareTo(VersionedIpAddress o) { + int version = version().compareTo(o.version()); + return (version != 0) ? version : asString().compareTo(o.asString()); + } + } |