Merge branch 'master' into enable-patterns

# Conflicts:
#	src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
#	src/main/java/ru/serega6531/packmate/service/PatternService.java

src/main/java/ru/serega6531/packmate/model/CtfService.java

@@ -22,4 +22,6 @@ public class CtfService {
 
     private boolean mergeAdjacentPackets;
 
+    private boolean inflateWebSockets;
+
 }

src/main/java/ru/serega6531/packmate/model/Packet.java

@@ -52,6 +52,18 @@ public class Packet {
 
     private boolean ungzipped;
 
+    private boolean webSocketInflated;
+
     private byte[] content;
 
+    @Transient
+    @JsonIgnore
+    public String getContentString() {
+        return new String(content);
+    }
+
+    public String toString() {
+        return "Packet(id=" + id + ", content=" + getContentString() + ")";
+    }
+
 }

src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java

@@ -1,5 +1,5 @@
 package ru.serega6531.packmate.model.enums;
 
 public enum SubscriptionMessageType {
-    SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, ENABLE_PATTERN, DISABLE_PATTERN, NEW_STREAM
+    SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, ENABLE_PATTERN, DISABLE_PATTERN, NEW_STREAM, COUNTERS_UPDATE
 }

src/main/java/ru/serega6531/packmate/model/pojo/Counter.java

@@ -0,0 +1,18 @@
+package ru.serega6531.packmate.model.pojo;
+
+import lombok.Getter;
+
+@Getter
+public class Counter {
+
+    private int value = 0;
+
+    public void increment() {
+        value++;
+    }
+
+    public void increment(int num) {
+        value += num;
+    }
+
+}

src/main/java/ru/serega6531/packmate/model/pojo/CountersHolder.java

@@ -0,0 +1,23 @@
+package ru.serega6531.packmate.model.pojo;
+
+import lombok.Getter;
+
+import java.util.Map;
+
+@Getter
+public class CountersHolder {
+
+    private Map<Integer, Integer> servicesPackets;
+    private Map<Integer, Integer> servicesStreams;
+
+    private int totalPackets;
+    private int totalStreams;
+
+    public CountersHolder(Map<Integer, Integer> servicesPackets, Map<Integer, Integer> servicesStreams,
+                          int totalPackets, int totalStreams) {
+        this.servicesPackets = servicesPackets;
+        this.servicesStreams = servicesStreams;
+        this.totalPackets = totalPackets;
+        this.totalStreams = totalStreams;
+    }
+}