diff --git a/src/main/java/ru/serega6531/packmate/model/CtfService.java b/src/main/java/ru/serega6531/packmate/model/CtfService.java index a20a8f4..737f2fb 100644 --- a/src/main/java/ru/serega6531/packmate/model/CtfService.java +++ b/src/main/java/ru/serega6531/packmate/model/CtfService.java @@ -3,6 +3,7 @@ package ru.serega6531.packmate.model; import lombok.*; import org.hibernate.Hibernate; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; @@ -19,6 +20,7 @@ public class CtfService { @Id private Integer port; + @Column(nullable = false) private String name; private boolean decryptTls; diff --git a/src/main/java/ru/serega6531/packmate/model/Packet.java b/src/main/java/ru/serega6531/packmate/model/Packet.java index 4095fcf..c35af64 100644 --- a/src/main/java/ru/serega6531/packmate/model/Packet.java +++ b/src/main/java/ru/serega6531/packmate/model/Packet.java @@ -55,6 +55,7 @@ public class Packet { private boolean tlsDecrypted; + @Column(nullable = false) private byte[] content; @Transient diff --git a/src/main/java/ru/serega6531/packmate/model/Pattern.java b/src/main/java/ru/serega6531/packmate/model/Pattern.java index 46bcba1..6d5acad 100644 --- a/src/main/java/ru/serega6531/packmate/model/Pattern.java +++ b/src/main/java/ru/serega6531/packmate/model/Pattern.java @@ -11,9 +11,7 @@ import ru.serega6531.packmate.model.enums.PatternActionType; import ru.serega6531.packmate.model.enums.PatternDirectionType; import ru.serega6531.packmate.model.enums.PatternSearchType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import javax.persistence.*; import java.util.Objects; @Getter @@ -38,16 +36,25 @@ public class Pattern { private boolean enabled; + @Column(nullable = false) private String name; + @Column(nullable = false) private String value; + @Column(nullable = false) private String color; // для вставки в css + @Enumerated + @Column(nullable = false) private PatternSearchType searchType; + @Enumerated + @Column(nullable = false) private PatternDirectionType directionType; + @Enumerated + @Column(nullable = false) private PatternActionType actionType; private Integer serviceId; diff --git a/src/main/java/ru/serega6531/packmate/model/Stream.java b/src/main/java/ru/serega6531/packmate/model/Stream.java index 7ec6edf..685fc3f 100644 --- a/src/main/java/ru/serega6531/packmate/model/Stream.java +++ b/src/main/java/ru/serega6531/packmate/model/Stream.java @@ -37,9 +37,11 @@ public class Stream { @GeneratedValue(generator = "stream_generator") private Long id; - @Column(name = "service_id") + @Column(name = "service_id", nullable = false) private int service; + @Enumerated + @Column(nullable = false) private Protocol protocol; @OneToMany(mappedBy = "stream", cascade = CascadeType.ALL, orphanRemoval = true) @@ -62,7 +64,7 @@ public class Stream { private boolean favorite; - @Column(columnDefinition = "smallint") + @Column(nullable = false, columnDefinition = "smallint") private int ttl; @Column(columnDefinition = "char(3)")