diff --git a/.docs/.openapi/api-data.yaml b/.docs/.openapi/api-data.yaml
index f61466dc6b8dbf4ab405be438bb03b4edbd1b29e..fad4c0fd74a39b914dcf0a526b2795e6eb6c923b 100644
--- a/.docs/.openapi/api-data.yaml
+++ b/.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:
diff --git a/.docs/.openapi/api-metadata.yaml b/.docs/.openapi/api-metadata.yaml
index 2696cecd0cfc1b7440e8cdf57615e52eddbf53bd..6792f0f0e9382fcdeca5fbd6f9a85c9162e7bce6 100644
--- a/.docs/.openapi/api-metadata.yaml
+++ b/.docs/.openapi/api-metadata.yaml
@@ -61,29 +61,35 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/DatabaseCreateDto"
+ $ref: "#/components/schemas/CreateDatabaseDto"
required: true
responses:
- "503":
- description: Failed to save in search service
+ "409":
+ description: Query store could not be created
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "201":
+ description: Created a new database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DatabaseBriefDto"
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Database create query is malformed or image is not supported
+ "404":
+ description: Failed to fin container/user/database in metadata database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "423":
- description: Database quota exceeded
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -95,20 +101,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "201":
- description: Created a new database
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/DatabaseBriefDto"
- "409":
- description: Query store could not be created
+ "423":
+ description: Database quota exceeded
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Failed to fin container/user/database in metadata database
+ "400":
+ description: Database create query is malformed or image is not supported
content:
application/json:
schema:
@@ -173,6 +173,12 @@ paths:
type: string
format: uuid
responses:
+ "403":
+ description: No access to this database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"404":
description: Database not found
content:
@@ -185,12 +191,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/DatabaseAccessDto"
- "403":
- description: No access to this database
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -221,36 +221,36 @@ paths:
$ref: "#/components/schemas/CreateAccessDto"
required: true
responses:
- "404":
- description: Database or user not found
+ "403":
+ description: Modify access not permitted when no access is granted in the
+ first place
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Access could not be updated due to connection error in the
- data service
+ "404":
+ description: Database or user not found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Access could not be updated in the data service
+ "400":
+ description: Modify access query or database connection is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
"202":
description: Modified access
- "400":
- description: Modify access query or database connection is malformed
+ "502":
+ description: Access could not be updated due to connection error in the
+ data service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Modify access not permitted when no access is granted in the
- first place
+ "503":
+ description: Access could not be updated in the data service
content:
application/json:
schema:
@@ -285,14 +285,8 @@ paths:
$ref: "#/components/schemas/CreateAccessDto"
required: true
responses:
- "400":
- description: Granting access query or database connection is malformed
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Failed giving access
+ "502":
+ description: Access could not be created due to connection error
content:
application/json:
schema:
@@ -303,24 +297,30 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Access could not be created due to connection error
+ "400":
+ description: Granting access query or database connection is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Granting access succeeded
+ "403":
+ description: Failed giving access
content:
application/json:
schema:
- $ref: "#/components/schemas/DatabaseAccessDto"
+ $ref: "#/components/schemas/ApiErrorDto"
"503":
description: Access could not be created in the data service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "202":
+ description: Granting access succeeded
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DatabaseAccessDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -345,34 +345,34 @@ paths:
type: string
format: uuid
responses:
- "503":
- description: Access could not be revoked in the data service
+ "502":
+ description: Access could not be created due to connection error
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Revoke of access not permitted as no access was found
+ "400":
+ description: Modify access query or database connection is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Deleted access
- "502":
- description: Access could not be created due to connection error
+ "404":
+ description: "User, database with access was not found"
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: "User, database with access was not found"
+ "202":
+ description: Deleted access
+ "503":
+ description: Access could not be revoked in the data service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Modify access query or database connection is malformed
+ "403":
+ description: Revoke of access not permitted as no access was found
content:
application/json:
schema:
@@ -404,6 +404,12 @@ paths:
type: string
format: uuid
responses:
+ "403":
+ description: No access to this database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"404":
description: Database not found
content:
@@ -416,12 +422,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/DatabaseAccessDto"
- "403":
- description: No access to this database
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -449,18 +449,18 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: User was not found
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Found user
content:
application/json:
schema:
$ref: "#/components/schemas/UserDto"
+ "404":
+ description: User was not found
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -484,14 +484,14 @@ paths:
$ref: "#/components/schemas/UserUpdateDto"
required: true
responses:
- "403":
- description: Not allowed to modify user metadata
+ "400":
+ description: Modify user query is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Modify user query is malformed
+ "404":
+ description: Failed to find database/user in metadata database
content:
application/json:
schema:
@@ -502,8 +502,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/UserDto"
- "404":
- description: Failed to find database/user in metadata database
+ "403":
+ description: Not allowed to modify user metadata
content:
application/json:
schema:
@@ -532,34 +532,34 @@ paths:
$ref: "#/components/schemas/UserPasswordDto"
required: true
responses:
- "400":
- description: Invalid password payload
+ "403":
+ description: Not allowed to change foreign user password
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
"202":
description: Modified user password
- "502":
- description: Connection to auth service failed
+ "404":
+ description: Failed to find database/user in metadata database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Not allowed to change foreign user password
+ "503":
+ description: Failed to get user in auth service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Failed to find database/user in metadata database
+ "502":
+ description: Connection to auth service failed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to get user in auth service
+ "400":
+ description: Invalid password payload
content:
application/json:
schema:
@@ -581,14 +581,14 @@ paths:
$ref: "#/components/schemas/RefreshTokenRequestDto"
required: true
responses:
- "400":
- description: Invalid refresh token
+ "502":
+ description: Connection to auth service failed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Not allowed
+ "400":
+ description: Invalid refresh token
content:
application/json:
schema:
@@ -599,8 +599,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/TokenDto"
- "502":
- description: Connection to auth service failed
+ "403":
+ description: Not allowed
content:
application/json:
schema:
@@ -618,27 +618,26 @@ paths:
$ref: "#/components/schemas/LoginRequestDto"
required: true
responses:
- "428":
- description: Account is not fully setup in auth service (requires password
- change?)
+ "202":
+ description: Obtained user token
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Not allowed to get token
+ $ref: "#/components/schemas/TokenDto"
+ "400":
+ description: Invalid login request
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Obtained user token
+ "403":
+ description: Not allowed to get token
content:
application/json:
schema:
- $ref: "#/components/schemas/TokenDto"
- "404":
- description: Failed to find user in auth database
+ $ref: "#/components/schemas/ApiErrorDto"
+ "503":
+ description: Failed to get user in auth service
content:
application/json:
schema:
@@ -649,14 +648,15 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Invalid login request
+ "404":
+ description: Failed to find user in auth database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to get user in auth service
+ "428":
+ description: Account is not fully setup in auth service (requires password
+ change?)
content:
application/json:
schema:
@@ -676,18 +676,18 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: Could not find ontology
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Find one ontology
content:
application/json:
schema:
$ref: "#/components/schemas/OntologyDto"
+ "404":
+ description: Could not find ontology
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
put:
tags:
- ontology-endpoint
@@ -708,18 +708,18 @@ paths:
$ref: "#/components/schemas/OntologyModifyDto"
required: true
responses:
- "404":
- description: Could not find ontology
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"202":
description: Updated ontology successfully
content:
application/json:
schema:
$ref: "#/components/schemas/OntologyDto"
+ "404":
+ description: Could not find ontology
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -737,16 +737,16 @@ paths:
type: integer
format: int64
responses:
+ "202":
+ description: Deleted ontology successfully
+ content:
+ application/json: {}
"404":
description: Could not find ontology
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Deleted ontology successfully
- content:
- application/json: {}
security:
- bearerAuth: []
- basicAuth: []
@@ -800,16 +800,16 @@ paths:
type: integer
format: int64
responses:
+ "202":
+ description: Deleted message
+ content:
+ application/json: {}
"404":
description: Could not find message
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Deleted message
- content:
- application/json: {}
security:
- bearerAuth: []
- basicAuth: []
@@ -828,18 +828,18 @@ paths:
type: integer
format: int64
responses:
- "200":
- description: Found image
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ImageDto"
"404":
description: Image could not be found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "200":
+ description: Found image
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ImageDto"
put:
tags:
- image-endpoint
@@ -923,27 +923,8 @@ paths:
schema:
type: string
responses:
- "400":
- description: "Identifier could not be exported, the requested style is not\
- \ known"
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "409":
- description: Exported resource was not found
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "406":
- description: Failed to find acceptable representation
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to data service failed
+ "410":
+ description: Failed to retrieve from S3 endpoint
content:
application/json:
schema:
@@ -960,6 +941,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "406":
+ description: Failed to find acceptable representation
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Found identifier successfully
content:
@@ -975,8 +962,21 @@ paths:
text/bibliography; style=apa: {}
text/bibliography; style=ieee: {}
text/bibliography; style=bibtex: {}
- "410":
- description: Failed to retrieve from S3 endpoint
+ "400":
+ description: "Identifier could not be exported, the requested style is not\
+ \ known"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "409":
+ description: Exported resource was not found
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "502":
+ description: Connection to data service failed
content:
application/json:
schema:
@@ -1028,14 +1028,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: "Failed to find database, table or view"
+ "400":
+ description: Identifier form contains invalid request data
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Identifier form contains invalid request data
+ "404":
+ description: "Failed to find database, table or view"
content:
application/json:
schema:
@@ -1057,20 +1057,14 @@ paths:
type: integer
format: int64
responses:
- "502":
- description: Connection to search service failed
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to delete in search service
+ "403":
+ description: Deleting identifier not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Deleting identifier not permitted
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1083,6 +1077,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "503":
+ description: Failed to delete in search service
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1102,12 +1102,6 @@ paths:
type: integer
format: int64
responses:
- "202":
- description: Published identifier
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/IdentifierDto"
"403":
description: Insufficient access rights or authorities
content:
@@ -1126,18 +1120,24 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: "Failed to find database, table or view"
+ "202":
+ description: Published identifier
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
+ $ref: "#/components/schemas/IdentifierDto"
"400":
description: Identifier form contains invalid request data
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "404":
+ description: "Failed to find database, table or view"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1163,38 +1163,38 @@ paths:
$ref: "#/components/schemas/DatabaseModifyVisibilityDto"
required: true
responses:
- "202":
- description: Visibility modified successfully
+ "400":
+ description: The visibility payload is malformed
content:
application/json:
schema:
- $ref: "#/components/schemas/DatabaseBriefDto"
- "503":
- description: Failed to save in search service
+ $ref: "#/components/schemas/ApiErrorDto"
+ "403":
+ description: Visibility modification is not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "404":
+ description: Failed to find database in metadata database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: The visibility payload is malformed
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Failed to find database in metadata database
+ "202":
+ description: Visibility modified successfully
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Visibility modification is not permitted
+ $ref: "#/components/schemas/DatabaseBriefDto"
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1223,12 +1223,6 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: "Database, view or user could not be found"
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Find view successfully
headers:
@@ -1266,6 +1260,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "404":
+ description: "Database, view or user could not be found"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1296,6 +1296,12 @@ paths:
$ref: "#/components/schemas/ViewUpdateDto"
required: true
responses:
+ "400":
+ description: Update view query is malformed
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"403":
description: Update not allowed
content:
@@ -1308,8 +1314,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "404":
+ description: Database or View could not be found
content:
application/json:
schema:
@@ -1319,15 +1325,9 @@ paths:
content:
'*/*':
schema:
- $ref: "#/components/schemas/ViewDto"
- "400":
- description: Update view query is malformed
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Database or View could not be found
+ $ref: "#/components/schemas/ViewBriefDto"
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1355,14 +1355,16 @@ paths:
type: integer
format: int64
responses:
- "400":
- description: Delete view query is malformed
+ "202":
+ description: Delete view successfully
+ "403":
+ description: Deletion not allowed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Deletion not allowed
+ "400":
+ description: Delete view query is malformed
content:
application/json:
schema:
@@ -1373,20 +1375,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Delete view successfully
- content:
- '*/*':
- schema:
- type: object
- "423":
- description: Delete view resulted in an invalid query statement
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "423":
+ description: Delete view resulted in an invalid query statement
content:
application/json:
schema:
@@ -1424,45 +1420,36 @@ paths:
type: integer
format: int64
responses:
+ "503":
+ description: Failed to obtain queue information from broker service
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Find table successfully
headers:
X-Username:
description: The authentication username
style: simple
- X-Table:
- description: The table internal name
- style: simple
Access-Control-Expose-Headers:
description: Expose custom headers
style: simple
- X-Type:
- description: The JDBC connection type
- style: simple
- X-Database:
- description: The database internal name
- style: simple
X-Password:
description: The authentication password
style: simple
- X-Host:
- description: The database hostname
- style: simple
- X-Port:
- description: The database port number
- style: simple
content:
application/json:
schema:
$ref: "#/components/schemas/TableDto"
- "404":
- description: "Table, database or container could not be found"
+ "403":
+ description: Access to the database is forbidden
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to obtain queue information from broker service
+ "404":
+ description: "Table, database or container could not be found"
content:
application/json:
schema:
@@ -1473,12 +1460,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Access to the database is forbidden
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1508,42 +1489,42 @@ paths:
$ref: "#/components/schemas/TableUpdateDto"
required: true
responses:
- "503":
- description: Failed to save in search service
+ "400":
+ description: Update table visibility payload is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "403":
+ description: Update table visibility not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Updated the table
+ "404":
+ description: Table could not be found
content:
application/json:
schema:
- $ref: "#/components/schemas/TableBriefDto"
- "400":
- description: Update table visibility payload is malformed
+ $ref: "#/components/schemas/ApiErrorDto"
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Update table visibility not permitted
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Table could not be found
+ "202":
+ description: Updated the table
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
+ $ref: "#/components/schemas/TableBriefDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1569,34 +1550,34 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: "Table, database or container could not be found"
+ "400":
+ description: Delete table query resulted in an invalid query statement
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to save in search service
+ "202":
+ description: Delete table successfully
+ "403":
+ description: Access to the database is forbidden
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "404":
+ description: "Table, database or container could not be found"
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Delete table successfully
- "400":
- description: Delete table query resulted in an invalid query statement
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Access to the database is forbidden
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1627,6 +1608,12 @@ paths:
type: integer
format: int64
responses:
+ "503":
+ description: Failed to save in search service
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"403":
description: Not the owner
content:
@@ -1639,8 +1626,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to save in search service
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1651,12 +1638,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"202":
description: Updated table statistics successfully
security:
@@ -1698,15 +1679,15 @@ paths:
$ref: "#/components/schemas/ColumnSemanticsUpdateDto"
required: true
responses:
- "404":
- description: Failed to find user/table/database/ontology in metadata database
+ "400":
+ description: Update semantic concept query is malformed or update unit of
+ measurement query is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Update semantic concept query is malformed or update unit of
- measurement query is malformed
+ "403":
+ description: Access to the database is forbidden
content:
application/json:
schema:
@@ -1717,6 +1698,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "404":
+ description: Failed to find user/table/database/ontology in metadata database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"502":
description: Connection to search service failed
content:
@@ -1729,12 +1716,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ColumnDto"
- "403":
- description: Access to the database is forbidden
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1760,20 +1741,20 @@ paths:
$ref: "#/components/schemas/DatabaseTransferDto"
required: true
responses:
- "503":
- description: Failed to save in search service
+ "400":
+ description: Owner payload is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "403":
+ description: Transfer of ownership is not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Transfer of ownership is not permitted
+ "404":
+ description: Database or user could not be found
content:
application/json:
schema:
@@ -1784,14 +1765,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/DatabaseBriefDto"
- "404":
- description: Database or user could not be found
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Owner payload is malformed
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1816,36 +1797,36 @@ paths:
type: integer
format: int64
responses:
- "403":
- description: Refresh view metadata is not permitted
+ "404":
+ description: Failed to find database in metadata database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to save in search service
+ "200":
+ description: Refreshed database views metadata
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ $ref: "#/components/schemas/DatabaseBriefDto"
+ "403":
+ description: Refresh view metadata is not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Failed to find database in metadata database
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "200":
- description: Refreshed database views metadata
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
- $ref: "#/components/schemas/DatabaseBriefDto"
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1866,20 +1847,20 @@ paths:
type: integer
format: int64
responses:
- "503":
- description: Failed to save in search service
+ "400":
+ description: Failed to parse payload at search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "403":
+ description: Not allowed to refresh table metadata
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Failed to parse payload at search service
+ "404":
+ description: Failed to fin user/database in metadata database
content:
application/json:
schema:
@@ -1890,14 +1871,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/DatabaseBriefDto"
- "403":
- description: Not allowed to refresh table metadata
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Failed to fin user/database in metadata database
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -1920,6 +1901,12 @@ paths:
type: integer
format: int64
responses:
+ "404":
+ description: Database or user could not be found
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"200":
description: View of image was successful
content:
@@ -1929,12 +1916,6 @@ paths:
items:
type: string
format: byte
- "404":
- description: Database or user could not be found
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -1959,38 +1940,38 @@ paths:
$ref: "#/components/schemas/DatabaseModifyImageDto"
required: true
responses:
- "404":
- description: Database could not be found
+ "403":
+ description: Modify of image is not permitted
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to save in search service
+ "410":
+ description: File was not found in the Storage Service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "202":
+ description: Modify of image was successful
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Modify of image is not permitted
+ $ref: "#/components/schemas/DatabaseBriefDto"
+ "404":
+ description: Database could not be found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "202":
- description: Modify of image was successful
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
- $ref: "#/components/schemas/DatabaseBriefDto"
- "410":
- description: File was not found in the Storage Service
+ $ref: "#/components/schemas/ApiErrorDto"
+ "502":
+ description: Connection to search service failed
content:
application/json:
schema:
@@ -2033,55 +2014,55 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/SignupRequestDto"
+ $ref: "#/components/schemas/CreateUserDto"
required: true
responses:
- "502":
- description: Failed to create in auth service
+ "417":
+ description: User with e-mail already exists
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "409":
- description: User with username already exists
+ "400":
+ description: Parameters are not well-formed (likely email)
+ content:
+ application/json: {}
+ "503":
+ description: Failed to create in auth service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Default role not found
+ "201":
+ description: Created user
content:
application/json:
schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Internal authentication to the auth service is invalid
+ $ref: "#/components/schemas/UserDto"
+ "404":
+ description: Default role not found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "417":
- description: User with e-mail already exists
+ "502":
+ description: Failed to create in auth service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "201":
- description: Created user
+ "403":
+ description: Internal authentication to the auth service is invalid
content:
application/json:
schema:
- $ref: "#/components/schemas/UserDto"
- "503":
- description: Failed to create in auth service
+ $ref: "#/components/schemas/ApiErrorDto"
+ "409":
+ description: User with username already exists
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Parameters are not well-formed (likely email)
- content:
- application/json: {}
/api/ontology:
get:
tags:
@@ -2198,18 +2179,18 @@ paths:
$ref: "#/components/schemas/ImageCreateDto"
required: true
responses:
- "409":
- description: Image already exists
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"201":
description: Created image
content:
application/json:
schema:
$ref: "#/components/schemas/ImageDto"
+ "409":
+ description: Image already exists
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"400":
description: Image specification is invalid
content:
@@ -2257,13 +2238,6 @@ paths:
schema:
type: string
responses:
- "406":
- description: "Identifier could not be exported, the requested style is not\
- \ known"
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Found identifiers successfully
content:
@@ -2277,6 +2251,13 @@ paths:
type: array
items:
$ref: "#/components/schemas/LdDatasetDto"
+ "406":
+ description: "Identifier could not be exported, the requested style is not\
+ \ known"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
post:
tags:
- identifier-endpoint
@@ -2290,7 +2271,7 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/IdentifierCreateDto"
+ $ref: "#/components/schemas/CreateIdentifierDto"
required: true
responses:
"403":
@@ -2311,12 +2292,6 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: "Failed to find database, table or view"
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"400":
description: Identifier form contains invalid request data
content:
@@ -2329,6 +2304,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/IdentifierDto"
+ "404":
+ description: "Failed to find database, table or view"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -2347,6 +2328,12 @@ paths:
type: integer
format: int64
responses:
+ "404":
+ description: Database or user could not be found
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Find views successfully
content:
@@ -2355,12 +2342,6 @@ paths:
type: array
items:
$ref: "#/components/schemas/ViewBriefDto"
- "404":
- description: Database or user could not be found
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -2382,29 +2363,23 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/ViewCreateDto"
+ $ref: "#/components/schemas/CreateViewDto"
required: true
responses:
- "503":
- description: Failed to save in search service
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"201":
description: Create view successfully
content:
application/json:
schema:
$ref: "#/components/schemas/ViewBriefDto"
- "423":
- description: Create view resulted in an invalid query statement
+ "400":
+ description: Create view query is malformed
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "502":
- description: Connection to search service failed
+ "403":
+ description: Credentials missing
content:
application/json:
schema:
@@ -2415,14 +2390,20 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Create view query is malformed
+ "503":
+ description: Failed to save in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Credentials missing
+ "502":
+ description: Connection to search service failed
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "423":
+ description: Create view resulted in an invalid query statement
content:
application/json:
schema:
@@ -2487,11 +2468,17 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/TableCreateDto"
+ $ref: "#/components/schemas/CreateTableDto"
required: true
responses:
- "404":
- description: "Database, container or user could not be found"
+ "400":
+ description: Create table query is malformed
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "409":
+ description: Create table conflicts with existing table name
content:
application/json:
schema:
@@ -2514,20 +2501,14 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "409":
- description: Create table conflicts with existing table name
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"201":
description: Created a new table
content:
application/json:
schema:
$ref: "#/components/schemas/TableBriefDto"
- "400":
- description: Create table query is malformed
+ "404":
+ description: "Database, container or user could not be found"
content:
application/json:
schema:
@@ -2571,32 +2552,32 @@ paths:
$ref: "#/components/schemas/CreateContainerDto"
required: true
responses:
- "400":
- description: Container payload malformed
+ "409":
+ description: Container name already exists
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "201":
- description: Created a new container
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ContainerDto"
"403":
description: "Create container not permitted, need authority `create-container`"
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "409":
- description: Container name already exists
+ "404":
+ description: Container image or user could not be found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: Container image or user could not be found
+ "201":
+ description: Created a new container
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ContainerDto"
+ "400":
+ description: Container payload malformed
content:
application/json:
schema:
@@ -2646,24 +2627,12 @@ paths:
schema:
type: string
responses:
- "404":
- description: Could not find ontology
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"422":
description: Ontology does not have rdf or sparql endpoint
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "417":
- description: Generated query or uri is malformed
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"400":
description: Filter params are invalid
content:
@@ -2678,6 +2647,18 @@ paths:
type: array
items:
$ref: "#/components/schemas/EntityDto"
+ "404":
+ description: Could not find ontology
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "417":
+ description: Generated query or uri is malformed
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -2758,18 +2739,18 @@ paths:
schema:
type: string
responses:
- "200":
- description: Retrieved metadata from identifier
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/IdentifierDto"
"404":
description: Failed to find metadata for identifier
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "200":
+ description: Retrieved metadata from identifier
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/IdentifierDto"
/api/database/{databaseId}:
get:
tags:
@@ -2785,24 +2766,6 @@ paths:
type: integer
format: int64
responses:
- "403":
- description: Not allowed to view database
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "404":
- description: "Database, user or exchange could not be found"
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
- "503":
- description: Failed to find queue information in broker service
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Database found successfully
headers:
@@ -2819,12 +2782,30 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/DatabaseBriefDto"
+ "404":
+ description: "Database, user or exchange could not be found"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
+ "503":
+ description: Failed to find queue information in broker service
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"502":
description: Connection to the broker service could not be established
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "403":
+ description: Not allowed to view database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
security:
- bearerAuth: []
- basicAuth: []
@@ -2850,40 +2831,40 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: Failed to find database/table in metadata database
+ "403":
+ description: Not the table owner.
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "200":
- description: Suggested table semantics successfully
- content:
- application/json:
- schema:
- type: array
- items:
- $ref: "#/components/schemas/EntityDto"
"422":
description: Ontology does not have rdf or sparql endpoint
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "403":
- description: Not the table owner.
+ "400":
+ description: Failed to parse statistic in search service
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "417":
- description: Generated query is malformed
+ "200":
+ description: Suggested table semantics successfully
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ $ref: "#/components/schemas/EntityDto"
+ "404":
+ description: Failed to find database/table in metadata database
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
- "400":
- description: Failed to parse statistic in search service
+ "417":
+ description: Generated query is malformed
content:
application/json:
schema:
@@ -2918,12 +2899,6 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: Failed to find database/table in metadata database
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ApiErrorDto"
"422":
description: Ontology does not have rdf or sparql endpoint
content:
@@ -2936,6 +2911,12 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "404":
+ description: Failed to find database/table in metadata database
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ApiErrorDto"
"200":
description: Suggested table column semantics successfully
content:
@@ -2962,18 +2943,18 @@ paths:
type: integer
format: int64
responses:
- "200":
- description: Found container
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/ContainerDto"
"404":
description: Container image could not be found
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
+ "200":
+ description: Found container
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ContainerDto"
delete:
tags:
- container-endpoint
@@ -2988,16 +2969,16 @@ paths:
type: integer
format: int64
responses:
- "404":
- description: Container not found
+ "403":
+ description: "Create container not permitted, need authority `delete-container`"
content:
application/json:
schema:
$ref: "#/components/schemas/ApiErrorDto"
"202":
description: Deleted container
- "403":
- description: "Create container not permitted, need authority `delete-container`"
+ "404":
+ description: Container not found
content:
application/json:
schema:
@@ -3561,24 +3542,10 @@ components:
required:
- attributes
- id
+ - password
+ - username
type: object
properties:
- jdbcMethod:
- type: string
- example: mariadb
- host:
- type: string
- example: data-db
- port:
- type: integer
- format: int32
- example: 3306
- username:
- type: string
- example: username
- database:
- type: string
- example: air_quality
id:
type: string
format: uuid
@@ -3586,6 +3553,12 @@ components:
name:
type: string
example: Josiah Carberry
+ username:
+ type: string
+ example: username
+ password:
+ type: string
+ example: p4ssw0rd
attributes:
$ref: "#/components/schemas/UserAttributesDto"
last_retrieved:
@@ -3905,105 +3878,53 @@ components:
display_name:
type: string
example: XOR
- CreatorSaveDto:
+ IdentifierSaveDto:
required:
- - creator_name
+ - creators
+ - database_id
- id
+ - publication_year
+ - publisher
+ - titles
+ - type
type: object
properties:
id:
type: integer
format: int64
example: 1
- firstname:
- type: string
- example: Josiah
- lastname:
- type: string
- example: Carberry
- affiliation:
- type: string
- example: Wesleyan University
- creator_name:
- type: string
- example: "Carberry, Josiah"
- name_type:
+ type:
type: string
- example: Personal
+ example: database
enum:
- - Personal
- - Organizational
- name_identifier:
- type: string
- example: 0000-0002-1825-0097
- name_identifier_scheme:
- type: string
- example: ORCID
- enum:
- - ORCID
- - ROR
- - ISNI
- - GRID
- affiliation_identifier:
- type: string
- example: https://ror.org/04d836q62
- affiliation_identifier_scheme:
- type: string
- example: ROR
- enum:
- - ROR
- - GRID
- - ISNI
- IdentifierFunderSaveDto:
- required:
- - funder_name
- - id
- type: object
- properties:
- id:
- type: integer
- format: int64
- example: 1
- funder_name:
- type: string
- example: European Commission
- funder_identifier:
- type: string
- example: http://doi.org/10.13039/501100000780
- funder_identifier_type:
- type: string
- example: Crossref Funder ID
- enum:
- - Crossref Funder ID
- - ROR
- - GND
- - ISNI
- - Other
- scheme_uri:
- type: string
- example: http://doi.org/
- award_number:
- type: string
- example: "824087"
- award_title:
+ - database
+ - subset
+ - table
+ - view
+ doi:
type: string
- example: EOSC-Life
- IdentifierSaveDescriptionDto:
- required:
- - description
- - id
- type: object
- properties:
- id:
- type: integer
- format: int64
- example: 1
- description:
+ example: 10.1111/11111111
+ titles:
+ type: array
+ items:
+ $ref: "#/components/schemas/SaveIdentifierTitleDto"
+ descriptions:
+ type: array
+ items:
+ $ref: "#/components/schemas/SaveIdentifierDescriptionDto"
+ funders:
+ type: array
+ items:
+ $ref: "#/components/schemas/SaveIdentifierFunderDto"
+ licenses:
+ type: array
+ items:
+ $ref: "#/components/schemas/LicenseDto"
+ publisher:
type: string
- example: "Air quality reports at Stephansplatz, Vienna"
+ example: TU Wien
language:
type: string
- example: en
enum:
- ab
- aa
@@ -4189,63 +4110,122 @@ components:
- yo
- za
- zu
- type:
+ creators:
+ type: array
+ items:
+ $ref: "#/components/schemas/SaveIdentifierCreatorDto"
+ database_id:
+ type: integer
+ format: int64
+ example: 1
+ query_id:
+ type: integer
+ format: int64
+ view_id:
+ type: integer
+ format: int64
+ table_id:
+ type: integer
+ format: int64
+ publication_day:
+ type: integer
+ format: int32
+ example: 15
+ publication_month:
+ type: integer
+ format: int32
+ example: 12
+ publication_year:
+ type: integer
+ format: int32
+ example: 2022
+ related_identifiers:
+ type: array
+ items:
+ $ref: "#/components/schemas/SaveRelatedIdentifierDto"
+ LicenseDto:
+ required:
+ - identifier
+ - uri
+ type: object
+ properties:
+ identifier:
type: string
- example: Abstract
- enum:
- - Abstract
- - Methods
- - SeriesInformation
- - TableOfContents
- - TechnicalInfo
- - Other
- IdentifierSaveDto:
+ example: MIT
+ uri:
+ type: string
+ example: https://opensource.org/licenses/MIT
+ description:
+ type: string
+ example: "A short and simple permissive license with conditions only requiring\
+ \ preservation of copyright and license notices. Licensed works, modifications,\
+ \ and larger works may be distributed under different terms and without\
+ \ source code."
+ SaveIdentifierCreatorDto:
required:
- - creators
- - database_id
+ - creator_name
- id
- - publication_year
- - publisher
- - titles
- - type
type: object
properties:
id:
type: integer
format: int64
example: 1
- type:
+ firstname:
type: string
- example: database
+ example: Josiah
+ lastname:
+ type: string
+ example: Carberry
+ affiliation:
+ type: string
+ example: Wesleyan University
+ creator_name:
+ type: string
+ example: "Carberry, Josiah"
+ name_type:
+ type: string
+ example: Personal
enum:
- - database
- - subset
- - table
- - view
- doi:
+ - Personal
+ - Organizational
+ name_identifier:
type: string
- example: 10.1111/11111111
- titles:
- type: array
- items:
- $ref: "#/components/schemas/IdentifierSaveTitleDto"
- descriptions:
- type: array
- items:
- $ref: "#/components/schemas/IdentifierSaveDescriptionDto"
- funders:
- type: array
- items:
- $ref: "#/components/schemas/IdentifierFunderSaveDto"
- licenses:
- type: array
- items:
- $ref: "#/components/schemas/LicenseDto"
- publisher:
+ example: 0000-0002-1825-0097
+ name_identifier_scheme:
type: string
- example: TU Wien
+ example: ORCID
+ enum:
+ - ORCID
+ - ROR
+ - ISNI
+ - GRID
+ affiliation_identifier:
+ type: string
+ example: https://ror.org/04d836q62
+ affiliation_identifier_scheme:
+ type: string
+ example: ROR
+ enum:
+ - ROR
+ - GRID
+ - ISNI
+ SaveIdentifierDescriptionDto:
+ required:
+ - description
+ - id
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ example: 1
+ description:
+ type: string
+ example: "Air quality reports at Stephansplatz, Vienna"
language:
type: string
+ example: en
enum:
- ab
- aa
@@ -4431,40 +4411,51 @@ components:
- yo
- za
- zu
- creators:
- type: array
- items:
- $ref: "#/components/schemas/CreatorSaveDto"
- database_id:
+ type:
+ type: string
+ example: Abstract
+ enum:
+ - Abstract
+ - Methods
+ - SeriesInformation
+ - TableOfContents
+ - TechnicalInfo
+ - Other
+ SaveIdentifierFunderDto:
+ required:
+ - funder_name
+ - id
+ type: object
+ properties:
+ id:
type: integer
format: int64
example: 1
- query_id:
- type: integer
- format: int64
- view_id:
- type: integer
- format: int64
- table_id:
- type: integer
- format: int64
- publication_day:
- type: integer
- format: int32
- example: 15
- publication_month:
- type: integer
- format: int32
- example: 12
- publication_year:
- type: integer
- format: int32
- example: 2022
- related_identifiers:
- type: array
- items:
- $ref: "#/components/schemas/RelatedIdentifierSaveDto"
- IdentifierSaveTitleDto:
+ funder_name:
+ type: string
+ example: European Commission
+ funder_identifier:
+ type: string
+ example: http://doi.org/10.13039/501100000780
+ funder_identifier_type:
+ type: string
+ example: Crossref Funder ID
+ enum:
+ - Crossref Funder ID
+ - ROR
+ - GND
+ - ISNI
+ - Other
+ scheme_uri:
+ type: string
+ example: http://doi.org/
+ award_number:
+ type: string
+ example: "824087"
+ award_title:
+ type: string
+ example: EOSC-Life
+ SaveIdentifierTitleDto:
required:
- id
- title
@@ -4673,25 +4664,7 @@ components:
- Subtitle
- TranslatedTitle
- Other
- LicenseDto:
- required:
- - identifier
- - uri
- type: object
- properties:
- identifier:
- type: string
- example: MIT
- uri:
- type: string
- example: https://opensource.org/licenses/MIT
- description:
- type: string
- example: "A short and simple permissive license with conditions only requiring\
- \ preservation of copyright and license notices. Licensed works, modifications,\
- \ and larger works may be distributed under different terms and without\
- \ source code."
- RelatedIdentifierSaveDto:
+ SaveRelatedIdentifierDto:
required:
- id
- relation
@@ -5471,126 +5444,16 @@ components:
is_schema_public:
type: boolean
example: true
- ViewColumnDto:
- required:
- - database_id
- - id
- - internal_name
- - is_null_allowed
- - name
- - ord
- - type
- type: object
- properties:
- id:
- type: integer
- format: int64
- example: 12
- name:
- maxLength: 64
- minLength: 0
- type: string
- example: Given Name
- size:
- type: integer
- format: int64
- example: 255
- d:
- type: integer
- format: int64
- example: 0
- description:
- maxLength: 2048
- minLength: 0
- type: string
- example: Column comment
- database_id:
- type: integer
- format: int64
- example: 1
- ord:
- type: integer
- format: int32
- example: 0
- internal_name:
- maxLength: 64
- minLength: 0
- type: string
- example: given_name
- index_length:
- type: integer
- format: int64
- example: 255
- length:
- type: integer
- format: int64
- example: 255
- type:
- type: string
- example: varchar
- enum:
- - char
- - varchar
- - binary
- - varbinary
- - tinyblob
- - tinytext
- - text
- - blob
- - mediumtext
- - mediumblob
- - longtext
- - longblob
- - enum
- - set
- - serial
- - bit
- - tinyint
- - bool
- - smallint
- - mediumint
- - int
- - bigint
- - float
- - double
- - decimal
- - date
- - datetime
- - timestamp
- - time
- - year
- is_null_allowed:
- type: boolean
- example: false
- ViewDto:
+ ViewBriefDto:
required:
- - columns
- database_id
- id
- - identifiers
- internal_name
- name
- - owner
- query
- query_hash
type: object
properties:
- jdbcMethod:
- type: string
- example: mariadb
- host:
- type: string
- example: data-db
- port:
- type: integer
- format: int32
- example: 3306
- username:
- type: string
- example: username
- database:
- type: string
- example: air_quality
id:
type: integer
format: int64
@@ -5598,22 +5461,9 @@ components:
name:
type: string
example: Air Quality
- identifiers:
- type: array
- items:
- $ref: "#/components/schemas/IdentifierDto"
query:
type: string
example: SELECT `id` FROM `air_quality` ORDER BY `value` DESC
- owner:
- $ref: "#/components/schemas/UserBriefDto"
- columns:
- type: array
- items:
- $ref: "#/components/schemas/ViewColumnDto"
- last_retrieved:
- type: string
- format: date-time
database_id:
type: integer
format: int64
@@ -5634,6 +5484,10 @@ components:
query_hash:
type: string
example: 7de03e818900b6ea6d58ad0306d4a741d658c6df3d1964e89ed2395d8c7e7916
+ owned_by:
+ type: string
+ format: uuid
+ example: ac750fcf-ea02-4fce-85ac-d73857e18b35
TableUpdateDto:
required:
- is_public
@@ -5908,7 +5762,7 @@ components:
- read
- write_own
- write_all
- SignupRequestDto:
+ CreateUserDto:
required:
- email
- password
@@ -6013,7 +5867,7 @@ components:
minimum: 1024
type: integer
format: int32
- IdentifierCreateDto:
+ CreateIdentifierDto:
required:
- creators
- database_id
@@ -6037,15 +5891,15 @@ components:
titles:
type: array
items:
- $ref: "#/components/schemas/IdentifierSaveTitleDto"
+ $ref: "#/components/schemas/SaveIdentifierTitleDto"
descriptions:
type: array
items:
- $ref: "#/components/schemas/IdentifierSaveDescriptionDto"
+ $ref: "#/components/schemas/SaveIdentifierDescriptionDto"
funders:
type: array
items:
- $ref: "#/components/schemas/IdentifierFunderSaveDto"
+ $ref: "#/components/schemas/SaveIdentifierFunderDto"
licenses:
type: array
items:
@@ -6243,7 +6097,7 @@ components:
creators:
type: array
items:
- $ref: "#/components/schemas/CreatorSaveDto"
+ $ref: "#/components/schemas/SaveIdentifierCreatorDto"
database_id:
type: integer
format: int64
@@ -6272,8 +6126,8 @@ components:
related_identifiers:
type: array
items:
- $ref: "#/components/schemas/RelatedIdentifierSaveDto"
- DatabaseCreateDto:
+ $ref: "#/components/schemas/SaveRelatedIdentifierDto"
+ CreateDatabaseDto:
required:
- container_id
- is_public
@@ -6294,7 +6148,7 @@ components:
is_schema_public:
type: boolean
example: true
- ViewCreateDto:
+ CreateViewDto:
required:
- is_public
- is_schema_public
@@ -6316,51 +6170,40 @@ components:
is_schema_public:
type: boolean
example: true
- ViewBriefDto:
+ CreateForeignKeyDto:
required:
- - database_id
- - id
- - internal_name
- - name
- - query
- - query_hash
+ - columns
+ - referenced_columns
+ - referenced_table
type: object
properties:
- id:
- type: integer
- format: int64
- example: 4
- name:
- type: string
- example: Air Quality
- query:
- type: string
- example: SELECT `id` FROM `air_quality` ORDER BY `value` DESC
- database_id:
- type: integer
- format: int64
- example: 1
- internal_name:
+ columns:
+ type: array
+ items:
+ type: string
+ referenced_table:
type: string
- example: air_quality
- is_public:
- type: boolean
- example: true
- is_schema_public:
- type: boolean
- example: true
- initial_view:
- type: boolean
- description: True if it is the default view for the database
- example: true
- query_hash:
+ referenced_columns:
+ type: array
+ items:
+ type: string
+ on_update:
type: string
- example: 7de03e818900b6ea6d58ad0306d4a741d658c6df3d1964e89ed2395d8c7e7916
- owned_by:
+ enum:
+ - restrict
+ - cascade
+ - set_null
+ - no_action
+ - set_default
+ on_delete:
type: string
- format: uuid
- example: ac750fcf-ea02-4fce-85ac-d73857e18b35
- ColumnCreateDto:
+ enum:
+ - restrict
+ - cascade
+ - set_null
+ - no_action
+ - set_default
+ CreateTableColumnDto:
required:
- name
- null_allowed
@@ -6439,7 +6282,7 @@ components:
type: string
unit_uri:
type: string
- ConstraintsCreateDto:
+ CreateTableConstraintsDto:
required:
- checks
- foreign_keys
@@ -6454,53 +6297,20 @@ components:
items:
type: string
checks:
- uniqueItems: true
- type: array
- items:
- type: string
- foreign_keys:
- type: array
- items:
- $ref: "#/components/schemas/ForeignKeyCreateDto"
- primary_key:
- uniqueItems: true
- type: array
- items:
- type: string
- ForeignKeyCreateDto:
- required:
- - columns
- - referenced_columns
- - referenced_table
- type: object
- properties:
- columns:
- type: array
- items:
- type: string
- referenced_table:
- type: string
- referenced_columns:
- type: array
- items:
- type: string
- on_update:
- type: string
- enum:
- - restrict
- - cascade
- - set_null
- - no_action
- - set_default
- on_delete:
- type: string
- enum:
- - restrict
- - cascade
- - set_null
- - no_action
- - set_default
- TableCreateDto:
+ uniqueItems: true
+ type: array
+ items:
+ type: string
+ foreign_keys:
+ type: array
+ items:
+ $ref: "#/components/schemas/CreateForeignKeyDto"
+ primary_key:
+ uniqueItems: true
+ type: array
+ items:
+ type: string
+ CreateTableDto:
required:
- columns
- constraints
@@ -6522,9 +6332,9 @@ components:
columns:
type: array
items:
- $ref: "#/components/schemas/ColumnCreateDto"
+ $ref: "#/components/schemas/CreateTableColumnDto"
constraints:
- $ref: "#/components/schemas/ConstraintsCreateDto"
+ $ref: "#/components/schemas/CreateTableConstraintsDto"
is_public:
type: boolean
example: true
@@ -6587,9 +6397,13 @@ components:
- quota
type: object
properties:
- jdbcMethod:
+ id:
+ type: integer
+ format: int64
+ example: 4
+ name:
type: string
- example: mariadb
+ example: Air Quality
host:
type: string
example: data-db
@@ -6597,19 +6411,6 @@ components:
type: integer
format: int32
example: 3306
- username:
- type: string
- example: username
- database:
- type: string
- example: air_quality
- id:
- type: integer
- format: int64
- example: 4
- name:
- type: string
- example: Air Quality
image:
$ref: "#/components/schemas/ImageDto"
quota:
@@ -6620,6 +6421,12 @@ components:
type: integer
format: int64
example: 10
+ username:
+ type: string
+ example: username
+ password:
+ type: string
+ example: p4ssw0rd
last_retrieved:
type: string
format: date-time
@@ -6929,6 +6736,79 @@ components:
type: array
items:
$ref: "#/components/schemas/PrimaryKeyDto"
+ DatabaseDto:
+ required:
+ - accesses
+ - contact
+ - exchange_name
+ - id
+ - identifiers
+ - internal_name
+ - is_public
+ - is_schema_public
+ - name
+ - owner
+ - subsets
+ - tables
+ - views
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ example: 3
+ name:
+ type: string
+ example: Air Quality
+ description:
+ type: string
+ example: Air Quality
+ tables:
+ type: array
+ items:
+ $ref: "#/components/schemas/TableDto"
+ views:
+ type: array
+ items:
+ $ref: "#/components/schemas/ViewDto"
+ container:
+ $ref: "#/components/schemas/ContainerDto"
+ accesses:
+ type: array
+ items:
+ $ref: "#/components/schemas/DatabaseAccessDto"
+ identifiers:
+ type: array
+ items:
+ $ref: "#/components/schemas/IdentifierDto"
+ subsets:
+ type: array
+ items:
+ $ref: "#/components/schemas/IdentifierDto"
+ contact:
+ $ref: "#/components/schemas/UserBriefDto"
+ owner:
+ $ref: "#/components/schemas/UserBriefDto"
+ last_retrieved:
+ type: string
+ format: date-time
+ exchange_name:
+ type: string
+ example: dbrepo
+ exchange_type:
+ type: string
+ example: topic
+ internal_name:
+ type: string
+ example: air_quality
+ is_public:
+ type: boolean
+ example: true
+ is_schema_public:
+ type: boolean
+ example: true
+ preview_image:
+ type: string
ForeignKeyBriefDto:
type: object
properties:
@@ -7024,22 +6904,6 @@ components:
- routing_key
type: object
properties:
- jdbcMethod:
- type: string
- example: mariadb
- host:
- type: string
- example: data-db
- port:
- type: integer
- format: int32
- example: 3306
- username:
- type: string
- example: username
- database:
- type: string
- example: air_quality
id:
type: integer
format: int64
@@ -7065,6 +6929,8 @@ components:
type: array
items:
$ref: "#/components/schemas/ColumnDto"
+ database:
+ $ref: "#/components/schemas/DatabaseDto"
constraints:
$ref: "#/components/schemas/ConstraintsDto"
last_retrieved:
@@ -7135,6 +7001,155 @@ components:
type: array
items:
$ref: "#/components/schemas/ColumnBriefDto"
+ ViewColumnDto:
+ required:
+ - database_id
+ - id
+ - internal_name
+ - is_null_allowed
+ - name
+ - ord
+ - type
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ example: 12
+ name:
+ maxLength: 64
+ minLength: 0
+ type: string
+ example: Given Name
+ size:
+ type: integer
+ format: int64
+ example: 255
+ d:
+ type: integer
+ format: int64
+ example: 0
+ description:
+ maxLength: 2048
+ minLength: 0
+ type: string
+ example: Column comment
+ database_id:
+ type: integer
+ format: int64
+ example: 1
+ ord:
+ type: integer
+ format: int32
+ example: 0
+ internal_name:
+ maxLength: 64
+ minLength: 0
+ type: string
+ example: given_name
+ index_length:
+ type: integer
+ format: int64
+ example: 255
+ length:
+ type: integer
+ format: int64
+ example: 255
+ type:
+ type: string
+ example: varchar
+ enum:
+ - char
+ - varchar
+ - binary
+ - varbinary
+ - tinyblob
+ - tinytext
+ - text
+ - blob
+ - mediumtext
+ - mediumblob
+ - longtext
+ - longblob
+ - enum
+ - set
+ - serial
+ - bit
+ - tinyint
+ - bool
+ - smallint
+ - mediumint
+ - int
+ - bigint
+ - float
+ - double
+ - decimal
+ - date
+ - datetime
+ - timestamp
+ - time
+ - year
+ is_null_allowed:
+ type: boolean
+ example: false
+ ViewDto:
+ required:
+ - columns
+ - database_id
+ - id
+ - identifiers
+ - internal_name
+ - name
+ - owner
+ - query
+ - query_hash
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ example: 4
+ name:
+ type: string
+ example: Air Quality
+ identifiers:
+ type: array
+ items:
+ $ref: "#/components/schemas/IdentifierDto"
+ query:
+ type: string
+ example: SELECT `id` FROM `air_quality` ORDER BY `value` DESC
+ database:
+ $ref: "#/components/schemas/DatabaseDto"
+ owner:
+ $ref: "#/components/schemas/UserBriefDto"
+ columns:
+ type: array
+ items:
+ $ref: "#/components/schemas/ViewColumnDto"
+ last_retrieved:
+ type: string
+ format: date-time
+ database_id:
+ type: integer
+ format: int64
+ example: 1
+ internal_name:
+ type: string
+ example: air_quality
+ is_public:
+ type: boolean
+ example: true
+ is_schema_public:
+ type: boolean
+ example: true
+ initial_view:
+ type: boolean
+ description: True if it is the default view for the database
+ example: true
+ query_hash:
+ type: string
+ example: 7de03e818900b6ea6d58ad0306d4a741d658c6df3d1964e89ed2395d8c7e7916
TableColumnEntityDto:
required:
- column_id
diff --git a/.docs/.openapi/api.base.yaml b/.docs/.openapi/api.base.yaml
index fc0a733ccc7e1c4134f8a444c9b6fe08acb7aabb..ee32aad2ff6d82927876773fb76d26b79c7b846c 100644
--- a/.docs/.openapi/api.base.yaml
+++ b/.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
diff --git a/.docs/.openapi/swagger-ui.html b/.docs/.openapi/swagger-ui.html
index 0bb08a1c07c1bfca6cc820474190dada3580df48..e84dd2ca47861ad5cdc87f51d9671a9d28e2c97b 100644
--- a/.docs/.openapi/swagger-ui.html
+++ b/.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({
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java
index 0beb8a379491869edef613a594616beb21d1da83..a30208bad0c577af2e80c9d629b087bdf5b3e7e7 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java
+++ b/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;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java
deleted file mode 100644
index c9110e041aaf1187675c58d2365cf63e1f1f2003..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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;
-
-}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java
index f87673764ea55479e86ede7e3f2b70c94cd16b9a..c10d6b0b5e2618a6c3854e591d99e477be952035 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java
index 142a751ec4cc8eaceee7a9402af2c711d1acaa19..366845d08304881519c80f4984106626bf52a01a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java
+++ b/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)
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java
similarity index 77%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java
index 7c3defcc0b69dc47e20c4e9aa9931fdfad1143b0..15a798ee2d6bd237a6f578678d8885ca3b0f87dd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java
@@ -1,7 +1,7 @@
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;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java
index ca9bb10569e7bbeb30dd4b8080d0adbbcd2fab75..ca7f3b8d58a3ee08a342b6df0452719c786b863b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java
similarity index 77%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java
index 3d35a20b0c57ae76f2d5fb6c4843e4d46d43ffab..7b223372d2ae0057149e3b9ed95824c7a5baa05d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java
@@ -1,6 +1,6 @@
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;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java
index 8e2a110997bb257b9414a9780fb29751265cce76..31e43b0c6a4377b59d096f5acf5b6bf43067a295 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyCreateDto.java
+++ b/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;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
index 777a870bb9650f0e06b732f0a5776a6768902945..f8db928e8e9bb3d7491e67ea36756b95749a4482 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
@@ -1,7 +1,7 @@
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;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java
index 46eb1bbc7db597e788918745d526ba7dace1ed1b..db55272383828e1bfc0c870f086ecc2c27ecba03 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java
+++ b/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;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java
index 8591cdc8c2b6b6c35672c8bf7451652b5a523e61..ed4d445de0ffd2686a84331981d3d5899a4a9b65 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java
+++ b/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;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorSaveDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorSaveDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java
index 86d51e7b4cc3d132959f60731acd1352765df20f..c87ff81d3c058edd475d89102c8e29468dae211e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorSaveDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDescriptionDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDescriptionDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java
index 76f4f4b7bc1ff6e4763ec0e57f3de9ca1a1e125c..1d251db634d4f1a6cb0b369013c113aae69f1968 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDescriptionDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderSaveDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderSaveDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java
index 81fd7c91ab44c0f1b89d18656c214fdc50958e38..89bea57a1cf5c69a4184fae5edc3d77f8062bb39 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderSaveDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveTitleDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveTitleDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java
index 9da7e7ec8b7d61f35fe963b2e651c2662e7353e9..0832a77cee0323db7220cf88ff295982fee2c0a1 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveTitleDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierSaveDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierSaveDto.java
rename to dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java
index f72d5b02d29d038233031365b7172c93da567b5d..b3a95eee06fe4cc0cb91fb8df822e52c3f507221 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierSaveDto.java
+++ b/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")
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index bd6b952c172a71e38ad4f63a106db4c4d48dc6c6..ac6cacf64f007440e26df82d86eb6d1302f27390 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -1,6 +1,6 @@
package at.tuwien.mapper;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.container.ContainerBriefDto;
import at.tuwien.api.container.ContainerDto;
import at.tuwien.api.container.CreateContainerDto;
@@ -13,13 +13,13 @@ import at.tuwien.api.database.*;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.columns.ColumnBriefDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.api.database.table.columns.concepts.ConceptSaveDto;
import at.tuwien.api.database.table.columns.concepts.UnitDto;
import at.tuwien.api.database.table.columns.concepts.UnitSaveDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
import at.tuwien.api.database.table.constraints.ConstraintsDto;
import at.tuwien.api.database.table.constraints.foreign.ForeignKeyBriefDto;
import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
@@ -363,19 +363,19 @@ public interface MetadataMapper {
.build();
}
- Identifier identifierCreateDtoToIdentifier(IdentifierCreateDto data);
+ Identifier identifierCreateDtoToIdentifier(CreateIdentifierDto data);
Identifier identifierUpdateDtoToIdentifier(IdentifierSaveDto data);
License licenseDtoToLicense(LicenseDto data);
- IdentifierTitle identifierCreateTitleDtoToIdentifierTitle(IdentifierSaveTitleDto data);
+ IdentifierTitle identifierCreateTitleDtoToIdentifierTitle(SaveIdentifierTitleDto data);
- IdentifierDescription identifierCreateDescriptionDtoToIdentifierDescription(IdentifierSaveDescriptionDto data);
+ IdentifierDescription identifierCreateDescriptionDtoToIdentifierDescription(SaveIdentifierDescriptionDto data);
- IdentifierFunder identifierFunderSaveDtoToIdentifierFunder(IdentifierFunderSaveDto data);
+ IdentifierFunder identifierFunderSaveDtoToIdentifierFunder(SaveIdentifierFunderDto data);
- IdentifierSaveDto identifierCreateDtoToIdentifierSaveDto(IdentifierCreateDto data);
+ IdentifierSaveDto identifierCreateDtoToIdentifierSaveDto(CreateIdentifierDto data);
RelatedIdentifierDto relatedIdentifierToRelatedIdentifierDto(RelatedIdentifier data);
@@ -389,9 +389,9 @@ public interface MetadataMapper {
@Mapping(target = "nameIdentifierSchemeUri", source = "nameIdentifierScheme", qualifiedByName = "nameSchemaMapper"),
@Mapping(target = "affiliationIdentifierSchemeUri", source = "affiliationIdentifierScheme", qualifiedByName = "affiliationSchemaMapper"),
})
- Creator creatorCreateDtoToCreator(CreatorSaveDto data);
+ Creator creatorCreateDtoToCreator(SaveIdentifierCreatorDto data);
- RelatedIdentifier relatedIdentifierCreateDtoToRelatedIdentifier(RelatedIdentifierSaveDto data);
+ RelatedIdentifier relatedIdentifierCreateDtoToRelatedIdentifier(SaveRelatedIdentifierDto data);
IdentifierType identifierTypeDtoToIdentifierType(IdentifierTypeDto data);
@@ -637,7 +637,7 @@ public interface MetadataMapper {
ReferenceType referenceTypeDtoToReferenceType(ReferenceTypeDto data);
/* keep */
- default Constraints constraintsCreateDtoToConstraints(ConstraintsCreateDto data, Database database, Table table) {
+ default Constraints constraintsCreateDtoToConstraints(CreateTableConstraintsDto data, Database database, Table table) {
final int[] idx = new int[]{0, 0};
final Constraints constrains = Constraints.builder()
.checks(data.getChecks())
@@ -744,7 +744,7 @@ public interface MetadataMapper {
@Mapping(target = "name", source = "data.name"),
@Mapping(target = "internalName", expression = "java(nameToInternalName(data.getName()))"),
})
- TableColumn columnCreateDtoToTableColumn(ColumnCreateDto data, ContainerImage image);
+ TableColumn columnCreateDtoToTableColumn(CreateTableColumnDto data, ContainerImage image);
default UpdateCredentialsDto passwordToUpdateCredentialsDto(String password) {
return UpdateCredentialsDto.builder()
@@ -756,7 +756,7 @@ public interface MetadataMapper {
.build();
}
- default UserCreateDto signupRequestDtoToUserCreateDto(SignupRequestDto data) {
+ default UserCreateDto signupRequestDtoToUserCreateDto(CreateUserDto data) {
return UserCreateDto.builder()
.username(data.getUsername())
.email(data.getEmail())
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index 44d3c10c744ab7282186939444cd9fb7692307ed..6ee9fa6c9e4a3e7b7d9882197e8a835eca8e6f9c 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -153,7 +153,7 @@ public class DatabaseEndpoint extends AbstractEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<DatabaseBriefDto> create(@Valid @RequestBody DatabaseCreateDto data,
+ public ResponseEntity<DatabaseBriefDto> create(@Valid @RequestBody CreateDatabaseDto data,
@NotNull Principal principal) throws DataServiceException,
DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException,
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
index 2830f9714a62cb7fea0b0cf616b4bd54eff8d340..b70516fa66e8476fa65cb9d50ab750976394da9f 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
@@ -475,7 +475,7 @@ public class IdentifierEndpoint extends AbstractEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<IdentifierDto> create(@NotNull @Valid @RequestBody IdentifierCreateDto data,
+ public ResponseEntity<IdentifierDto> create(@NotNull @Valid @RequestBody CreateIdentifierDto data,
@NotNull Principal principal) throws DatabaseNotFoundException,
UserNotFoundException, NotAllowedException, MalformedException, DataServiceConnectionException,
SearchServiceException, DataServiceException, QueryNotFoundException, SearchServiceConnectionException,
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index 61ba0d53e74c921ab3b21e3d850b32a8917b6a4b..08535fde69a20f162ea3d4478110d9360db55f99 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableUpdateDto;
import at.tuwien.api.database.table.columns.ColumnDto;
@@ -359,7 +359,7 @@ public class TableEndpoint extends AbstractEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<TableBriefDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull @Valid @RequestBody TableCreateDto data,
+ @NotNull @Valid @RequestBody CreateTableDto data,
@NotNull Principal principal) throws NotAllowedException, MalformedException,
DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, UserNotFoundException,
AccessNotFoundException, TableNotFoundException, TableExistsException, SearchServiceException,
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index da979b34f183d25a3696aaad4f2ca606fc8d76a5..ade963c2559062b0ce225e0857ead02de351774c 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -2,7 +2,7 @@ package at.tuwien.endpoints;
import at.tuwien.api.auth.LoginRequestDto;
import at.tuwien.api.auth.RefreshTokenRequestDto;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.keycloak.TokenDto;
import at.tuwien.api.user.UserBriefDto;
@@ -139,7 +139,7 @@ public class UserEndpoint extends AbstractEndpoint {
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody SignupRequestDto data)
+ public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody CreateUserDto data)
throws UserExistsException, EmailExistsException, AuthServiceException, AuthServiceConnectionException,
UserNotFoundException, CredentialsInvalidException {
log.debug("endpoint create user, data.username={}", data.getUsername());
@@ -201,7 +201,7 @@ public class UserEndpoint extends AbstractEndpoint {
} catch (UserNotFoundException e) {
/* need to sync */
log.warn("User with username {} does not exist in metadata database yet", data.getUsername());
- final SignupRequestDto request = SignupRequestDto.builder()
+ final CreateUserDto request = CreateUserDto.builder()
.username(data.getUsername())
.email("noreply@example.com")
.password(data.getPassword())
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index abfbdb5d366f289c2d93fd07194241ce1b31a8d4..e8b40de8b2bfa05f9901a01ce0e269fbbffefe41 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.api.database.ViewBriefDto;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.ViewUpdateDto;
import at.tuwien.api.error.ApiErrorDto;
@@ -137,7 +137,7 @@ public class ViewEndpoint extends AbstractEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<ViewBriefDto> create(@NotNull @PathVariable("databaseId") Long databaseId,
- @NotNull @Valid @RequestBody ViewCreateDto data,
+ @NotNull @Valid @RequestBody CreateViewDto data,
@NotNull Principal principal) throws NotAllowedException,
MalformedException, DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
UserNotFoundException, SearchServiceException, SearchServiceConnectionException {
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index 1f7c391bd2ef63d49ed1acd5255409a1564af0ca..3fc9c7216e5ad6f84fa530556708a8453eac2bac 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -1,8 +1,8 @@
package at.tuwien.validation;
import at.tuwien.SortType;
-import at.tuwien.api.database.table.TableCreateDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.identifier.IdentifierSaveDto;
import at.tuwien.endpoints.AbstractEndpoint;
@@ -87,12 +87,12 @@ public class EndpointValidator extends AbstractEndpoint {
}
}
- public void validateColumnCreateConstraints(TableCreateDto data) throws MalformedException {
+ public void validateColumnCreateConstraints(CreateTableDto data) throws MalformedException {
if (data == null) {
throw new MalformedException("Validation failed: table data is null");
}
/* check size */
- final Optional<ColumnCreateDto> optional0 = data.getColumns()
+ final Optional<CreateTableColumnDto> optional0 = data.getColumns()
.stream()
.filter(c -> Objects.isNull(c.getSize()))
.filter(c -> NEED_SIZE.contains(c.getType()))
@@ -101,7 +101,7 @@ public class EndpointValidator extends AbstractEndpoint {
log.error("Validation failed: column {} need size parameter", optional0.get().getName());
throw new MalformedException("Validation failed: column " + optional0.get().getName() + " need size parameter");
}
- final Optional<ColumnCreateDto> optional0a = data.getColumns()
+ final Optional<CreateTableColumnDto> optional0a = data.getColumns()
.stream()
.filter(c -> !Objects.isNull(c.getSize()))
.filter(c -> CAN_HAVE_SIZE.contains(c.getType()) || CAN_HAVE_SIZE_AND_D.contains(c.getType()))
@@ -111,7 +111,7 @@ public class EndpointValidator extends AbstractEndpoint {
log.error("Validation failed: column {} needs positive size parameter", optional0a.get().getName());
throw new MalformedException("Validation failed: column " + optional0a.get().getName() + " needs positive size parameter");
}
- final Optional<ColumnCreateDto> optional0b = data.getColumns()
+ final Optional<CreateTableColumnDto> optional0b = data.getColumns()
.stream()
.filter(c -> !Objects.isNull(c.getD()))
.filter(c -> CAN_HAVE_SIZE_AND_D.contains(c.getType()))
@@ -122,7 +122,7 @@ public class EndpointValidator extends AbstractEndpoint {
throw new MalformedException("Validation failed: column " + optional0b.get().getName() + " needs positive d parameter");
}
/* check size and d */
- final Optional<ColumnCreateDto> optional1 = data.getColumns()
+ final Optional<CreateTableColumnDto> optional1 = data.getColumns()
.stream()
.filter(c -> Objects.isNull(c.getSize()) ^ Objects.isNull(c.getD()))
.filter(c -> CAN_HAVE_SIZE_AND_D.contains(c.getType()))
@@ -132,7 +132,7 @@ public class EndpointValidator extends AbstractEndpoint {
throw new MalformedException("Validation failed: column " + optional1.get().getName() + " either needs both size and d parameter or none (use default)");
}
/* check enum */
- final Optional<ColumnCreateDto> optional2 = data.getColumns()
+ final Optional<CreateTableColumnDto> optional2 = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.ENUM))
.filter(c -> c.getEnums() == null || c.getEnums().isEmpty())
@@ -142,7 +142,7 @@ public class EndpointValidator extends AbstractEndpoint {
throw new MalformedException("Validation failed: column " + optional2.get().getName() + " needs at least 1 allowed enum value");
}
/* check set */
- final Optional<ColumnCreateDto> optional3 = data.getColumns()
+ final Optional<CreateTableColumnDto> optional3 = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.SET))
.filter(c -> c.getEnums() == null || c.getSets().isEmpty())
@@ -152,7 +152,7 @@ public class EndpointValidator extends AbstractEndpoint {
throw new MalformedException("Validation failed: column " + optional3.get().getName() + " needs at least 1 allowed set value");
}
/* check serial */
- final List<ColumnCreateDto> list4a = data.getColumns()
+ final List<CreateTableColumnDto> list4a = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.SERIAL))
.toList();
@@ -160,16 +160,16 @@ public class EndpointValidator extends AbstractEndpoint {
log.error("Validation failed: only one column of type serial allowed");
throw new MalformedException("Validation failed: only one column of type serial allowed");
}
- final Optional<ColumnCreateDto> optional4a = data.getColumns()
+ final Optional<CreateTableColumnDto> optional4a = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.SERIAL))
- .filter(ColumnCreateDto::getNullAllowed)
+ .filter(CreateTableColumnDto::getNullAllowed)
.findFirst();
if (optional4a.isPresent()) {
log.error("Validation failed: column {} type serial demands non-null", optional4a.get().getName());
throw new MalformedException("Validation failed: column " + optional4a.get().getName() + " type serial demands non-null");
}
- final Optional<ColumnCreateDto> optional4b = data.getColumns()
+ final Optional<CreateTableColumnDto> optional4b = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.SERIAL) && data.getConstraints()
.getUniques()
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
index 371e710faed24100589904d8e82a9934edf18dae..5118aec776b4f5956f8a82a23803f4ce2bfc6cdf 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
@@ -68,7 +68,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void create_anonymous_fails() {
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
+ final CreateDatabaseDto request = CreateDatabaseDto.builder()
.cid(CONTAINER_1_ID)
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
@@ -83,7 +83,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
public void create_noRole_fails() {
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
+ final CreateDatabaseDto request = CreateDatabaseDto.builder()
.cid(CONTAINER_3_ID)
.name(DATABASE_3_NAME)
.isPublic(DATABASE_3_PUBLIC)
@@ -101,7 +101,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
DatabaseNotFoundException, ContainerNotFoundException, SearchServiceException,
SearchServiceConnectionException, AuthServiceException, AuthServiceConnectionException,
BrokerServiceException, BrokerServiceConnectionException, ContainerQuotaException {
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
+ final CreateDatabaseDto request = CreateDatabaseDto.builder()
.cid(CONTAINER_1_ID)
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
@@ -124,7 +124,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"create-database"})
public void create_quotaExceeded_fails() throws UserNotFoundException, ContainerNotFoundException {
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
+ final CreateDatabaseDto request = CreateDatabaseDto.builder()
.cid(CONTAINER_4_ID)
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
@@ -669,7 +669,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
assertEquals(expectedSize, body.size());
}
- public void create_generic(DatabaseCreateDto data, Principal principal, User user) throws DataServiceException,
+ public void create_generic(CreateDatabaseDto data, Principal principal, User user) throws DataServiceException,
DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException,
BrokerServiceException, BrokerServiceConnectionException, ContainerQuotaException {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
index 9cc0c4cc8baa09e15116a1048a95312f2e954ae6..a17d31649e6824442613261b91bca4ee923a4817 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
import at.tuwien.api.semantics.EntityDto;
import at.tuwien.api.semantics.TableColumnEntityDto;
import at.tuwien.entities.database.Database;
@@ -203,10 +203,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicDecimalColumnSizeTooSmall_fails() {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(ColumnTypeDto.DECIMAL)
.size(-1L) // <<<
@@ -224,10 +224,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicDecimalColumnDTooSmall_fails() {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(ColumnTypeDto.DECIMAL)
.size(0L)
@@ -247,10 +247,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicOptionalSizeNone_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(null) // <<<
@@ -278,10 +278,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicOptionalSize_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(40L)
@@ -303,15 +303,15 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicNeedNothing_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.nullAllowed(false)
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.uniques(List.of(List.of("ID")))
.build())
.build();
@@ -329,10 +329,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicNeedSize_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(40L)
@@ -353,10 +353,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MethodSource("needSize_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicNeedSizeNone_fails(ColumnTypeDto columnType) {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(null) // <<<
@@ -375,10 +375,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MethodSource("canHaveSizeAndD_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicCanHaveSizeAndDSizeNone_fails(ColumnTypeDto columnType) {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(null) // <<<
@@ -397,10 +397,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MethodSource("canHaveSizeAndD_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicCanHaveSizeAndDDNone_fails(ColumnTypeDto columnType) {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(0L)
@@ -423,10 +423,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException,
DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException,
SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(null) // <<<
@@ -446,20 +446,20 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicHasMultipleSerial_fails() {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(ColumnTypeDto.SERIAL)
.nullAllowed(false)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Counter")
.type(ColumnTypeDto.SERIAL)
.nullAllowed(false)
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.uniques(List.of(List.of("ID"),
List.of("Counter")))
.build())
@@ -474,15 +474,15 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
public void create_publicSerialNullAllowed_fails() {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(ColumnTypeDto.SERIAL)
.nullAllowed(true) // <<<
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.uniques(List.of(List.of("ID")))
.build())
.build();
@@ -501,10 +501,10 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException,
DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException,
SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("Some Table")
.description("Some Description")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("ID")
.type(columnType)
.size(0L) // <<<
@@ -1147,7 +1147,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
return tableEndpoint.list(databaseId, principal);
}
- protected ResponseEntity<TableBriefDto> generic_create(Long databaseId, Database database, TableCreateDto data,
+ protected ResponseEntity<TableBriefDto> generic_create(Long databaseId, Database database, CreateTableDto data,
Principal principal, User user, DatabaseAccess access)
throws MalformedException, NotAllowedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException, TableNotFoundException,
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
index 8b653f9356b7814add62faa42636bbcfe5640aed..152c17c4616a9637c08c50b9ba944dcef41c92f8 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.api.auth.LoginRequestDto;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.keycloak.UserAttributesDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto;
@@ -107,7 +107,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@WithAnonymousUser
public void create_anonymous_succeeds() throws UserExistsException, EmailExistsException, UserNotFoundException,
AuthServiceException, AuthServiceConnectionException, CredentialsInvalidException {
- final SignupRequestDto request = SignupRequestDto.builder()
+ final CreateUserDto request = CreateUserDto.builder()
.email(USER_1_EMAIL)
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
@@ -120,7 +120,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME)
public void create_isAuthenticated_fails() {
- final SignupRequestDto request = SignupRequestDto.builder()
+ final CreateUserDto request = CreateUserDto.builder()
.email(USER_2_EMAIL)
.username(USER_2_USERNAME)
.password(USER_2_PASSWORD)
@@ -312,7 +312,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
/* mock */
when(authenticationService.findByUsername(USER_1_USERNAME))
.thenReturn(USER_1_KEYCLOAK_DTO);
- when(userService.create(any(SignupRequestDto.class), any(UUID.class)))
+ when(userService.create(any(CreateUserDto.class), any(UUID.class)))
.thenReturn(USER_1);
/* test */
@@ -445,7 +445,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
return response.getBody();
}
- protected void create_generic(SignupRequestDto data, User user, at.tuwien.api.keycloak.UserDto userDto, UUID id)
+ protected void create_generic(CreateUserDto data, User user, at.tuwien.api.keycloak.UserDto userDto, UUID id)
throws UserExistsException, EmailExistsException, UserNotFoundException, AuthServiceException,
AuthServiceConnectionException, CredentialsInvalidException {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
index 4cd9296425a6e56c32f5f380a52d79e8945900e6..4f1a3da45c87922aabd73ee6e75b1cca3160dd62 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
import at.tuwien.api.database.ViewBriefDto;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.ViewUpdateDto;
import at.tuwien.entities.database.Database;
@@ -461,7 +461,7 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
DatabaseAccess access) throws MalformedException, DataServiceException,
DataServiceConnectionException, NotAllowedException, UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, SearchServiceException, SearchServiceConnectionException {
- final ViewCreateDto request = ViewCreateDto.builder()
+ final CreateViewDto request = CreateViewDto.builder()
.name(VIEW_1_NAME)
.query(VIEW_1_QUERY)
.isPublic(VIEW_1_PUBLIC)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
index 5250f7e106d7bdcd31b01e1c887b6ffd8a5cc852..b0efccab9ac856f727ee3377554e7cf8a01bb2c7 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.TableCreateDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
@@ -82,22 +82,22 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
@Transactional
public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, TableNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException, SemanticEntityNotFoundException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("New Table")
.description("A wonderful table")
.isPublic(true)
.isSchemaPublic(true)
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("id")
.nullAllowed(false)
.type(ColumnTypeDto.BIGINT)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("date")
.nullAllowed(true)
.type(ColumnTypeDto.DATE)
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.checks(Set.of())
.uniques(List.of(List.of("date")))
.foreignKeys(List.of())
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index 5fb8e9ad7eecd267ffa9fb58ffc2b6404f93d737..8cb5081f6d98b68971f71f2da5538ab72bd772a8 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnStatisticDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyCreateDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
+import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
@@ -275,7 +275,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
.thenReturn(USER_1);
doNothing()
.when(dataServiceGateway)
- .createTable(eq(DATABASE_1_ID), any(TableCreateDto.class));
+ .createTable(eq(DATABASE_1_ID), any(CreateTableDto.class));
when(databaseRepository.save(any(Database.class)))
.thenReturn(DATABASE_1);
when(searchServiceGateway.update(any(Database.class)))
@@ -291,15 +291,15 @@ public class TableServiceUnitTest extends AbstractUnitTest {
DataServiceConnectionException, UserNotFoundException, TableNotFoundException, DatabaseNotFoundException,
TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException,
OntologyNotFoundException, SemanticEntityNotFoundException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("New Table")
.description("A wonderful table")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("I Am Späshül")
.nullAllowed(true)
.type(ColumnTypeDto.TEXT)
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.checks(Set.of())
.uniques(List.of(List.of("I Am Späshül")))
.foreignKeys(List.of())
@@ -312,7 +312,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
.thenReturn(USER_1);
doNothing()
.when(dataServiceGateway)
- .createTable(eq(DATABASE_1_ID), any(TableCreateDto.class));
+ .createTable(eq(DATABASE_1_ID), any(CreateTableDto.class));
when(databaseRepository.save(any(Database.class)))
.thenReturn(DATABASE_1);
when(searchServiceGateway.update(any(Database.class)))
@@ -344,15 +344,15 @@ public class TableServiceUnitTest extends AbstractUnitTest {
public void createTable_dateFormatNotFound_fails() throws DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, TableExistsException, SearchServiceException,
SearchServiceConnectionException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name("New Table")
.description("A wonderful table")
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("date")
.nullAllowed(true)
.type(ColumnTypeDto.DATE)
.build()))
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.checks(Set.of())
.uniques(List.of(List.of("date")))
.foreignKeys(List.of())
@@ -365,7 +365,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
.thenReturn(USER_1);
doNothing()
.when(dataServiceGateway)
- .createTable(eq(DATABASE_1_ID), any(TableCreateDto.class));
+ .createTable(eq(DATABASE_1_ID), any(CreateTableDto.class));
when(databaseRepository.save(any(Database.class)))
.thenReturn(DATABASE_1);
when(searchServiceGateway.update(any(Database.class)))
@@ -423,11 +423,11 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@Test
public void createTable_primaryKeyMalformed_fails() throws UserNotFoundException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.foreignKeys(new LinkedList<>())
.checks(new LinkedHashSet<>())
.primaryKey(Set.of("i_do_not_exist"))
@@ -447,11 +447,11 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@Test
public void createTable_uniquesMalformed_fails() throws UserNotFoundException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.foreignKeys(new LinkedList<>())
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>())
@@ -473,12 +473,12 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@Test
public void createTable_foreignKeyMalformed_fails() throws UserNotFoundException {
- final TableCreateDto request = TableCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
- .constraints(ConstraintsCreateDto.builder()
- .foreignKeys(List.of(ForeignKeyCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
+ .foreignKeys(List.of(CreateForeignKeyDto.builder()
.columns(List.of("some_column"))
.referencedColumns(List.of("some_foreign_column"))
.referencedTable("some_referenced_table")
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
index 09a372a6eb3ca23bb0539b8a1be4a648a1bff9a1..8724e08be1c3312b74f487f413d035b7bfa1dfd2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
@@ -69,7 +69,7 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
@Test
public void create_succeeds() throws UserExistsException, UserNotFoundException, EmailExistsException {
- final SignupRequestDto request = SignupRequestDto.builder()
+ final CreateUserDto request = CreateUserDto.builder()
.username(USER_2_USERNAME)
.password(USER_2_PASSWORD)
.email(USER_2_EMAIL)
@@ -109,7 +109,7 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
.build();
/* mock */
- final User user = userService.create(SignupRequestDto.builder()
+ final User user = userService.create(CreateUserDto.builder()
.username(USER_3_USERNAME)
.password(USER_3_PASSWORD)
.email(USER_3_EMAIL)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
index c63d207e6e3f1022ce861a967016206b7702ee95..4ba217a60c0b5a520e7fcd1c59a610769530760e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
@@ -2,7 +2,7 @@ package at.tuwien.service;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.View;
import at.tuwien.exception.*;
@@ -50,7 +50,7 @@ public class ViewServiceUnitTest extends AbstractUnitTest {
@Test
public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
- final ViewCreateDto request = ViewCreateDto.builder()
+ final CreateViewDto request = CreateViewDto.builder()
.name(VIEW_1_NAME)
.query(VIEW_1_QUERY)
.isPublic(VIEW_1_PUBLIC)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
index 342a9e328ecc8e69abe7bfedf1827bdc7777fff3..fe650589addb6ae15cb3d1d4d4b48f801054eca3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.validator;
import at.tuwien.SortType;
-import at.tuwien.api.database.table.TableCreateDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.identifier.IdentifierSaveDto;
import at.tuwien.entities.database.Database;
@@ -264,8 +264,8 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
@ParameterizedTest
@MethodSource("needSize_parameters")
public void validateColumnCreateConstraints_needSize_fails(ColumnTypeDto type) {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.type(type)
.size(null) // <<<<<<
.build()))
@@ -279,8 +279,8 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
@Test
public void validateColumnCreateConstraints_needEnum_fails() {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.type(ColumnTypeDto.ENUM)
.enums(null) // <<<<<<<
.build()))
@@ -294,8 +294,8 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
@Test
public void validateColumnCreateConstraints_needSet_fails() {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
+ final CreateTableDto request = CreateTableDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.type(ColumnTypeDto.SET)
.sets(null) // <<<<<<<
.build()))
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
index 976830cebbb17d0378ee6e4afedba30170507250..4ee76c36bf7adf98fe38a32fcab869759ec3af0a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
@@ -3,11 +3,11 @@ package at.tuwien.gateway;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.AccessTypeDto;
import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.TableUpdateDto;
@@ -94,7 +94,7 @@ public interface DataServiceGateway {
* @throws DatabaseNotFoundException Some of the privileged parameters of the given database were not provided by the metadata service.
* @throws TableExistsException A table with this internal name exists already in the database.
*/
- void createTable(Long databaseId, TableCreateDto data) throws DataServiceConnectionException, DataServiceException,
+ void createTable(Long databaseId, CreateTableDto data) throws DataServiceConnectionException, DataServiceException,
DatabaseNotFoundException, TableExistsException;
/**
@@ -118,7 +118,7 @@ public interface DataServiceGateway {
* @throws DataServiceConnectionException The connection to the data service could not be established.
* @throws DataServiceException The data service responded unexpectedly.
*/
- ViewDto createView(Long databaseId, ViewCreateDto data) throws DataServiceConnectionException, DataServiceException;
+ ViewDto createView(Long databaseId, CreateViewDto data) throws DataServiceConnectionException, DataServiceException;
/**
* Deletes a given view in the given database.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
index 191f42fea30fa711cb67b8b62284302a074c25dc..6ee2ef084b962e30bd614dd1073aecf65a0ced09 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
@@ -4,7 +4,7 @@ import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.*;
import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.TableUpdateDto;
@@ -188,7 +188,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
}
@Override
- public void createTable(Long databaseId, TableCreateDto data) throws DataServiceConnectionException, DataServiceException,
+ public void createTable(Long databaseId, CreateTableDto data) throws DataServiceConnectionException, DataServiceException,
DatabaseNotFoundException, TableExistsException {
final ResponseEntity<Void> response;
final String path = "/api/database/" + databaseId + "/table";
@@ -239,7 +239,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
}
@Override
- public ViewDto createView(Long databaseId, ViewCreateDto data) throws DataServiceConnectionException, DataServiceException {
+ public ViewDto createView(Long databaseId, CreateViewDto data) throws DataServiceConnectionException, DataServiceException {
final ResponseEntity<ViewDto> response;
final String path = "/api/database/" + databaseId + "/view";
log.trace("create view at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
index eb378290aaf0cec147292a4528efae7e3928811b..a288d1d6e08488de5935e6d0af776fb157c8531e 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
import at.tuwien.api.auth.LoginRequestDto;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.keycloak.TokenDto;
import at.tuwien.api.keycloak.UserDto;
import at.tuwien.api.user.UserPasswordDto;
@@ -22,7 +22,7 @@ public interface AuthenticationService {
* @throws AuthServiceConnectionException The connection with the auth service could not be established.
* @throws EmailExistsException The user email already exists in the metadata database.
*/
- UserDto create(SignupRequestDto data) throws UserExistsException, AuthServiceException, AuthServiceConnectionException,
+ UserDto create(CreateUserDto data) throws UserExistsException, AuthServiceException, AuthServiceConnectionException,
EmailExistsException, CredentialsInvalidException;
/**
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
index 3000ece11e91cc2b58f2edcfac85f6a0f8a60528..4e3765fd6ec8231d8bcfdcdaae83c0c96bcb8788 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseCreateDto;
+import at.tuwien.api.database.CreateDatabaseDto;
import at.tuwien.api.database.DatabaseModifyVisibilityDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database;
@@ -68,7 +68,7 @@ public interface DatabaseService {
* @throws DataServiceException If the data service returned non-successfully.
* @throws DataServiceConnectionException If failing to connect to the data service/search service.
*/
- Database create(Container container, DatabaseCreateDto createDto, User user, List<User> internalUsers) throws UserNotFoundException,
+ Database create(Container container, CreateDatabaseDto createDto, User user, List<User> internalUsers) throws UserNotFoundException,
ContainerNotFoundException, DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
SearchServiceException, SearchServiceConnectionException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
index ded8204f32b8b6f99af5553952dfa6f0c535c652..47183700f91df1b24194fef24d931992b6b8b932 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.IdentifierCreateDto;
+import at.tuwien.api.identifier.CreateIdentifierDto;
import at.tuwien.api.identifier.IdentifierSaveDto;
import at.tuwien.api.identifier.IdentifierTypeDto;
import at.tuwien.entities.database.Database;
@@ -139,7 +139,7 @@ public interface IdentifierService {
* @throws SearchServiceException
* @throws SearchServiceConnectionException
*/
- Identifier create(Database database, User user, IdentifierCreateDto data) throws DataServiceException,
+ Identifier create(Database database, User user, CreateIdentifierDto data) throws DataServiceException,
DataServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
DatabaseNotFoundException, QueryNotFoundException, SearchServiceException, SearchServiceConnectionException, ExternalServiceException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
index 299283e68bbf6bd07ddb6b042248ead6681a6970..c0880c07dc8230d803ad455093cbea17c3145f61 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableUpdateDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.entities.database.Database;
@@ -39,7 +39,7 @@ public interface TableService {
* @param principal The principal.
* @return The created table.
*/
- Table createTable(Database database, TableCreateDto createDto, Principal principal)
+ Table createTable(Database database, CreateTableDto createDto, Principal principal)
throws TableNotFoundException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException, OntologyNotFoundException, SemanticEntityNotFoundException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
index 6416da9b803d93f633f13223127a978954dd6e5d..c2f57c4e53af97573e7710b978f82b399ec54240 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
@@ -47,7 +47,7 @@ public interface UserService {
* @param id The user id.
* @return The user, if successful.
*/
- User create(SignupRequestDto data, UUID id);
+ User create(CreateUserDto data, UUID id);
/**
* Updates the user information for a user with given id in the metadata database.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
index 9ec30b74f2efd58886269f8e8994f4852ead827e..4d183f1cc467d070a51a89edca99850c81a9b2ed 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -1,12 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.api.database.ViewUpdateDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.View;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -53,7 +52,7 @@ public interface ViewService {
* @throws SearchServiceConnectionException
* @throws ViewNotFoundException
*/
- View create(Database database, User user, ViewCreateDto data) throws MalformedException, DataServiceException,
+ View create(Database database, User user, CreateViewDto data) throws MalformedException, DataServiceException,
DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
index 52aa5048891102ae10494790992076f9375388f5..24ebeb1665a77a874fd311f9e4fc4151ac80689f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
@@ -1,7 +1,7 @@
package at.tuwien.service.impl;
import at.tuwien.api.auth.LoginRequestDto;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.keycloak.TokenDto;
import at.tuwien.api.keycloak.UserDto;
import at.tuwien.api.user.UserPasswordDto;
@@ -30,7 +30,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
}
@Override
- public UserDto create(SignupRequestDto data) throws UserExistsException, AuthServiceException,
+ public UserDto create(CreateUserDto data) throws UserExistsException, AuthServiceException,
AuthServiceConnectionException, EmailExistsException, CredentialsInvalidException {
keycloakGateway.createUser(metadataMapper.signupRequestDtoToUserCreateDto(data));
try {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
index 0151ea92f7c4e8110bda544b70b7d341381902c2..b4e42a67e15939c2b779fc0dbe9d392371588c76 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
@@ -6,7 +6,7 @@ import at.tuwien.api.datacite.doi.DataCiteCreateDoi;
import at.tuwien.api.datacite.doi.DataCiteDoi;
import at.tuwien.api.datacite.doi.DataCiteDoiEvent;
import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.IdentifierCreateDto;
+import at.tuwien.api.identifier.CreateIdentifierDto;
import at.tuwien.api.identifier.IdentifierSaveDto;
import at.tuwien.api.identifier.IdentifierTypeDto;
import at.tuwien.config.DataCiteConfig;
@@ -105,7 +105,7 @@ public class DataCiteIdentifierServiceImpl implements IdentifierService {
@Override
@Transactional(rollbackFor = {Exception.class})
- public Identifier create(Database database, User user, IdentifierCreateDto data) throws DataServiceException,
+ public Identifier create(Database database, User user, CreateIdentifierDto data) throws DataServiceException,
DataServiceConnectionException, IdentifierNotFoundException, MalformedException, ViewNotFoundException,
DatabaseNotFoundException, QueryNotFoundException, SearchServiceException,
SearchServiceConnectionException, ExternalServiceException {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
index 7415ded56a8a2a926742ef3b44b025f7fb535baa..17ba0bd60beba0281c605bfbf32e7439fc0a0fbc 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
@@ -1,10 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseCreateDto;
+import at.tuwien.api.database.CreateDatabaseDto;
import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.DatabaseModifyVisibilityDto;
import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.user.internal.UpdateUserPasswordDto;
import at.tuwien.entities.container.Container;
@@ -96,7 +95,7 @@ public class DatabaseServiceImpl implements DatabaseService {
@Override
@Transactional
- public Database create(Container container, DatabaseCreateDto data, User user, List<User> internalUsers)
+ public Database create(Container container, CreateDatabaseDto data, User user, List<User> internalUsers)
throws UserNotFoundException, ContainerNotFoundException, DataServiceException, SearchServiceException,
DataServiceConnectionException, DatabaseNotFoundException, SearchServiceConnectionException {
final Database entity = Database.builder()
@@ -116,7 +115,7 @@ public class DatabaseServiceImpl implements DatabaseService {
.identifiers(new LinkedList<>())
.build();
/* create in data database */
- final CreateDatabaseDto payload = CreateDatabaseDto.builder()
+ final at.tuwien.api.database.internal.CreateDatabaseDto payload = at.tuwien.api.database.internal.CreateDatabaseDto.builder()
.containerId(data.getCid())
.userId(user.getId())
.username(user.getUsername())
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
index 39e4824706a6d89a3588c6748c46ee2c3935b63e..932a1a598c49f5f2a70f95b8c8264f5433a9cc13 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
@@ -3,7 +3,7 @@ package at.tuwien.service.impl;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.IdentifierCreateDto;
+import at.tuwien.api.identifier.CreateIdentifierDto;
import at.tuwien.api.identifier.IdentifierSaveDto;
import at.tuwien.api.identifier.IdentifierTypeDto;
import at.tuwien.config.MetadataConfig;
@@ -228,7 +228,7 @@ public class IdentifierServiceImpl implements IdentifierService {
@Override
@Transactional
- public Identifier create(Database database, User user, IdentifierCreateDto data) throws SearchServiceException,
+ public Identifier create(Database database, User user, CreateIdentifierDto data) throws SearchServiceException,
DataServiceException, QueryNotFoundException, DataServiceConnectionException, DatabaseNotFoundException,
SearchServiceConnectionException, IdentifierNotFoundException, ViewNotFoundException {
final Identifier identifier = metadataMapper.identifierCreateDtoToIdentifier(data);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index 52a9a63667c8faa22bdd142d5161f04e85d70513..da92fb7ef59eac9af0df3cf1f779da150c2d437f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.ColumnStatisticDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.config.RabbitConfig;
@@ -90,7 +90,7 @@ public class TableServiceImpl implements TableService {
@Override
@Transactional
- public Table createTable(Database database, TableCreateDto data, Principal principal) throws DataServiceException,
+ public Table createTable(Database database, CreateTableDto data, Principal principal) throws DataServiceException,
DataServiceConnectionException, UserNotFoundException, TableNotFoundException, DatabaseNotFoundException,
TableExistsException, SearchServiceException, SearchServiceConnectionException, MalformedException,
OntologyNotFoundException, SemanticEntityNotFoundException {
@@ -117,7 +117,7 @@ public class TableServiceImpl implements TableService {
/* set the ordinal position for the columns */
final int[] idx = new int[]{0};
for (int i = 0; i < data.getColumns().size(); i++) {
- final ColumnCreateDto c = data.getColumns().get(i);
+ final CreateTableColumnDto c = data.getColumns().get(i);
final TableColumn column = metadataMapper.columnCreateDtoToTableColumn(c, database.getContainer().getImage());
column.setOrdinalPosition(idx[0]++);
column.setTable(table);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
index 6f9f43aeda934ecd7065ead11077ad529597e118..042684f8c9e398aaf60ea8a15b6adb1b45b56df5 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
@@ -1,6 +1,6 @@
package at.tuwien.service.impl;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.config.KeycloakConfig;
@@ -64,7 +64,7 @@ public class UserServiceImpl implements UserService {
}
@Override
- public User create(SignupRequestDto data, UUID id) {
+ public User create(CreateUserDto data, UUID id) {
/* create at authentication service */
final User entity = User.builder()
.id(id)
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
index b0a8f017962ccc808d8f3d1a37ae584fb1106316..8ca688b1edcc869be309561b4c9fef434e081285 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
@@ -1,6 +1,6 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.CreateViewDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.ViewUpdateDto;
import at.tuwien.entities.database.Database;
@@ -87,7 +87,7 @@ public class ViewServiceImpl implements ViewService {
@Override
@Transactional
- public View create(Database database, User creator, ViewCreateDto data) throws MalformedException,
+ public View create(Database database, User creator, CreateViewDto data) throws MalformedException,
DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* create in metadata database */
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 85999836878d6c0b8e930b07bad8ca91b70a79e0..21e7e0519b9c1f6b8565efee715dde08b4442e86 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -7,21 +7,20 @@ import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.api.amqp.QueueDto;
import at.tuwien.api.auth.LoginRequestDto;
import at.tuwien.api.auth.RefreshTokenRequestDto;
-import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.container.ContainerBriefDto;
import at.tuwien.api.container.ContainerDto;
import at.tuwien.api.container.image.*;
import at.tuwien.api.database.*;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.api.database.query.QueryBriefDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableCreateDto;
+import at.tuwien.api.database.table.CreateTableDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.columns.*;
import at.tuwien.api.database.table.columns.concepts.*;
-import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
+import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
import at.tuwien.api.database.table.constraints.ConstraintsDto;
import at.tuwien.api.database.table.constraints.foreign.*;
import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
@@ -619,7 +618,7 @@ public abstract class BaseTest {
public final static Principal USER_1_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_1_DETAILS,
USER_1_PASSWORD, USER_1_DETAILS.getAuthorities());
- public final static SignupRequestDto USER_1_SIGNUP_REQUEST_DTO = SignupRequestDto.builder()
+ public final static CreateUserDto USER_1_SIGNUP_REQUEST_DTO = CreateUserDto.builder()
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
.email(USER_1_EMAIL)
@@ -697,7 +696,7 @@ public abstract class BaseTest {
.qualifiedName(USER_2_QUALIFIED_NAME)
.build();
- public final static SignupRequestDto USER_2_SIGNUP_REQUEST_DTO = SignupRequestDto.builder()
+ public final static CreateUserDto USER_2_SIGNUP_REQUEST_DTO = CreateUserDto.builder()
.username(USER_2_USERNAME)
.password(USER_2_PASSWORD)
.email(USER_2_EMAIL)
@@ -1274,13 +1273,13 @@ public abstract class BaseTest {
public final static UserDto DATABASE_1_CREATOR_DTO = USER_1_DTO;
public final static UserDto DATABASE_1_OWNER_DTO = USER_1_DTO;
- public final static DatabaseCreateDto DATABASE_1_CREATE = DatabaseCreateDto.builder()
+ public final static CreateDatabaseDto DATABASE_1_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
.cid(CONTAINER_1_ID)
.build();
- public final static CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = CreateDatabaseDto.builder()
+ public final static at.tuwien.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.tuwien.api.database.internal.CreateDatabaseDto.builder()
.internalName(DATABASE_1_INTERNALNAME)
.containerId(CONTAINER_1_ID)
.username(USER_1_USERNAME)
@@ -1302,7 +1301,7 @@ public abstract class BaseTest {
public final static UUID DATABASE_2_OWNER = USER_2_ID;
public final static UUID DATABASE_2_CREATOR = USER_2_ID;
- public final static DatabaseCreateDto DATABASE_2_CREATE = DatabaseCreateDto.builder()
+ public final static CreateDatabaseDto DATABASE_2_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_2_NAME)
.isPublic(DATABASE_2_PUBLIC)
.cid(CONTAINER_1_ID)
@@ -1358,7 +1357,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static DatabaseCreateDto DATABASE_3_CREATE = DatabaseCreateDto.builder()
+ public final static CreateDatabaseDto DATABASE_3_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_3_NAME)
.isPublic(DATABASE_3_PUBLIC)
.cid(CONTAINER_1_ID)
@@ -1418,169 +1417,169 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static TableCreateDto TABLE_0_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_0_CREATE_DTO = CreateTableDto.builder()
.name("full")
.description("full example")
- .constraints(ConstraintsCreateDto.builder()
+ .constraints(CreateTableConstraintsDto.builder()
.uniques(new LinkedList<>())
.foreignKeys(new LinkedList<>())
.build())
- .columns(List.of(ColumnCreateDto.builder()
+ .columns(List.of(CreateTableColumnDto.builder()
.name("col1a")
.type(ColumnTypeDto.CHAR)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col1b")
.type(ColumnTypeDto.CHAR)
.nullAllowed(true)
.size(50L)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col2a")
.type(ColumnTypeDto.VARCHAR)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col2b")
.type(ColumnTypeDto.VARCHAR)
.nullAllowed(true)
.size(1024L)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col3")
.type(ColumnTypeDto.BINARY)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col4")
.type(ColumnTypeDto.VARBINARY)
.nullAllowed(true)
.size(200L)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col5")
.type(ColumnTypeDto.TINYBLOB)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col6")
.type(ColumnTypeDto.TINYTEXT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col7")
.type(ColumnTypeDto.TEXT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col8")
.type(ColumnTypeDto.BLOB)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col9")
.type(ColumnTypeDto.MEDIUMTEXT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col10")
.type(ColumnTypeDto.MEDIUMBLOB)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col11")
.type(ColumnTypeDto.LONGTEXT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col12")
.type(ColumnTypeDto.LONGBLOB)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col13")
.type(ColumnTypeDto.ENUM)
.nullAllowed(true)
.enums(new LinkedList<>(List.of("val1", "val2")))
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col14")
.type(ColumnTypeDto.SET)
.nullAllowed(true)
.sets(new LinkedList<>(List.of("val1", "val2")))
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col15")
.type(ColumnTypeDto.BIT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col16")
.type(ColumnTypeDto.TINYINT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col17")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col18")
.type(ColumnTypeDto.SMALLINT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col19")
.type(ColumnTypeDto.MEDIUMINT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col20")
.type(ColumnTypeDto.INT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col21")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col22")
.type(ColumnTypeDto.FLOAT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col23")
.type(ColumnTypeDto.DOUBLE)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col24")
.type(ColumnTypeDto.DECIMAL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col25")
.type(ColumnTypeDto.DATE)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col26")
.type(ColumnTypeDto.DATETIME)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col27")
.type(ColumnTypeDto.TIMESTAMP)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col28")
.type(ColumnTypeDto.TIME)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("col29")
.type(ColumnTypeDto.YEAR)
.nullAllowed(true)
@@ -1946,32 +1945,32 @@ public abstract class BaseTest {
.ownedBy(USER_3_ID)
.build();
- public final static ConstraintsCreateDto TABLE_3_CONSTRAINTS_CREATE_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_3_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
.build();
- public final static ConstraintsCreateDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>()) // <<<<
.uniques(new LinkedList<>())
- .foreignKeys(List.of(ForeignKeyCreateDto.builder()
+ .foreignKeys(List.of(CreateForeignKeyDto.builder()
.referencedTable("weather_location")
.columns(new LinkedList<>(List.of("fahrzeug")))
.referencedColumns(new LinkedList<>(List.of("doesnotexist")))
.build()))
.build();
- public final static TableCreateDto TABLE_3_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_3_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_3_NAME)
.description(TABLE_3_DESCRIPTION)
.columns(new LinkedList<>())
.constraints(TABLE_3_CONSTRAINTS_CREATE_DTO)
.build();
- public final static TableCreateDto TABLE_3_INVALID_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_3_INVALID_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_3_NAME)
.description(TABLE_3_DESCRIPTION)
.columns(new LinkedList<>())
@@ -2286,12 +2285,12 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<ColumnCreateDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(ColumnCreateDto.builder()
+ public final static List<CreateTableColumnDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
.name("Timestamp")
.type(ColumnTypeDto.TIMESTAMP)
.nullAllowed(false)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Value")
.type(ColumnTypeDto.DECIMAL)
.nullAllowed(true)
@@ -2299,14 +2298,14 @@ public abstract class BaseTest {
.d(10L)
.build());
- public final static ConstraintsCreateDto TABLE_4_CONSTRAINTS_CREATE_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_4_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>(Set.of("Timestamp")))
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>(List.of(List.of("Timestamp"))))
.build();
- public final static TableCreateDto TABLE_4_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_4_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_4_NAME)
.description(TABLE_4_DESCRIPTION)
.columns(TABLE_4_COLUMNS_CREATE_DTO)
@@ -3183,32 +3182,32 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<ColumnCreateDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(ColumnCreateDto.builder()
+ public final static List<CreateTableColumnDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
.name("id")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(false)
.enums(null)
.sets(null)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Date")
.type(ColumnTypeDto.DATE)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Location")
.type(ColumnTypeDto.VARCHAR)
.size(255L)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("MinTemp")
.type(ColumnTypeDto.DECIMAL)
.size(10L)
.d(0L)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Rainfall")
.type(ColumnTypeDto.DECIMAL)
.size(10L)
@@ -3218,21 +3217,21 @@ public abstract class BaseTest {
.unitUri(UNIT_1_URI)
.build());
- public final static ConstraintsCreateDto TABLE_1_CONSTRAINTS_CREATE_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>(List.of("id")))
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>(List.of(List.of("date"))))
.build();
- public final static ConstraintsCreateDto TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>(List.of(List.of("date"))))
.build();
- public final static TableCreateDto TABLE_1_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_1_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
@@ -4655,137 +4654,137 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<ForeignKeyCreateDto> TABLE_5_FOREIGN_KEYS_INVALID_CREATE = List.of(ForeignKeyCreateDto.builder()
+ public final static List<CreateForeignKeyDto> TABLE_5_FOREIGN_KEYS_INVALID_CREATE = List.of(CreateForeignKeyDto.builder()
.columns(new LinkedList<>(List.of("somecolumn")))
.referencedTable("sometable")
.referencedColumns(new LinkedList<>(List.of("someothercolumn")))
.build());
- public final static ConstraintsCreateDto TABLE_5_CONSTRAINTS_INVALID_CREATE = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_5_CONSTRAINTS_INVALID_CREATE = CreateTableConstraintsDto.builder()
.foreignKeys(TABLE_5_FOREIGN_KEYS_INVALID_CREATE)
.build();
- public final static List<ColumnCreateDto> TABLE_5_COLUMNS_CREATE = List.of(ColumnCreateDto.builder()
+ public final static List<CreateTableColumnDto> TABLE_5_COLUMNS_CREATE = List.of(CreateTableColumnDto.builder()
.name("id")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(false)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Animal Name")
.type(ColumnTypeDto.VARCHAR)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Hair")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Feathers")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Bread")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Eggs")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Milk")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Water")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Airborne")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Waterborne")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Aquantic")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Predator")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Backbone")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Breathes")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Venomous")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Fin")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Legs")
.type(ColumnTypeDto.INT)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Tail")
.type(ColumnTypeDto.DECIMAL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Domestic")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Catsize")
.type(ColumnTypeDto.BOOL)
.nullAllowed(true)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("Class Type")
.type(ColumnTypeDto.DECIMAL)
.nullAllowed(true)
.build());
- public final static ConstraintsCreateDto TABLE_5_CREATE_CONSTRAINTS_DTO = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_5_CREATE_CONSTRAINTS_DTO = CreateTableConstraintsDto.builder()
.primaryKey(Set.of("id"))
.uniques(new LinkedList<>(List.of(List.of("id"))))
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.build();
- public final static TableCreateDto TABLE_5_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_5_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
.constraints(TABLE_5_CREATE_CONSTRAINTS_DTO)
.build();
- public final static TableCreateDto TABLE_5_INVALID_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_5_INVALID_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
@@ -4912,7 +4911,7 @@ public abstract class BaseTest {
public final static List<List<String>> TABLE_6_UNIQUES_CREATE = List.of(
List.of("firstname", "lastname"));
- public final static List<ForeignKeyCreateDto> TABLE_6_FOREIGN_KEYS_CREATE = List.of(ForeignKeyCreateDto.builder()
+ public final static List<CreateForeignKeyDto> TABLE_6_FOREIGN_KEYS_CREATE = List.of(CreateForeignKeyDto.builder()
.columns(new LinkedList<>(List.of("ref_id")))
.referencedTable("zoo")
.referencedColumns(new LinkedList<>(List.of("id")))
@@ -4920,27 +4919,27 @@ public abstract class BaseTest {
public final static Set<String> TABLE_6_CHECKS_CREATE = Set.of("firstname != lastname");
- public final static ConstraintsCreateDto TABLE_6_CONSTRAINTS_CREATE = ConstraintsCreateDto.builder()
+ public final static CreateTableConstraintsDto TABLE_6_CONSTRAINTS_CREATE = CreateTableConstraintsDto.builder()
.uniques(TABLE_6_UNIQUES_CREATE)
.foreignKeys(TABLE_6_FOREIGN_KEYS_CREATE)
.checks(TABLE_6_CHECKS_CREATE)
.primaryKey(Set.of("id"))
.build();
- public final static List<ColumnCreateDto> TABLE_6_COLUMNS_CREATE = List.of(
- ColumnCreateDto.builder()
+ public final static List<CreateTableColumnDto> TABLE_6_COLUMNS_CREATE = List.of(
+ CreateTableColumnDto.builder()
.name("name_id")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(false)
.build(),
- ColumnCreateDto.builder()
+ CreateTableColumnDto.builder()
.name("zoo_id")
.type(ColumnTypeDto.BIGINT)
.size(255L)
.nullAllowed(false)
.build());
- public final static TableCreateDto TABLE_6_CREATE_DTO = TableCreateDto.builder()
+ public final static CreateTableDto TABLE_6_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_6_NAME)
.description(TABLE_6_DESCRIPTION)
.columns(TABLE_6_COLUMNS_CREATE)
@@ -5162,7 +5161,7 @@ public abstract class BaseTest {
.queryHash(VIEW_1_QUERY_HASH)
.build();
- public final static ViewCreateDto VIEW_1_CREATE_DTO = ViewCreateDto.builder()
+ public final static CreateViewDto VIEW_1_CREATE_DTO = CreateViewDto.builder()
.isPublic(VIEW_1_PUBLIC)
.name(VIEW_1_NAME)
.query(VIEW_1_QUERY)
@@ -6128,13 +6127,13 @@ public abstract class BaseTest {
.language(IDENTIFIER_1_TITLE_1_LANG_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_1_TITLE_1_CREATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_1_TITLE_1_TITLE)
.titleType(IDENTIFIER_1_TITLE_1_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_1_LANG_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_1_TITLE_1_UPDATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_1_UPDATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_1_TITLE_1_TITLE_MODIFY)
.titleType(IDENTIFIER_1_TITLE_1_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_1_LANG_DTO)
@@ -6170,13 +6169,13 @@ public abstract class BaseTest {
.language(IDENTIFIER_1_TITLE_2_LANG_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_1_TITLE_2_CREATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_2_CREATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_1_TITLE_2_TITLE)
.titleType(IDENTIFIER_1_TITLE_2_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_2_LANG_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_1_TITLE_2_UPDATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_2_UPDATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_1_TITLE_2_TITLE_MODIFY)
.titleType(IDENTIFIER_1_TITLE_2_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_2_LANG_DTO)
@@ -6212,7 +6211,7 @@ public abstract class BaseTest {
.language(IDENTIFIER_1_DESCRIPTION_1_LANG_DTO)
.build();
- public final static IdentifierSaveDescriptionDto IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ public final static SaveIdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
.id(null)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO)
@@ -6260,7 +6259,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI)
.build();
- public final static CreatorSaveDto IDENTIFIER_1_CREATOR_1_CREATE_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_1_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.id(null)
.firstname(IDENTIFIER_1_CREATOR_1_FIRSTNAME)
.lastname(IDENTIFIER_1_CREATOR_1_LASTNAME)
@@ -6297,7 +6296,7 @@ public abstract class BaseTest {
.awardTitle(FUNDER_1_AWARD_TITLE)
.build();
- public final static IdentifierFunderSaveDto IDENTIFIER_1_FUNDER_1_CREATE_DTO = IdentifierFunderSaveDto.builder()
+ public final static SaveIdentifierFunderDto IDENTIFIER_1_FUNDER_1_CREATE_DTO = SaveIdentifierFunderDto.builder()
.funderName(FUNDER_1_NAME)
.funderIdentifier(FUNDER_1_IDENTIFIER)
.funderIdentifierType(FUNDER_1_IDENTIFIER_TYPE_DTO)
@@ -6402,7 +6401,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_1_STATUS_TYPE_DTO)
.build();
- public final static IdentifierCreateDto IDENTIFIER_1_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_1_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_1_DATABASE_ID)
.type(IDENTIFIER_1_TYPE_DTO)
.publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
@@ -6419,7 +6418,7 @@ public abstract class BaseTest {
.funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
.build();
- public final static IdentifierCreateDto IDENTIFIER_1_CREATE_WITH_DOI_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_1_CREATE_WITH_DOI_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_1_DATABASE_ID)
.type(IDENTIFIER_1_TYPE_DTO)
.doi(IDENTIFIER_1_DOI)
@@ -6511,7 +6510,7 @@ public abstract class BaseTest {
.titleType(IDENTIFIER_5_TITLE_1_TYPE_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_5_TITLE_1_CREATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_5_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_5_TITLE_1_TITLE)
.language(IDENTIFIER_5_TITLE_1_LANG_DTO)
.titleType(IDENTIFIER_5_TITLE_1_TYPE_DTO)
@@ -6539,7 +6538,7 @@ public abstract class BaseTest {
.descriptionType(IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO)
.build();
- public final static IdentifierSaveDescriptionDto IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ public final static SaveIdentifierDescriptionDto IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
.id(null)
.description(IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_5_DESCRIPTION_1_LANG_DTO)
@@ -6574,7 +6573,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static CreatorSaveDto IDENTIFIER_5_CREATOR_1_CREATE_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6583,7 +6582,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_1_AFFIL)
.build();
- public final static CreatorSaveDto IDENTIFIER_5_CREATOR_1_MODIFY_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6614,7 +6613,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static CreatorSaveDto IDENTIFIER_5_CREATOR_2_CREATE_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
.creatorName(CREATOR_2_NAME)
@@ -6623,7 +6622,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static CreatorSaveDto IDENTIFIER_5_CREATOR_2_MODIFY_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
.creatorName(CREATOR_2_NAME)
@@ -6707,13 +6706,13 @@ public abstract class BaseTest {
.value(RELATED_IDENTIFIER_5_VALUE)
.build();
- public final static RelatedIdentifierSaveDto IDENTIFIER_1_RELATED_IDENTIFIER_5_CREATE_DTO = RelatedIdentifierSaveDto.builder()
+ public final static SaveRelatedIdentifierDto IDENTIFIER_1_RELATED_IDENTIFIER_5_CREATE_DTO = SaveRelatedIdentifierDto.builder()
.value(RELATED_IDENTIFIER_5_VALUE)
.type(RELATED_IDENTIFIER_5_TYPE_DTO)
.relation(RELATED_IDENTIFIER_5_RELATION_TYPE_DTO)
.build();
- public final static IdentifierCreateDto IDENTIFIER_5_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_5_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_5_DATABASE_ID)
.publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
.publisher(IDENTIFIER_5_PUBLISHER)
@@ -6782,7 +6781,7 @@ public abstract class BaseTest {
.language(IDENTIFIER_6_TITLE_1_LANG_DTO)
.build();
- public final static IdentifierSaveTitleDto IDENTIFIER_6_TITLE_1_CREATE_DTO = IdentifierSaveTitleDto.builder()
+ public final static SaveIdentifierTitleDto IDENTIFIER_6_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_6_TITLE_1_TITLE_MODIFY)
.language(IDENTIFIER_6_TITLE_1_LANG_DTO)
.build();
@@ -6812,7 +6811,7 @@ public abstract class BaseTest {
.language(IDENTIFIER_6_DESCRIPTION_1_LANG_DTO)
.build();
- public final static IdentifierSaveDescriptionDto IDENTIFIER_6_DESCRIPTION_1_CREATE_DTO = IdentifierSaveDescriptionDto.builder()
+ public final static SaveIdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
.id(null)
.description(IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION_MODIFY)
.language(IDENTIFIER_6_DESCRIPTION_1_LANG_DTO)
@@ -6846,7 +6845,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static CreatorSaveDto IDENTIFIER_6_CREATOR_1_CREATE_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6857,7 +6856,7 @@ public abstract class BaseTest {
.affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
.build();
- public final static CreatorSaveDto IDENTIFIER_6_CREATOR_1_MODIFY_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6981,7 +6980,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_6_STATUS_TYPE_DTO)
.build();
- public final static IdentifierCreateDto IDENTIFIER_6_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_6_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_6_DATABASE_ID)
.publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
.publisher(IDENTIFIER_6_PUBLISHER)
@@ -7076,7 +7075,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_7_STATUS_TYPE_DTO)
.build();
- public final static CreatorSaveDto IDENTIFIER_7_CREATOR_1_CREATE_DTO = CreatorSaveDto.builder()
+ public final static SaveIdentifierCreatorDto IDENTIFIER_7_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -7086,7 +7085,7 @@ public abstract class BaseTest {
.affiliationIdentifier(CREATOR_1_AFFIL_ROR)
.build();
- public final static IdentifierCreateDto IDENTIFIER_7_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_7_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_7_DATABASE_ID)
.publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
.publisher(IDENTIFIER_7_PUBLISHER)
@@ -7129,7 +7128,7 @@ public abstract class BaseTest {
public final static IdentifierStatusTypeDto IDENTIFIER_2_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
public final static UUID IDENTIFIER_2_CREATED_BY = USER_1_ID;
- public final static IdentifierCreateDto IDENTIFIER_2_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_2_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_2_DATABASE_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
.type(IDENTIFIER_2_TYPE_DTO)
@@ -7301,7 +7300,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_3_STATUS_TYPE_DTO)
.build();
- public final static IdentifierCreateDto IDENTIFIER_3_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_3_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_3_DATABASE_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
.type(IDENTIFIER_3_TYPE_DTO)
@@ -7400,7 +7399,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_4_STATUS_TYPE_DTO)
.build();
- public final static IdentifierCreateDto IDENTIFIER_4_CREATE_DTO = IdentifierCreateDto.builder()
+ public final static CreateIdentifierDto IDENTIFIER_4_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_4_DATABASE_ID)
.publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
.publisher(IDENTIFIER_4_PUBLISHER)
diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py
index 78861ffd048edaf9d451a02cab8cbf591acd3a21..a0b4bf60c43f2065ffd2f73f5010407fb0d20287 100644
--- a/lib/python/dbrepo/RestClient.py
+++ b/lib/python/dbrepo/RestClient.py
@@ -1767,13 +1767,13 @@ class RestClient:
raise ResponseCodeError(f'Failed to update query: response code: {response.status_code} is not '
f'202 (ACCEPTED): {response.text}')
- def create_identifier(self, database_id: int, type: IdentifierType, titles: List[CreateIdentifierTitle],
+ def create_identifier(self, database_id: int, type: IdentifierType, titles: List[SaveIdentifierTitle],
publisher: str, creators: List[CreateIdentifierCreator], publication_year: int,
- descriptions: List[CreateIdentifierDescription] = None,
- funders: List[CreateIdentifierFunder] = None, licenses: List[License] = None,
+ descriptions: List[SaveIdentifierDescription] = None,
+ funders: List[SaveIdentifierFunder] = None, licenses: List[License] = None,
language: Language = None, subset_id: int = None, view_id: int = None, table_id: int = None,
publication_day: int = None, publication_month: int = None,
- related_identifiers: List[CreateRelatedIdentifier] = None) -> Identifier:
+ related_identifiers: List[SaveRelatedIdentifier] = None) -> Identifier:
"""
Create an identifier draft.
@@ -1828,12 +1828,12 @@ class RestClient:
f'201 (CREATED): {response.text}')
def save_identifier(self, identifier_id: int, database_id: int, type: IdentifierType,
- titles: List[CreateIdentifierTitle], publisher: str, creators: List[CreateIdentifierCreator],
- publication_year: int, descriptions: List[CreateIdentifierDescription] = None,
- funders: List[CreateIdentifierFunder] = None, licenses: List[License] = None,
+ titles: List[SaveIdentifierTitle], publisher: str, creators: List[CreateIdentifierCreator],
+ publication_year: int, descriptions: List[SaveIdentifierDescription] = None,
+ funders: List[SaveIdentifierFunder] = None, licenses: List[License] = None,
language: Language = None, subset_id: int = None, view_id: int = None, table_id: int = None,
publication_day: int = None, publication_month: int = None,
- related_identifiers: List[CreateRelatedIdentifier] = None) -> Identifier:
+ related_identifiers: List[SaveRelatedIdentifier] = None) -> Identifier:
"""
Save an existing identifier and update the metadata attached to it.
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index b7556a03a5424ad981c5a7988a7419224767bad9..50cd161bc300e249e7cb904a055e4f8d7390e818 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -419,7 +419,7 @@ class IdentifierTitle(BaseModel):
type: Optional[TitleType] = None
-class CreateIdentifierTitle(BaseModel):
+class SaveIdentifierTitle(BaseModel):
title: str
language: Optional[Language] = None
type: Optional[TitleType] = None
@@ -432,7 +432,7 @@ class IdentifierDescription(BaseModel):
type: Optional[DescriptionType] = None
-class CreateIdentifierDescription(BaseModel):
+class SaveIdentifierDescription(BaseModel):
description: str
language: Optional[Language] = None
type: Optional[DescriptionType] = None
@@ -448,7 +448,7 @@ class IdentifierFunder(BaseModel):
award_title: Optional[str] = None
-class CreateIdentifierFunder(BaseModel):
+class SaveIdentifierFunder(BaseModel):
funder_name: str
funder_identifier: Optional[str] = None
funder_identifier_type: Optional[str] = None
@@ -594,7 +594,7 @@ class RelatedIdentifier(BaseModel):
relation: RelatedIdentifierRelation
-class CreateRelatedIdentifier(BaseModel):
+class SaveRelatedIdentifier(BaseModel):
value: str
type: RelatedIdentifierType
relation: RelatedIdentifierRelation
@@ -606,9 +606,9 @@ class CreateIdentifier(BaseModel):
creators: List[CreateIdentifierCreator]
publication_year: int
publisher: str
- titles: List[CreateIdentifierTitle]
- descriptions: List[CreateIdentifierDescription]
- funders: Optional[List[CreateIdentifierFunder]] = field(default_factory=list)
+ titles: List[SaveIdentifierTitle]
+ descriptions: List[SaveIdentifierDescription]
+ funders: Optional[List[SaveIdentifierFunder]] = field(default_factory=list)
doi: Optional[str] = None
language: Optional[str] = None
licenses: Optional[List[License]] = field(default_factory=list)
@@ -618,7 +618,7 @@ class CreateIdentifier(BaseModel):
query: Optional[str] = None
query_normalized: Optional[str] = None
execution: Optional[str] = None
- related_identifiers: Optional[List[CreateRelatedIdentifier]] = field(default_factory=list)
+ related_identifiers: Optional[List[SaveRelatedIdentifier]] = field(default_factory=list)
result_hash: Optional[str] = None
result_number: Optional[int] = None
publication_day: Optional[int] = None
diff --git a/lib/python/tests/test_dtos.py b/lib/python/tests/test_dtos.py
index 0a90949dba2aa42d0f9edc611cdcc37780350499..3f05e24081b45deb662afed4a3b342803b6ce56a 100644
--- a/lib/python/tests/test_dtos.py
+++ b/lib/python/tests/test_dtos.py
@@ -42,8 +42,8 @@ class AnalyseUnitTest(unittest.TestCase):
skipped: [str] = []
def setUp(self):
- with open('../../.docs/.openapi/api.yaml', 'r') as f:
- self.schemas = safe_load(f)['components']['schemas']
+ with open('../../.docs/.openapi/api.yaml') as fh:
+ self.schemas = safe_load(fh)['components']['schemas']
for name, obj in inspect.getmembers(sys.modules[dto.__name__]):
self.found += 1
if not inspect.isclass(obj):
diff --git a/lib/python/tests/test_unit_identifier.py b/lib/python/tests/test_unit_identifier.py
index 0c71c0216f94403e71351415a1aa5ace6049d442..8726d05ef23108c2a0a8fb9e8c4cd65052e19b1e 100644
--- a/lib/python/tests/test_unit_identifier.py
+++ b/lib/python/tests/test_unit_identifier.py
@@ -3,8 +3,8 @@ import unittest
import requests_mock
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Identifier, IdentifierType, CreateIdentifierTitle, Creator, IdentifierTitle, \
- IdentifierDescription, CreateIdentifierDescription, Language, CreateIdentifierFunder, CreateRelatedIdentifier, \
+from dbrepo.api.dto import Identifier, IdentifierType, SaveIdentifierTitle, Creator, IdentifierTitle, \
+ IdentifierDescription, SaveIdentifierDescription, Language, SaveIdentifierFunder, SaveRelatedIdentifier, \
RelatedIdentifierRelation, RelatedIdentifierType, IdentifierFunder, RelatedIdentifier, UserBrief, \
IdentifierStatusType, CreateIdentifierCreator
from dbrepo.api.exceptions import MalformedError, ForbiddenError, NotExistsError, AuthenticationError
@@ -36,14 +36,14 @@ class IdentifierUnitTest(unittest.TestCase):
client = RestClient(username="a", password="b")
response = client.create_identifier(
database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
+ titles=[SaveIdentifierTitle(title='Test Title')],
publisher='TU Wien', publication_year=2024,
language=Language.EN,
- funders=[CreateIdentifierFunder(funder_name='FWF')],
- related_identifiers=[CreateRelatedIdentifier(value='10.12345/abc',
- relation=RelatedIdentifierRelation.CITES,
- type=RelatedIdentifierType.DOI)],
- descriptions=[CreateIdentifierDescription(description='Test Description')],
+ funders=[SaveIdentifierFunder(funder_name='FWF')],
+ related_identifiers=[SaveRelatedIdentifier(value='10.12345/abc',
+ relation=RelatedIdentifierRelation.CITES,
+ type=RelatedIdentifierType.DOI)],
+ descriptions=[SaveIdentifierDescription(description='Test Description')],
creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
self.assertEqual(exp, response)
@@ -56,8 +56,8 @@ class IdentifierUnitTest(unittest.TestCase):
client = RestClient(username="a", password="b")
response = client.create_identifier(
database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
- descriptions=[CreateIdentifierDescription(description='Test')],
+ titles=[SaveIdentifierTitle(title='Test Title')],
+ descriptions=[SaveIdentifierDescription(description='Test')],
publisher='TU Wien', publication_year=2024,
creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
except MalformedError:
@@ -72,8 +72,8 @@ class IdentifierUnitTest(unittest.TestCase):
client = RestClient(username="a", password="b")
response = client.create_identifier(
database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
- descriptions=[CreateIdentifierDescription(description='Test')],
+ titles=[SaveIdentifierTitle(title='Test Title')],
+ descriptions=[SaveIdentifierDescription(description='Test')],
publisher='TU Wien', publication_year=2024,
creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
except ForbiddenError:
@@ -88,8 +88,8 @@ class IdentifierUnitTest(unittest.TestCase):
client = RestClient(username="a", password="b")
response = client.create_identifier(
database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
- descriptions=[CreateIdentifierDescription(description='Test')],
+ titles=[SaveIdentifierTitle(title='Test Title')],
+ descriptions=[SaveIdentifierDescription(description='Test')],
publisher='TU Wien', publication_year=2024,
creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
except NotExistsError:
@@ -103,8 +103,8 @@ class IdentifierUnitTest(unittest.TestCase):
try:
response = RestClient().create_identifier(
database_id=1, type=IdentifierType.VIEW,
- titles=[CreateIdentifierTitle(title='Test Title')],
- descriptions=[CreateIdentifierDescription(description='Test')],
+ titles=[SaveIdentifierTitle(title='Test Title')],
+ descriptions=[SaveIdentifierDescription(description='Test')],
publisher='TU Wien', publication_year=2024,
creators=[CreateIdentifierCreator(creator_name='Carberry, Josiah')])
except AuthenticationError: