Изменен формат сообщений в ws, рефакторинг

This commit is contained in:
serega6531
2019-11-25 00:52:08 +03:00
parent 9b5a61f023
commit 43d6973948
19 changed files with 87 additions and 39 deletions

View File

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.ToString;
import org.hibernate.annotations.GenericGenerator;
import ru.serega6531.packmate.model.enums.PatternType;
import javax.persistence.*;
import java.util.List;

View File

@@ -1,5 +0,0 @@
package ru.serega6531.packmate.model;
public enum Protocol {
TCP, UDP
}

View File

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.ToString;
import org.hibernate.annotations.GenericGenerator;
import ru.serega6531.packmate.model.enums.Protocol;
import javax.persistence.*;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package ru.serega6531.packmate.model;
package ru.serega6531.packmate.model.enums;
public enum PatternType {
INPUT, OUTPUT, BOTH

View File

@@ -0,0 +1,5 @@
package ru.serega6531.packmate.model.enums;
public enum Protocol {
TCP, UDP
}

View File

@@ -0,0 +1,7 @@
package ru.serega6531.packmate.model.enums;
public enum SubscriptionMessageType {
SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, DELETE_PATTERN, NEW_STREAM
}

View File

@@ -1,7 +1,8 @@
package ru.serega6531.packmate.model;
package ru.serega6531.packmate.model.pojo;
import lombok.Data;
import org.springframework.data.domain.Sort;
import ru.serega6531.packmate.model.Pattern;
@Data
public class Pagination {

View File

@@ -0,0 +1,14 @@
package ru.serega6531.packmate.model.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
import ru.serega6531.packmate.model.enums.SubscriptionMessageType;
@Data
@AllArgsConstructor
public class SubscriptionMessage {
private SubscriptionMessageType type;
private Object value;
}

View File

@@ -1,7 +1,8 @@
package ru.serega6531.packmate.model;
package ru.serega6531.packmate.model.pojo;
import lombok.AllArgsConstructor;
import lombok.Getter;
import ru.serega6531.packmate.model.enums.Protocol;
import java.net.Inet4Address;
@@ -17,7 +18,7 @@ public class UnfinishedStream {
@Override
public boolean equals(Object obj) {
if(!(obj instanceof UnfinishedStream)) {
if (!(obj instanceof UnfinishedStream)) {
return false;
}