Skip to content
Snippets Groups Projects
Commit f6575c0a authored by Jan Tymel's avatar Jan Tymel
Browse files

Change strategy of generated value of entities' ID from TABLE to SEQUENCE since it is easier to use

parent 8cdf8280
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ import javax.persistence.GenerationType; ...@@ -8,6 +8,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Inheritance; import javax.persistence.Inheritance;
import javax.persistence.InheritanceType; import javax.persistence.InheritanceType;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
...@@ -18,7 +19,8 @@ import java.io.Serializable; ...@@ -18,7 +19,8 @@ import java.io.Serializable;
public abstract class AbstractPhase implements Serializable { public abstract class AbstractPhase implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "phaseGenerator")
@SequenceGenerator(name = "phaseGenerator", sequenceName = "phase_seq")
private Long id; private Long id;
private String title; private String title;
......
...@@ -7,16 +7,18 @@ import javax.persistence.GeneratedValue; ...@@ -7,16 +7,18 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
@Entity @Entity
public class DecisionMatrixRow implements Serializable { public class DecisionMatrixRow implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "decisionMatrixRowGenerator")
@SequenceGenerator(name = "decisionMatrixRowGenerator", sequenceName = "decision_matrix_row_seq")
private Long id; private Long id;
@Column(name = "order_in_phase", nullable = false) @Column(name = "order_in_training_phase", nullable = false)
private int order; private int order;
private double assessmentAnswered; private double assessmentAnswered;
private double keywordUsed; private double keywordUsed;
......
...@@ -15,6 +15,7 @@ import javax.persistence.ManyToMany; ...@@ -15,6 +15,7 @@ import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OrderBy; import javax.persistence.OrderBy;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -23,10 +24,11 @@ import java.util.List; ...@@ -23,10 +24,11 @@ import java.util.List;
import java.util.Set; import java.util.Set;
@Entity @Entity
public class Question implements Serializable { public class Question implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "questionGenerator")
@SequenceGenerator(name = "questionGenerator", sequenceName = "question_seq")
private Long id; private Long id;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
......
...@@ -7,13 +7,15 @@ import javax.persistence.GeneratedValue; ...@@ -7,13 +7,15 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
@Entity @Entity
public class QuestionChoice implements Serializable { public class QuestionChoice implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "questionChoiceGenerator")
@SequenceGenerator(name = "questionChoiceGenerator", sequenceName = "question_choice_seq")
private Long id; private Long id;
private String text; private String text;
......
...@@ -11,6 +11,7 @@ import javax.persistence.JoinColumn; ...@@ -11,6 +11,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; import java.util.Set;
...@@ -18,7 +19,8 @@ import java.util.Set; ...@@ -18,7 +19,8 @@ import java.util.Set;
public class QuestionPhaseRelation implements Serializable { public class QuestionPhaseRelation implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "questionPhaseGenerator")
@SequenceGenerator(name = "questionPhaseGenerator", sequenceName = "question_phase_seq")
private Long id; private Long id;
@Column(name = "order_in_questionnaire", nullable = false) @Column(name = "order_in_questionnaire", nullable = false)
......
...@@ -7,6 +7,7 @@ import javax.persistence.GeneratedValue; ...@@ -7,6 +7,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import java.io.Serializable; import java.io.Serializable;
...@@ -14,7 +15,8 @@ import java.io.Serializable; ...@@ -14,7 +15,8 @@ import java.io.Serializable;
public class Task implements Serializable { public class Task implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.TABLE) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "taskGenerator")
@SequenceGenerator(name = "taskGenerator", sequenceName = "task_seq")
private Long id; private Long id;
private String title; private String title;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment