Изменен формат сообщений в ws, рефакторинг
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
package ru.serega6531.packmate.model;
|
||||
|
||||
public enum Protocol {
|
||||
TCP, UDP
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package ru.serega6531.packmate.model;
|
||||
package ru.serega6531.packmate.model.enums;
|
||||
|
||||
public enum PatternType {
|
||||
INPUT, OUTPUT, BOTH
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.serega6531.packmate.model.enums;
|
||||
|
||||
public enum Protocol {
|
||||
TCP, UDP
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package ru.serega6531.packmate.model.enums;
|
||||
|
||||
public enum SubscriptionMessageType {
|
||||
|
||||
SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, DELETE_PATTERN, NEW_STREAM
|
||||
|
||||
}
|
||||
@@ -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 {
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user