From d3ed284ebe963121982835ded275a6fa4bee2a6e Mon Sep 17 00:00:00 2001
From: serega6531 <serega6531@yandex.ru>
Date: Sat, 14 Mar 2020 19:13:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packmate/service/PatternMatcher.java      | 109 ++++++++++--------
 .../service/StreamSubscriptionService.java    |   2 +-
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java b/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java
index c08e55a..46dff4b 100644
--- a/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java
+++ b/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,71 +19,87 @@ 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) {
-            final var regex = compilePattern(pattern);
-            final Matcher matcher = regex.matcher(content);
-            int startPos = 0;
+        switch (pattern.getSearchType()) {
+            case REGEX:
+                matchRegex(pattern);
+                break;
+            case SUBSTRING:
+                matchSubstring(pattern);
+                break;
+            case SUBBYTES:
+                matchSubbytes(pattern);
+                break;
+        }
+    }
 
-            while (matcher.find(startPos)) {
-                addIfPossible(FoundPattern.builder()
-                        .patternId(pattern.getId())
-                        .startPosition(matcher.start())
-                        .endPosition(matcher.end() - 1)
-                        .build());
-                startPos = matcher.end();
+    private void matchRegex(Pattern pattern) {
+        final var regex = compilePattern(pattern);
+        final Matcher matcher = regex.matcher(content);
+        int startPos = 0;
+
+        while (matcher.find(startPos)) {
+            addIfPossible(FoundPattern.builder()
+                    .patternId(pattern.getId())
+                    .startPosition(matcher.start())
+                    .endPosition(matcher.end() - 1)
+                    .build());
+            startPos = matcher.end();
+        }
+    }
+
+    private void matchSubstring(Pattern pattern) {
+        int startSearch = 0;
+        final String value = pattern.getValue();
+
+        while (true) {
+            int start = StringUtils.indexOfIgnoreCase(content, value, startSearch);
+
+            if (start == -1) {
+                return;
             }
-        } else if (pattern.getSearchType() == PatternSearchType.SUBSTRING) {
-            int startSearch = 0;
-            final String value = pattern.getValue();
 
-            while (true) {
-                int start = StringUtils.indexOfIgnoreCase(content, value, startSearch);
+            int end = start + value.length() - 1;
+            addIfPossible(FoundPattern.builder()
+                    .patternId(pattern.getId())
+                    .startPosition(start)
+                    .endPosition(end)
+                    .build());
 
-                if (start == -1) {
-                    return;
-                }
+            startSearch = end + 1;
+        }
+    }
 
-                int end = start + value.length() - 1;
-                addIfPossible(FoundPattern.builder()
-                        .patternId(pattern.getId())
-                        .startPosition(start)
-                        .endPosition(end)
-                        .build());
+    private void matchSubbytes(Pattern pattern) {
+        int startSearch = 0;
+        final byte[] value = Hex.decode(pattern.getValue());
 
-                startSearch = end + 1;
+        while (true) {
+            int start = Bytes.indexOf(contentBytes, value, startSearch, contentBytes.length);
+
+            if (start == -1) {
+                return;
             }
-        } else if (pattern.getSearchType() == PatternSearchType.SUBBYTES) {
-            int startSearch = 0;
-            final byte[] value = Hex.decode(pattern.getValue());
 
-            while (true) {
-                int start = Bytes.indexOf(contentBytes, value, startSearch, contentBytes.length);
+            int end = start + value.length - 1;
+            addIfPossible(FoundPattern.builder()
+                    .patternId(pattern.getId())
+                    .startPosition(start)
+                    .endPosition(end)
+                    .build());
 
-                if (start == -1) {
-                    return;
-                }
-
-                int end = start + value.length - 1;
-                addIfPossible(FoundPattern.builder()
-                        .patternId(pattern.getId())
-                        .startPosition(start)
-                        .endPosition(end)
-                        .build());
-
-                startSearch = end + 1;
-            }
+            startSearch = end + 1;
         }
     }
 
diff --git a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
index e89f2a5..94db5b5 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
+++ b/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));