From 9838777b74bd1814e2b2786d23f5490e65780aad Mon Sep 17 00:00:00 2001 From: sshkurov Date: Wed, 2 Feb 2022 06:00:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20id=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B7=D0=B0=20=D1=80=D0=B0=D0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/serega6531/packmate/model/FoundPattern.java | 9 +++++---- .../java/ru/serega6531/packmate/model/Packet.java | 8 +++++--- .../java/ru/serega6531/packmate/model/Pattern.java | 12 ++++++++---- .../java/ru/serega6531/packmate/model/Stream.java | 7 ++++--- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/ru/serega6531/packmate/model/FoundPattern.java b/src/main/java/ru/serega6531/packmate/model/FoundPattern.java index 8ec151a..d7b365b 100644 --- a/src/main/java/ru/serega6531/packmate/model/FoundPattern.java +++ b/src/main/java/ru/serega6531/packmate/model/FoundPattern.java @@ -3,6 +3,7 @@ package ru.serega6531.packmate.model; import lombok.*; import org.hibernate.Hibernate; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; import javax.persistence.*; import java.util.Objects; @@ -12,9 +13,9 @@ import java.util.Objects; name = "found_pattern_generator", strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator", parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "found_pattern_seq"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + @Parameter(name = "sequence_name", value = "found_pattern_seq"), + @Parameter(name = "initial_value", value = "1"), + @Parameter(name = "increment_size", value = "1") } ) @NoArgsConstructor @@ -25,7 +26,7 @@ import java.util.Objects; public class FoundPattern { @Id - @GeneratedValue(generator = "found_pattern_generator") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "found_pattern_generator") private Long id; @ManyToOne(optional = false) diff --git a/src/main/java/ru/serega6531/packmate/model/Packet.java b/src/main/java/ru/serega6531/packmate/model/Packet.java index 2f168b6..91b6a1d 100644 --- a/src/main/java/ru/serega6531/packmate/model/Packet.java +++ b/src/main/java/ru/serega6531/packmate/model/Packet.java @@ -3,6 +3,7 @@ package ru.serega6531.packmate.model; import lombok.*; import org.hibernate.Hibernate; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; import javax.persistence.*; import java.util.Objects; @@ -16,9 +17,10 @@ import java.util.Set; name = "packet_generator", strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator", parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "packet_seq"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + @Parameter(name = "sequence_name", value = "packet_seq"), + @Parameter(name = "initial_value", value = "1"), + @Parameter(name = "increment_size", value = "5"), + @Parameter(name = "optimizer", value = "hilo") } ) @AllArgsConstructor diff --git a/src/main/java/ru/serega6531/packmate/model/Pattern.java b/src/main/java/ru/serega6531/packmate/model/Pattern.java index 9017934..46bcba1 100644 --- a/src/main/java/ru/serega6531/packmate/model/Pattern.java +++ b/src/main/java/ru/serega6531/packmate/model/Pattern.java @@ -1,8 +1,12 @@ package ru.serega6531.packmate.model; -import lombok.*; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.ToString; import org.hibernate.Hibernate; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; import ru.serega6531.packmate.model.enums.PatternActionType; import ru.serega6531.packmate.model.enums.PatternDirectionType; import ru.serega6531.packmate.model.enums.PatternSearchType; @@ -21,9 +25,9 @@ import java.util.Objects; name = "pattern_generator", strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator", parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "pattern_seq"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + @Parameter(name = "sequence_name", value = "pattern_seq"), + @Parameter(name = "initial_value", value = "1"), + @Parameter(name = "increment_size", value = "1") } ) public class Pattern { diff --git a/src/main/java/ru/serega6531/packmate/model/Stream.java b/src/main/java/ru/serega6531/packmate/model/Stream.java index 9da546b..ad060dc 100644 --- a/src/main/java/ru/serega6531/packmate/model/Stream.java +++ b/src/main/java/ru/serega6531/packmate/model/Stream.java @@ -3,6 +3,7 @@ package ru.serega6531.packmate.model; import lombok.*; import org.hibernate.Hibernate; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; import ru.serega6531.packmate.model.enums.Protocol; import javax.persistence.*; @@ -17,9 +18,9 @@ import java.util.*; name = "stream_generator", strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator", parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "stream_seq"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + @Parameter(name = "sequence_name", value = "stream_seq"), + @Parameter(name = "initial_value", value = "1"), + @Parameter(name = "increment_size", value = "1") } ) public class Stream {