diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java index 2adde893da745180ca1182a7a93b2dfd6956be80..3f1af0486bcc153db6a1f34860ce07cf8265ac7d 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java @@ -31,7 +31,8 @@ public class Container { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "containers-sequence") + @GenericGenerator(name = "containers-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java index 3253c44e8590448359b4fba5d3c313be4d091835..5708abaf3510e7acf7c84e6e69f6372ed2733bd4 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java @@ -2,6 +2,7 @@ package at.tuwien.entities.container.image; import at.tuwien.entities.container.Container; import lombok.*; +import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -23,7 +24,8 @@ public class ContainerImage { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "images-sequence") + @GenericGenerator(name = "images-sequence", strategy = "increment") @Column(updatable = false, nullable = false) public Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java index bf2608fa413147575ded8394ced2e7555f630fc1..d593a17e250b79169b1bc895be2229edc381bddf 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java @@ -2,6 +2,7 @@ package at.tuwien.entities.container.image; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; +import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -21,7 +22,8 @@ public class ContainerImageDate { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "dates-sequence") + @GenericGenerator(name = "dates-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java index 8aa33c9c62dbc119b366507055efd1650c7ed2db..5d1a79e93c5b398a1c917fc2ed9cbd8a63ac30ec 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java @@ -1,6 +1,7 @@ package at.tuwien.entities.container.image; import lombok.*; +import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -22,7 +23,8 @@ public class ContainerImageEnvironmentItem { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "environments-sequence") + @GenericGenerator(name = "environments-sequence", strategy = "increment") @Column(updatable = false, nullable = false) public Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java index 3e6ad2ba8b4212678e709ea20b8366413701a5cf..67cb65cc91e98e140736b82a583a7c58e3f5a4d0 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java @@ -32,7 +32,8 @@ public class Database { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "databases-sequence") + @GenericGenerator(name = "databases-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java index 4dfc6e4df9a37e479b8cd3e5e9ef63b0100ea042..2f8aba24a74d847e629fd5fa25925e2e13afcf0d 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java @@ -23,7 +23,8 @@ public class View { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "views-sequence") + @GenericGenerator(name = "views-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java index 65ec9e82e4598f9b5722fb68700e44de0d2d86cb..e5244fd9b360d43c344c18fed5972d6afbeef30b 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java @@ -31,7 +31,8 @@ public class Table { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "tables-sequence") + @GenericGenerator(name = "tables-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java index 91c0f05df0bb5505ab96e1dba0a668aebd10bb49..10864d26ecfaadd4c3d9db81f60378f82be4d6a8 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java @@ -32,7 +32,8 @@ public class TableColumn implements Comparable<TableColumn> { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "columns-sequence") + @GenericGenerator(name = "columns-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java index d4ef80218086949cbc3fb93d2e1d22a42ed6a724..1548fe90303c699274f85d02c47d6144fd57e3ac 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java @@ -24,7 +24,8 @@ public class ColumnConcept implements Serializable { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "columns-concepts-sequence") + @GenericGenerator(name = "columns-concepts-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long cid; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java index 9d1777496c2202c96384f4226ddb0c8befeb2578..f7301ff0935429f1dce77836017f3525160e4e88 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java @@ -23,7 +23,8 @@ public class Concept { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "concepts-sequence") + @GenericGenerator(name = "concepts-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java index 6fea41a4261560bc1fe396df23cebff4cedd3802..95430bcc39d9da20a795a9885be9d83bbecb79ef 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java @@ -23,7 +23,8 @@ public class Creator { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "creators-sequence") + @GenericGenerator(name = "creatos-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java index ab6cb8d4edf124a9d327f9b5074e71d3a07419fe..74dfd88beb937592815ced41af8ee9bb79323b0e 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java @@ -31,7 +31,8 @@ public class Identifier { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "identifiers-sequence") + @GenericGenerator(name = "identifiers-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java index 3f36952fb33da086fdc10b22d608540b0fe1a756..e627a581d665c719d8c0acbb0e49ede111014292 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java @@ -28,7 +28,8 @@ public class RelatedIdentifier { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "related-identifiers-sequence") + @GenericGenerator(name = "related-identifiers-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java index dab6e3c3a413c47794b07b7711c991e5acbd3607..6cf18cf730876418c9c5fbfd36bcc2c1b8d799f3 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java @@ -23,7 +23,8 @@ public class TimeSecret { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "time-secrets-sequence") + @GenericGenerator(name = "time-secrets-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java index ae598e24413907a489e0659c2f5c5cb0acb7ab2a..d1ae37cfab91fd59117b12602a5ceece3f167392 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java @@ -23,7 +23,8 @@ public class Token { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "tokens-sequence") + @GenericGenerator(name = "tokens-sequence", strategy = "increment") @Column(updatable = false, nullable = false) private Long id; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java index 3a7ab7e059b0e90ec378982f605a6e7d669ed526..c3b62f684fa32ad1d5fb683b5c780a179f92bfdb 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java @@ -25,7 +25,8 @@ public class User { @Id @EqualsAndHashCode.Include - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(generator = "users-sequence") + @GenericGenerator(name = "users-sequence", strategy = "increment") @Column(name = "userid", updatable = false, nullable = false) private Long id;