From 493b291dceb20b58b659764db2e4013681c26999 Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Wed, 22 Apr 2020 20:21:15 +0200 Subject: Improve connect dialog --- .../java/cuchaz/enigma/utils/ServerAddress.java | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java (limited to 'enigma/src/main/java') diff --git a/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java b/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java new file mode 100644 index 0000000..021d9a1 --- /dev/null +++ b/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java @@ -0,0 +1,78 @@ +package cuchaz.enigma.utils; + +import java.util.Objects; + +import javax.annotation.Nullable; + +public class ServerAddress { + + public final String address; + public final int port; + + private ServerAddress(String address, int port) { + this.address = address; + this.port = port; + } + + @Nullable + public static ServerAddress of(String address, int port) { + if (port < 0 || port > 65535) return null; + if (address == null) return null; + if (address.equals("")) return null; + if (!address.matches("[a-zA-Z0-9.:-]+")) return null; + if (address.startsWith("-") || address.endsWith("-")) return null; + return new ServerAddress(address, port); + } + + @Nullable + public static ServerAddress from(String s, int defaultPort) { + String address; + int idx = s.indexOf(']'); + if (s.startsWith("[") && idx != -1) { + address = s.substring(1, idx); + s = s.substring(idx + 1); + } else if (s.chars().filter(c -> c == ':').count() == 1) { + idx = s.indexOf(':'); + address = s.substring(0, idx); + s = s.substring(idx); + } else { + address = s; + s = ""; + } + + int port; + if (s.isEmpty()) { + port = defaultPort; + } else if (s.startsWith(":")) { + s = s.substring(1); + try { + port = Integer.parseInt(s); + } catch (NumberFormatException e) { + return null; + } + } else { + return null; + } + return ServerAddress.of(address, port); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ServerAddress that = (ServerAddress) o; + return port == that.port && + Objects.equals(address, that.address); + } + + @Override + public int hashCode() { + return Objects.hash(address, port); + } + + @Override + public String toString() { + return String.format("ServerAddress { address: '%s', port: %d }", address, port); + } + +} -- cgit v1.2.3 From f51c8a16770216003a1c8039a94e1632b2b1bb3c Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Wed, 22 Apr 2020 22:59:41 +0200 Subject: Extend validation system --- enigma/src/main/java/cuchaz/enigma/utils/validation/Message.java | 1 + 1 file changed, 1 insertion(+) (limited to 'enigma/src/main/java') diff --git a/enigma/src/main/java/cuchaz/enigma/utils/validation/Message.java b/enigma/src/main/java/cuchaz/enigma/utils/validation/Message.java index dca74bc..113199a 100644 --- a/enigma/src/main/java/cuchaz/enigma/utils/validation/Message.java +++ b/enigma/src/main/java/cuchaz/enigma/utils/validation/Message.java @@ -5,6 +5,7 @@ import cuchaz.enigma.utils.I18n; public class Message { public static final Message EMPTY_FIELD = create(Type.ERROR, "empty_field"); + public static final Message INVALID_IP = create(Type.ERROR, "invalid_ip"); public static final Message NOT_INT = create(Type.ERROR, "not_int"); public static final Message FIELD_OUT_OF_RANGE_INT = create(Type.ERROR, "field_out_of_range_int"); public static final Message FIELD_LENGTH_OUT_OF_RANGE = create(Type.ERROR, "field_length_out_of_range"); -- cgit v1.2.3 From a7163d46a6414c38c3eb4ba1e6783b3c158312db Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Thu, 4 Jun 2020 10:10:53 +0200 Subject: Move ServerAddress to enigma-server --- .../java/cuchaz/enigma/utils/ServerAddress.java | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java (limited to 'enigma/src/main/java') diff --git a/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java b/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java deleted file mode 100644 index 021d9a1..0000000 --- a/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java +++ /dev/null @@ -1,78 +0,0 @@ -package cuchaz.enigma.utils; - -import java.util.Objects; - -import javax.annotation.Nullable; - -public class ServerAddress { - - public final String address; - public final int port; - - private ServerAddress(String address, int port) { - this.address = address; - this.port = port; - } - - @Nullable - public static ServerAddress of(String address, int port) { - if (port < 0 || port > 65535) return null; - if (address == null) return null; - if (address.equals("")) return null; - if (!address.matches("[a-zA-Z0-9.:-]+")) return null; - if (address.startsWith("-") || address.endsWith("-")) return null; - return new ServerAddress(address, port); - } - - @Nullable - public static ServerAddress from(String s, int defaultPort) { - String address; - int idx = s.indexOf(']'); - if (s.startsWith("[") && idx != -1) { - address = s.substring(1, idx); - s = s.substring(idx + 1); - } else if (s.chars().filter(c -> c == ':').count() == 1) { - idx = s.indexOf(':'); - address = s.substring(0, idx); - s = s.substring(idx); - } else { - address = s; - s = ""; - } - - int port; - if (s.isEmpty()) { - port = defaultPort; - } else if (s.startsWith(":")) { - s = s.substring(1); - try { - port = Integer.parseInt(s); - } catch (NumberFormatException e) { - return null; - } - } else { - return null; - } - return ServerAddress.of(address, port); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ServerAddress that = (ServerAddress) o; - return port == that.port && - Objects.equals(address, that.address); - } - - @Override - public int hashCode() { - return Objects.hash(address, port); - } - - @Override - public String toString() { - return String.format("ServerAddress { address: '%s', port: %d }", address, port); - } - -} -- cgit v1.2.3