From f6b265cb4ecaf6d5661a08c8b28d7c4c3c060651 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 29 Nov 2022 08:13:21 +0100
Subject: [PATCH] Fixed the ID Problem

---
 .../src/main/java/at/tuwien/entities/container/Container.java | 3 ++-
 .../at/tuwien/entities/container/image/ContainerImage.java    | 4 +++-
 .../tuwien/entities/container/image/ContainerImageDate.java   | 4 +++-
 .../container/image/ContainerImageEnvironmentItem.java        | 4 +++-
 .../src/main/java/at/tuwien/entities/database/Database.java   | 3 ++-
 .../src/main/java/at/tuwien/entities/database/View.java       | 3 ++-
 .../main/java/at/tuwien/entities/database/table/Table.java    | 3 ++-
 .../tuwien/entities/database/table/columns/TableColumn.java   | 3 ++-
 .../database/table/columns/concepts/ColumnConcept.java        | 3 ++-
 .../entities/database/table/columns/concepts/Concept.java     | 3 ++-
 .../src/main/java/at/tuwien/entities/identifier/Creator.java  | 3 ++-
 .../main/java/at/tuwien/entities/identifier/Identifier.java   | 3 ++-
 .../java/at/tuwien/entities/identifier/RelatedIdentifier.java | 3 ++-
 .../src/main/java/at/tuwien/entities/user/TimeSecret.java     | 3 ++-
 .../entities/src/main/java/at/tuwien/entities/user/Token.java | 3 ++-
 .../entities/src/main/java/at/tuwien/entities/user/User.java  | 3 ++-
 16 files changed, 35 insertions(+), 16 deletions(-)

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 2adde893da..3f1af0486b 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 3253c44e85..5708abaf35 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 bf2608fa41..d593a17e25 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 8aa33c9c62..5d1a79e93c 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 3e6ad2ba8b..67cb65cc91 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 4dfc6e4df9..2f8aba24a7 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 65ec9e82e4..e5244fd9b3 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 91c0f05df0..10864d26ec 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 d4ef802180..1548fe9030 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 9d1777496c..f7301ff093 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 6fea41a426..95430bcc39 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 ab6cb8d4ed..74dfd88beb 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 3f36952fb3..e627a581d6 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 dab6e3c3a4..6cf18cf730 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 ae598e2441..d1ae37cfab 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 3a7ab7e059..c3b62f684f 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;
 
-- 
GitLab