From 731d86595317fbc0cc576edb9800bd201b5a4ccf Mon Sep 17 00:00:00 2001
From: serega6531 <serega6531@yandex.ru>
Date: Sat, 14 Mar 2020 00:04:49 +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

---
 .../ru/serega6531/packmate/service/PatternMatcher.java     | 4 ++--
 .../ru/serega6531/packmate/service/ServicesService.java    | 2 +-
 .../java/ru/serega6531/packmate/service/StreamService.java | 3 ++-
 .../packmate/service/StreamSubscriptionService.java        | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java b/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java
index e2d2cbb..c08e55a 100644
--- a/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java
+++ b/src/main/java/ru/serega6531/packmate/service/PatternMatcher.java
@@ -10,7 +10,7 @@ import ru.serega6531.packmate.utils.Bytes;
 import java.util.*;
 import java.util.regex.Matcher;
 
-public class PatternMatcher {
+class PatternMatcher {
 
     private static final Map<String, java.util.regex.Pattern> compiledPatterns = new HashMap<>();
 
@@ -65,7 +65,7 @@ public class PatternMatcher {
 
                 startSearch = end + 1;
             }
-        } else {  // SUBBYTES
+        } else if (pattern.getSearchType() == PatternSearchType.SUBBYTES) {
             int startSearch = 0;
             final byte[] value = Hex.decode(pattern.getValue());
 
diff --git a/src/main/java/ru/serega6531/packmate/service/ServicesService.java b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
index 4037371..ee93035 100644
--- a/src/main/java/ru/serega6531/packmate/service/ServicesService.java
+++ b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
@@ -50,7 +50,7 @@ public class ServicesService {
         return Optional.empty();
     }
 
-    public Optional<CtfService> findByPort(int port) {
+    private Optional<CtfService> findByPort(int port) {
         return Optional.ofNullable(services.get(port));
     }
 
diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java
index 14a60ed..96b2e41 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamService.java
+++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java
@@ -145,7 +145,7 @@ public class StreamService {
         return foundPatterns;
     }
 
-    public Stream save(Stream stream) {
+    private Stream save(Stream stream) {
         Stream saved;
         if (stream.getId() == null) {
             saved = repository.save(stream);
@@ -167,6 +167,7 @@ public class StreamService {
         repository.setFavorite(id, favorite);
     }
 
+    @SuppressWarnings("ConstantConditions")
     public List<Stream> findAll(Pagination pagination, Optional<Integer> service, boolean onlyFavorites) {
         PageRequest page = PageRequest.of(0, pagination.getPageSize(), pagination.getDirection(), "id");
 
diff --git a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
index 0890081..e89f2a5 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
+++ b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
@@ -14,12 +14,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 public class StreamSubscriptionService {
 
-    private List<WebSocketSession> subscribers = Collections.synchronizedList(new ArrayList<>());
+    private final List<WebSocketSession> subscribers = Collections.synchronizedList(new ArrayList<>());
 
     private final ObjectMapper mapper;
 
@@ -30,12 +31,12 @@ public class StreamSubscriptionService {
 
     public void addSubscriber(WebSocketSession session) {
         subscribers.add(session);
-        log.info("Подписан пользователь {}", session.getRemoteAddress().getHostName());
+        log.info("Подписан пользователь {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
     }
 
     public void removeSubscriber(WebSocketSession session) {
         subscribers.remove(session);
-        log.info("Отписан пользователь {}", session.getRemoteAddress().getHostName());
+        log.info("Отписан пользователь {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
     }
 
     public void broadcast(SubscriptionMessage message) {