diff options
| author | 2020-06-04 10:10:53 +0200 | |
|---|---|---|
| committer | 2020-06-04 10:10:53 +0200 | |
| commit | a7163d46a6414c38c3eb4ba1e6783b3c158312db (patch) | |
| tree | 564f1b78819c68c64ae14b09b85c6a120c3170fb /enigma-server | |
| parent | Use StandardValidation.notBlank instead of manually checking field text (diff) | |
| download | enigma-a7163d46a6414c38c3eb4ba1e6783b3c158312db.tar.gz enigma-a7163d46a6414c38c3eb4ba1e6783b3c158312db.tar.xz enigma-a7163d46a6414c38c3eb4ba1e6783b3c158312db.zip | |
Move ServerAddress to enigma-server
Diffstat (limited to 'enigma-server')
| -rw-r--r-- | enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java | 78 | ||||
| -rw-r--r-- | enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java | 28 |
2 files changed, 106 insertions, 0 deletions
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java new file mode 100644 index 00000000..45e07508 --- /dev/null +++ b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java | |||
| @@ -0,0 +1,78 @@ | |||
| 1 | package cuchaz.enigma.network; | ||
| 2 | |||
| 3 | import java.util.Objects; | ||
| 4 | |||
| 5 | import javax.annotation.Nullable; | ||
| 6 | |||
| 7 | public class ServerAddress { | ||
| 8 | |||
| 9 | public final String address; | ||
| 10 | public final int port; | ||
| 11 | |||
| 12 | private ServerAddress(String address, int port) { | ||
| 13 | this.address = address; | ||
| 14 | this.port = port; | ||
| 15 | } | ||
| 16 | |||
| 17 | @Nullable | ||
| 18 | public static ServerAddress of(String address, int port) { | ||
| 19 | if (port < 0 || port > 65535) return null; | ||
| 20 | if (address == null) return null; | ||
| 21 | if (address.equals("")) return null; | ||
| 22 | if (!address.matches("[a-zA-Z0-9.:-]+")) return null; | ||
| 23 | if (address.startsWith("-") || address.endsWith("-")) return null; | ||
| 24 | return new ServerAddress(address, port); | ||
| 25 | } | ||
| 26 | |||
| 27 | @Nullable | ||
| 28 | public static ServerAddress from(String s, int defaultPort) { | ||
| 29 | String address; | ||
| 30 | int idx = s.indexOf(']'); | ||
| 31 | if (s.startsWith("[") && idx != -1) { | ||
| 32 | address = s.substring(1, idx); | ||
| 33 | s = s.substring(idx + 1); | ||
| 34 | } else if (s.chars().filter(c -> c == ':').count() == 1) { | ||
| 35 | idx = s.indexOf(':'); | ||
| 36 | address = s.substring(0, idx); | ||
| 37 | s = s.substring(idx); | ||
| 38 | } else { | ||
| 39 | address = s; | ||
| 40 | s = ""; | ||
| 41 | } | ||
| 42 | |||
| 43 | int port; | ||
| 44 | if (s.isEmpty()) { | ||
| 45 | port = defaultPort; | ||
| 46 | } else if (s.startsWith(":")) { | ||
| 47 | s = s.substring(1); | ||
| 48 | try { | ||
| 49 | port = Integer.parseInt(s); | ||
| 50 | } catch (NumberFormatException e) { | ||
| 51 | return null; | ||
| 52 | } | ||
| 53 | } else { | ||
| 54 | return null; | ||
| 55 | } | ||
| 56 | return ServerAddress.of(address, port); | ||
| 57 | } | ||
| 58 | |||
| 59 | @Override | ||
| 60 | public boolean equals(Object o) { | ||
| 61 | if (this == o) return true; | ||
| 62 | if (o == null || getClass() != o.getClass()) return false; | ||
| 63 | ServerAddress that = (ServerAddress) o; | ||
| 64 | return port == that.port && | ||
| 65 | Objects.equals(address, that.address); | ||
| 66 | } | ||
| 67 | |||
| 68 | @Override | ||
| 69 | public int hashCode() { | ||
| 70 | return Objects.hash(address, port); | ||
| 71 | } | ||
| 72 | |||
| 73 | @Override | ||
| 74 | public String toString() { | ||
| 75 | return String.format("ServerAddress { address: '%s', port: %d }", address, port); | ||
| 76 | } | ||
| 77 | |||
| 78 | } | ||
diff --git a/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java new file mode 100644 index 00000000..3765f7a5 --- /dev/null +++ b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | package cuchaz.enigma.network; | ||
| 2 | |||
| 3 | import org.junit.Test; | ||
| 4 | |||
| 5 | import static org.junit.Assert.assertEquals; | ||
| 6 | import static org.junit.Assert.assertNull; | ||
| 7 | |||
| 8 | public class ServerAddressTest { | ||
| 9 | |||
| 10 | @Test | ||
| 11 | public void validAddresses() { | ||
| 12 | assertEquals(ServerAddress.of("127.0.0.1", 22), ServerAddress.from("127.0.0.1", 22)); | ||
| 13 | assertEquals(ServerAddress.of("::1", 80), ServerAddress.from("[::1]:80", 22)); | ||
| 14 | assertEquals(ServerAddress.of("dblsaiko.net", 22), ServerAddress.from("dblsaiko.net", 22)); | ||
| 15 | assertEquals(ServerAddress.of("f00f:efee::127.0.0.1", 724), ServerAddress.from("[f00f:efee::127.0.0.1]:724", 22)); | ||
| 16 | assertEquals(ServerAddress.of("aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:70", 22), ServerAddress.from("aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:70", 22)); | ||
| 17 | assertEquals(ServerAddress.of("::1", 22), ServerAddress.from("::1", 22)); | ||
| 18 | assertEquals(ServerAddress.of("0", 22), ServerAddress.from("0", 22)); | ||
| 19 | } | ||
| 20 | |||
| 21 | @Test | ||
| 22 | public void invalidAddresses() { | ||
| 23 | assertNull(ServerAddress.from("127.0.0.1:-72", 22)); | ||
| 24 | assertNull(ServerAddress.from("127.0.0.1:100000000", 22)); | ||
| 25 | assertNull(ServerAddress.from("127.0.0.1:lmao", 22)); | ||
| 26 | } | ||
| 27 | |||
| 28 | } | ||