Рефакторинг

src/main/java/ru/serega6531/packmate/service/PatternMatcher.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.crypto.codec.Hex;
 import ru.serega6531.packmate.model.FoundPattern;
 import ru.serega6531.packmate.model.Pattern;
-import ru.serega6531.packmate.model.enums.PatternSearchType;
 import ru.serega6531.packmate.utils.Bytes;
 
 import java.util.*;
@@ -20,19 +19,32 @@ class PatternMatcher {
 
     private final Set<FoundPattern> result = new HashSet<>();
 
-    public PatternMatcher(byte[] contentBytes, List<Pattern> patterns) {
+    PatternMatcher(byte[] contentBytes, List<Pattern> patterns) {
         this.contentBytes = contentBytes;
         this.content = new String(contentBytes);
         this.patterns = patterns;
     }
 
-    public Set<FoundPattern> findMatches() {
+    Set<FoundPattern> findMatches() {
         patterns.forEach(this::match);
         return result;
     }
 
     private void match(Pattern pattern) {
-        if (pattern.getSearchType() == PatternSearchType.REGEX) {
+        switch (pattern.getSearchType()) {
+            case REGEX:
+                matchRegex(pattern);
+                break;
+            case SUBSTRING:
+                matchSubstring(pattern);
+                break;
+            case SUBBYTES:
+                matchSubbytes(pattern);
+                break;
+        }
+    }
+
+    private void matchRegex(Pattern pattern) {
         final var regex = compilePattern(pattern);
         final Matcher matcher = regex.matcher(content);
         int startPos = 0;
@@ -45,7 +57,9 @@ class PatternMatcher {
                     .build());
             startPos = matcher.end();
         }
-        } else if (pattern.getSearchType() == PatternSearchType.SUBSTRING) {
+    }
+
+    private void matchSubstring(Pattern pattern) {
         int startSearch = 0;
         final String value = pattern.getValue();
 
@@ -65,7 +79,9 @@ class PatternMatcher {
 
             startSearch = end + 1;
         }
-        } else if (pattern.getSearchType() == PatternSearchType.SUBBYTES) {
+    }
+
+    private void matchSubbytes(Pattern pattern) {
         int startSearch = 0;
         final byte[] value = Hex.decode(pattern.getValue());
 
@@ -86,7 +102,6 @@ class PatternMatcher {
             startSearch = end + 1;
         }
     }
-    }
 
     private void addIfPossible(FoundPattern found) {
         if (result.stream().noneMatch(match -> between(match.getStartPosition(), match.getEndPosition(), found.getStartPosition()) ||

src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java

@@ -39,7 +39,7 @@ public class StreamSubscriptionService {
         log.info("Отписан пользователь {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
     }
 
-    public void broadcast(SubscriptionMessage message) {
+    void broadcast(SubscriptionMessage message) {
         subscribers.forEach(s -> {
             try {
                 s.sendMessage(objectToTextMessage(message));