Wip

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

dbrepo-auth-service/init/.coveragerc

 [report]
-format = text
 omit =
     # omit tests
     ./tests/*

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java

@@ -27,7 +27,7 @@ public class Container {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
@@ -84,4 +84,11 @@ public class Container {
     @Column
     private String privilegedPassword;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java

@@ -13,8 +13,6 @@ import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 
-import static jakarta.persistence.GenerationType.IDENTITY;
-
 @Data
 @Entity
 @Builder
@@ -31,7 +29,7 @@ public class ContainerImage {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
@@ -81,4 +79,11 @@ public class ContainerImage {
     @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "image")
     private List<Operator> operators;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java

@@ -7,8 +7,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.util.UUID;
 
-import static jakarta.persistence.GenerationType.IDENTITY;
-
 @Data
 @Entity
 @Builder
@@ -22,7 +20,7 @@ public class DataType {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "display_name", nullable = false)
@@ -78,4 +76,11 @@ public class DataType {
     })
     private ContainerImage image;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java

@@ -20,7 +20,7 @@ public class Operator {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "display_name", nullable = false)
@@ -40,4 +40,11 @@ public class Operator {
     })
     private ContainerImage image;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java

@@ -43,7 +43,7 @@ public class Database implements Serializable {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @JdbcTypeCode(java.sql.Types.VARCHAR)
@@ -131,4 +131,11 @@ public class Database implements Serializable {
     @Column(columnDefinition = "TIMESTAMP")
     private Instant lastModified;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java

@@ -36,7 +36,7 @@ public class View {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
@@ -108,4 +108,11 @@ public class View {
     @Column(columnDefinition = "TIMESTAMP")
     private Instant lastModified;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java

@@ -25,7 +25,7 @@ public class ViewColumn implements Comparable<ViewColumn> {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
@@ -62,4 +62,11 @@ public class ViewColumn implements Comparable<ViewColumn> {
     public int compareTo(ViewColumn viewColumn) {
         return Integer.compare(this.ordinalPosition, viewColumn.getOrdinalPosition());
     }
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java

@@ -39,7 +39,7 @@ public class Table {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false)
@@ -128,5 +128,12 @@ public class Table {
     @Column(columnDefinition = "TIMESTAMP")
     private Instant lastModified;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }
 

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java

@@ -34,7 +34,7 @@ public class TableColumn implements Comparable<TableColumn> {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
@@ -131,4 +131,11 @@ public class TableColumn implements Comparable<TableColumn> {
     public int compareTo(TableColumn tableColumn) {
         return Integer.compare(this.ordinalPosition, tableColumn.getOrdinalPosition());
     }
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java

@@ -32,7 +32,7 @@ public class TableColumnConcept {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false, columnDefinition = "TEXT")
@@ -59,4 +59,11 @@ public class TableColumnConcept {
             },
             joinColumns = @JoinColumn(name = "id", referencedColumnName = "id"))
     private List<TableColumn> columns;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java

@@ -32,7 +32,7 @@ public class TableColumnUnit {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false, columnDefinition = "TEXT")
@@ -59,4 +59,11 @@ public class TableColumnUnit {
             },
             joinColumns = @JoinColumn(name = "id", referencedColumnName = "id"))
     private List<TableColumn> columns;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java

@@ -22,7 +22,7 @@ public class ForeignKey {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(name = "fkid", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Column(name = "fkid", nullable = false, columnDefinition = "VARCHAR(36) DEFAULT UUID()")
     private UUID id;
 
     @Column(updatable = false, nullable = false)
@@ -54,4 +54,11 @@ public class ForeignKey {
     @Column(columnDefinition = "VARCHAR(50)")
     @Enumerated(EnumType.STRING)
     private ReferenceType onDelete;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java

@@ -25,7 +25,7 @@ public class ForeignKeyReference {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
@@ -48,4 +48,11 @@ public class ForeignKeyReference {
     })
     private TableColumn referencedColumn;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java

@@ -22,7 +22,7 @@ public class PrimaryKey {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(name = "pkid", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Column(name = "pkid", nullable = false, columnDefinition = "VARCHAR(36) DEFAULT UUID()")
     private UUID id;
 
     @ToString.Exclude
@@ -42,4 +42,11 @@ public class PrimaryKey {
             @JoinColumn(name = "cid", referencedColumnName = "id", nullable = false)
     })
     private TableColumn column;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java

@@ -23,7 +23,7 @@ public class Unique {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(name = "uid", nullable = false, columnDefinition = "VARCHAR(36)")
+    @Column(name = "uid", nullable = false, columnDefinition = "VARCHAR(36) DEFAULT UUID()")
     private UUID id;
 
     @Column(updatable = false, nullable = false)
@@ -51,4 +51,11 @@ public class Unique {
             }
     )
     private List<TableColumn> columns;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java

@@ -22,7 +22,7 @@ public class Creator {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "given_names")
@@ -106,4 +106,11 @@ public class Creator {
         return this.getFirstname().charAt(0) + ". " + this.getLastname();
     }
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java

@@ -40,7 +40,7 @@ public class Identifier implements Serializable {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "qid", columnDefinition = "VARCHAR(36)")
@@ -176,6 +176,13 @@ public class Identifier implements Serializable {
     @Column(columnDefinition = "TIMESTAMP")
     private Instant lastModified;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }
 
 

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java

@@ -24,7 +24,7 @@ public class IdentifierDescription implements Serializable {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false, columnDefinition = "TEXT")
@@ -45,6 +45,13 @@ public class IdentifierDescription implements Serializable {
     })
     private Identifier identifier;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }
 
 

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java

@@ -23,7 +23,7 @@ public class IdentifierFunder implements Serializable {
 
     @Id
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
@@ -52,6 +52,13 @@ public class IdentifierFunder implements Serializable {
     })
     private Identifier identifier;
 
+    @PrePersist
+    public void prePersist() {
+        if (this.id == null) {
+            this.id = UUID.randomUUID();
+        }
+    }
+
 }