Attempt to reorder methods based on comments

NationalSecurityAgency · Jun 8, 2023 · 261303d · 261303d
1 parent dff4775
commit 261303d
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/src/main/java/emissary/util/search/ByteMatcher.java b/src/main/java/emissary/util/search/ByteMatcher.java
@@ -71,60 +71,60 @@ public boolean containsAny(String... patterns) {
         return Arrays.stream(patterns).anyMatch(this::contains);
     }
 
-    public boolean containsAnyIgnoreCase(String... patterns) {
-        return Arrays.stream(patterns).anyMatch(this::containsIgnoreCase);
-    }
-
-    public boolean containsAny(int beginIndex, int endIndex, String... patterns) {
-        return Arrays.stream(patterns).anyMatch(pattern -> contains(pattern, beginIndex, endIndex));
+    public boolean containsAll(String... patterns) {
+        return Arrays.stream(patterns).allMatch(this::contains);
     }
 
-    public boolean containsAnyIgnoreCase(int beginIndex, int endIndex, String... patterns) {
-        return Arrays.stream(patterns).anyMatch(pattern -> containsIgnoreCase(pattern, beginIndex, endIndex));
+    public boolean contains(String pattern) {
+        return contains(pattern.getBytes());
     }
 
-    public boolean containsAll(String... patterns) {
-        return Arrays.stream(patterns).allMatch(this::contains);
+    public boolean contains(byte[] pattern) {
+        return indexOf(pattern) >= 0;
     }
 
-    public boolean containsAllIgnoreCase(String... patterns) {
-        return Arrays.stream(patterns).allMatch(this::containsIgnoreCase);
+    public boolean containsAny(int beginIndex, int endIndex, String... patterns) {
+        return Arrays.stream(patterns).anyMatch(pattern -> contains(pattern, beginIndex, endIndex));
     }
 
     public boolean containsAll(int beginIndex, int endIndex, String... patterns) {
         return Arrays.stream(patterns).allMatch(pattern -> contains(pattern, beginIndex, endIndex));
     }
 
-    public boolean containsAllIgnoreCase(int beginIndex, int endIndex, String... patterns) {
-        return Arrays.stream(patterns).allMatch(pattern -> containsIgnoreCase(pattern, beginIndex, endIndex));
-    }
-
-    public boolean contains(String pattern) {
-        return contains(pattern.getBytes());
+    public boolean contains(String pattern, int beginIndex, int endIndex) {
+        return contains(pattern.getBytes(), beginIndex, endIndex);
     }
 
-    public boolean containsIgnoreCase(String pattern) {
-        return containsIgnoreCase(pattern.getBytes());
+    public boolean contains(byte[] pattern, int beginIndex, int endIndex) {
+        return indexOf(pattern, beginIndex, endIndex) >= 0;
     }
 
-    public boolean contains(String pattern, int beginIndex, int endIndex) {
-        return contains(pattern.getBytes(), beginIndex, endIndex);
+    public boolean containsAnyIgnoreCase(String... patterns) {
+        return Arrays.stream(patterns).anyMatch(this::containsIgnoreCase);
     }
 
-    public boolean containsIgnoreCase(String pattern, int beginIndex, int endIndex) {
-        return containsIgnoreCase(pattern.getBytes(), beginIndex, endIndex);
+    public boolean containsAllIgnoreCase(String... patterns) {
+        return Arrays.stream(patterns).allMatch(this::containsIgnoreCase);
     }
 
-    public boolean contains(byte[] pattern) {
-        return indexOf(pattern) >= 0;
+    public boolean containsIgnoreCase(String pattern) {
+        return containsIgnoreCase(pattern.getBytes());
     }
 
     public boolean containsIgnoreCase(byte[] pattern) {
         return indexIgnoreCase(pattern) >= 0;
     }
 
-    public boolean contains(byte[] pattern, int beginIndex, int endIndex) {
-        return indexOf(pattern, beginIndex, endIndex) >= 0;
+    public boolean containsAnyIgnoreCase(int beginIndex, int endIndex, String... patterns) {
+        return Arrays.stream(patterns).anyMatch(pattern -> containsIgnoreCase(pattern, beginIndex, endIndex));
+    }
+
+    public boolean containsAllIgnoreCase(int beginIndex, int endIndex, String... patterns) {
+        return Arrays.stream(patterns).allMatch(pattern -> containsIgnoreCase(pattern, beginIndex, endIndex));
+    }
+
+    public boolean containsIgnoreCase(String pattern, int beginIndex, int endIndex) {
+        return containsIgnoreCase(pattern.getBytes(), beginIndex, endIndex);
     }
 
     public boolean containsIgnoreCase(byte[] pattern, int beginIndex, int endIndex) {