From 78893f72d8e7aa83d78476cc6b975865a38a9e03 Mon Sep 17 00:00:00 2001 From: Bojnourdi Date: Mon, 31 Aug 2015 10:18:36 +0200 Subject: [PATCH] User table sequence generator for maximum compatibility --- .../GDE-ejb/src/java/com/edf/gde/entities/Attribute.java | 6 ++++-- .../src/java/com/edf/gde/entities/AttributeGroup.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/Chunk.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/Group.java | 2 +- .../src/java/com/edf/gde/entities/GroupPermission.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/Profile.java | 2 +- .../src/java/com/edf/gde/entities/ProfileAttribute.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/Study.java | 2 +- .../GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java | 2 +- .../GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java index f612414..a8c2258 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java @@ -19,6 +19,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import javax.persistence.TableGenerator; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; @@ -38,14 +39,15 @@ import javax.xml.bind.annotation.XmlRootElement; @NamedQuery(name = "Attribute.findByValue", query = "SELECT a FROM Attribute a WHERE a.value = :value"), @NamedQuery(name = "Attribute.findByGroupId", query = "SELECT a FROM Attribute a WHERE a.attributeGroup.id=:attributeGroupId") }) -@SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 10000) +@TableGenerator(name = "TABLE_GEN", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", + valueColumnName = "SEQ_COUNT", pkColumnValue = "DATA_SEQ", allocationSize = 500, initialValue = 10000) public class Attribute implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @NotNull - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") @Column(name = "id") private long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java index b5fe16f..191e346 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java @@ -42,7 +42,7 @@ public class AttributeGroup implements Serializable { @Id @Basic(optional = false) @NotNull - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") @Column(name = "id") private long id; @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, cascade = {CascadeType.ALL}, mappedBy = "attributeGroup") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java index e3e5c4b..49221c2 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java @@ -43,7 +43,7 @@ public class Chunk implements Serializable { @Id @Basic(optional = false) @NotNull - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") @Column(name = "id") private long id; @Column(name = "file_id", nullable = false) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java index cd3b0d2..f22ff59 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java @@ -52,7 +52,7 @@ public class GDEFile implements Serializable { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private long id; @Size(max = 255) @Column(name = "name") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java index d9c900e..d873d39 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java @@ -33,7 +33,7 @@ public class Group { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private Long id; @Size(max = 255) @Column(name = "groupName") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java index ad0f1b6..9903f6c 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java @@ -44,7 +44,7 @@ public class GroupPermission implements Serializable { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private Long id; @Column(name = "groupId") long groupId; diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java index 95a39ca..9dd45f6 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java @@ -45,7 +45,7 @@ public class Profile implements Serializable { @Id @Basic(optional = false) @NotNull - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") @Column(name = "id") private Long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java index 9060533..66db249 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java @@ -40,7 +40,7 @@ public class ProfileAttribute implements Serializable { @Id @Basic(optional = false) @NotNull - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") @Column(name = "id") private Long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java index b196f35..a391b88 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java @@ -51,7 +51,7 @@ public class Study implements Serializable { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private long id; @Size(max = 255) @Column(name = "name") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java index 4815e19..e00e467 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java @@ -38,7 +38,7 @@ public class User implements Serializable { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private Long id; @Size(max = 255) @Column(name = "userName") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java index 0775973..42cf2c6 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java @@ -44,7 +44,7 @@ public class UserGroup implements Serializable { @Basic(optional = false) @NotNull @Column(name = "id") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN") private Long id; @Column(name = "userId") long userId; -- 2.39.2