Рефакторинг

src/main/java/ru/serega6531/packmate/PcapWorker.java

@@ -23,7 +23,6 @@ import javax.annotation.PreDestroy;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
@@ -81,7 +80,7 @@ public class PcapWorker implements PacketListener {
         loopExecutorService.execute(() -> {
             try {
                 log.info("Intercept started");
-                pcap.loop(-1, this);   // использовать другой executor?
+                pcap.loop(-1, this);   //  использовать другой executor?
             } catch (InterruptedException ignored) {
                 Thread.currentThread().interrupt();
                 // выходим
@@ -192,11 +191,10 @@ public class PcapWorker implements PacketListener {
 
     private UnfinishedStream addNewPacket(Inet4Address sourceIp, Inet4Address destIp,
                                           int sourcePort, int destPort, byte ttl, byte[] content, Protocol protocol) {
-        boolean incoming = destIp.equals(localIp);
+        var incoming = destIp.equals(localIp);
+        var stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol);
 
-        UnfinishedStream stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol);
+        var packet = ru.serega6531.packmate.model.Packet.builder()
-
-        ru.serega6531.packmate.model.Packet packet = ru.serega6531.packmate.model.Packet.builder()
                 .tempId(packetIdCounter++)
                 .ttl(ttl)
                 .timestamp(System.currentTimeMillis())
@@ -204,8 +202,7 @@ public class PcapWorker implements PacketListener {
                 .content(content)
                 .build();
 
-        final ListMultimap<UnfinishedStream, ru.serega6531.packmate.model.Packet> streams =
+        final var streams = (protocol == Protocol.TCP) ? this.unfinishedTcpStreams : this.unfinishedUdpStreams;
-                (protocol == Protocol.TCP) ? this.unfinishedTcpStreams : this.unfinishedUdpStreams;
 
         if (!streams.containsKey(stream)) {
             log.debug("Начат новый стрим");
@@ -247,20 +244,18 @@ public class PcapWorker implements PacketListener {
             int streamsClosed = 0;
 
             final long time = System.currentTimeMillis();
-            final ListMultimap<UnfinishedStream, ru.serega6531.packmate.model.Packet> streams =
+            final var streams = (protocol == Protocol.TCP) ? this.unfinishedTcpStreams : this.unfinishedUdpStreams;
-                    (protocol == Protocol.TCP) ? this.unfinishedTcpStreams : this.unfinishedUdpStreams;
 
-            final Map<UnfinishedStream, List<ru.serega6531.packmate.model.Packet>> oldStreams =
+            final var oldStreams = Multimaps.asMap(streams).entrySet().stream()
-                    Multimaps.asMap(streams).entrySet().stream()
+                    .filter(entry -> {
-                            .filter(entry -> {
+                        final var packets = entry.getValue();
-                                final List<ru.serega6531.packmate.model.Packet> packets = entry.getValue();
+                        return time - packets.get(packets.size() - 1).getTimestamp() > timeoutMillis;
-                                return time - packets.get(packets.size() - 1).getTimestamp() > timeoutMillis;
+                    })
-                            })
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-                            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
-            for (Map.Entry<UnfinishedStream, List<ru.serega6531.packmate.model.Packet>> entry : oldStreams.entrySet()) {
+            for (var entry : oldStreams.entrySet()) {
                 final UnfinishedStream stream = entry.getKey();
-                final List<ru.serega6531.packmate.model.Packet> packets = entry.getValue();
+                final var packets = entry.getValue();
 
                 if (streamService.saveNewStream(stream, packets)) {
                     streamsClosed++;

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

@@ -33,7 +33,7 @@ public class PatternMatcher {
 
     private void match(Pattern pattern) {
         if (pattern.getSearchType() == PatternSearchType.REGEX) {
-            final java.util.regex.Pattern regex = compilePattern(pattern);
+            final var regex = compilePattern(pattern);
             final Matcher matcher = regex.matcher(content);
             int startPos = 0;
 
@@ -99,7 +99,6 @@ public class PatternMatcher {
         return a <= x && x <= b;
     }
 
-
     private java.util.regex.Pattern compilePattern(Pattern pattern) {
         return compiledPatterns.computeIfAbsent(pattern.getValue(), java.util.regex.Pattern::compile);
     }

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

@@ -56,14 +56,14 @@ public class StreamService {
      */
     @Transactional
     public boolean saveNewStream(UnfinishedStream unfinishedStream, List<Packet> packets) {
-        final Optional<CtfService> serviceOptional = servicesService.findService(
+        final var serviceOptional = servicesService.findService(
                 unfinishedStream.getFirstIp(),
                 unfinishedStream.getFirstPort(),
                 unfinishedStream.getSecondIp(),
                 unfinishedStream.getSecondPort()
         );
 
-        if (!serviceOptional.isPresent()) {
+        if (serviceOptional.isEmpty()) {
             log.warn("Не удалось сохранить стрим: сервиса на порту {} или {} не существует",
                     unfinishedStream.getFirstPort(), unfinishedStream.getSecondPort());
             return false;