move IP patterns to Patterns class

Daniel Gultsch created 8 months ago

Change summary

src/main/java/eu/siacs/conversations/utils/IP.java       | 27 +--------
src/main/java/eu/siacs/conversations/utils/Patterns.java | 16 +++++
2 files changed, 21 insertions(+), 22 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/utils/IP.java

@@ -2,33 +2,16 @@ package eu.siacs.conversations.utils;
 
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
-import java.util.regex.Pattern;
 
 public class IP {
 
-    private static final Pattern PATTERN_IPV4 =
-            Pattern.compile(
-                    "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_HEX4DECCOMPRESSED =
-            Pattern.compile(
-                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)"
-                        + " ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_6HEX4DEC =
-            Pattern.compile(
-                    "\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_HEXCOMPRESSED =
-            Pattern.compile(
-                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
-    private static final Pattern PATTERN_IPV6 =
-            Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
-
     public static boolean matches(final String server) {
         return server != null
-                && (PATTERN_IPV4.matcher(server).matches()
-                        || PATTERN_IPV6.matcher(server).matches()
-                        || PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
-                        || PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
-                        || PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches());
+                && (Patterns.IPV4.matcher(server).matches()
+                        || Patterns.IPV6.matcher(server).matches()
+                        || Patterns.IPV6_6HEX4DEC.matcher(server).matches()
+                        || Patterns.IPV6_HEX4_DECOMPRESSED.matcher(server).matches()
+                        || Patterns.IPV6_HEX_COMPRESSED.matcher(server).matches());
     }
 
     public static String wrapIPv6(final String host) {

src/main/java/eu/siacs/conversations/utils/Patterns.java

@@ -18,6 +18,22 @@ public class Patterns {
                     "geo:(-?\\d+(?:\\.\\d+)?),(-?\\d+(?:\\.\\d+)?)(?:,-?\\d+(?:\\.\\d+)?)?(?:;crs=[\\w-]+)?(?:;u=\\d+(?:\\.\\d+)?)?(?:;[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+)*(\\?z=\\d+)?",
                     Pattern.CASE_INSENSITIVE);
 
+    public static final Pattern IPV4 =
+            Pattern.compile(
+                    "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    public static final Pattern IPV6 =
+            Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
+    public static final Pattern IPV6_HEX4_DECOMPRESSED =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)"
+                        + " ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    public static final Pattern IPV6_6HEX4DEC =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    public static final Pattern IPV6_HEX_COMPRESSED =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
+
     private Patterns() {
         throw new AssertionError("Do not instantiate me");
     }