Fixed some DTOs

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

.docs/.openapi/api-data.yaml

@@ -74,32 +74,32 @@ paths:
             application/json:
               schema:
                 type: string
-        "503":
-          description: Failed to establish connection with the metadata service
+        "400":
+          description: Request pagination is malformed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find view in metadata database
+        "503":
+          description: Failed to establish connection with the metadata service
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "409":
-          description: View schema could not be mapped
+        "404":
+          description: Failed to find view in metadata database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Request pagination is malformed
+        "403":
+          description: Not allowed to retrieve view data
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to retrieve view data
+        "409":
+          description: View schema could not be mapped
           content:
             application/json:
               schema:
@@ -162,32 +162,32 @@ paths:
             application/json:
               schema:
                 type: string
-        "503":
-          description: Failed to establish connection with the metadata service
+        "400":
+          description: Request pagination is malformed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find view in metadata database
+        "503":
+          description: Failed to establish connection with the metadata service
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "409":
-          description: View schema could not be mapped
+        "404":
+          description: Failed to find view in metadata database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Request pagination is malformed
+        "403":
+          description: Not allowed to retrieve view data
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to retrieve view data
+        "409":
+          description: View schema could not be mapped
           content:
             application/json:
               schema:
@@ -237,8 +237,8 @@ paths:
           type: integer
           format: int64
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
+        "403":
+          description: Not allowed to get table data
           content:
             application/json:
               schema:
@@ -249,6 +249,12 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
+        "404":
+          description: Failed to find table in metadata database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
         "200":
           description: Get table data
           headers:
@@ -264,14 +270,8 @@ paths:
             application/json:
               schema:
                 type: string
-        "404":
-          description: Failed to find table in metadata database
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to get table data
+        "400":
+          description: Request pagination or table data select query is malformed
           content:
             application/json:
               schema:
@@ -312,8 +312,8 @@ paths:
               $ref: "#/components/schemas/TupleUpdateDto"
         required: true
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
+        "403":
+          description: Update table data not allowed
           content:
             application/json:
               schema:
@@ -324,20 +324,20 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Update table data not allowed
+        "202":
+          description: Updated table data
+        "404":
+          description: Failed to find table in metadata database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find table in metadata database
+        "400":
+          description: Request pagination or table data select query is malformed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "202":
-          description: Updated table data
       security:
       - basicAuth: []
       - bearerAuth: []
@@ -374,8 +374,15 @@ paths:
               $ref: "#/components/schemas/TupleDto"
         required: true
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
+        "503":
+          description: Failed to establish connection with the metadata service or
+            storage service
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
+        "403":
+          description: Create table data not allowed
           content:
             application/json:
               schema:
@@ -389,15 +396,8 @@ paths:
                 $ref: "#/components/schemas/ApiErrorDto"
         "201":
           description: Created table data
-        "503":
-          description: Failed to establish connection with the metadata service or
-            storage service
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Create table data not allowed
+        "400":
+          description: Request pagination or table data select query is malformed
           content:
             application/json:
               schema:
@@ -438,8 +438,8 @@ paths:
               $ref: "#/components/schemas/TupleDeleteDto"
         required: true
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
+        "403":
+          description: Delete table data not allowed
           content:
             application/json:
               schema:
@@ -450,16 +450,16 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
+        "202":
+          description: Deleted table data
         "404":
           description: Failed to find table in metadata database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "202":
-          description: Deleted table data
-        "403":
-          description: Delete table data not allowed
+        "400":
+          description: Request pagination or table data select query is malformed
           content:
             application/json:
               schema:
@@ -508,8 +508,8 @@ paths:
           type: integer
           format: int64
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
+        "403":
+          description: Not allowed to get table data
           content:
             application/json:
               schema:
@@ -520,6 +520,12 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
+        "404":
+          description: Failed to find table in metadata database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
         "200":
           description: Get table data
           headers:
@@ -535,14 +541,8 @@ paths:
             application/json:
               schema:
                 type: string
-        "404":
-          description: Failed to find table in metadata database
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to get table data
+        "400":
+          description: Request pagination or table data select query is malformed
           content:
             application/json:
               schema:
@@ -586,14 +586,27 @@ paths:
           type: integer
           format: int64
       responses:
+        "403":
+          description: Not allowed to retrieve subset data
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
         "503":
           description: Failed to communicate with database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to retrieve subset data
+        "400":
+          description: Invalid pagination
           content:
             application/json:
               schema:
@@ -619,19 +632,6 @@ paths:
             application/json:
               schema:
                 type: string
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Invalid pagination
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
       security:
       - bearerAuth: []
       - basicAuth: []
@@ -670,14 +670,27 @@ paths:
           type: integer
           format: int64
       responses:
+        "403":
+          description: Not allowed to retrieve subset data
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
         "503":
           description: Failed to communicate with database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to retrieve subset data
+        "400":
+          description: Invalid pagination
           content:
             application/json:
               schema:
@@ -703,19 +716,6 @@ paths:
             application/json:
               schema:
                 type: string
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Invalid pagination
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
       security:
       - bearerAuth: []
       - basicAuth: []
@@ -752,8 +752,9 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/QueryDto"
-        "403":
-          description: Not allowed to persist subset
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
           content:
             application/json:
               schema:
@@ -770,15 +771,14 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Malformed select query
+        "403":
+          description: Not allowed to persist subset
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
+        "400":
+          description: Malformed select query
           content:
             application/json:
               schema:
@@ -823,26 +823,26 @@ paths:
       responses:
         "202":
           description: Imported dataset successfully
-        "503":
-          description: Failed to establish connection with the metadata service
+        "403":
+          description: Import table dataset not allowed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find table in metadata database
+        "400":
+          description: Dataset and/or query are malformed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Import table dataset not allowed
+        "503":
+          description: Failed to establish connection with the metadata service
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Dataset and/or query are malformed
+        "404":
+          description: Failed to find table in metadata database
           content:
             application/json:
               schema:
@@ -874,29 +874,29 @@ paths:
         schema:
           type: boolean
       responses:
-        "200":
-          description: Found subsets
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/QueryDto"
-        "503":
-          description: Failed to communicate with database
+                $ref: "#/components/schemas/ApiErrorDto"
+        "403":
+          description: Not allowed to find subsets
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
+        "200":
+          description: Found subsets
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "403":
-          description: Not allowed to find subsets
+                type: array
+                items:
+                  $ref: "#/components/schemas/QueryDto"
+        "503":
+          description: Failed to communicate with database
           content:
             application/json:
               schema:
@@ -945,32 +945,27 @@ paths:
               $ref: "#/components/schemas/ExecuteStatementDto"
         required: true
       responses:
-        "403":
-          description: Not allowed to find subset
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "501":
-          description: Failed to execute query as it contains non-supported keywords
+        "417":
+          description: Failed to insert query into query store of data database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "503":
-          description: Failed to communicate with database
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Malformed select query
+        "501":
+          description: Failed to execute query as it contains non-supported keywords
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "417":
-          description: Failed to insert query into query store of data database
+        "403":
+          description: Not allowed to find subset
           content:
             application/json:
               schema:
@@ -981,9 +976,14 @@ paths:
             application/json:
               schema:
                 type: string
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
+        "503":
+          description: Failed to communicate with database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
+        "400":
+          description: Malformed select query
           content:
             application/json:
               schema:
@@ -1020,33 +1020,33 @@ paths:
           type: string
           format: date-time
       responses:
-        "400":
-          description: Request pagination or view data select query is malformed
+        "404":
+          description: Failed to find view in metadata database or export dataset
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "200":
-          description: Exported view data
+        "503":
+          description: Failed to establish connection with the metadata service
           content:
             application/json:
               schema:
-                type: string
-                format: binary
+                $ref: "#/components/schemas/ApiErrorDto"
         "403":
           description: Export view data not allowed
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find view in metadata database or export dataset
+        "200":
+          description: Exported view data
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ApiErrorDto"
-        "503":
-          description: Failed to establish connection with the metadata service
+                type: string
+                format: binary
+        "400":
+          description: Request pagination or view data select query is malformed
           content:
             application/json:
               schema:
@@ -1083,8 +1083,8 @@ paths:
           type: integer
           format: int64
       responses:
-        "400":
-          description: "Invalid pagination size request, must be > 0"
+        "404":
+          description: Failed to find table history in data database
           content:
             application/json:
               schema:
@@ -1095,8 +1095,14 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "404":
-          description: Failed to find table history in data database
+        "403":
+          description: Find table history not allowed
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
+        "400":
+          description: "Invalid pagination size request, must be > 0"
           content:
             application/json:
               schema:
@@ -1109,12 +1115,6 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/TableHistoryDto"
-        "403":
-          description: Find table history not allowed
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
       security:
       - basicAuth: []
       - bearerAuth: []
@@ -1147,12 +1147,6 @@ paths:
           type: string
           format: date-time
       responses:
-        "400":
-          description: Request pagination or table data select query is malformed
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
         "403":
           description: Export table data not allowed
           content:
@@ -1178,6 +1172,12 @@ paths:
               schema:
                 type: string
                 format: binary
+        "400":
+          description: Request pagination or table data select query is malformed
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
       security:
       - basicAuth: []
       - bearerAuth: []
@@ -1217,6 +1217,13 @@ paths:
           type: string
           format: date-time
       responses:
+        "404":
+          description: Failed to find database in metadata database or query in query
+            store of the data database
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiErrorDto"
         "403":
           description: Not allowed to find subset
           content:
@@ -1235,12 +1242,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiErrorDto"
-        "400":
-          description: Malformed select query
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ApiErrorDto"
         "200":
           description: Found subset
           content:
@@ -1248,9 +1249,8 @@ paths:
               schema:
                 $ref: "#/components/schemas/QueryDto"
             text/csv: {}
-        "404":
-          description: Failed to find database in metadata database or query in query
-            store of the data database
+        "400":
+          description: Malformed select query
           content:
             application/json:
               schema:

.docs/.openapi/api.base.yaml

@@ -24,7 +24,7 @@ info:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0
   title: DBRepo REST API
-  version: 1.6.1
+  version: 1.6.2
 openapi: 3.1.0
 servers:
   - description: Test Instance

.docs/.openapi/swagger-ui.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta name="description" content="DBRepo REST API description in OpenAPI 3.0"/>
     <title>DBRepo REST API</title>
-    <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.17.12/swagger-ui.css"/>
+    <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.18.2/swagger-ui.css"/>
     <link rel="stylesheet" href="./custom.css"/>
     <link rel="icon" href="https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/.docs/images/logos/favicon.png" />
 </head>
@@ -17,8 +17,8 @@
     </div>
 </div>
 <div id="swagger-ui"></div>
-<script src="https://unpkg.com/swagger-ui-dist@5.17.12/swagger-ui-bundle.js" crossorigin></script>
-<script src="https://unpkg.com/swagger-ui-dist@5.17.12/swagger-ui-standalone-preset.js" crossorigin></script>
+<script src="https://unpkg.com/swagger-ui-dist@5.18.2/swagger-ui-bundle.js" crossorigin></script>
+<script src="https://unpkg.com/swagger-ui-dist@5.18.2/swagger-ui-standalone-preset.js" crossorigin></script>
 <script>
     window.onload = () => {
       window.ui = SwaggerUIBundle({

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java

@@ -4,11 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.*;
 import lombok.extern.jackson.Jacksonized;
 
-import java.util.List;
-
 @Getter
 @Setter
 @Builder
@@ -19,11 +18,8 @@ import java.util.List;
 @ToString
 public class CreateUserDto {
 
-    @NotNull
-    @Schema(example = "true")
-    private Boolean enabled;
-
     @NotBlank
+    @Pattern(regexp = "^[a-z0-9]{3,}$")
     @Schema(example = "user")
     private String username;
 
@@ -32,11 +28,8 @@ public class CreateUserDto {
     @Schema(example = "user@example.com")
     private String email;
 
-    private String firstName;
-
-    private String lastName;
-
     @NotNull
-    private List<CredentialDto> credentials;
+    @ToString.Exclude
+    private String password;
 
 }

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java

-package at.tuwien.api.auth;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.*;
-import lombok.extern.jackson.Jacksonized;
-
-@Getter
-@Setter
-@Builder
-@EqualsAndHashCode
-@NoArgsConstructor
-@AllArgsConstructor
-@Jacksonized
-@ToString
-public class SignupRequestDto {
-
-    @NotBlank
-    @Pattern(regexp = "^[a-z0-9]{3,}$")
-    @Schema(example = "user")
-    private String username;
-
-    @NotBlank
-    @Email
-    @Schema(example = "user@example.com")
-    private String email;
-
-    @NotNull
-    @ToString.Exclude
-    private String password;
-
-}

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java

@@ -15,7 +15,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class DatabaseCreateDto {
+public class CreateDatabaseDto {
 
     @NotNull
     @JsonProperty("container_id")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java

@@ -16,7 +16,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class ViewCreateDto {
+public class CreateViewDto {
 
     @NotBlank
     @Size(min = 1, max = 63)

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java

 package at.tuwien.api.database.table;
 
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -20,7 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class TableCreateDto {
+public class CreateTableDto {
 
     @NotBlank
     @Size(min = 1, max = 64)
@@ -42,8 +42,8 @@ public class TableCreateDto {
     private Boolean isSchemaPublic;
 
     @NotNull
-    private List<ColumnCreateDto> columns;
+    private List<CreateTableColumnDto> columns;
 
     @NotNull
-    private ConstraintsCreateDto constraints;
+    private CreateTableConstraintsDto constraints;
 }

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java

@@ -18,7 +18,7 @@ import java.util.List;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class ColumnCreateDto {
+public class CreateTableColumnDto {
 
     @NotBlank
     @Schema(example = "Date")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java

 package at.tuwien.api.database.table.constraints;
 
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyCreateDto;
+import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
@@ -17,14 +17,14 @@ import java.util.Set;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class ConstraintsCreateDto {
+public class CreateTableConstraintsDto {
 
     @NotNull
     private List<List<String>> uniques;
 
     @NotNull
     @JsonProperty("foreign_keys")
-    private List<ForeignKeyCreateDto> foreignKeys;
+    private List<CreateForeignKeyDto> foreignKeys;
 
     @NotNull
     private Set<String> checks;

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java

@@ -14,7 +14,7 @@ import java.util.List;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class ForeignKeyCreateDto {
+public class CreateForeignKeyDto {
 
     @NotNull
     private List<String> columns;

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java

 package at.tuwien.api.database.table.internal;
 
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -41,8 +41,8 @@ public class TableCreateDto {
     private Boolean isSchemaPublic;
 
     @NotNull
-    private List<ColumnCreateDto> columns;
+    private List<CreateTableColumnDto> columns;
 
     @NotNull
-    private ConstraintsCreateDto constraints;
+    private CreateTableConstraintsDto constraints;
 }

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java

@@ -19,7 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class IdentifierCreateDto {
+public class CreateIdentifierDto {
 
     @NotNull
     @JsonProperty("database_id")
@@ -47,11 +47,11 @@ public class IdentifierCreateDto {
 
     @NotNull
     @NotEmpty
-    private List<IdentifierSaveTitleDto> titles;
+    private List<SaveIdentifierTitleDto> titles;
 
-    private List<IdentifierSaveDescriptionDto> descriptions;
+    private List<SaveIdentifierDescriptionDto> descriptions;
 
-    private List<IdentifierFunderSaveDto> funders;
+    private List<SaveIdentifierFunderDto> funders;
 
     private List<LicenseDto> licenses;
 
@@ -76,9 +76,9 @@ public class IdentifierCreateDto {
 
     @NotNull
     @NotEmpty
-    private List<CreatorSaveDto> creators;
+    private List<SaveIdentifierCreatorDto> creators;
 
     @JsonProperty("related_identifiers")
-    private List<RelatedIdentifierSaveDto> relatedIdentifiers;
+    private List<SaveRelatedIdentifierDto> relatedIdentifiers;
 
 }

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java

@@ -51,11 +51,11 @@ public class IdentifierSaveDto {
 
     @NotNull
     @NotEmpty
-    private List<IdentifierSaveTitleDto> titles;
+    private List<SaveIdentifierTitleDto> titles;
 
-    private List<IdentifierSaveDescriptionDto> descriptions;
+    private List<SaveIdentifierDescriptionDto> descriptions;
 
-    private List<IdentifierFunderSaveDto> funders;
+    private List<SaveIdentifierFunderDto> funders;
 
     private List<LicenseDto> licenses;
 
@@ -80,9 +80,9 @@ public class IdentifierSaveDto {
 
     @NotNull
     @NotEmpty
-    private List<CreatorSaveDto> creators;
+    private List<SaveIdentifierCreatorDto> creators;
 
     @JsonProperty("related_identifiers")
-    private List<RelatedIdentifierSaveDto> relatedIdentifiers;
+    private List<SaveRelatedIdentifierDto> relatedIdentifiers;
 
 }

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorSaveDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java

@@ -15,7 +15,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class CreatorSaveDto {
+public class SaveIdentifierCreatorDto {
 
     @NotNull
     @Schema(example = "1")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDescriptionDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java

@@ -15,7 +15,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class IdentifierSaveDescriptionDto {
+public class SaveIdentifierDescriptionDto {
 
     @NotNull
     @Schema(example = "1")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderSaveDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java

@@ -14,7 +14,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class IdentifierFunderSaveDto {
+public class SaveIdentifierFunderDto {
 
     @NotNull
     @Schema(example = "1")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveTitleDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java

@@ -15,7 +15,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class IdentifierSaveTitleDto {
+public class SaveIdentifierTitleDto {
 
     @NotNull
     @Schema(example = "1")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierSaveDto.java → dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java

@@ -13,7 +13,7 @@ import jakarta.validation.constraints.NotNull;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class RelatedIdentifierSaveDto {
+public class SaveRelatedIdentifierDto {
 
     @NotNull
     @Schema(example = "1")