From 87cc50724cbb1af013a483847f7bfeb8c1fc29c4 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 13 Feb 2025 15:57:54 +0000
Subject: [PATCH 1/3] Fixed the sync
---
.docker/docker-compose.yml | 20 +-
.docs/.openapi/api.base.yaml | 4 +-
.docs/changelog.md | 11 +
.docs/index.md | 2 +-
.docs/kubernetes.md | 2 +-
.gitlab-ci.yml | 6 +-
Makefile | 4 +-
README.md | 2 +-
dbrepo-analyse-service/Pipfile | 2 +-
dbrepo-analyse-service/Pipfile.lock | 22 +-
.../lib/dbrepo-1.6.4-py3-none-any.whl | Bin 0 -> 30969 bytes
.../lib/dbrepo-1.6.4.tar.gz | Bin 0 -> 40698 bytes
dbrepo-auth-service/dbrepo-realm.json | 61 +-
.../src/main/java/at/tuwien/Client.java | 3 +-
.../tuwien/CreateEventListenerProvider.java | 1 -
.../target/create-event-listener.jar | Bin 10130 -> 10238 bytes
dbrepo-data-service/pom.xml | 2 +-
dbrepo-data-service/querystore/pom.xml | 4 +-
dbrepo-data-service/report/pom.xml | 4 +-
dbrepo-data-service/rest-service/pom.xml | 6 +-
dbrepo-data-service/services/pom.xml | 6 +-
dbrepo-metadata-service/api/pom.xml | 6 +-
.../at/tuwien/api/auth/CreateUserDto.java | 3 -
dbrepo-metadata-service/entities/pom.xml | 4 +-
.../java/at/tuwien/entities/user/User.java | 2 +-
dbrepo-metadata-service/oai/pom.xml | 4 +-
dbrepo-metadata-service/pom.xml | 2 +-
dbrepo-metadata-service/report/pom.xml | 4 +-
dbrepo-metadata-service/repositories/pom.xml | 4 +-
dbrepo-metadata-service/rest-service/pom.xml | 4 +-
.../at/tuwien/endpoints/DatabaseEndpoint.java | 7 +
.../at/tuwien/endpoints/UserEndpoint.java | 44 +-
.../tuwien/validation/EndpointValidator.java | 2 +-
.../at/tuwien/ApplicationIntegrationTest.java | 23 +
.../endpoints/DatabaseEndpointUnitTest.java | 87 +-
.../endpoints/TableEndpointUnitTest.java | 70 +-
.../endpoints/UserEndpointUnitTest.java | 73 +-
.../KeycloakGatewayIntegrationTest.java | 19 -
.../handlers/ApiExceptionHandlerTest.java | 907 +++++++++++++++++-
.../service/UserServiceIntegrationTest.java | 85 ++
.../service/UserServicePersistenceTest.java | 14 +-
.../tuwien/service/UserServiceUnitTest.java | 4 +-
.../validator/EndpointValidatorUnitTest.java | 94 +-
dbrepo-metadata-service/services/pom.xml | 4 +-
.../at/tuwien/gateway/KeycloakGateway.java | 9 +-
.../gateway/impl/KeycloakGatewayImpl.java | 33 +-
.../tuwien/service/AuthenticationService.java | 4 +-
.../java/at/tuwien/service/UserService.java | 3 +-
.../impl/AuthenticationServiceImpl.java | 7 +-
.../tuwien/service/impl/UserServiceImpl.java | 4 +-
dbrepo-metadata-service/test/pom.xml | 4 +-
.../main/java/at/tuwien/test/BaseTest.java | 57 +-
dbrepo-search-service/Pipfile | 2 +-
dbrepo-search-service/Pipfile.lock | 6 +-
.../init/lib/dbrepo-1.6.4-py3-none-any.whl | Bin 0 -> 30969 bytes
.../init/lib/dbrepo-1.6.4.tar.gz | Bin 0 -> 40698 bytes
.../lib/dbrepo-1.6.4-py3-none-any.whl | Bin 0 -> 30969 bytes
dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz | Bin 0 -> 40698 bytes
.../composables/authentication-service.ts | 24 -
dbrepo-ui/composables/axios-instance.ts | 2 +-
dbrepo-ui/composables/user-service.ts | 32 -
dbrepo-ui/layouts/default.vue | 29 +-
dbrepo-ui/locales/en-US.json | 12 +-
dbrepo-ui/pages/user/authentication.vue | 13 +-
dbrepo-ui/pages/user/info.vue | 14 +-
dbrepo-upload-service/pom.xml | 2 +-
docker-compose.yml | 2 +-
helm/dbrepo/Chart.yaml | 6 +-
helm/dbrepo/README.md | 12 +-
helm/dbrepo/files/create-event-listener.jar | Bin 10130 -> 10238 bytes
helm/dbrepo/values.yaml | 20 +-
install.sh | 2 +-
lib/python/README.md | 12 +-
lib/python/docs/index.rst | 4 +-
lib/python/pyproject.toml | 6 +-
lib/python/setup.py | 4 +-
mkdocs.yml | 6 +-
sonar-project.properties | 2 +-
versions.json | 5 -
79 files changed, 1602 insertions(+), 364 deletions(-)
create mode 100644 dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl
create mode 100644 dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz
create mode 100644 dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/ApplicationIntegrationTest.java
create mode 100644 dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
create mode 100644 dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl
create mode 100644 dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz
create mode 100644 dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl
create mode 100644 dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz
delete mode 100644 dbrepo-ui/composables/authentication-service.ts
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 0f675e47eb..f637eb4f8b 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -114,7 +114,7 @@ services:
init: true
restart: "no"
container_name: dbrepo-auth-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
environment:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
@@ -135,7 +135,7 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
@@ -198,7 +198,7 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
- image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.4
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -253,7 +253,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
- image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.4
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
@@ -277,7 +277,7 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.4
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -301,7 +301,7 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
- image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.4
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
@@ -381,7 +381,7 @@ services:
init: true
container_name: dbrepo-search-service-init
hostname: search-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.4
environment:
LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
@@ -438,7 +438,7 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
- image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.4
ports:
- "3000:3000"
volumes:
@@ -465,7 +465,7 @@ services:
init: true
container_name: dbrepo-storage-service-init
hostname: storage-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.4
environment:
S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -511,7 +511,7 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
- image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.4
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
diff --git a/.docs/.openapi/api.base.yaml b/.docs/.openapi/api.base.yaml
index abadb218e7..f37d861b09 100644
--- a/.docs/.openapi/api.base.yaml
+++ b/.docs/.openapi/api.base.yaml
@@ -11,7 +11,7 @@ components:
type: http
externalDocs:
description: Project Website
- url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
+ url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
info:
contact:
email: andreas.rauber@tuwien.ac.at
@@ -24,7 +24,7 @@ info:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
title: DBRepo REST API
- version: 1.7.0
+ version: 1.6.4
openapi: 3.1.0
servers:
- description: Test Instance
diff --git a/.docs/changelog.md b/.docs/changelog.md
index efdb4dd291..e1452dd12c 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -2,6 +2,17 @@
author: Martin Weise
---
+## v1.6.4 (2025-02-13)
+
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.4)
+
+### What's Changed
+
+#### Fixes
+
+* Fixed a bug where the users were not synced with the Metadata Database and the API Password was not recommended on
+ first login in [#489](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/489).
+
## v1.6.3 (2025-02-05)
[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.3)
diff --git a/.docs/index.md b/.docs/index.md
index aa9c6e7693..cf54cf46cc 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -14,7 +14,7 @@ author: Martin Weise
-Documentation for version: [v1.7.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.6.4](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
index 68f9bc16c1..ea377171d3 100644
--- a/.docs/kubernetes.md
+++ b/.docs/kubernetes.md
@@ -14,7 +14,7 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
- --version "1.7.0" \
+ --version "1.6.4" \
--create-namespace \
--cleanup-on-fail
```
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b20acd3f2a..74cfb6df9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@ variables:
NODE_VERSION: "18"
SONARQUBE_VERSION: "10.0"
BUN_VERSION: "1.1.40"
- DOC_VERSION: "1.7"
- APP_VERSION: "1.7.0"
- CHART_VERSION: "1.7.0"
+ DOC_VERSION: "1.6"
+ APP_VERSION: "1.6.4"
+ CHART_VERSION: "1.6.4"
CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
diff --git a/Makefile b/Makefile
index e8f2553784..c81307ab1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all
-APP_VERSION ?= 1.7.0
-CHART_VERSION ?= 1.7.0
+APP_VERSION ?= 1.6.4
+CHART_VERSION ?= 1.6.4
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
diff --git a/README.md b/README.md
index 901d24dd06..628da3f3f3 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
with:
```bash
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/install.sh | bash
```
## Documentation
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 6b144eec80..3d7911147c 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.7.0.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
opensearch-py = "*"
[dev-packages]
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 83ed8a674d..c3a282c985 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "0af9d522f713554dd7996401992cffddf372ade320c11d7950bdcd5888aa1a03"
+ "sha256": "b24e4e03891018663e2746e2dbe5a9fe716f823be5ccb310c90e8e68b9ffd1d5"
},
"pipfile-spec": 6,
"requires": {
@@ -180,20 +180,20 @@
},
"boto3": {
"hashes": [
- "sha256:59bcf0c4b04d9cc36f8b418ad17ab3c4a99a21a175d2fad7096aa21cbe84630b",
- "sha256:5ecae20e780a3ce9afb3add532b61c466a8cb8960618e4fa565b3883064c1346"
+ "sha256:7784590369a9d545bb07b2de56b6ce4d5a5e232883a957f704c3f842caeba155",
+ "sha256:8c2c2a4ccdfe35dd2611ee1b7473dd2383948415c777e42dc4e7f1ebe371fe8c"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.36.17"
+ "version": "==1.36.19"
},
"botocore": {
"hashes": [
- "sha256:069858b2fd693548035d7fd53a774e37e4260fea64e0ac9b8a3aee904f9321df",
- "sha256:cec13e0a7ce78e71aad0b397581b4e81824c7981ef4c261d2e296d200c399b09"
+ "sha256:98882c106fec4c08678ea028199f7f5119550fab95d682b30846f7aae04b7bec",
+ "sha256:cdf6729f601f82b1acdb9004b1f88b57cfb470f576394cdb3bbf5150f7fafb5b"
],
"markers": "python_version >= '3.8'",
- "version": "==1.36.17"
+ "version": "==1.36.19"
},
"certifi": {
"hashes": [
@@ -421,9 +421,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:f25d5adbd618bf2906578e671af2bf3bcc24d738ef8bc791c220e7e5b714e2f7"
+ "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
],
- "path": "./lib/dbrepo-1.7.0.tar.gz"
+ "path": "./lib/dbrepo-1.6.4.tar.gz"
},
"events": {
"hashes": [
@@ -1621,7 +1621,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -2246,7 +2246,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"wrapt": {
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..d083b0bafc937528fdcc09634c41132578cbf345
GIT binary patch
literal 30969
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
bZWAF@Nq{#i8%QZ110TaRW(Ee{QV<US?`Zyw
literal 0
HcmV?d00001
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..87e9a503ebc621238ebe7efca15f2bdf0a6e1a85
GIT binary patch
literal 40698
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
Bo(KQ{
literal 0
HcmV?d00001
diff --git a/dbrepo-auth-service/dbrepo-realm.json b/dbrepo-auth-service/dbrepo-realm.json
index 1c703b8375..bac2ddc978 100644
--- a/dbrepo-auth-service/dbrepo-realm.json
+++ b/dbrepo-auth-service/dbrepo-realm.json
@@ -1475,6 +1475,39 @@
"claim.name" : "language",
"jsonType.label" : "String"
}
+ }, {
+ "id" : "9bdc3e60-09b8-4241-915e-29f083434026",
+ "name" : "provider",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "identity_provider",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "identity_provider",
+ "jsonType.label" : "String",
+ "access.tokenResponse.claim" : "false"
+ }
+ }, {
+ "id" : "e567cb5c-8856-4124-8b86-f19cd53d7c71",
+ "name" : "setup_finished",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "SETUP_FINISHED",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "setup_finished",
+ "jsonType.label" : "boolean"
+ }
}, {
"id" : "b817424d-7f91-43d8-b7d0-6a32582377fb",
"name" : "family name",
@@ -2376,7 +2409,7 @@
"subType" : "anonymous",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "saml-user-property-mapper", "saml-user-attribute-mapper", "saml-role-list-mapper", "oidc-full-name-mapper", "oidc-usermodel-attribute-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper" ]
+ "allowed-protocol-mapper-types" : [ "saml-role-list-mapper", "saml-user-property-mapper", "oidc-address-mapper", "oidc-usermodel-property-mapper", "oidc-full-name-mapper", "saml-user-attribute-mapper", "oidc-usermodel-attribute-mapper", "oidc-sha256-pairwise-sub-mapper" ]
}
}, {
"id" : "1849e52a-b8c9-44a8-af3d-ee19376a1ed1",
@@ -2402,7 +2435,7 @@
"subType" : "authenticated",
"subComponents" : { },
"config" : {
- "allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper", "oidc-full-name-mapper", "saml-role-list-mapper", "oidc-address-mapper", "saml-user-property-mapper", "saml-user-attribute-mapper", "oidc-sha256-pairwise-sub-mapper" ]
+ "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "saml-role-list-mapper", "saml-user-attribute-mapper", "oidc-usermodel-attribute-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-property-mapper", "saml-user-property-mapper", "oidc-address-mapper" ]
}
} ],
"org.keycloak.userprofile.UserProfileProvider" : [ {
@@ -2426,8 +2459,8 @@
"config" : {
"ldap.attribute" : [ "createTimestamp" ],
"is.mandatory.in.ldap" : [ "false" ],
- "always.read.value.from.ldap" : [ "true" ],
"read.only" : [ "true" ],
+ "always.read.value.from.ldap" : [ "true" ],
"user.model.attribute" : [ "createTimestamp" ]
}
}, {
@@ -2438,8 +2471,8 @@
"config" : {
"ldap.attribute" : [ "sn" ],
"is.mandatory.in.ldap" : [ "true" ],
- "read.only" : [ "false" ],
"always.read.value.from.ldap" : [ "true" ],
+ "read.only" : [ "false" ],
"user.model.attribute" : [ "lastName" ]
}
}, {
@@ -2450,8 +2483,8 @@
"config" : {
"ldap.attribute" : [ "cn" ],
"is.mandatory.in.ldap" : [ "true" ],
- "always.read.value.from.ldap" : [ "true" ],
"read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "true" ],
"user.model.attribute" : [ "firstName" ]
}
}, {
@@ -2462,8 +2495,8 @@
"config" : {
"ldap.attribute" : [ "mail" ],
"is.mandatory.in.ldap" : [ "false" ],
- "always.read.value.from.ldap" : [ "false" ],
"read.only" : [ "false" ],
+ "always.read.value.from.ldap" : [ "false" ],
"user.model.attribute" : [ "email" ]
}
}, {
@@ -2476,15 +2509,15 @@
"membership.attribute.type" : [ "DN" ],
"user.roles.retrieve.strategy" : [ "LOAD_GROUPS_BY_MEMBER_ATTRIBUTE" ],
"group.name.ldap.attribute" : [ "cn" ],
- "membership.user.ldap.attribute" : [ "uid" ],
- "ignore.missing.groups" : [ "false" ],
"preserve.group.inheritance" : [ "false" ],
"membership.ldap.attribute" : [ "member" ],
- "memberof.ldap.attribute" : [ "memberOf" ],
- "group.object.classes" : [ "groupOfNames" ],
+ "ignore.missing.groups" : [ "false" ],
+ "membership.user.ldap.attribute" : [ "uid" ],
"groups.dn" : [ "ou=users,dc=dbrepo,dc=at" ],
- "groups.path" : [ "/" ],
- "drop.non.existing.groups.during.sync" : [ "false" ]
+ "group.object.classes" : [ "groupOfNames" ],
+ "memberof.ldap.attribute" : [ "memberOf" ],
+ "drop.non.existing.groups.during.sync" : [ "false" ],
+ "groups.path" : [ "/" ]
}
}, {
"id" : "b6ff3285-35af-4e86-8bb4-d94b8e0d70bb",
@@ -2518,8 +2551,8 @@
"fullSyncPeriod" : [ "-1" ],
"pagination" : [ "false" ],
"startTls" : [ "false" ],
- "connectionPooling" : [ "true" ],
"usersDn" : [ "ou=users,dc=dbrepo,dc=at" ],
+ "connectionPooling" : [ "true" ],
"cachePolicy" : [ "DEFAULT" ],
"useKerberosForPasswordAuthentication" : [ "false" ],
"importEnabled" : [ "true" ],
@@ -2531,8 +2564,8 @@
"lastSync" : [ "1719252666" ],
"vendor" : [ "other" ],
"uuidLDAPAttribute" : [ "entryUUID" ],
- "allowKerberosAuthentication" : [ "false" ],
"connectionUrl" : [ "ldap://identity-service:1389" ],
+ "allowKerberosAuthentication" : [ "false" ],
"syncRegistrations" : [ "true" ],
"authType" : [ "simple" ],
"useTruststoreSpi" : [ "always" ],
diff --git a/dbrepo-auth-service/listeners/src/main/java/at/tuwien/Client.java b/dbrepo-auth-service/listeners/src/main/java/at/tuwien/Client.java
index 769ec49097..c63e88618b 100644
--- a/dbrepo-auth-service/listeners/src/main/java/at/tuwien/Client.java
+++ b/dbrepo-auth-service/listeners/src/main/java/at/tuwien/Client.java
@@ -31,8 +31,7 @@ public class Client {
if (systemPassword == null || systemPassword.isEmpty()) {
throw new IllegalArgumentException("Environment variable SYSTEM_PASSWORD is not set or is empty.");
}
-
- URL url = URI.create(urlString).toURL();
+ final URL url = URI.create(urlString + "/api/user").toURL();
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setDoOutput(true);
conn.setRequestMethod("POST");
diff --git a/dbrepo-auth-service/listeners/src/main/java/at/tuwien/CreateEventListenerProvider.java b/dbrepo-auth-service/listeners/src/main/java/at/tuwien/CreateEventListenerProvider.java
index 93f2b2919b..ea4aa7794b 100644
--- a/dbrepo-auth-service/listeners/src/main/java/at/tuwien/CreateEventListenerProvider.java
+++ b/dbrepo-auth-service/listeners/src/main/java/at/tuwien/CreateEventListenerProvider.java
@@ -57,7 +57,6 @@ public class CreateEventListenerProvider implements EventListenerProvider {
final String userData = "{" +
quoteAttr("id", user.getId()) + ", " +
quoteAttr("username", user.getUsername()) + ", " +
- quoteAttr("email", user.getEmail()) + ", " +
quoteAttr("ldap_id", user.getFirstAttribute("LDAP_ID")) + ", " +
quoteAttr("given_name", user.getFirstName()) + ", " +
quoteAttr("family_name", user.getLastName()) +
diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index a23243d39509ec3821219e5799a25740c93e2ca1..a970096eeaa5015d9e95064f6b341fffdf8aae5f 100644
GIT binary patch
delta 6843
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
T<fSgnST{LMU5!mh8Dtm$g_hbd
delta 6774
zcmez8KgnM@z?+#xgn@yBgW-jkPt^OFECMBr3=C(O7#Kt*+bWCK_XZv8yJaA-*Zq|J
z5B8kRiYgPL7q*KzYCCQ(uQt*Y>ui4GsZk#<oDmSXbvOI%<ny2RJU73mm96#VNd2PE
z%eJys3r@C(vJ7cajgRBn7HS*y?c~9OUtZh@SrUF^lX2<E>rW@X_vd&RCFg$qL<pNm
ztJk0Qg;LyMS?$ZGt?uKyv$*~>?*rqaCw^_0&U;30TbJ-U^|kF~@ok4E)dq^V$IlM#
z<&CPE|DN*~|H2u6)&D!5yMA|B0{f!L`b%u)pFb257f^1N(aN;YLn_+x>B&-uxz76e
zpHgI47jNFMCUm{qzVj=3H$8rMzmFw*e|6nkhl3%(X)ibYUpDK*o!*Ui-zVBXGOib_
zIx%_9{f*TbKUQrOYi!%ozU)V8hD1=?&kLE1xyt<&jk`jR8wx0DCjQ`-`Mto>X3q6v
z!cisL4_UuC8~ZG0*NM-bMr(sksDIW}xyfV_V&y9wky5qptIy)7JMZ@H`t|Tmw3Lda
z%S{&ki?&;MoSGKwo|cdz^Oq46D_jf=91JX=Xqmj8QHA-rn9t;EjJjZ&jY$qnt23!G
zzYz18?9ZeHrfZl?!1QJ&FOd8s=CdGb@&)E@5WP8$WeyYXb1|Q&fQh$$9N=JJ=$p*W
zu2?U8T(b6Yc53Cpz5_Rknisd6W_Oz);FR0<W5U6;HAjS&wQVcWUHg_ba`l^aJ_|fA
zo8{ixvc=@3Yt=>LFMf(4WpCA%i2HiH|7|yE-pks*$Jc*3d#atsNYmcf*!uIc+4=X%
zd-eX5zcOUF{ZU?@D`3R}4_8Ak7A?N4$593gRo$ER);qI*ouM4C>8yv;Iljh2yM8h9
z+c5om7qDgPV$)ky3PP{sUu5yia(pfM^0n-%%ia%*d>U6JaZb~lAZD3l{YzqL?~A^9
zGU5@@;^!hub(AeH1=T+d(bOvFWt!iW8sXPDOSt4xJFl%|j{k<Gb*-GmE(_FhqLdFd
zJ1@&+w=_Jo_h7w2_1&zG39ScCxt8Yft=YJDMO(aMZ`bpOQH`&TrUd@qVK+riQY>P+
z`~MG5-)z0YUlG{-T7)Gere9ht=uw_f0FSlFw4%NpJnw@yL_KJ$3<+0S*q_lEmaSrY
z?04I{j+dIp4JOO25q-g<dYt#P	>gcBDz(3UK1rsk+*b$UbRVz3_%o^@ONT-qYFh
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
X3>z637=%&G5Sn~RU5#y-5=amLiEW)w
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index db7947432e..0e2001b931 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<description>Service that manages the data</description>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index 1aa138f611..0c01d6893c 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-data-service-querystore</artifactId>
<name>dbrepo-data-service-querystore</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index 98536501d3..ed4826a38d 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>report</artifactId>
<name>dbrepo-data-service-report</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 434c423ef0..8367823870 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>rest-service</artifactId>
<name>dbrepo-data-service-rest-service</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>services</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index 5252e6a3d3..3f645dda32 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>services</artifactId>
<name>dbrepo-data-service-services</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service-querystore</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 6c3b1aa13f..3f68887ec0 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<name>dbrepo-metadata-service-api</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
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 16f45aec4d..9742986ae0 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
@@ -40,7 +40,4 @@ public class CreateUserDto {
@Schema(example = "bar")
private String familyName;
- @Schema(example = "foo.bar@example.com")
- private String email;
-
}
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index 313309e188..382fa2e7e8 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<name>dbrepo-metadata-service-entity</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
index ba86e3d29c..156fc3b4c8 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
@@ -65,7 +65,7 @@ public class User {
@Column(name = "mariadb_password", nullable = false)
private String mariadbPassword;
- @Column(name = "is_internal", nullable = false, updatable = false)
+ @Column(name = "is_internal", nullable = false, updatable = false, columnDefinition = "bool default false")
private Boolean isInternal;
}
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index 54c464b11a..76beb8d88f 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<name>dbrepo-metadata-service-oai</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index d64da973f0..ae5c004e0c 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<name>dbrepo-metadata-service</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<description>Service that manages the metadata</description>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index 6bcb8d579b..be6e86a4d0 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index 4d3b5f933d..cf327942a4 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<name>dbrepo-metadata-service-repositories</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index 9e9f23d11f..e1524f7971 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<name>dbrepo-metadata-service-rest</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
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 50016103d8..41cc59ca6a 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
@@ -511,19 +511,26 @@ public class DatabaseEndpoint extends AbstractEndpoint {
.stream()
.filter(a -> a.getUser().getId().equals(getId(principal)))
.findFirst();
+ optional.ifPresentOrElse(access -> log.trace("user has access: {}", access), () -> log.trace("user has no access"));
if (!database.getIsPublic() && !database.getIsSchemaPublic() && optional.isEmpty() && !isSystem(principal)) {
log.error("Failed to find database: not public and no access found");
throw new NotAllowedException("Failed to find database: not public and no access found");
}
/* reduce metadata */
+ final int tables = database.getTables()
+ .size();
database.setTables(database.getTables()
.stream()
.filter(t -> t.getIsPublic() || t.getIsSchemaPublic() || optional.isPresent())
.toList());
+ log.trace("filtered database tables from {} to {}", tables, database.getTables().size());
+ final int views = database.getViews()
+ .size();
database.setViews(database.getViews()
.stream()
.filter(v -> v.getIsPublic() || v.getIsSchemaPublic() || optional.isPresent())
.toList());
+ log.trace("filtered database views from {} to {}", views, database.getViews().size());
if (!isSystem(principal) && !database.getOwner().getId().equals(getId(principal))) {
log.trace("authenticated user {} is not owner: remove access list", principal.getName());
database.setAccesses(List.of());
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 51f323c30f..5ca14a5a34 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
@@ -106,47 +106,15 @@ public class UserEndpoint extends AbstractEndpoint {
@ApiResponse(responseCode = "400",
description = "Parameters are not well-formed (likely email)",
content = {@Content(mediaType = "application/json")}),
- @ApiResponse(responseCode = "403",
- description = "Internal authentication to the auth service is invalid",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "404",
- description = "Default role not found",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "409",
- description = "User with username already exists",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "417",
- description = "User with e-mail already exists",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "502",
- description = "Failed to create in auth service",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "503",
- description = "Failed to create in auth service",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
})
- public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody CreateUserDto data)
- throws UserExistsException, EmailExistsException, AuthServiceException, AuthServiceConnectionException,
- UserNotFoundException, CredentialsInvalidException {
+ public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody CreateUserDto data) {
log.debug("endpoint create user, data.id={}, data.username={}", data.getId(), data.getUsername());
return ResponseEntity.status(HttpStatus.CREATED)
.body(userMapper.userToUserBriefDto(
userService.create(data)));
}
- @GetMapping("/{userId}")
+ @RequestMapping(value = "/{userId}", method = {RequestMethod.GET, RequestMethod.HEAD})
@Transactional(readOnly = true)
@PreAuthorize("isAuthenticated()")
@Observed(name = "dbrepo_user_find")
@@ -181,12 +149,14 @@ public class UserEndpoint extends AbstractEndpoint {
throw new NotAllowedException("Failed to find user: foreign user");
}
if (user.getIsInternal()) {
- throw new UserNotFoundException("Failed to find user with username: " + user.getUsername());
+ log.error("Failed to find user: internal user");
+ throw new NotAllowedException("Failed to find user: internal user");
}
final HttpHeaders headers = new HttpHeaders();
if (isSystem(principal)) {
headers.set("X-Username", user.getUsername());
headers.set("X-Password", user.getMariadbPassword());
+ headers.set("Access-Control-Expose-Headers", "X-Username X-Password");
}
return ResponseEntity.status(HttpStatus.OK)
.headers(headers)
@@ -282,18 +252,18 @@ public class UserEndpoint extends AbstractEndpoint {
@NotNull @Valid @RequestBody UserPasswordDto data,
@NotNull Principal principal) throws NotAllowedException,
UserNotFoundException, DatabaseNotFoundException, DataServiceException,
- DataServiceConnectionException {
+ DataServiceConnectionException, AuthServiceException {
log.debug("endpoint modify a user password, userId={}, principal.name={}", userId, principal.getName());
final User user = userService.findById(userId);
if (!user.getUsername().equals(principal.getName())) {
log.error("Failed to modify user password: not current user");
throw new NotAllowedException("Failed to modify user password: not current user");
}
- authenticationService.updatePassword(user, data);
for (Database database : databaseService.findAllAtLestReadAccess(userId)) {
databaseService.updatePassword(database, user);
}
userService.updatePassword(user, data);
+ authenticationService.setupFinished(user);
return ResponseEntity.accepted()
.build();
}
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 a54f616b01..6fe29c118b 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
@@ -131,7 +131,7 @@ public class EndpointValidator extends AbstractEndpoint {
final Optional<CreateTableColumnDto> optional3 = data.getColumns()
.stream()
.filter(c -> c.getType().equals(ColumnTypeDto.SET))
- .filter(c -> c.getEnums() == null || c.getSets().isEmpty())
+ .filter(c -> c.getSets() == null || c.getSets().isEmpty())
.findFirst();
if (optional3.isPresent()) {
log.error("Validation failed: column {} needs at least 1 allowed set value", optional3.get().getName());
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/ApplicationIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/ApplicationIntegrationTest.java
new file mode 100644
index 0000000000..33c7bc76c5
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/ApplicationIntegrationTest.java
@@ -0,0 +1,23 @@
+package at.tuwien;
+
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@Log4j2
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+public class ApplicationIntegrationTest {
+
+ @Test
+ public void main_succeeds() {
+
+ /* test */
+ DbrepoMetadataServiceApplication.main(new String[]{});
+ }
+
+}
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 fd91fb5655..1340d552d1 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
@@ -269,7 +269,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
- public void list_anonymous_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_anonymous_succeeds() {
/* mock */
when(databaseService.findAllPublicOrSchemaPublic())
@@ -281,7 +281,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"list-databases"})
- public void list_hasRole_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_hasRole_succeeds() {
/* pre-condition */
assertTrue(DATABASE_3_PUBLIC);
@@ -296,7 +296,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"list-databases"})
- public void list_hasRoleForeign_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_hasRoleForeign_succeeds() {
/* pre-condition */
assertTrue(DATABASE_3_PUBLIC);
@@ -311,7 +311,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"list-databases"})
- public void list_hasRoleFilter_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_hasRoleFilter_succeeds() {
/* mock */
when(databaseService.findAllPublicOrSchemaPublicOrReadAccessByInternalName(USER_1_ID, DATABASE_3_INTERNALNAME))
@@ -323,7 +323,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = {"list-databases"})
- public void list_hasRoleFilterNoResult_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_hasRoleFilterNoResult_succeeds() {
/* mock */
when(databaseService.findAllPublicOrSchemaPublicOrReadAccessByInternalName(USER_1_ID, "i_do_not_exist"))
@@ -333,6 +333,18 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
list_generic("i_do_not_exist", USER_1_PRINCIPAL, 0);
}
+ @Test
+ @WithAnonymousUser
+ public void list_filterNoResult_succeeds() {
+
+ /* mock */
+ when(databaseService.findAllPublicOrSchemaPublicByInternalName("i_do_not_exist"))
+ .thenReturn(List.of());
+
+ /* test */
+ list_generic("i_do_not_exist", null, 0);
+ }
+
@Test
@WithAnonymousUser
public void visibility_anonymous_fails() {
@@ -562,15 +574,15 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
}
@Test
- @WithAnonymousUser
- public void findById_anonymousPrivateSchemaNoAccessSystem_succeeds() throws UserNotFoundException,
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
+ public void findById_privateSchemaNoAccessInternalUser_succeeds() throws UserNotFoundException,
NotAllowedException, DataServiceException, DatabaseNotFoundException, ExchangeNotFoundException,
DataServiceConnectionException {
/* test */
- final DatabaseDto database = findById_generic(DATABASE_1_ID, DATABASE_1, USER_LOCAL_ADMIN_PRINCIPAL);
- assertEquals(4, database.getTables().size());
- assertEquals(2, database.getViews().size());
+ final DatabaseDto database = findById_generic(DATABASE_3_ID, DATABASE_3, USER_LOCAL_ADMIN_PRINCIPAL);
+ assertEquals(0, database.getTables().size());
+ assertEquals(1, database.getViews().size());
assertNotEquals(0, database.getAccesses().size());
}
@@ -610,6 +622,58 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
assertEquals(3, database.getAccesses().size());
}
+ @Test
+ @WithMockUser(username = USER_2_USERNAME)
+ public void findById_hiddenAccessRights_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, ExchangeNotFoundException, UserNotFoundException, NotAllowedException {
+
+ /* mock */
+ when(accessService.list(DATABASE_1))
+ .thenReturn(List.of(DATABASE_1_USER_1_WRITE_ALL_ACCESS, DATABASE_1_USER_2_READ_ACCESS));
+
+ /* test */
+ final DatabaseDto database = findById_generic(DATABASE_1_ID, DATABASE_1, USER_2_PRINCIPAL);
+ assertEquals(4, database.getTables().size());
+ assertEquals(3, database.getViews().size());
+ assertEquals(0, database.getAccesses().size());
+ }
+
+ @Test
+ @WithMockUser(username = USER_1_USERNAME)
+ public void findById_hiddenAccessRightsSeesOwn_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException, ExchangeNotFoundException, UserNotFoundException, NotAllowedException {
+
+ /* mock */
+ when(accessService.list(DATABASE_1))
+ .thenReturn(List.of(DATABASE_1_USER_1_WRITE_ALL_ACCESS, DATABASE_1_USER_2_READ_ACCESS));
+
+ /* test */
+ final DatabaseDto database = findById_generic(DATABASE_1_ID, DATABASE_1, USER_1_PRINCIPAL);
+ assertEquals(4, database.getTables().size());
+ assertEquals(3, database.getViews().size());
+ assertEquals(3, database.getAccesses().size());
+ }
+
+ @Test
+ @WithMockUser(username = USER_1_USERNAME)
+ public void findById_privateDataPrivateSchemaNoAccess_fails() {
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ findById_generic(DATABASE_1_ID, DATABASE_1, USER_4_PRINCIPAL);
+ });
+ }
+
+ @Test
+ @WithMockUser(username = USER_1_USERNAME)
+ public void findById_anonymousPrivateDataPrivateSchema_fails() {
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ findById_generic(DATABASE_1_ID, DATABASE_1, null);
+ });
+ }
+
@Test
@WithAnonymousUser
public void findPreviewImage_anonymous_succeeds() throws DatabaseNotFoundException {
@@ -660,8 +724,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- public void list_generic(String internalName, Principal principal, Integer expectedSize)
- throws DatabaseNotFoundException, UserNotFoundException {
+ public void list_generic(String internalName, Principal principal, Integer expectedSize) {
/* test */
final ResponseEntity<List<DatabaseBriefDto>> response = databaseEndpoint.list(internalName, principal);
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 a17d31649e..16551784c8 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,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.CreateTableDto;
+import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableUpdateDto;
-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.CreateTableColumnDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
import at.tuwien.api.semantics.EntityDto;
@@ -40,6 +40,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
import java.util.List;
+import java.util.UUID;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*;
@@ -524,7 +525,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithAnonymousUser
public void findById_publicDatabasePrivateDataPrivateSchemaAnonymous_succeeds() throws UserNotFoundException,
- TableNotFoundException, NotAllowedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, QueueNotFoundException, DataServiceConnectionException {
+ TableNotFoundException, NotAllowedException, DataServiceException, DatabaseNotFoundException,
+ AccessNotFoundException, QueueNotFoundException, DataServiceConnectionException {
/* test */
final ResponseEntity<TableDto> response = generic_findById(DATABASE_3_ID, DATABASE_3, TABLE_8_ID, TABLE_8, null, null, null);
@@ -596,6 +598,16 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
});
}
+ @Test
+ @WithMockUser(username = USER_4_USERNAME, authorities = {"table-semantic-analyse"})
+ public void analyseTable_notOwner_fails() {
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ analyseTable_generic(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL);
+ });
+ }
+
@Test
@WithMockUser(username = USER_4_USERNAME)
public void findAll_noRole_fails() {
@@ -930,6 +942,29 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_2_ID, TABLE_2, null, null, null);
}
+ @Test
+ @WithMockUser(username = USER_4_USERNAME)
+ public void findById_privateSchemaNotOwnerNoAccess_fails() {
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ generic_findById(DATABASE_3_ID, DATABASE_3, TABLE_8_ID, TABLE_8, USER_4_PRINCIPAL, USER_4, null);
+ });
+ }
+
+ @Test
+ @WithMockUser(username = USER_4_USERNAME)
+ public void findById_publicSchemaNotOwnerNoAccess_succeeds() throws UserNotFoundException, TableNotFoundException,
+ NotAllowedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException,
+ QueueNotFoundException, DataServiceConnectionException {
+
+ /* test */
+ final ResponseEntity<TableDto> response = generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_2_ID, TABLE_2, USER_4_PRINCIPAL, USER_4, null);
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ final TableDto body = response.getBody();
+ assertNotNull(body);
+ }
+
@Test
@WithMockUser(username = USER_1_USERNAME, authorities = "find-table")
public void findById_privateHasRoleTableNotFound_fails() {
@@ -970,7 +1005,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
AccessNotFoundException, QueueNotFoundException, DataServiceConnectionException {
/* test */
- generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL, USER_4, null);
+ generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL, USER_4, DATABASE_1_USER_4_READ_ACCESS);
}
@Test
@@ -1081,6 +1116,17 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
}
+ @Test
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system", "update-table-statistic"})
+ public void updateStatistic_internalUser_succeeds() throws TableNotFoundException, SearchServiceException,
+ MalformedException, NotAllowedException, DataServiceException, DatabaseNotFoundException,
+ SearchServiceConnectionException, DataServiceConnectionException {
+
+ /* test */
+ final ResponseEntity<Void> response = generic_updateStatistic(USER_LOCAL_ADMIN_PRINCIPAL);
+ assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+ }
+
/* ################################################################################################### */
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
@@ -1148,7 +1194,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
}
protected ResponseEntity<TableBriefDto> generic_create(Long databaseId, Database database, CreateTableDto data,
- Principal principal, User user, DatabaseAccess access)
+ Principal principal, User user, DatabaseAccess access)
throws MalformedException, NotAllowedException, DataServiceException, DataServiceConnectionException,
UserNotFoundException, DatabaseNotFoundException, AccessNotFoundException, TableNotFoundException,
TableExistsException, SearchServiceException, SearchServiceConnectionException, OntologyNotFoundException,
@@ -1203,11 +1249,21 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
.when(tableService)
.findById(any(Database.class), eq(tableId));
}
- if (principal != null) {
+ if (user != null) {
when(userService.findById(user.getId()))
.thenReturn(user);
- when(accessService.find(any(Database.class), eq(user)))
+ } else {
+ doThrow(UserNotFoundException.class)
+ .when(userService)
+ .findById(any(UUID.class));
+ }
+ if (access != null) {
+ when(accessService.find(any(Database.class), any(User.class)))
.thenReturn(access);
+ } else {
+ doThrow(AccessNotFoundException.class)
+ .when(accessService)
+ .find(any(Database.class), any(User.class));
}
/* test */
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 6ef4bd8779..de5c8993a1 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,5 +1,6 @@
package at.tuwien.endpoints;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto;
import at.tuwien.api.user.UserPasswordDto;
@@ -19,6 +20,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.test.context.support.WithAnonymousUser;
@@ -63,6 +65,15 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
assertEquals(2, response.size());
}
+ @Test
+ @WithAnonymousUser
+ public void findAll_filterInternalUserEmptyList_succeeds() throws UserNotFoundException {
+
+ /* test */
+ final List<UserBriefDto> response = findAll_generic(USER_LOCAL_ADMIN_USERNAME, null);
+ assertEquals(0, response.size());
+ }
+
@Test
@WithMockUser(username = USER_1_USERNAME)
public void findAll_noRole_succeeds() throws UserNotFoundException {
@@ -142,6 +153,18 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
assertEquals(USER_3_DATABASE_PASSWORD, response.getHeaders().get("X-Password").get(0));
}
+ @Test
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
+ public void find_internalUser_fails() {
+ final Principal principal = new UsernamePasswordAuthenticationToken(USER_LOCAL_ADMIN_DETAILS, USER_LOCAL_ADMIN_PASSWORD, List.of(
+ new SimpleGrantedAuthority("system")));
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ find_generic(USER_LOCAL_ADMIN_ID, USER_LOCAL, principal);
+ });
+ }
+
@Test
@WithAnonymousUser
public void modify_anonymous_fails() {
@@ -233,7 +256,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_1_USERNAME)
public void password_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
- UserNotFoundException, DatabaseNotFoundException {
+ UserNotFoundException, DatabaseNotFoundException, AuthServiceException {
final UserPasswordDto request = UserPasswordDto.builder()
.password(USER_1_PASSWORD)
.build();
@@ -242,6 +265,38 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
password_generic(USER_1_PRINCIPAL, request);
}
+ @Test
+ @WithAnonymousUser
+ public void create_anonymous_fails() {
+
+ /* test */
+ assertThrows(AccessDeniedException.class, () -> {
+ generic_create(USER_1_CREATE_USER_DTO);
+ });
+ }
+
+ @Test
+ @WithMockUser(username = USER_2_USERNAME)
+ public void create_notInternalUser_fails() {
+
+ /* test */
+ assertThrows(AccessDeniedException.class, () -> {
+ generic_create(USER_1_CREATE_USER_DTO);
+ });
+ }
+
+ @Test
+ @WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
+ public void create_succeeds() {
+
+ /* mock */
+ when(userService.create(USER_1_CREATE_USER_DTO))
+ .thenReturn(USER_1);
+
+ /* test */
+ generic_create(USER_1_CREATE_USER_DTO);
+ }
+
/* ################################################################################################### */
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
@@ -260,7 +315,7 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
}
} else {
when(userService.findAll())
- .thenReturn(List.of(USER_1, USER_2));
+ .thenReturn(List.of(USER_1, USER_2, USER_LOCAL));
}
/* test */
@@ -310,14 +365,15 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
}
protected void password_generic(Principal principal, UserPasswordDto data) throws NotAllowedException,
- DataServiceException, DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException {
+ DataServiceException, DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
+ AuthServiceException {
/* mock */
when(userService.findById(USER_1_ID))
.thenReturn(USER_1);
doNothing()
.when(authenticationService)
- .updatePassword(USER_1, data);
+ .setupFinished(USER_1);
doNothing()
.when(userService)
.updatePassword(USER_1, data);
@@ -331,4 +387,13 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
final ResponseEntity<?> response = userEndpoint.password(USER_1_ID, data, principal);
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
}
+
+ protected void generic_create(CreateUserDto data) {
+
+ /* test */
+ final ResponseEntity<UserBriefDto> response = userEndpoint.create(data);
+ assertEquals(HttpStatus.CREATED, response.getStatusCode());
+ final UserBriefDto body = response.getBody();
+ assertNotNull(body);
+ }
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
index e72cd7fa75..58701adfc3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
@@ -92,23 +92,4 @@ public class KeycloakGatewayIntegrationTest extends AbstractUnitTest {
});
}
- @Test
- public void updateUserCredentials_succeeds() throws UserNotFoundException {
-
- /* mock */
- keycloakUtils.createUser(USER_1_ID, USER_1_KEYCLOAK_SIGNUP_REQUEST);
-
- /* test */
- keycloakGateway.updateUserCredentials(keycloakUtils.getUserId(USER_1_USERNAME), USER_1_PASSWORD_DTO);
- }
-
- @Test
- public void updateUserCredentials_notFound_fails() {
-
- /* test */
- assertThrows(UserNotFoundException.class, () -> {
- keycloakGateway.updateUserCredentials(keycloakUtils.getUserId(USER_1_USERNAME), USER_1_PASSWORD_DTO);
- });
- }
-
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
index 9075ec2a02..a58a4b49da 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
@@ -1,12 +1,16 @@
package at.tuwien.handlers;
+import at.tuwien.api.error.ApiErrorDto;
+import at.tuwien.exception.*;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.web.bind.annotation.ResponseStatus;
@@ -18,12 +22,17 @@ import java.util.Optional;
import static at.tuwien.test.utils.EndpointUtils.getErrorCodes;
import static at.tuwien.test.utils.EndpointUtils.getExceptions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@Log4j2
@ExtendWith(SpringExtension.class)
@SpringBootTest
public class ApiExceptionHandlerTest extends AbstractUnitTest {
+ @Autowired
+ private ApiExceptionHandler apiExceptionHandler;
+
@Test
public void handle_succeeds() throws ClassNotFoundException, IOException {
final List<Method> handlers = Arrays.asList(ApiExceptionHandler.class.getMethods());
@@ -42,7 +51,903 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
Assertions.assertNotNull(exception.getDeclaredAnnotation(ResponseStatus.class).reason(), "Exception " + exception.getName() + " does not provide a reason code");
Assertions.assertTrue(errorCodes.contains(exception.getDeclaredAnnotation(ResponseStatus.class).reason()), "Exception code " + exception.getDeclaredAnnotation(ResponseStatus.class).reason() + " does have a reason code mapped in localized ui error messages");
/* handler method */
- Assertions.assertEquals(method.getDeclaredAnnotation(ResponseStatus.class).code(), exception.getDeclaredAnnotation(ResponseStatus.class).code());
+ assertEquals(method.getDeclaredAnnotation(ResponseStatus.class).code(), exception.getDeclaredAnnotation(ResponseStatus.class).code());
}
}
+
+ @Test
+ public void handle_accessNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new AccessNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.access.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_accountNotSetupException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new AccountNotSetupException("msg"));
+ assertEquals(HttpStatus.PRECONDITION_REQUIRED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.PRECONDITION_REQUIRED, body.getStatus());
+ assertEquals("error.user.setup", body.getCode());
+ }
+
+
+ @Test
+ public void handle_analyseServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new AnalyseServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.analyse.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_authServiceConnectionException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new AuthServiceConnectionException("msg"));
+ assertEquals(HttpStatus.BAD_GATEWAY, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_GATEWAY, body.getStatus());
+ assertEquals("error.auth.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_authServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new AuthServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.auth.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_brokerServiceConnectionException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new BrokerServiceConnectionException("msg"));
+ assertEquals(HttpStatus.BAD_GATEWAY, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_GATEWAY, body.getStatus());
+ assertEquals("error.broker.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_brokerServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new BrokerServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.broker.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_conceptNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ConceptNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.concept.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_containerAlreadyExistsException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ContainerAlreadyExistsException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.container.exists", body.getCode());
+ }
+
+
+ @Test
+ public void handle_containerNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ContainerNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.container.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_containerQuotaException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ContainerQuotaException("msg"));
+ assertEquals(HttpStatus.LOCKED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.LOCKED, body.getStatus());
+ assertEquals("error.container.quota", body.getCode());
+ }
+
+
+ @Test
+ public void handle_credentialsInvalidException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new CredentialsInvalidException("msg"));
+ assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.FORBIDDEN, body.getStatus());
+ assertEquals("error.user.credentials", body.getCode());
+ }
+
+
+ @Test
+ public void handle_dataServiceConnectionException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DataServiceConnectionException("msg"));
+ assertEquals(HttpStatus.BAD_GATEWAY, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_GATEWAY, body.getStatus());
+ assertEquals("error.data.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_dataServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DataServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.data.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_databaseMalformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DatabaseMalformedException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.database.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_databaseNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DatabaseNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.database.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_databaseUnavailableException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DatabaseUnavailableException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.database.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_doiNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new DoiNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.doi.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_emailExistsException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new EmailExistsException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.user.email-exists", body.getCode());
+ }
+
+
+ @Test
+ public void handle_exchangeNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ExchangeNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.exchange.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_externalServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ExternalServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.external.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_filterBadRequestException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new FilterBadRequestException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.semantic.filter", body.getCode());
+ }
+
+
+ @Test
+ public void handle_formatNotAvailableException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new FormatNotAvailableException("msg"));
+ assertEquals(HttpStatus.NOT_ACCEPTABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_ACCEPTABLE, body.getStatus());
+ assertEquals("error.identifier.format", body.getCode());
+ }
+
+
+ @Test
+ public void handle_identifierNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new IdentifierNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.identifier.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_identifierNotSupportedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new IdentifierNotSupportedException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.identifier.unsupported", body.getCode());
+ }
+
+
+ @Test
+ public void handle_imageAlreadyExistsException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ImageAlreadyExistsException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.image.exists", body.getCode());
+ }
+
+
+ @Test
+ public void handle_imageInvalidException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ImageInvalidException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.image.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_imageNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ImageNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.image.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_licenseNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new LicenseNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.license.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_malformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new MalformedException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.request.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_messageNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new MessageNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.message.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_metadataServiceConnectionException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new MetadataServiceConnectionException("msg"));
+ assertEquals(HttpStatus.BAD_GATEWAY, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_GATEWAY, body.getStatus());
+ assertEquals("error.metadata.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_metadataServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new MetadataServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.metadata.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_notAllowedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new NotAllowedException("msg"));
+ assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.FORBIDDEN, body.getStatus());
+ assertEquals("error.request.forbidden", body.getCode());
+ }
+
+
+ @Test
+ public void handle_ontologyNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new OntologyNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.ontology.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_orcidNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new OrcidNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.orcid.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_paginationException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new PaginationException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.request.pagination", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryMalformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryMalformedException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.query.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.query.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryNotSupportedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryNotSupportedException("msg"));
+ assertEquals(HttpStatus.NOT_IMPLEMENTED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_IMPLEMENTED, body.getStatus());
+ assertEquals("error.query.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryStoreCreateException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryStoreCreateException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.store.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryStoreGCException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryStoreGCException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.store.clean", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryStoreInsertException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryStoreInsertException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.store.insert", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queryStorePersistException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueryStorePersistException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.store.persist", body.getCode());
+ }
+
+
+ @Test
+ public void handle_queueNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new QueueNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.queue.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_remoteUnavailableException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new RemoteUnavailableException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.metadata.privileged", body.getCode());
+ }
+
+
+ @Test
+ public void handle_rorNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new RorNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.ror.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_searchServiceConnectionException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new SearchServiceConnectionException("msg"));
+ assertEquals(HttpStatus.BAD_GATEWAY, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_GATEWAY, body.getStatus());
+ assertEquals("error.search.connection", body.getCode());
+ }
+
+
+ @Test
+ public void handle_searchServiceException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new SearchServiceException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.search.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_semanticEntityNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new SemanticEntityNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.semantic.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_sortException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new SortException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.request.sort", body.getCode());
+ }
+
+
+ @Test
+ public void handle_storageNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new StorageNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.storage.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_storageUnavailableException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new StorageUnavailableException("msg"));
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.SERVICE_UNAVAILABLE, body.getStatus());
+ assertEquals("error.storage.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_tableExistsException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new TableExistsException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.table.exists", body.getCode());
+ }
+
+
+ @Test
+ public void handle_tableMalformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new TableMalformedException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.table.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_tableNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new TableNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.table.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_tableSchemaException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new TableSchemaException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.schema.table", body.getCode());
+ }
+
+
+ @Test
+ public void handle_unitNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new UnitNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.unit.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_uriMalformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new UriMalformedException("msg"));
+ assertEquals(HttpStatus.EXPECTATION_FAILED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.EXPECTATION_FAILED, body.getStatus());
+ assertEquals("error.semantics.uri", body.getCode());
+ }
+
+
+ @Test
+ public void handle_userExistsException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new UserExistsException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.user.exists", body.getCode());
+ }
+
+
+ @Test
+ public void handle_userNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new UserNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.user.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_viewMalformedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ViewMalformedException("msg"));
+ assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.BAD_REQUEST, body.getStatus());
+ assertEquals("error.view.invalid", body.getCode());
+ }
+
+
+ @Test
+ public void handle_viewNotFoundException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ViewNotFoundException("msg"));
+ assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.NOT_FOUND, body.getStatus());
+ assertEquals("error.view.missing", body.getCode());
+ }
+
+
+ @Test
+ public void handle_viewSchemaException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new ViewSchemaException("msg"));
+ assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertEquals("msg", body.getMessage());
+ assertEquals(HttpStatus.CONFLICT, body.getStatus());
+ assertEquals("error.schema.view", body.getCode());
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
new file mode 100644
index 0000000000..39aed0d28e
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -0,0 +1,85 @@
+package at.tuwien.service;
+
+import at.tuwien.entities.user.User;
+import at.tuwien.exception.AuthServiceException;
+import at.tuwien.exception.UserNotFoundException;
+import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.repository.UserRepository;
+import at.tuwien.test.AbstractUnitTest;
+import at.tuwien.utils.KeycloakUtils;
+import dasniko.testcontainers.keycloak.KeycloakContainer;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.images.PullPolicy;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@Log4j2
+@Testcontainers
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class UserServiceIntegrationTest extends AbstractUnitTest {
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private KeycloakUtils keycloakUtils;
+
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ /* keycloak */
+ userRepository.deleteAll();
+ keycloakUtils.deleteUser(USER_1_USERNAME);
+ }
+
+ @Container
+ private static KeycloakContainer keycloakContainer = new KeycloakContainer(KEYCLOAK_IMAGE)
+ .withImagePullPolicy(PullPolicy.alwaysPull())
+ .withAdminUsername("admin")
+ .withAdminPassword("admin")
+ .withRealmImportFile("./init/dbrepo-realm.json")
+ .withEnv("KC_HOSTNAME_STRICT_HTTPS", "false");
+
+ @DynamicPropertySource
+ static void keycloakProperties(DynamicPropertyRegistry registry) {
+ final String authServiceEndpoint = "http://localhost:" + keycloakContainer.getMappedPort(8080);
+ log.trace("set auth endpoint: {}", authServiceEndpoint);
+ registry.add("dbrepo.endpoints.authService", () -> authServiceEndpoint);
+ }
+
+ @Test
+ public void create_succeeds() throws UserNotFoundException, AuthServiceException {
+
+ /* test */
+ final User response = userService.create(USER_1_CREATE_USER_DTO);
+ assertEquals(USER_1_ID, response.getId());
+ assertEquals(USER_1_KEYCLOAK_ID, response.getKeycloakId());
+ assertEquals(USER_1_USERNAME, response.getUsername());
+ assertEquals(USER_1_THEME, response.getTheme());
+ assertNotNull(response.getMariadbPassword());
+ assertEquals(USER_1_LANGUAGE, response.getLanguage());
+ assertEquals(USER_1_FIRSTNAME, response.getFirstname());
+ assertEquals(USER_1_LASTNAME, response.getLastname());
+ assertEquals(USER_1_IS_INTERNAL, response.getIsInternal());
+ }
+
+}
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 514d23b227..eb228ab3c3 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
@@ -42,7 +42,7 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
public void beforeEach() {
genesis();
/* metadata database */
- userRepository.save(USER_1);
+ userRepository.saveAll(List.of(USER_1, USER_LOCAL));
}
@Test
@@ -54,6 +54,16 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
assertEquals(USER_1_USERNAME, response.getUsername());
}
+ @Test
+ public void findAllInternalUsers_succeeds() {
+
+ /* test */
+ final List<User> response = userService.findAllInternalUsers();
+ assertEquals(1, response.size());
+ final User user0 = response.get(0);
+ assertEquals(USER_LOCAL_ADMIN_ID, user0.getId());
+ }
+
@Test
public void findByUsername_fails() {
@@ -68,7 +78,7 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
/* test */
final List<User> response = userService.findAll();
- assertEquals(1, response.size());
+ assertEquals(2, response.size());
}
@Test
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 58d7cdc5e4..df13d00b08 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -93,12 +93,12 @@ public class UserServiceUnitTest extends AbstractUnitTest {
}
@Test
- public void updatePassword_succeeds() throws UserNotFoundException {
+ public void updatePassword_succeeds() throws UserNotFoundException, AuthServiceException {
/* mock */
doNothing()
.when(keycloakGateway)
- .updateUserCredentials(USER_1_ID, USER_1_PASSWORD_DTO);
+ .setupFinished(USER_1_ID);
when(userRepository.findById(USER_1_ID))
.thenReturn(Optional.of(USER_1));
when(userRepository.save(any(User.class)))
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 486db28e59..8105a7fb89 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
@@ -52,9 +52,27 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
public static Stream<Arguments> needSize_parameters() {
return Stream.of(
- Arguments.arguments(ColumnTypeDto.VARCHAR),
- Arguments.arguments(ColumnTypeDto.BINARY),
- Arguments.arguments(ColumnTypeDto.VARBINARY)
+ Arguments.arguments("varchar", ColumnTypeDto.VARCHAR),
+ Arguments.arguments("binary", ColumnTypeDto.BINARY),
+ Arguments.arguments("varbinary", ColumnTypeDto.VARBINARY)
+ );
+ }
+
+ public static Stream<Arguments> needSizeAndD_parameters() {
+ return Stream.of(
+ Arguments.arguments("double_size", ColumnTypeDto.DOUBLE, 40L, null),
+ Arguments.arguments("double_d", ColumnTypeDto.DOUBLE, null, 10L),
+ Arguments.arguments("decimal_size", ColumnTypeDto.DECIMAL, 40L, null),
+ Arguments.arguments("decimal_d", ColumnTypeDto.DECIMAL, null, 10L)
+ );
+ }
+
+ public static Stream<Arguments> enums_parameters() {
+ return Stream.of(
+ Arguments.arguments("enums_null", ColumnTypeDto.ENUM, null),
+ Arguments.arguments("enums_empty", ColumnTypeDto.ENUM, List.of()),
+ Arguments.arguments("sets_null", ColumnTypeDto.SET, null),
+ Arguments.arguments("sets_empty", ColumnTypeDto.SET, List.of())
);
}
@@ -244,6 +262,20 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
endpointValidator.validateOnlyWriteOwnOrWriteAllAccess(TABLE_1, USER_1);
}
+ @Test
+ public void validateOnlyWriteOwnOrWriteAllAccess_writeOwnAccess_succeeds() throws DatabaseNotFoundException,
+ TableNotFoundException, AccessNotFoundException, NotAllowedException {
+
+ /* mock */
+ when(tableService.findById(DATABASE_1, TABLE_1_ID))
+ .thenReturn(TABLE_1);
+ when(accessService.find(eq(DATABASE_1), any(User.class)))
+ .thenReturn(DATABASE_1_USER_1_WRITE_OWN_ACCESS);
+
+ /* test */
+ endpointValidator.validateOnlyWriteOwnOrWriteAllAccess(TABLE_1, USER_1);
+ }
+
@Test
public void validateOnlyWriteOwnOrWriteAllAccess_privateHasReadAccess_fails() throws DatabaseNotFoundException,
TableNotFoundException, AccessNotFoundException {
@@ -285,7 +317,7 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
@ParameterizedTest
@MethodSource("needSize_parameters")
- public void validateColumnCreateConstraints_needSize_fails(ColumnTypeDto type) {
+ public void validateColumnCreateConstraints_needSize_fails(String name, ColumnTypeDto type) {
final CreateTableDto request = CreateTableDto.builder()
.columns(List.of(CreateTableColumnDto.builder()
.type(type)
@@ -299,12 +331,13 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
});
}
- @Test
- public void validateColumnCreateConstraints_needEnum_fails() {
+ @ParameterizedTest
+ @MethodSource("enums_parameters")
+ public void validateColumnCreateConstraints_needEnum_fails(String name, ColumnTypeDto type, List<String> enums) {
final CreateTableDto request = CreateTableDto.builder()
.columns(List.of(CreateTableColumnDto.builder()
- .type(ColumnTypeDto.ENUM)
- .enums(null) // <<<<<<<
+ .type(type)
+ .enums(enums)
.build()))
.build();
@@ -314,12 +347,14 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
});
}
- @Test
- public void validateColumnCreateConstraints_needSet_fails() {
+ @ParameterizedTest
+ @MethodSource("needSizeAndD_parameters")
+ public void validateColumnCreateConstraints_needSizeAndD_fails(String name, ColumnTypeDto type, Long size, Long d) {
final CreateTableDto request = CreateTableDto.builder()
.columns(List.of(CreateTableColumnDto.builder()
- .type(ColumnTypeDto.SET)
- .sets(null) // <<<<<<<
+ .type(type)
+ .size(size)
+ .d(d)
.build()))
.build();
@@ -345,6 +380,34 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
});
}
+ @Test
+ public void validateOnlyOwnerOrWriteAll_writeOwnAccess_succeeds() throws DatabaseNotFoundException,
+ TableNotFoundException, AccessNotFoundException, NotAllowedException {
+
+ /* mock */
+ when(tableService.findById(DATABASE_1, TABLE_1_ID))
+ .thenReturn(TABLE_1);
+ when(accessService.find(DATABASE_1, USER_1))
+ .thenReturn(DATABASE_1_USER_1_WRITE_OWN_ACCESS);
+
+ /* test */
+ endpointValidator.validateOnlyOwnerOrWriteAll(TABLE_1, USER_1);
+ }
+
+ @Test
+ public void validateOnlyOwnerOrWriteAll_writeAllAccess_succeeds() throws DatabaseNotFoundException,
+ TableNotFoundException, AccessNotFoundException, NotAllowedException {
+
+ /* mock */
+ when(tableService.findById(DATABASE_1, TABLE_1_ID))
+ .thenReturn(TABLE_1);
+ when(accessService.find(DATABASE_1, USER_2))
+ .thenReturn(DATABASE_1_USER_2_WRITE_ALL_ACCESS);
+
+ /* test */
+ endpointValidator.validateOnlyOwnerOrWriteAll(TABLE_1, USER_2);
+ }
+
@Test
public void validateOnlyPrivateDataHasRole_publicDatabase_succeeds() throws NotAllowedException {
@@ -555,6 +618,13 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
assertTrue(endpointValidator.validateOnlyMineOrWriteAccessOrHasRole(USER_1, USER_1_PRINCIPAL, DATABASE_1_USER_1_WRITE_OWN_ACCESS, "nobody-role"));
}
+ @Test
+ public void validateOnlyMineOrWriteAccessOrHasRole_ownerOnlyWriteAll_succeeds() {
+
+ /* test */
+ assertTrue(endpointValidator.validateOnlyMineOrWriteAccessOrHasRole(USER_1, USER_1_PRINCIPAL, DATABASE_1_USER_1_WRITE_ALL_ACCESS, "nobody-role"));
+ }
+
@Test
public void validateOnlyMineOrWriteAccessOrHasRole_notOwnerOnlyWriteOwn_fails() {
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index 906fa5258b..e918d3ae24 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<name>dbrepo-metadata-service-services</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index cd5fd08a7e..296457b3d8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -1,7 +1,6 @@
package at.tuwien.gateway;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserNotFoundException;
@@ -22,13 +21,7 @@ public interface KeycloakGateway {
*/
void deleteUser(UUID id) throws UserNotFoundException;
- /**
- * Update the credentials for a given user.
- *
- * @param id The user id.
- * @param password The user credential.
- */
- void updateUserCredentials(UUID id, UserPasswordDto password) throws UserNotFoundException;
+ void setupFinished(UUID id) throws AuthServiceException, UserNotFoundException;
void updateUser(UUID id, UserUpdateDto data) throws AuthServiceException, UserNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index af54651d6c..270653ee8f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -1,14 +1,12 @@
package at.tuwien.gateway.impl;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.config.KeycloakConfig;
import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.mapper.MetadataMapper;
-import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.ForbiddenException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.core.Response;
@@ -17,7 +15,6 @@ import org.keycloak.OAuth2Constants;
import org.keycloak.admin.client.Keycloak;
import org.keycloak.admin.client.KeycloakBuilder;
import org.keycloak.admin.client.resource.UserResource;
-import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.springframework.stereotype.Service;
@@ -80,21 +77,25 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
}
@Override
- public void updateUserCredentials(UUID id, UserPasswordDto data) throws UserNotFoundException {
- final CredentialRepresentation credential = new CredentialRepresentation();
- credential.setTemporary(false);
- credential.setValue(data.getPassword());
- credential.setType(CredentialRepresentation.PASSWORD);
+ public void setupFinished(UUID id) throws AuthServiceException, UserNotFoundException {
+ final UserResource resource = keycloak.realm(keycloakConfig.getRealm())
+ .users()
+ .get(String.valueOf(id));
+ final UserRepresentation user;
try {
- keycloak.realm(keycloakConfig.getRealm())
- .users()
- .get(String.valueOf(id))
- .resetPassword(credential);
+ user = resource.toRepresentation();
} catch (NotFoundException e) {
- log.error("Failed to update user password: not found");
- throw new UserNotFoundException("Failed to update user password: not found", e);
+ log.error("Failed to update user setup: not found: {}", e.getMessage());
+ throw new UserNotFoundException("Failed to update user setup: not found", e);
+ }
+ user.singleAttribute("SETUP_FINISHED", "true");
+ try {
+ resource.update(user);
+ } catch (ForbiddenException e) {
+ log.error("Failed to update user setup: forbidden: {}", e.getMessage());
+ throw new AuthServiceException("Failed to update user setup: forbidden", e);
}
- log.info("Updated user {} password at auth service", id);
+ log.info("Updated user {} setup at auth service", id);
}
@Override
@@ -102,7 +103,7 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
final UserResource resource = keycloak.realm(keycloakConfig.getRealm())
.users()
.get(String.valueOf(id));
- UserRepresentation user;
+ final UserRepresentation user;
try {
user = resource.toRepresentation();
} catch (NotFoundException e) {
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 75b647bf95..3abe07a10a 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,6 +1,5 @@
package at.tuwien.service;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AuthServiceConnectionException;
import at.tuwien.exception.AuthServiceException;
@@ -23,8 +22,7 @@ public interface AuthenticationService {
* Updates the password of a user with given id.
*
* @param user The user.
- * @param data The new password.
* @throws UserNotFoundException The user was not found after creation in the auth database.
*/
- void updatePassword(User user, UserPasswordDto data) throws UserNotFoundException;
+ void setupFinished(User user) throws UserNotFoundException, AuthServiceException;
}
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 581641a93a..c6ca0ff21e 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
@@ -4,7 +4,6 @@ import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceConnectionException;
import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserExistsException;
import at.tuwien.exception.UserNotFoundException;
@@ -47,7 +46,7 @@ public interface UserService {
* @param data The user data.
* @return The user, if successful.
*/
- User create(CreateUserDto data) throws UserNotFoundException, AuthServiceException;
+ User create(CreateUserDto data);
/**
* 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/impl/AuthenticationServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
index 1159913039..dec3577886 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,10 +1,7 @@
package at.tuwien.service.impl;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceConnectionException;
import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.CredentialsInvalidException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.service.AuthenticationService;
@@ -29,8 +26,8 @@ public class AuthenticationServiceImpl implements AuthenticationService {
}
@Override
- public void updatePassword(User user, UserPasswordDto data) throws UserNotFoundException {
- keycloakGateway.updateUserCredentials(user.getKeycloakId(), data);
+ public void setupFinished(User user) throws AuthServiceException, UserNotFoundException {
+ keycloakGateway.setupFinished(user.getKeycloakId());
}
}
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 1d582bb975..e79dd9bd84 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
@@ -65,14 +65,14 @@ public class UserServiceImpl implements UserService {
}
@Override
- public User create(CreateUserDto data) throws UserNotFoundException, AuthServiceException {
+ public User create(CreateUserDto data) {
/* create at authentication service */
final User entity = User.builder()
.id(data.getLdapId())
.keycloakId(data.getId())
.username(data.getUsername())
.theme("light")
- .mariadbPassword(getMariaDbPassword(RandomStringUtils.randomAlphabetic(10))) /* user needs to set it later to access */
+ .mariadbPassword(getMariaDbPassword(RandomStringUtils.randomAlphabetic(10)))
.language("en")
.firstname(data.getGivenName())
.lastname(data.getFamilyName())
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index 792523227e..4aa6188f9f 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.7.0</version>
+ <version>1.6.4</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<name>dbrepo-metadata-service-test</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<dependencies>
<dependency>
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 bccf903b8b..860eeb8253 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
@@ -5,6 +5,7 @@ import at.tuwien.api.amqp.CreateVirtualHostDto;
import at.tuwien.api.amqp.ExchangeDto;
import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.api.amqp.QueueDto;
+import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.auth.LoginRequestDto;
import at.tuwien.api.auth.RefreshTokenRequestDto;
import at.tuwien.api.container.ContainerBriefDto;
@@ -478,8 +479,6 @@ public abstract class BaseTest {
@SuppressWarnings("java:S2068")
public final static String USER_1_PASSWORD = "junit1";
@SuppressWarnings("java:S2068")
- public final static String USER_1_PASSWORD_ENCODED = "$2a$10$0dtdedA/RLTrFbUsvpbUw.I73AXOKeQP3t5UXj96OvnDEaDb3d3M6";
- @SuppressWarnings("java:S2068")
public final static String USER_1_DATABASE_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA" /* junit1 */;
public final static String USER_1_FIRSTNAME = "John";
public final static String USER_1_LASTNAME = "Doe";
@@ -487,18 +486,11 @@ public abstract class BaseTest {
public final static String USER_1_NAME = "John Doe";
public final static String USER_1_AFFILIATION = "TU Graz";
public final static String USER_1_ORCID_URL = "https://orcid.org/0000-0003-4216-302X";
- public final static String USER_1_TITLES_BEFORE = "Dr.";
- public final static String USER_1_TITLES_AFTER = "MSc BSc";
- public final static Boolean USER_1_VERIFIED = false;
- public final static Boolean USER_1_TOTP = false;
- public final static Long USER_1_NOT_BEFORE = 0L;
public final static Boolean USER_1_ENABLED = true;
public final static Boolean USER_1_IS_INTERNAL = false;
public final static String USER_1_THEME = "light";
public final static String USER_1_LANGUAGE = "en";
public final static Instant USER_1_CREATED = Instant.ofEpochSecond(1677399441L) /* 2023-02-26 08:17:21 (UTC) */;
- public final static Instant USER_1_LAST_MODIFIED = USER_1_CREATED;
- public final static UUID USER_1_REALM_ID = REALM_DBREPO_ID;
public final static UpdateUserPasswordDto USER_1_UPDATE_PASSWORD_DTO = UpdateUserPasswordDto.builder()
.username(USER_1_USERNAME)
@@ -568,6 +560,14 @@ public abstract class BaseTest {
.qualifiedName(USER_1_QUALIFIED_NAME)
.build();
+ public final static CreateUserDto USER_1_CREATE_USER_DTO = CreateUserDto.builder()
+ .id(USER_1_KEYCLOAK_ID)
+ .ldapId(USER_1_ID)
+ .givenName(USER_1_FIRSTNAME)
+ .familyName(USER_1_LASTNAME)
+ .username(USER_1_USERNAME)
+ .build();
+
public final static UserUpdateDto USER_1_UPDATE_DTO = UserUpdateDto.builder()
.firstname(USER_1_FIRSTNAME)
.lastname(USER_1_LASTNAME)
@@ -608,7 +608,6 @@ public abstract class BaseTest {
public final static UUID USER_2_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
public final static UUID USER_2_KEYCLOAK_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
- public final static String USER_2_EMAIL = "jane.doe@example.com";
public final static String USER_2_USERNAME = "junit2";
public final static String USER_2_FIRSTNAME = "Jane";
public final static String USER_2_LASTNAME = "Doe";
@@ -620,16 +619,9 @@ public abstract class BaseTest {
@SuppressWarnings("java:S2068")
public final static String USER_2_DATABASE_PASSWORD = "*9AA70A8B0EEFAFCB5BED5BDEF6EE264D5DA915AE" /* junit2 */;
public final static String USER_2_QUALIFIED_NAME = USER_2_FIRSTNAME + " " + USER_2_LASTNAME + " — @" + USER_2_USERNAME;
- public final static Boolean USER_2_VERIFIED = true;
- public final static Boolean USER_2_TOTP = false;
- public final static Long USER_2_NOT_BEFORE = 0L;
- public final static Boolean USER_2_ENABLED = true;
public final static Boolean USER_2_IS_INTERNAL = false;
public final static String USER_2_THEME = "light";
public final static String USER_2_LANGUAGE = "de";
- public final static Instant USER_2_CREATED = Instant.ofEpochSecond(1677399528L) /* 2023-02-26 08:18:48 (UTC) */;
- public final static Instant USER_2_LAST_MODIFIED = USER_1_CREATED;
- public final static UUID USER_2_REALM_ID = REALM_DBREPO_ID;
public final static UserAttributesDto USER_2_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_2_THEME)
@@ -697,20 +689,13 @@ public abstract class BaseTest {
public final static String USER_3_AFFILIATION = "TU Wien";
public final static String USER_3_ORCID_URL = null;
public final static String USER_3_ORCID_UNCOMPRESSED = null;
- public final static String USER_3_EMAIL = "system@example.com";
@SuppressWarnings("java:S2068")
public final static String USER_3_PASSWORD = "password";
@SuppressWarnings("java:S2068")
public final static String USER_3_DATABASE_PASSWORD = "*D65FCA043964B63E849DD6334699ECB065905DA4" /* junit3 */;
public final static String USER_3_QUALIFIED_NAME = USER_3_FIRSTNAME + " " + USER_3_LASTNAME + " — @" + USER_3_USERNAME;
- public final static Boolean USER_3_VERIFIED = true;
- public final static Boolean USER_3_TOTP = false;
- public final static Long USER_3_NOT_BEFORE = 0L;
- public final static Boolean USER_3_ENABLED = true;
public final static Boolean USER_3_IS_INTERNAL = false;
public final static String USER_3_THEME = "light";
- public final static Instant USER_3_CREATED = Instant.ofEpochSecond(1677399559L) /* 2023-02-26 08:19:19 (UTC) */;
- public final static UUID USER_3_REALM_ID = REALM_DBREPO_ID;
public final static UserAttributesDto USER_3_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_3_THEME)
@@ -779,12 +764,8 @@ public abstract class BaseTest {
@SuppressWarnings("java:S2068")
public final static String USER_4_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit4 */;
public final static String USER_4_QUALIFIED_NAME = USER_4_FIRSTNAME + " " + USER_4_LASTNAME + " — @" + USER_4_USERNAME;
- public final static Boolean USER_4_VERIFIED = true;
- public final static Boolean USER_4_ENABLED = true;
public final static Boolean USER_4_IS_INTERNAL = false;
public final static String USER_4_THEME = "light";
- public final static Instant USER_4_CREATED = Instant.ofEpochSecond(1677399592L) /* 2023-02-26 08:19:52 (UTC) */;
- public final static UUID USER_4_REALM_ID = REALM_DBREPO_ID;
public final static UserAttributesDto USER_4_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_4_THEME)
@@ -842,18 +823,13 @@ public abstract class BaseTest {
public final static String USER_5_LASTNAME = "Body";
public final static String USER_5_NAME = "No Body";
public final static String USER_5_AFFILIATION = "TU Wien";
- public final static String USER_5_ORCID = null;
@SuppressWarnings("java:S2068")
public final static String USER_5_PASSWORD = "junit5";
@SuppressWarnings("java:S2068")
public final static String USER_5_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
public final static String USER_5_QUALIFIED_NAME = USER_5_FIRSTNAME + " " + USER_5_LASTNAME + " — @" + USER_5_USERNAME;
- public final static Boolean USER_5_VERIFIED = true;
- public final static Boolean USER_5_ENABLED = true;
public final static Boolean USER_5_IS_INTERNAL = false;
public final static String USER_5_THEME = "dark";
- public final static Instant USER_5_CREATED = Instant.ofEpochSecond(1677399592L) /* 2023-02-26 08:19:52 (UTC) */;
- public final static UUID USER_5_REALM_ID = REALM_DBREPO_ID;
public final static UserAttributesDto USER_5_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_5_THEME)
@@ -7680,6 +7656,21 @@ public abstract class BaseTest {
.user(USER_3_BRIEF_DTO)
.build();
+ public final static DatabaseAccess DATABASE_1_USER_4_READ_ACCESS = DatabaseAccess.builder()
+ .type(AccessType.READ)
+ .hdbid(DATABASE_1_ID)
+ .database(DATABASE_1)
+ .huserid(USER_4_ID)
+ .user(USER_4)
+ .build();
+
+ public final static DatabaseAccessDto DATABASE_1_USER_4_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ .type(AccessTypeDto.READ)
+ .hdbid(DATABASE_1_ID)
+ .huserid(USER_4_ID)
+ .user(USER_4_BRIEF_DTO)
+ .build();
+
public final static Database DATABASE_2 = Database.builder()
.id(DATABASE_2_ID)
.created(DATABASE_2_CREATED)
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index 6284708cc1..4e3f996802 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -18,7 +18,7 @@ jwt = "~=1.3"
testcontainers-opensearch = "*"
pytest = "*"
rdflib = "*"
-dbrepo = {path = "./lib/dbrepo-1.7.0.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
gunicorn = "*"
[dev-packages]
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 4fc5ec3cab..87013913cd 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "30aa6fefdbdbb9f57d58ebc8660eee64445a831cea44c6ca1fa605f2a2e1adc3"
+ "sha256": "c22580f5873b7bd3fc1edb71c84b7269ae79da6a2554225fe8d95cab6af9f14d"
},
"pipfile-spec": 6,
"requires": {
@@ -369,9 +369,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:f25d5adbd618bf2906578e671af2bf3bcc24d738ef8bc791c220e7e5b714e2f7"
+ "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
],
- "path": "./lib/dbrepo-1.7.0.tar.gz"
+ "path": "./lib/dbrepo-1.6.4.tar.gz"
},
"docker": {
"hashes": [
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..d083b0bafc937528fdcc09634c41132578cbf345
GIT binary patch
literal 30969
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
bZWAF@Nq{#i8%QZ110TaRW(Ee{QV<US?`Zyw
literal 0
HcmV?d00001
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..87e9a503ebc621238ebe7efca15f2bdf0a6e1a85
GIT binary patch
literal 40698
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
Bo(KQ{
literal 0
HcmV?d00001
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..d083b0bafc937528fdcc09634c41132578cbf345
GIT binary patch
literal 30969
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
bZWAF@Nq{#i8%QZ110TaRW(Ee{QV<US?`Zyw
literal 0
HcmV?d00001
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..87e9a503ebc621238ebe7efca15f2bdf0a6e1a85
GIT binary patch
literal 40698
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
Bo(KQ{
literal 0
HcmV?d00001
diff --git a/dbrepo-ui/composables/authentication-service.ts b/dbrepo-ui/composables/authentication-service.ts
deleted file mode 100644
index 39f6cc5a3f..0000000000
--- a/dbrepo-ui/composables/authentication-service.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {jwtDecode} from 'jwt-decode'
-
-export const useAuthenticationService = (): any => {
-
- function isExpiredToken(token: string): boolean {
- if (!token) {
- return false
- }
- return tokenToExpiryDate(token) < Date.now()
- }
-
- function tokenToExpiryDate(token: string): number {
- if (!token) {
- return -1
- }
- const exp: number = jwtDecode<Token>(token).exp
- if (exp) {
- return exp * 1000
- }
- return -1
- }
-
- return {isExpiredToken, tokenToExpiryDate}
-}
diff --git a/dbrepo-ui/composables/axios-instance.ts b/dbrepo-ui/composables/axios-instance.ts
index ca7a7b111c..cd3737f2bf 100644
--- a/dbrepo-ui/composables/axios-instance.ts
+++ b/dbrepo-ui/composables/axios-instance.ts
@@ -16,7 +16,7 @@ export const useAxiosInstance = () => {
baseURL: config.public.api.client
});
instance.interceptors.request.use((config) => {
- const { loggedIn, user, login, logout } = useOidcAuth()
+ const { loggedIn, user } = useOidcAuth()
if (!loggedIn) {
return config
}
diff --git a/dbrepo-ui/composables/user-service.ts b/dbrepo-ui/composables/user-service.ts
index 3425dbaa5c..b90ee34033 100644
--- a/dbrepo-ui/composables/user-service.ts
+++ b/dbrepo-ui/composables/user-service.ts
@@ -1,5 +1,3 @@
-import {jwtDecode} from 'jwt-decode'
-import axios from 'axios'
import {axiosErrorToApiError} from '@/utils'
export const useUserService = (): any => {
@@ -80,36 +78,6 @@ export const useUserService = (): any => {
})
}
- async function refreshToken(refreshToken: string): Promise<KeycloakOpenIdTokenDto> {
- console.debug('refresh user token')
- return new Promise<KeycloakOpenIdTokenDto>((resolve, reject) => {
- const config = useRuntimeConfig()
- const instance = axios.create({
- timeout: 90_000,
- params: {},
- baseURL: config.public.api.client
- })
- instance.put<KeycloakOpenIdTokenDto>('/api/user/token', {refresh_token: refreshToken})
- .then((response) => {
- console.info('Refreshed user token')
- const userStore = useUserStore()
- // eslint-disable-next-line camelcase
- const {access_token, refresh_token} = response.data
- userStore.setToken(access_token)
- userStore.setRefreshToken(refresh_token)
- resolve(response.data)
- }).catch((error) => {
- console.error('Failed to refresh user token', error)
- reject(axiosErrorToApiError(error))
- })
- })
- }
-
- function tokenToRoles(token: string): string[] {
- const data: Token = jwtDecode<Token>(token)
- return data.realm_access.roles || []
- }
-
function nameIdentifierToNameIdentifierScheme(nameIdentifier: string) {
if (nameIdentifier.includes('orcid.org')) {
return 'ORCID'
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index a26c6d2539..85d530e74d 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -141,12 +141,30 @@
</v-form>
<v-main>
<v-container>
- <slot />
+ <div
+ v-cloak>
+ <v-alert
+ v-if="isNotFinishedAccountSetup"
+ border="start"
+ color="info"
+ class="mb-4">
+ {{ $t('pages.settings.subpages.authentication.setup.text') }}
+ <v-btn
+ variant="flat"
+ size="small"
+ to="/user/authentication">
+ {{ $t('pages.settings.subpages.authentication.setup.action') }}
+ </v-btn>
+ .
+ </v-alert>
+ </div>
<JumboBox
v-if="error"
:title="$t(errorCodeKey(error).title, { resource })"
:subtitle="$t(errorCodeKey(error).subtitle)"
:text="$t(errorCodeKey(error).text, { resource })" />
+ <slot
+ v-else />
</v-container>
</v-main>
</v-app>
@@ -251,6 +269,15 @@ export default {
commitShort () {
return this.$config.public.commit.substr(0, 8)
},
+ isNotFinishedAccountSetup () {
+ if (!this.cacheUser) {
+ return false
+ }
+ if (!('setup_finished' in this.cacheUser)) {
+ return true
+ }
+ return this.cacheUser.setup_finished === false
+ },
error () {
if (this.identifier) {
return null
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index 07ac0163ef..d17da2341d 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -794,11 +794,11 @@
},
"firstname": {
"label": "Given Name",
- "hint": ""
+ "hint": "Managed by your identity provider: {provider}"
},
"lastname": {
"label": "Family Name",
- "hint": ""
+ "hint": "Managed by your identity provider: {provider}"
},
"affiliation": {
"label": "Affiliation Identifier",
@@ -834,8 +834,12 @@
"settings": {
"subpages": {
"authentication": {
- "title": "User Password",
- "subtitle": "Update the user password used for basic authentication with all interfaces",
+ "title": "API Password",
+ "subtitle": "Update the user password used for authentication with all interfaces (e.g. HTTP API, AMQP API, MQTT API)",
+ "setup": {
+ "text": "Finish your account setup by setting the",
+ "action": "API Password"
+ },
"password": {
"label": "Password",
"hint": "Required"
diff --git a/dbrepo-ui/pages/user/authentication.vue b/dbrepo-ui/pages/user/authentication.vue
index 50008d3c5d..912c1878c4 100644
--- a/dbrepo-ui/pages/user/authentication.vue
+++ b/dbrepo-ui/pages/user/authentication.vue
@@ -61,7 +61,7 @@
</template>
<script setup>
-const { loggedIn } = useOidcAuth()
+const { loggedIn, user } = useOidcAuth()
</script>
<script>
import UserToolbar from '@/components/user/UserToolbar.vue'
@@ -113,11 +113,20 @@ export default {
const userService = useUserService()
userService.updatePassword(this.cacheUser.uid, {'password': this.password})
.then(() => {
+ const user = Object.assign({}, this.cacheUser)
+ user.setup_finished = true
+ this.cacheStore.setUser(user)
+ // fixme [mweise]: currently nuxt-oidc-auth cannot refresh the session correctly
const toast = useToastInstance()
toast.success(this.$t('success.user.password'))
this.loadingUpdate = false
})
- .catch(() => {
+ .catch(({code, message}) => {
+ const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
+ toast.error(message)
this.loadingUpdate = false
})
.finally(() => {
diff --git a/dbrepo-ui/pages/user/info.vue b/dbrepo-ui/pages/user/info.vue
index 8674c57e2d..9c8dbf873d 100644
--- a/dbrepo-ui/pages/user/info.vue
+++ b/dbrepo-ui/pages/user/info.vue
@@ -74,24 +74,24 @@
<v-col md="6">
<v-text-field
v-model="model.firstname"
- :disabled="!canModifyInformation"
+ :disabled="!canModifyInformation || identityProvider"
clearable
persistent-hint
:variant="inputVariant"
:label="$t('pages.user.subpages.info.firstname.label')"
- :hint="$t('pages.user.subpages.info.firstname.hint')" />
+ :hint="identityProvider ? $t('pages.user.subpages.info.firstname.hint', { provider: identityProvider }) : ''" />
</v-col>
</v-row>
<v-row dense>
<v-col md="6">
<v-text-field
v-model="model.lastname"
- :disabled="!canModifyInformation"
+ :disabled="!canModifyInformation || identityProvider"
clearable
persistent-hint
:variant="inputVariant"
:label="$t('pages.user.subpages.info.lastname.label')"
- :hint="$t('pages.user.subpages.info.lastname.hint')" />
+ :hint="identityProvider ? $t('pages.user.subpages.info.lastname.hint', { provider: identityProvider }) : ''" />
</v-col>
</v-row>
<v-row dense>
@@ -191,6 +191,12 @@ export default {
cacheUser () {
return this.cacheStore.getUser
},
+ identityProvider () {
+ if (!this.cacheUser || !('identity_provider' in this.cacheUser)) {
+ return false
+ }
+ return this.cacheUser.identity_provider
+ },
canModifyInformation () {
if (!this.roles) {
return false
diff --git a/dbrepo-upload-service/pom.xml b/dbrepo-upload-service/pom.xml
index 9a5531c0be..7e4f27586e 100644
--- a/dbrepo-upload-service/pom.xml
+++ b/dbrepo-upload-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-upload-service</artifactId>
<name>dbrepo-upload-service</name>
- <version>1.7.0</version>
+ <version>1.6.4</version>
<url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/</url>
<developers>
diff --git a/docker-compose.yml b/docker-compose.yml
index 9176f6404a..94b5fc30a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,7 +96,7 @@ services:
KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
- METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}/api/user"
+ METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck:
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index b6fa24359a..9418fa7c66 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -7,14 +7,14 @@ description: Helm Chart for installing DBRepo
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.7.0"
-appVersion: "1.7.0"
+version: "1.6.4"
+appVersion: "1.6.4"
keywords:
- dbrepo
maintainers:
- name: Martin Weise
email: martin.weise@tuwien.ac.at
-home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
+home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-ui/public/favicon.png
dependencies:
- name: opensearch
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 086b635a63..88051e6035 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -1,17 +1,17 @@
# DBRepo Helm chart
-[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/) is a database repository system that
+[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/) is a database repository system that
allows researchers to ingest data into a central, versioned repository through common interfaces.
## TL;DR
Download the
sample [
-`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/helm-charts/dbrepo/values.yaml?inline=true)
+`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/helm-charts/dbrepo/values.yaml?inline=true)
for your deployment and update the variables, especially `hostname`.
```bash
-helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.7.0"
+helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.6.4"
```
## Prerequisites
@@ -28,7 +28,7 @@ helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo"
To install the chart with the release name `my-release`:
```bash
-helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.7.0"
+helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.6.4"
```
The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the
@@ -68,7 +68,7 @@ The command removes all the Kubernetes components associated with the chart and
| ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
| `metadatadb.enabled` | Enable the Metadata datadb. | `true` |
| `metadatadb.host` | The hostname for the microservices. | `metadata-db` |
-| `metadatadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
+| `metadatadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
| `metadatadb.rootUser.user` | The root username. | `root` |
| `metadatadb.rootUser.password` | The root user password. | `dbrepo` |
| `metadatadb.db.name` | The database name. | `dbrepo` |
@@ -101,7 +101,7 @@ The command removes all the Kubernetes components associated with the chart and
| Name | Description | Value |
| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
| `datadb.host` | The hostname for the microservices. | `data-db` |
-| `datadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
+| `datadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
| `datadb.rootUser.user` | The root username. | `root` |
| `datadb.rootUser.password` | The root user password. | `dbrepo` |
| `datadb.db.name` | The database name. | `dbrepo` |
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index a23243d39509ec3821219e5799a25740c93e2ca1..a970096eeaa5015d9e95064f6b341fffdf8aae5f 100644
GIT binary patch
delta 6843
zcmbQ_|Ic4Kz?+#xgn@yBgW<cfZ`Az{I%Wlo3=C(O7#Kt*UsMvW?+uFeKV%?M8^7uQ
z1^WwO5<E9&zi1Y^$a3`i?r(ll+xoVYJOA68`k>>;3eWxTU)nBzUdDJ$<VENHg`byg
zla%gQZLzDAqh;3lZ<5gt-P7(`Y&Fxhn$~fV(J<R*<<FS>AE(7acbIi9K72~Vjj`3|
z&((lV$;&$r=bl}-(DeI@sKp=Zg>Dw}@4hnKadr0ejX&3XoA<POo6FgEjgMX|yfrOi
z;nMv-^%mUcIQpaghrMO^>Ek_XJGa?QF4}&ZGq}R>?70P^3s@$YY%6$h(zHveJx=cF
zNeeEw<%zSLxoz*uK4Z(N{}DPd;qB(<?OZ85T66n${S^**xU>J5nf%>-$CoQznZU1J
z|EHxkP;~#=wXUwQcUEgvn_nr_JiH^XXyGfbyn^+oq|E+0wJZp^8~@-2+u4T?_n6GP
zu*h01E-BkD&M7d)x9een$%*4pOD|^%-BR!@jN*A<<?l9OiRP=vd#7rjKlgW;<0R)P
zp&tb9MtZBOa9Cw>x*fZy4vG;j1_llWP>f98%&5ZrP1$$yEk<4D@5;WDxtQd@v^J9}
zm=0#r0@DplCSZCylNVS$3-ehpeTBIjB)&O`WeyWBD2loN3I4go!N9O?GB>+oeTcj4
zf4_CxZ`#Z%QJk=}HP2GmDPom_B4d^i(~-QsG-rbak50c+soZdL`=0M+A{Vmu=Gro>
z-xl?8#iDE6QD%l4mu4LedjH#Q^|jsiezD7cw9YTiNpOBDoR*fp@AK^YHTBo`sQ<VA
zrqQ7LqhFp?<4VAi#S*GaqQ83+mFE~tVt!cPx9_jfGp;E)W|Nog4qdQe*Rtd6^Bp#<
zUAnt4I=TGuz6|eh|Lo$^`=))%oh!Tc?cKT`fy*4P8?s+NGeOMu&5ojuOKeNDCm&|g
zUZrfgdR?v>yHwV?Ia;o)>#ho1Fckl+ak1cV-meLolOH}~iGCG6V*?wDn43<u!k+!-
zi{==pv+bximr2xr%O?MfTW412^IsQ=j`wS^nCe_9lwBvjVwSJi*Z$M{zBueZaLVSF
zyI%VGh0BijAKl^T>~Xv|!f3Kk{^W)<D_v*J?;DPPkmEhgGR<dklrX1df{N7J#xDZz
zZx>bjEQ`79^=pGuLbZ3%jV)`JL~-&;Z_E6mnv!vCb(@d+l=>}qCMe&Xkh(fPNOsS$
z{-rCz<N}lfW}esEQoYupa*O$`yO*}*i$C3FzHRG|0QC))>$#>Yrd!`=-*Dj0=>w+}
z?CzM<#-%5l?ApCJdp7_1+G(HFCT^Z9zToou>l+;{pEoH!Zphg-$?)*q++EEwmg^>#
zyyTYN=;^$-k1a>+g00!4OZB|(Uu7-*o4m~=##8w0yZyos*i<uD_eFoOX-v9)>#FF&
zzpK+5lvqp`Mjkek)xBZ&+2YXpjX_49S0|OINzJXRyZP_sRyJPiopxJyTrLeZW~h5}
z;B)C6u2Z_o#<$n>ZJF(5+|sq`yN2-g;wv`=--aFVlijXazCvMxx15jn@!ZMp>KBOe
zJ1DHucq4YB;;Y0A+f}tM1ZP~HvCQGNO;XC%YQ`$lHy1aG>(A+#yd_)hkZ+r^`5NI5
z#-&?SlEY$-KKwe_=83~J-!+piizm--oBqP!!tsK0MM+T)Z!Ads?DX(ij(^?bP4_+2
z@2u?9+*$d6S8Lj1D;0_Vc3GE8ZcObv@aWae`t4WV<bFyPSl0H}ici6CrLWx9mAzlw
z?p{mDni0QuyC#1vquSfAr@W^1iSTi;EL(de^Kxp=RNr~3&QFh+y<c$If5wcvyWSnv
zeCa&vW8#t^PUB~i>U-`lY;L`jSAW;7^qr#Y_Gb4flUvpZ2hK8?aeuYiPi66)+H&RY
zqUHLb|DIi}FJg~d_fXX8-4SipXHRb*-C>zBTkB4jsIYC;`PHR++@`L2^v~s%WXP>O
ze#c*bY+GX%d&$#qlH`rTm#SC7c+36UTFc+BE4gIa{v<?+cY#2D5Z~XlsehtAUwC^w
zcEz=VIp1c4Y|^}YUq4s!{UkQs<qy}c>6)Cq_N3<D&8NMNZ+~4;&wkHSIQX~>L*_X}
zo%F``c?b4tso!7jah5x<M&|Ht(HC{gE@lRNi#WeUePzV7ivjy{d0Q7<lABhR!TZ1U
z&#E_j{jcu%&K>gn<Fvg$xo;WTEO^}fL!h~#>WFgMq>%Hg&qeS3`(s02|AWO_T9*d-
zKAkdYu8U9nx8xr?+WcSqSmI?>U;H^CLOu9Zc+=GPCQmC|p4`)nK3@JnQI=o(|A*tg
z>eGDdq>L<`qOF(Zygwe<^XkWzUEN;#xt9ui7$qGhcCFw1qvz2#!N$;V{-y66Z(A*S
zHNo9q^xVq|p8290OHZ6^caB}x@vP;cg-_4seUTE%k^Fk$Z?-LO|Fz`qTEB!f?rZ92
zOnfnOMUC)e*LMqEuGo6|zWbDrX`5ui3sa7D==k35Jo!av$EUC_0mrLXy)9ZY*QD*q
z6&LkTyOf)SQInJ`Y&Z7>vL7`we(~jxsOpM?+AZuViL7E@=gzkeH;}z){3v3>C$TRR
zkFN6g$MIyEQ1+r(oHJjiSzZgXI>viF;brG8w>R|;vnS44aNfRkVbH#_8;=~Bd|iI)
zr81v9bI}z#r(Z~^&SYJ6a#PIlt-T@J^sJt${#YvS|1eytZtbO$`7G0XFK4T@SH9<*
zwt0QuTemY?bJ8wW7sVzs%@Eyn+2fe-rAV=jYnWe#%zI;d+imL6&j&uUewnH?tJg*8
z)SA;qf1`^O4!PBz;#vNZ-|o-6YvNxIwc8uXMeaKj(P973XLY{0N03d3{H>dJ?@CVE
zcD8)FR@xlJNBTa_!W`GRG~1utKJ(c_@A93sUj%M<bA<+M?d)3dP@d`ZfBig@Ki#cA
zUIqN}5IeKHg4J8&$CStw`?M{zp3I1M$gw{jpZKk*_TwtSj>|G459&YXc<(t`WOFX;
zJktl(IqC6T`it5$^7MX4rJvTY7P{aTC}r9F$sskDjXUf7;q!GD_s%fxTe`RLsd7Z6
z-iEFj+pfk$&E32uN_S;%w#9CR4bx_Pvr2kZWN<!k#x27&%x;CnY|*c}n_MML?Am0%
z9zB@E7u|fcaT||S*!A9p+$;3!AHI)Wd_z`8@@ThFN2-BAo1#LqO8A?G*Stm&>#jH5
zTE)|s@?q10X$Mzdd6I4ZL#y`sqeGrLA%BI{1tpHh?wz{NaF3wG!RT|nk0ah&_<hm(
za@(!oJjcDz_*Hrz=N)nnm~gPVd8uU0g6;R}<wDa7v|gNl;JEdVrfF2ct4qOIk7w2g
z`*1zBxb3~n?U(`EmA-^OcQTJ|i_kYS(iE@SX3?0M^ZcUP)Ga4!q>32Rn<9>0teUnZ
zdIN{`&u1COd0)7480s8!ta~n_`pQq|d3PdfU$W{uXVZ7-{}tYTH^?&VySgP`R__Am
zzP_zLEb|T-N2qsga142nRw!%Mwe*I{wMC9=>W_zIZHde|Bvz>HA5vG?GA~f+P(_na
zgoTUbyeBIfs%(1o3qw3~<&IDPD0*$i;yw4n7yfx_A@?9tykd5t*AKRRoW1*1_qFDK
z?%v&DRl|PYb>)gjYxlX&nV-(~q4v*#$Er>8MSMR5|KD%h)E%)RvGAp9NXqU7uk;?~
zO(~l2`TCOj#CG!?%}#nsOCH{E{knG74<Uc?H=)I54f4S`g8Ww8@^wa{%H~y!4%hiZ
zdLCVD52(Avz2c?C$_KIaua2HOe?lpvIq6T6wtw~8_j|ta$Ng4cU&~gn>a{nQ{ip5+
z^J7=;fAs$&eegdcs7-}v<(l#?`MZOcfq_$gl7Lmc$tCGtIfb^P96h!tn6?~Dm@S~p
z=*Gdx=H@gpCGmhu-K@$<Y`tkm&PX%fdnAxvKFKWilEbVexwm$$-F-x5nq%awye*Np
zmSyiczV-FHm(%nz-`@KBzBWHiMS}O&uiA|lYs+m<*H5c{SM&AjPJPB3+VVULn5MGT
zsI3anU16PkHlqIFlBrVs^3t}+$7LM9&U4Xv_(nLy%#{E7fqp4wM&Ydnth061-#j^|
z`X*$Dc5-yzUEAd4b25}(-_W$aJm2%Y%A+#3gp{{AW)uBBx|qzB<oCZNo^*1HspLGb
z<8M>UYOYB0@49W3wNXZ!=gQ28&IJ$Fsm@urV2Xm}RMq}v&nCsN)nBQKTfw*VRF-h|
zhOmI8<r6MWI=9w&Z{t@rvj=4dkFl!fEUh<NlPIyvAeZ|O^WAo(X6L)iP1cK3zn8HT
zu)i}AFxtq;+w{w|T=+ua?Zx|Fx}|zgh;4Thp1rYE;%0hr*d&RynO*lXUiCej?6qA@
z_-xe169?bzTX^C^=fr=F$%kd?d3wIMu(7qfEjrHU`fJLXwQ9FE_zEmAV9!17rEy4G
zvwzu~Vxf}->rL+pE?M5{`{uyiC;3N{zHNEj6??~Qn)gu|DZ?6ti&Onli-V8s6#JgE
zywQB-jaGB+X}SttEXOX*%+oeg%*fcqy7XD1>f1cww=W8oUKQ&-!n*o%QicrMT%UR+
zQ@?Z78_ys3tM+a2<VE)`sb@U32|Rdi*=)^eACJdfz0P+(^^wA^mpwbz%vGG!+r8r>
z^Ub7;%=wlnk2YLd)8@3|sK*{L_kt@9S6uXeu`G<9D0rnRoj)dE1CQBVuLnzCt;pD=
z&eXHLPB@=Y`QVvbD|bX$Wmrzzmhf|P-Xlq)j|}x~Gdm`|EIe3M`|M1H)okA4q&Y?{
zi~k6T*vpBm@mgNOV^Vr-xlrDA%ZAAosSgx|mwya9xa+9K1&+dM6Z3r@b9jD#G_b8b
zaBf-g%o(z?w$17McHvnL!{QFfj@cWg+DdsJUAlA$r+BK+nhX0LPkN=Us`_L{C#Q;p
zepHX)!D~Wsq4iOlPX3%^>BCTYa+%MP32`URpH<ZDej*Tl?PoRT+epU`H@3{(7&1dQ
zVS?#Hh2!2WJY3c>d}~uJb#C~GJ)iNXizB!E(z-*wXZ6(W^=4GC^c%hT<lXdbnGsLd
z5i74F)x2`Yh1u?<J@VWWyCF3*fTM<=XVsRtzK=|An4VmYXkPxI-jDgc(Z{?!?Pak_
zS|zRP8sD8$eAd2HSyExWTk6caj5fXe5<eDn@<0477W29CPu8ZL7uQ^mzbvB3I9Xm^
zEJS5SOr3zd;fFwB`z3p7l5bu}Rk<jwRG7NeTTSor<CIdf>1A*HjwjB!8-8y+_s*p)
zCi5StPUwlgtlYUne*Pncstxs<>s5*ZPJUmkR>w0xO=Uu*ztZGVk?lt^&M8ia_ELKx
z#8cPAx2&k})T~XS7t?+IOu1w+U;FAFd3$Hkx0-QvS*Op>`eC`%^)CC}pC{uDK1!Od
zY~A>HUhAUHD@%+{iwe&_`ds5*&(t$Fj~^5Hqwammc(vYomb12#roUL#nccN%W_bN(
z|L!l9r!3NZRVRsaS?|wy<Xw4l@wDBB90#ZS{t>E+EVw<zH1qSZp2%|_TZ|XJ^E<vM
zp3`oR3U}@MG%u%*tIzy5j4f;n`nGezrXY=pT&3UK?}!x2?$3K*?o-1WzjXWg)j^Xv
z=N4x#zZ{u<;oKROq;I^QcIV4(9JpTDEh4__eEsT6t<yd~-p-O;oe^s-S9EFNjHy0i
zk@Jt3`~2ziyH}<*`CN~t^8b0A_m9h8IMMlrQE2v+t6w~~e)1Krf3mj3-`86F&ky0o
zmMfR$&-_vRht+$2gw@feTQ9$5ZRh=b^zEz-M$Kzpy$Ly!#wwm-`+w1<m&==19PwWD
zy^y)ywX)lEQvK?O6HA&*cgfeEU67}|fBMJmuLM7or@rK8e|XqlW7U6+9otKuX@|{I
z^;!Po&*aYfWBUb|w9iF7o_BPotM}<MU7NV{SDkupt@h9M{nd4u${!V0eM}N)+x>XA
z+COV~#fdM^RoEPU?lj?~$NGI~kLtM}uIdqW>9vx1!1zW$@J(KnPkl%9)%90Gw65A7
zy|*G{W{_@Mf~95YvpJnkd+)@2OPjNOtFnTrMG8mi?LAAF9j|nG2A?!Kc&}*sl|$Z(
zr(8Tyxjk#2u!`Q1^qE=HR;RHxJ~>q0ydro)-y_qib!&{5##OG1uUt3PBXHW(3e66M
zxKF3utbRYsIngb)bMn%@mM)L!_3I0~uG(~YHEWi8E{<k?p1mWN+eSMxb#vUrs7)Cr
zE$<gUbCvz|%sn^w<*Kj8w&xgYhsBFukEk?!e!F((%0O%5lwLJU;htqPZQIuRIQ8!J
zoNqjFL3&QF-pf+o@1~c2Mt$ltQe3IJ^3;y?Q!cFKs_9y|>6P#LYqPV8OaJaXV?L$+
z;aMHC7ZDph_uaM8jh+^<VQxqg`<hDD&(oI5rbx*?z3=&NrHs7p#FN&0r0><XvE-LI
zsA+y$*!8RE*>s)Ff7(tzis|zEDmmBe$BPJ^g&Q0m#F{1aYcr?k{IxTBBG4OkFT`g0
zmSt{_!;<$&<vsEK{m)hS`Xs&Bq`2pSU+1hYJYKIGulSko_xB@{?!9+wbc|*Ct}^AS
zbE-|{?nN&9*e_+aFI{1JH``kHWks3m);+2U%tjd}CTQ|=oHQ4isTO4X($iYz>Y-09
zrfEm#l(f06o;%C_*RPtJd!6-~4~J>Z+p@X$Vo8;ed92)gR`$|;f9iF2>71UQyRUL<
z_tawvhc;Tjs(*4&dQG63y^#GhsXEKlQ-YRJ>h6{wuQl|XINTQTswrWH$-N_|uin+=
ztp21>_okYE(e}R~oW7?R9*IvA>h1T6Uh!eQ;zU`=;?ud-_b$9UYyVDs+6`0QOBdw4
zo=)=I?{gvg>xAC;a|R(-7niO7(Yi2na$&tz&|#5U%V(jISvGI$Q~Ar6)VX**(dIE-
zShwu5=z}=L2gawEp8Htp2<{g+Df;r~_I0=Zuei1T9#7T>i^`|><+A>mg<g8DU1NH%
zJxd`|^!WRP+=(;4Yd6iRR=+%b#kt)xcc#1#yLoDt+N7itFK=HsC-uoLOxSzV3Ppco
z;i>n%Ufel*;|SMkCZ*YtE$hPT_updJ^CvsfcEx+CHBYyTd97M|=jxG*0^h?w?B4a1
z)x-PsXM?Dy^^HqUe~$Pn^IUsL<ovH2V~=l}H}zK4nnP@v56?t>U$eza`bzz3Q~k8M
zn`*ah`8H2+o%?Qo)9tAAjfG<6v2J%obH1`oFOaX+Exy6GZ`He%4yT`Q=raBudw3pK
z{g<MYn8S>Y($A~bDF$`!o0hxTV%d__S1zqhf6000WIl)Qkpyw60+#ZJ65BE~qfgX}
zzf#q))_5<NRlog?^Gc0i$4_-T!^?smnQwgWeDv4csP@=(d`SiCy0pdDCm2-Jh^b#G
zZ()kuED`+I_>KDBe<r^r*V|t{bg<I4;>_Kmk3#j|Vh>v1v3<X{Ww&kV{pDBRYOmPs
z8@PV;yraLjo_o7*TGf4~wcCZWm(G@7dt`6#uKeWPvbzPB^;sKq>`r_rXVW#e!n!O|
zr7Vb>Td~(gHGGw+&?zf%ZjYEL=BI17EPVBLT3J=Yp(R|Ov`&VskQcHIP)b?bcaCNM
ze7(=iO{;%Ie5h}aZl1rVO@8HtX8GrT{C9n}Kl^U;uG8nvbH{hJy_fu<wf@o02cPFu
z9lUFH{GE77Ip2PcFIqhHOM8E8jXk>FwmG#n>ydfpzx#E4O7jk}sC_i$pHMdK*n(dy
z-Jyl-W(oY;67(P5XlLFbzxT#@;n<GH3g=}Xoy=3Y*et^*en+KKs{Z8!+gp}tTocY@
z%n;en+w;0sPDSv?J%!m^%yrHFweuU7bN{~=u<)^N$l3S_<{68;%3GbEM#ZmobolG^
z_~_{^;uCe(Uf(#+@5AotTkHQkOr5dzp#8j~^W&TvE`HK|V63~g_=k5Lx824V?z$<f
z+$EW7KPPQ*eYgC<g}r~@h}zUT*PH&HyW-o9?VtQ_#&sQxU#re$YIr&J%Y>B&l#32n
z|H$1GcIJG&oc?@{eV>^AEem&jbIkJ3-cyYC!vt;H>(74wpUd}u;`{Gs9@>BY`+wHq
z|1bU(^2P1#o7#0^b#cXBgPTRNj$bopAC`_gmN9#3ml8)_0*~;O$3Bt#iv-mr_|#wW
z)-NxR;5XEr^X$L!m*)0~PnA7hiWa5nNBr3{o6kd8HMZ!&<_cb|xWk#u`s)K%8Q0x$
zsF>9rT2_(jsG)x%=Fx1?{j>LQ{n+yRRjn598PB!L_uksNhhvh|I*mt5GM_B8+V|G#
z+tuIOUapum*~)gOZ~N^zYtHn?1uRae`@(7(^;9mrevRnCtCf2~cg>t^S~(+CH}Tr+
zYhnk|nP&AD^UF_9IHGf0#7x<@=e*G=qZi7nmOm^=Z97-f7x~!6u7&#ti(<7{|Ksio
zruc)Cf3St`YhBLO*~uXGp}zIUYLzWA_rF~FmR1wFtMt~r#^+moYi_A&2Yj@eXS&3l
z{mSX@*I2K_zPGG@Dm*XPY<q0`&0{Yn-qusTap{(s`s>)a^A2*^-g&^+{qpMGPdfW{
zx))m4F6B)AY_l}do8fM7qw22h`zJ`R3fP%bshgVk^!dq6@vgJE6qjuXEwa{U+xhsI
z0{7YOh|K~Umq~BbNm<ltad*l0%c{-)R&RQ_S)#`8c<RI}TCXmyKKVWDq+y->VXc?X
z?-W`p@}JCn*ZcC?wYNL+gm=xo@^(tz<z2R`Z?7r0dp_5G{cZP>-!t;&UwAut*WMMk
zmzVt3tK?VZ*zi5Ba(@lO*Z=H@UY?D{=J~P@m_Z}olbaN0foXZA$(*18aPS<*<lRb^
zRv;b&65xch1sL8sE@EV0@O2Gw)b;dp(+}`wWD;S949kOt<MouK8Bb33QdR^Tou@1<
z_LGr;A+ZESA!xjQzOpo<)a2dDk}>GE@uS%0#Drv9Zem$#9=cIcaP<rf43cmT$f^00
z4OBG1E{Rr=W?IHHd7`4><drHs^52wwqyEfmbLwJXVEDkmz@P!w#=x+o@$=*>D(2u>
z0zOq~#>11fR0F|=)Tv4{1+q*oWHFh1UX@1y<Z$?`fdB)87>Xeu*d`0GOXxrX2wNYU
zfk7KZ!$1DXg)Him)6|5RY&0fUsmU<?mz_LO(RA`zHGZ)5_tm7C9x6_rsAxagTAc?h
T<fSgnST{LMU5!mh8Dtm$g_hbd
delta 6774
zcmez8KgnM@z?+#xgn@yBgW-jkPt^OFECMBr3=C(O7#Kt*+bWCK_XZv8yJaA-*Zq|J
z5B8kRiYgPL7q*KzYCCQ(uQt*Y>ui4GsZk#<oDmSXbvOI%<ny2RJU73mm96#VNd2PE
z%eJys3r@C(vJ7cajgRBn7HS*y?c~9OUtZh@SrUF^lX2<E>rW@X_vd&RCFg$qL<pNm
ztJk0Qg;LyMS?$ZGt?uKyv$*~>?*rqaCw^_0&U;30TbJ-U^|kF~@ok4E)dq^V$IlM#
z<&CPE|DN*~|H2u6)&D!5yMA|B0{f!L`b%u)pFb257f^1N(aN;YLn_+x>B&-uxz76e
zpHgI47jNFMCUm{qzVj=3H$8rMzmFw*e|6nkhl3%(X)ibYUpDK*o!*Ui-zVBXGOib_
zIx%_9{f*TbKUQrOYi!%ozU)V8hD1=?&kLE1xyt<&jk`jR8wx0DCjQ`-`Mto>X3q6v
z!cisL4_UuC8~ZG0*NM-bMr(sksDIW}xyfV_V&y9wky5qptIy)7JMZ@H`t|Tmw3Lda
z%S{&ki?&;MoSGKwo|cdz^Oq46D_jf=91JX=Xqmj8QHA-rn9t;EjJjZ&jY$qnt23!G
zzYz18?9ZeHrfZl?!1QJ&FOd8s=CdGb@&)E@5WP8$WeyYXb1|Q&fQh$$9N=JJ=$p*W
zu2?U8T(b6Yc53Cpz5_Rknisd6W_Oz);FR0<W5U6;HAjS&wQVcWUHg_ba`l^aJ_|fA
zo8{ixvc=@3Yt=>LFMf(4WpCA%i2HiH|7|yE-pks*$Jc*3d#atsNYmcf*!uIc+4=X%
zd-eX5zcOUF{ZU?@D`3R}4_8Ak7A?N4$593gRo$ER);qI*ouM4C>8yv;Iljh2yM8h9
z+c5om7qDgPV$)ky3PP{sUu5yia(pfM^0n-%%ia%*d>U6JaZb~lAZD3l{YzqL?~A^9
zGU5@@;^!hub(AeH1=T+d(bOvFWt!iW8sXPDOSt4xJFl%|j{k<Gb*-GmE(_FhqLdFd
zJ1@&+w=_Jo_h7w2_1&zG39ScCxt8Yft=YJDMO(aMZ`bpOQH`&TrUd@qVK+riQY>P+
z`~MG5-)z0YUlG{-T7)Gere9ht=uw_f0FSlFw4%NpJnw@yL_KJ$3<+0S*q_lEmaSrY
z?04I{j+dIp4JOO25q-g<dYt#P	>gcBDz(3UK1rsk+*b$UbRVz3_%o^@ONT-qYFh
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
X3>z637=%&G5Sn~RU5#y-5=amLiEW)w
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 18a0ec69c7..d5260781df 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -33,7 +33,7 @@ metadatadb:
fullnameOverride: metadata-db
## @param metadatadb.host The hostname for the microservices.
host: metadata-db
- ## @param metadatadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/data-db/#data
+ ## @param metadatadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data
extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
rootUser:
## @param metadatadb.rootUser.user The root username.
@@ -118,7 +118,7 @@ authservice:
setupJob:
image:
## @skip authservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.4
## @param authservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -162,7 +162,7 @@ datadb:
fullnameOverride: data-db
## @param datadb.host The hostname for the microservices.
host: data-db
- ## @param datadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/data-db/#data
+ ## @param datadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data
extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
rootUser:
## @param datadb.rootUser.user The root username.
@@ -401,7 +401,7 @@ analyseservice:
enabled: true
image:
## @skip analyseservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.4
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param analyseservice.podSecurityContext.enabled Enable pods' Security Context
@@ -462,7 +462,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -559,7 +559,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.4
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -645,7 +645,7 @@ searchservice:
endpoint: http://search-service
image:
## @skip searchservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.4
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param searchservice.podSecurityContext.enabled Enable pods' Security Context
@@ -692,7 +692,7 @@ searchservice:
init:
image:
## @skip searchservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.4
## @param searchservice.init.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -753,7 +753,7 @@ storageservice:
init:
image:
## @skip storageservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.4
s3:
## @param storageservice.init.s3.endpoint The S3-capable endpoint the microservice connects to.
endpoint: http://storage-service-s3:8333
@@ -862,7 +862,7 @@ ui:
enabled: true
image:
## @skip ui.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.4
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param ui.podSecurityContext.enabled Enable pods' Security Context
diff --git a/install.sh b/install.sh
index 6de016007f..c5f130f5b7 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# preset
-VERSION="1.7.0"
+VERSION="1.6.4"
MIN_CPU=8
MIN_RAM=4
MIN_MAP_COUNT=262144
diff --git a/lib/python/README.md b/lib/python/README.md
index d4599caee8..443787cbb4 100644
--- a/lib/python/README.md
+++ b/lib/python/README.md
@@ -48,17 +48,17 @@ client.import_table_data(database_id=7, table_id=13, file_name_or_data_frame=df)
## Supported Features & Best-Practices
- Manage user
- account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/#create-user-account))
+ account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/#create-user-account))
- Manage
- databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/usage-overview/#create-database))
+ databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/usage-overview/#create-database))
- Manage database access &
- visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/#create-database))
+ visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/#create-database))
- Import
- dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/#import-dataset))
+ dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/#import-dataset))
- Create persistent
- identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/#assign-database-pid))
+ identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/#assign-database-pid))
- Execute
- queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/#export-subset))
+ queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/#export-subset))
- Get data from tables/views/subsets
## Configure
diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst
index 137dde40c6..6c0c17e375 100644
--- a/lib/python/docs/index.rst
+++ b/lib/python/docs/index.rst
@@ -6,13 +6,13 @@ Pandas `DataFrame <https://pandas.pydata.org/docs/reference/api/pandas.DataFrame
provides an object-oriented API as well as low-level access to DBRepo services.
.. note::
- The SDK has been implemented and documented for DBRepo version 1.7.0, earlier versions may be supported but are not tested for compatibility.
+ The SDK has been implemented and documented for DBRepo version 1.6.4, earlier versions may be supported but are not tested for compatibility.
Quickstart
----------
Find numerous quickstart examples on
-the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/api/>`_.
+the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/>`_.
AMQP API Client
-----------
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index 65d9c7e3d9..b956d6afd0 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.7.0"
+version = "1.6.4"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
@@ -34,7 +34,7 @@ requires = [
build-backend = "setuptools.build_meta"
[project.urls]
-Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/"
-Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/python/"
+Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/"
+Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/python/"
Issues = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues"
Source = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/"
\ No newline at end of file
diff --git a/lib/python/setup.py b/lib/python/setup.py
index 4fff48185b..53f4832404 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,9 +2,9 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.7.0",
+ version="1.6.4",
description="A library for communicating with DBRepo",
- url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/",
+ url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/",
author="Martin Weise",
license="Apache-2.0",
author_email="martin.weise@tuwien.ac.at",
diff --git a/mkdocs.yml b/mkdocs.yml
index 536eed294e..5ec3a92799 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
site_name: Database Repository
-site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
@@ -120,9 +120,9 @@ markdown_extensions:
custom_icons:
- .docs/overrides/.icons
extra:
- homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
+ homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
version:
- default: 1.7
+ default: 1.6
provider: mike
social:
- icon: simple/artifacthub
diff --git a/sonar-project.properties b/sonar-project.properties
index 0d25b112d7..e118258889 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77
sonar.host.url=https://s39.datalab.tuwien.ac.at
# project
-sonar.projectVersion=1.7.0
+sonar.projectVersion=1.6.4
# general
sonar.qualitygate.wait=true
sonar.projectCreation.mainBranchName=master
diff --git a/versions.json b/versions.json
index 95ca2a62a6..b42a3dfd7d 100644
--- a/versions.json
+++ b/versions.json
@@ -1,9 +1,4 @@
[
- {
- "version": "1.7",
- "title": "1.7",
- "aliases": []
- },
{
"version": "1.6",
"title": "1.6",
--
GitLab
From 120573283414d461c9aad2e0e55369549e6f7bc4 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 13 Feb 2025 21:04:19 +0000
Subject: [PATCH 2/3] Fixed the sync
---
.../target/create-event-listener.jar | Bin 10238 -> 10146 bytes
.../tuwien/handlers/ApiExceptionHandler.java | 17 +-
.../handlers/ApiExceptionHandlerTest.java | 19 +-
.../main/java/at/tuwien/test/BaseTest.java | 2830 ++++++++---------
dbrepo-ui/layouts/default.vue | 26 -
helm/dbrepo/files/create-event-listener.jar | Bin 10238 -> 10146 bytes
6 files changed, 1446 insertions(+), 1446 deletions(-)
diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index a970096eeaa5015d9e95064f6b341fffdf8aae5f..7b332886dd5aca385115460c47692fdef8522e0b 100644
GIT binary patch
delta 4412
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
delta 4508
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
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index 5b5769583a..44e35f3a29 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -2,6 +2,7 @@ package at.tuwien.handlers;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
+import com.auth0.jwt.exceptions.TokenExpiredException;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.HttpHeaders;
@@ -16,6 +17,20 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
@ControllerAdvice
public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
+ @Hidden
+ @ResponseStatus(code = HttpStatus.UNAUTHORIZED)
+ @ExceptionHandler(TokenExpiredException.class)
+ public ResponseEntity<ApiErrorDto> handle(TokenExpiredException e) {
+ final HttpHeaders headers = new HttpHeaders();
+ headers.set("Content-Type", "application/problem+json");
+ final ApiErrorDto response = ApiErrorDto.builder()
+ .status(HttpStatus.UNAUTHORIZED)
+ .message(e.getLocalizedMessage())
+ .code("error.token.expired")
+ .build();
+ return new ResponseEntity<>(response, headers, response.getStatus());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(AccessNotFoundException.class)
@@ -471,7 +486,7 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
final ApiErrorDto response = ApiErrorDto.builder()
.status(annotation.code())
.message(message)
- .code(annotation.reason())
+ .code(exceptionClass.getAnnotation(ResponseStatus.class).reason())
.build();
return new ResponseEntity<>(response, headers, response.getStatus());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
index a58a4b49da..06a4e377b0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
@@ -3,6 +3,7 @@ package at.tuwien.handlers;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
import at.tuwien.test.AbstractUnitTest;
+import com.auth0.jwt.exceptions.TokenExpiredException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.time.Instant;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@@ -55,6 +57,19 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
}
}
+ @Test
+ public void handle_tokenExpiredException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new TokenExpiredException("msg", Instant.now()));
+ assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertNotNull(body.getMessage());
+ assertEquals(HttpStatus.UNAUTHORIZED, body.getStatus());
+ assertEquals("error.token.expired", body.getCode());
+ }
+
@Test
public void handle_accessNotFoundException_succeeds() {
@@ -68,7 +83,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.access.missing", body.getCode());
}
-
@Test
public void handle_accountNotSetupException_succeeds() {
@@ -82,7 +96,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.user.setup", body.getCode());
}
-
@Test
public void handle_analyseServiceException_succeeds() {
@@ -96,7 +109,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.analyse.invalid", body.getCode());
}
-
@Test
public void handle_authServiceConnectionException_succeeds() {
@@ -110,7 +122,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.auth.connection", body.getCode());
}
-
@Test
public void handle_authServiceException_succeeds() {
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 860eeb8253..2921447017 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
@@ -146,173 +146,173 @@ import static java.time.temporal.ChronoUnit.MINUTES;
*/
public abstract class BaseTest {
- public final static String MINIO_IMAGE = "minio/minio:RELEASE.2024-06-06T09-36-42Z";
+ public static final String MINIO_IMAGE = "minio/minio:RELEASE.2024-06-06T09-36-42Z";
- public final static String MARIADB_IMAGE = "mariadb:11.3.2";
+ public static final String MARIADB_IMAGE = "mariadb:11.3.2";
- public final static String RABBITMQ_IMAGE = "rabbitmq:3.13.7";
+ public static final String RABBITMQ_IMAGE = "rabbitmq:3.13.7";
- public final static String KEYCLOAK_IMAGE = "quay.io/keycloak/keycloak:26.0";
+ public static final String KEYCLOAK_IMAGE = "quay.io/keycloak/keycloak:26.0";
- public final static String[] DEFAULT_SEMANTICS_HANDLING = new String[]{"default-semantics-handling",
+ public static final String[] DEFAULT_SEMANTICS_HANDLING = new String[]{"default-semantics-handling",
"create-semantic-unit", "execute-semantic-query", "table-semantic-analyse", "create-semantic-concept"};
- public final static String[] DEFAULT_VIEW_HANDLING = new String[]{"update-database-view", "create-database-view",
+ public static final String[] DEFAULT_VIEW_HANDLING = new String[]{"update-database-view", "create-database-view",
"delete-database-view", "list-database-views", "modify-view-visibility", "find-database-view"};
- public final static String[] ESCALATED_SEMANTICS_HANDLING = new String[]{"escalated-semantics-handling",
+ public static final String[] ESCALATED_SEMANTICS_HANDLING = new String[]{"escalated-semantics-handling",
"update-semantic-concept", "modify-foreign-table-column-semantics", "delete-ontology", "list-ontologies",
"update-semantic-unit", "create-ontology", "update-ontology"};
- public final static String[] DEFAULT_CONTAINER_HANDLING = new String[]{"default-container-handling",
+ public static final String[] DEFAULT_CONTAINER_HANDLING = new String[]{"default-container-handling",
"create-container", "list-containers", "modify-container-state"};
- public final static String[] ESCALATED_CONTAINER_HANDLING = new String[]{"escalated-container-handling",
+ public static final String[] ESCALATED_CONTAINER_HANDLING = new String[]{"escalated-container-handling",
"modify-foreign-container-state", "delete-container"};
- public final static String[] DEFAULT_DATABASE_HANDLING = new String[]{"default-database-handling",
+ public static final String[] DEFAULT_DATABASE_HANDLING = new String[]{"default-database-handling",
"update-database-access", "modify-database-visibility", "create-database", "modify-database-owner",
"delete-database-access", "check-database-access", "list-databases", "modify-database-image",
"create-database-access", "find-database", "import-database-data"};
- public final static String[] ESCALATED_DATABASE_HANDLING = new String[]{"escalated-database-handling",
+ public static final String[] ESCALATED_DATABASE_HANDLING = new String[]{"escalated-database-handling",
"delete-database"};
- public final static String[] DEFAULT_IDENTIFIER_HANDLING = new String[]{"default-identifier-handling",
+ public static final String[] DEFAULT_IDENTIFIER_HANDLING = new String[]{"default-identifier-handling",
"create-identifier", "find-identifier", "list-identifiers", "publish-identifier", "delete-identifier"};
- public final static String[] ESCALATED_IDENTIFIER_HANDLING = new String[]{"escalated-identifier-handling",
+ public static final String[] ESCALATED_IDENTIFIER_HANDLING = new String[]{"escalated-identifier-handling",
"modify-identifier-metadata", "update-foreign-identifier", "create-foreign-identifier"};
- public final static String[] DEFAULT_QUERY_HANDLING = new String[]{"default-query-handling", "view-table-data",
+ public static final String[] DEFAULT_QUERY_HANDLING = new String[]{"default-query-handling", "view-table-data",
"execute-query", "view-table-history", "list-database-views", "export-query-data", "create-database-view",
"delete-database-view", "delete-table-data", "export-table-data", "persist-query", "re-execute-query",
"insert-table-data", "find-database-view"};
- public final static String[] ESCALATED_QUERY_HANDLING = new String[]{"escalated-query-handling"};
+ public static final String[] ESCALATED_QUERY_HANDLING = new String[]{"escalated-query-handling"};
- public final static String[] DEFAULT_TABLE_HANDLING = new String[]{"default-table-handling",
+ public static final String[] DEFAULT_TABLE_HANDLING = new String[]{"default-table-handling",
"list-tables", "create-table", "modify-table-column-semantics", "find-table", "delete-table",
"update-table-statistic", "update-table"};
- public final static String[] ESCALATED_TABLE_HANDLING = new String[]{"escalated-table-handling",
+ public static final String[] ESCALATED_TABLE_HANDLING = new String[]{"escalated-table-handling",
"delete-foreign-table"};
- public final static String[] DEFAULT_USER_HANDLING = new String[]{"default-user-handling", "modify-user-theme",
+ public static final String[] DEFAULT_USER_HANDLING = new String[]{"default-user-handling", "modify-user-theme",
"modify-user-information"};
- public final static String[] ESCALATED_USER_HANDLING = new String[]{"escalated-user-handling", "find-user"};
+ public static final String[] ESCALATED_USER_HANDLING = new String[]{"escalated-user-handling", "find-user"};
- public final static String[] DEFAULT_RESEARCHER_ROLES = ArrayUtils.merge(List.of(new String[]{"default-researcher-roles"},
+ public static final String[] DEFAULT_RESEARCHER_ROLES = ArrayUtils.merge(List.of(new String[]{"default-researcher-roles"},
DEFAULT_CONTAINER_HANDLING, DEFAULT_DATABASE_HANDLING, DEFAULT_IDENTIFIER_HANDLING, DEFAULT_QUERY_HANDLING,
DEFAULT_TABLE_HANDLING, DEFAULT_USER_HANDLING, DEFAULT_SEMANTICS_HANDLING, DEFAULT_VIEW_HANDLING));
- public final static String[] DEFAULT_DEVELOPER_ROLES = ArrayUtils.merge(List.of(new String[]{"default-developer-roles"},
+ public static final String[] DEFAULT_DEVELOPER_ROLES = ArrayUtils.merge(List.of(new String[]{"default-developer-roles"},
DEFAULT_CONTAINER_HANDLING, DEFAULT_DATABASE_HANDLING, DEFAULT_IDENTIFIER_HANDLING, DEFAULT_QUERY_HANDLING,
DEFAULT_TABLE_HANDLING, DEFAULT_USER_HANDLING, ESCALATED_USER_HANDLING, ESCALATED_CONTAINER_HANDLING,
ESCALATED_DATABASE_HANDLING, ESCALATED_IDENTIFIER_HANDLING, ESCALATED_QUERY_HANDLING,
ESCALATED_TABLE_HANDLING, DEFAULT_VIEW_HANDLING));
- public final static String[] DEFAULT_DATA_STEWARD_ROLES = ArrayUtils.merge(List.of(new String[]{"default-data-steward-roles"},
+ public static final String[] DEFAULT_DATA_STEWARD_ROLES = ArrayUtils.merge(List.of(new String[]{"default-data-steward-roles"},
ESCALATED_IDENTIFIER_HANDLING, DEFAULT_SEMANTICS_HANDLING, ESCALATED_SEMANTICS_HANDLING, DEFAULT_VIEW_HANDLING));
- public final static String[] DEFAULT_LOCAL_ADMIN_ROLES = new String[]{"system"};
+ public static final String[] DEFAULT_LOCAL_ADMIN_ROLES = new String[]{"system"};
- public final static List<GrantedAuthorityDto> AUTHORITY_LOCAL_ADMIN_ROLES = Arrays.stream(DEFAULT_LOCAL_ADMIN_ROLES)
+ public static final List<GrantedAuthorityDto> AUTHORITY_LOCAL_ADMIN_ROLES = Arrays.stream(DEFAULT_LOCAL_ADMIN_ROLES)
.map(GrantedAuthorityDto::new)
.collect(Collectors.toList());
- public final static List<GrantedAuthorityDto> AUTHORITY_DEFAULT_RESEARCHER_ROLES = Arrays.stream(DEFAULT_RESEARCHER_ROLES)
+ public static final List<GrantedAuthorityDto> AUTHORITY_DEFAULT_RESEARCHER_ROLES = Arrays.stream(DEFAULT_RESEARCHER_ROLES)
.map(GrantedAuthorityDto::new)
.collect(Collectors.toList());
- public final static List<GrantedAuthorityDto> AUTHORITY_DEFAULT_DEVELOPER_ROLES = Arrays.stream(DEFAULT_DEVELOPER_ROLES)
+ public static final List<GrantedAuthorityDto> AUTHORITY_DEFAULT_DEVELOPER_ROLES = Arrays.stream(DEFAULT_DEVELOPER_ROLES)
.map(GrantedAuthorityDto::new)
.collect(Collectors.toList());
- public final static List<GrantedAuthorityDto> AUTHORITY_DEFAULT_DATA_STEWARD_ROLES = Arrays.stream(DEFAULT_DATA_STEWARD_ROLES)
+ public static final List<GrantedAuthorityDto> AUTHORITY_DEFAULT_DATA_STEWARD_ROLES = Arrays.stream(DEFAULT_DATA_STEWARD_ROLES)
.map(GrantedAuthorityDto::new)
.collect(Collectors.toList());
- public final static List<GrantedAuthority> AUTHORITY_DEFAULT_LOCAL_ADMIN_AUTHORITIES = AUTHORITY_LOCAL_ADMIN_ROLES.stream()
+ public static final List<GrantedAuthority> AUTHORITY_DEFAULT_LOCAL_ADMIN_AUTHORITIES = AUTHORITY_LOCAL_ADMIN_ROLES.stream()
.map(a -> new SimpleGrantedAuthority(a.getAuthority()))
.collect(Collectors.toList());
- public final static List<GrantedAuthority> AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES = AUTHORITY_DEFAULT_RESEARCHER_ROLES.stream()
+ public static final List<GrantedAuthority> AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES = AUTHORITY_DEFAULT_RESEARCHER_ROLES.stream()
.map(a -> new SimpleGrantedAuthority(a.getAuthority()))
.collect(Collectors.toList());
- public final static List<GrantedAuthority> AUTHORITY_DEFAULT_DEVELOPER_AUTHORITIES = AUTHORITY_DEFAULT_DEVELOPER_ROLES.stream()
+ public static final List<GrantedAuthority> AUTHORITY_DEFAULT_DEVELOPER_AUTHORITIES = AUTHORITY_DEFAULT_DEVELOPER_ROLES.stream()
.map(a -> new SimpleGrantedAuthority(a.getAuthority()))
.collect(Collectors.toList());
- public final static List<GrantedAuthority> AUTHORITY_DEFAULT_DATA_STEWARD_AUTHORITIES = AUTHORITY_DEFAULT_DATA_STEWARD_ROLES.stream()
+ public static final List<GrantedAuthority> AUTHORITY_DEFAULT_DATA_STEWARD_AUTHORITIES = AUTHORITY_DEFAULT_DATA_STEWARD_ROLES.stream()
.map(a -> new SimpleGrantedAuthority(a.getAuthority()))
.collect(Collectors.toList());
- public final static UUID REALM_DBREPO_ID = UUID.fromString("6264bf7b-d1d3-4562-9c07-ce4364a8f9d3");
- public final static String REALM_DBREPO_NAME = "dbrepo";
- public final static Boolean REALM_DBREPO_ENABLED = true;
+ public static final UUID REALM_DBREPO_ID = UUID.fromString("6264bf7b-d1d3-4562-9c07-ce4364a8f9d3");
+ public static final String REALM_DBREPO_NAME = "dbrepo";
+ public static final Boolean REALM_DBREPO_ENABLED = true;
- public final static UUID ROLE_DEFAULT_REALM_DBREPO_ROLES_ID = UUID.fromString("c74cbbe7-3ab1-4472-9211-cc904567268");
- public final static String ROLE_DEFAULT_REALM_DBREPO_ROLES_NAME = "default-dbrepo-roles";
- public final static UUID ROLE_DEFAULT_REALM_DBREPO_ROLES_REALM_ID = REALM_DBREPO_ID;
+ public static final UUID ROLE_DEFAULT_REALM_DBREPO_ROLES_ID = UUID.fromString("c74cbbe7-3ab1-4472-9211-cc904567268");
+ public static final String ROLE_DEFAULT_REALM_DBREPO_ROLES_NAME = "default-dbrepo-roles";
+ public static final UUID ROLE_DEFAULT_REALM_DBREPO_ROLES_REALM_ID = REALM_DBREPO_ID;
- public final static UUID ROLE_DEFAULT_RESEARCHER_ROLES_ID = UUID.fromString("c74cbbe7-3ab1-4472-9211-cc9045672682");
- public final static String ROLE_DEFAULT_RESEARCHER_ROLES_NAME = "default-researcher-roles";
- public final static UUID ROLE_DEFAULT_RESEARCHER_ROLES_REALM_ID = REALM_DBREPO_ID;
+ public static final UUID ROLE_DEFAULT_RESEARCHER_ROLES_ID = UUID.fromString("c74cbbe7-3ab1-4472-9211-cc9045672682");
+ public static final String ROLE_DEFAULT_RESEARCHER_ROLES_NAME = "default-researcher-roles";
+ public static final UUID ROLE_DEFAULT_RESEARCHER_ROLES_REALM_ID = REALM_DBREPO_ID;
- public final static CreateAccessDto UPDATE_DATABASE_ACCESS_READ_DTO = CreateAccessDto.builder()
+ public static final CreateAccessDto UPDATE_DATABASE_ACCESS_READ_DTO = CreateAccessDto.builder()
.type(AccessTypeDto.READ)
.build();
- public final static CreateAccessDto UPDATE_DATABASE_ACCESS_WRITE_OWN_DTO = CreateAccessDto.builder()
+ public static final CreateAccessDto UPDATE_DATABASE_ACCESS_WRITE_OWN_DTO = CreateAccessDto.builder()
.type(AccessTypeDto.WRITE_OWN)
.build();
- public final static CreateAccessDto UPDATE_DATABASE_ACCESS_WRITE_ALL_DTO = CreateAccessDto.builder()
+ public static final CreateAccessDto UPDATE_DATABASE_ACCESS_WRITE_ALL_DTO = CreateAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.build();
- public final static String TOKEN_ACCESS_TOKEN = "ey.yee.skrr";
- public final static String TOKEN_ACCESS_SCOPE = "openid";
+ public static final String TOKEN_ACCESS_TOKEN = "ey.yee.skrr";
+ public static final String TOKEN_ACCESS_SCOPE = "openid";
- public final static TokenDto TOKEN_DTO = TokenDto.builder()
+ public static final TokenDto TOKEN_DTO = TokenDto.builder()
.accessToken(TOKEN_ACCESS_TOKEN)
.scope(TOKEN_ACCESS_SCOPE)
.build();
- public final static RefreshTokenRequestDto REFRESH_TOKEN_REQUEST_DTO = RefreshTokenRequestDto.builder()
+ public static final RefreshTokenRequestDto REFRESH_TOKEN_REQUEST_DTO = RefreshTokenRequestDto.builder()
.refreshToken("ey.yee.skrr")
.build();
- public final static Long CONCEPT_1_ID = 1L;
- public final static String CONCEPT_1_NAME = "precipitation";
- public final static String CONCEPT_1_URI = "http://www.wikidata.org/entity/Q25257";
- public final static String CONCEPT_1_DESCRIPTION = null;
- public final static Instant CONCEPT_1_CREATED = Instant.ofEpochSecond(1701976048L) /* 2023-12-07 19:07:27 (UTC) */;
+ public static final Long CONCEPT_1_ID = 1L;
+ public static final String CONCEPT_1_NAME = "precipitation";
+ public static final String CONCEPT_1_URI = "http://www.wikidata.org/entity/Q25257";
+ public static final String CONCEPT_1_DESCRIPTION = null;
+ public static final Instant CONCEPT_1_CREATED = Instant.ofEpochSecond(1701976048L) /* 2023-12-07 19:07:27 (UTC) */;
- public final static ConceptSaveDto CONCEPT_1_SAVE_DTO = ConceptSaveDto.builder()
+ public static final ConceptSaveDto CONCEPT_1_SAVE_DTO = ConceptSaveDto.builder()
.uri(CONCEPT_1_URI)
.name(CONCEPT_1_NAME)
.description(CONCEPT_1_DESCRIPTION)
.build();
- public final static ConceptDto CONCEPT_1_DTO = ConceptDto.builder()
+ public static final ConceptDto CONCEPT_1_DTO = ConceptDto.builder()
.id(CONCEPT_1_ID)
.uri(CONCEPT_1_URI)
.name(CONCEPT_1_NAME)
.description(CONCEPT_1_DESCRIPTION)
.build();
- public final static ConceptBriefDto CONCEPT_1_BRIEF_DTO = ConceptBriefDto.builder()
+ public static final ConceptBriefDto CONCEPT_1_BRIEF_DTO = ConceptBriefDto.builder()
.id(CONCEPT_1_ID)
.uri(CONCEPT_1_URI)
.name(CONCEPT_1_NAME)
.description(CONCEPT_1_DESCRIPTION)
.build();
- public final static TableColumnConcept CONCEPT_1 = TableColumnConcept.builder()
+ public static final TableColumnConcept CONCEPT_1 = TableColumnConcept.builder()
.id(CONCEPT_1_ID)
.uri(CONCEPT_1_URI)
.name(CONCEPT_1_NAME)
@@ -320,39 +320,39 @@ public abstract class BaseTest {
.created(CONCEPT_1_CREATED)
.build();
- public final static EntityDto CONCEPT_1_ENTITY_DTO = EntityDto.builder()
+ public static final EntityDto CONCEPT_1_ENTITY_DTO = EntityDto.builder()
.uri(CONCEPT_1_URI)
.description(CONCEPT_1_DESCRIPTION)
.label(CONCEPT_1_NAME)
.build();
- public final static Long CONCEPT_2_ID = 2L;
- public final static String CONCEPT_2_NAME = "FAIR data";
- public final static String CONCEPT_2_URI = "http://www.wikidata.org/entity/Q29032648";
- public final static String CONCEPT_2_DESCRIPTION = "data compliant with the terms of the FAIR Data Principles";
- public final static Instant CONCEPT_2_CREATED = Instant.now();
+ public static final Long CONCEPT_2_ID = 2L;
+ public static final String CONCEPT_2_NAME = "FAIR data";
+ public static final String CONCEPT_2_URI = "http://www.wikidata.org/entity/Q29032648";
+ public static final String CONCEPT_2_DESCRIPTION = "data compliant with the terms of the FAIR Data Principles";
+ public static final Instant CONCEPT_2_CREATED = Instant.now();
- public final static ConceptSaveDto CONCEPT_2_SAVE_DTO = ConceptSaveDto.builder()
+ public static final ConceptSaveDto CONCEPT_2_SAVE_DTO = ConceptSaveDto.builder()
.uri(CONCEPT_2_URI)
.name(CONCEPT_2_NAME)
.description(CONCEPT_2_DESCRIPTION)
.build();
- public final static ConceptDto CONCEPT_2_DTO = ConceptDto.builder()
+ public static final ConceptDto CONCEPT_2_DTO = ConceptDto.builder()
.id(CONCEPT_2_ID)
.uri(CONCEPT_2_URI)
.name(CONCEPT_2_NAME)
.description(CONCEPT_2_DESCRIPTION)
.build();
- public final static ConceptBriefDto CONCEPT_2_BRIEF_DTO = ConceptBriefDto.builder()
+ public static final ConceptBriefDto CONCEPT_2_BRIEF_DTO = ConceptBriefDto.builder()
.id(CONCEPT_2_ID)
.uri(CONCEPT_2_URI)
.name(CONCEPT_2_NAME)
.description(CONCEPT_2_DESCRIPTION)
.build();
- public final static TableColumnConcept CONCEPT_2 = TableColumnConcept.builder()
+ public static final TableColumnConcept CONCEPT_2 = TableColumnConcept.builder()
.id(CONCEPT_2_ID)
.uri(CONCEPT_2_URI)
.name(CONCEPT_2_NAME)
@@ -360,33 +360,33 @@ public abstract class BaseTest {
.created(CONCEPT_2_CREATED)
.build();
- public final static Long UNIT_1_ID = 1L;
- public final static String UNIT_1_NAME = "millimetre";
- public final static String UNIT_1_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/millimetre";
- public final static String UNIT_1_DESCRIPTION = "The millimetre is a unit of length defined as 1.0e-3 metre.";
- public final static Instant UNIT_1_CREATED = Instant.ofEpochSecond(1701976282L) /* 2023-12-07 19:11:22 */;
+ public static final Long UNIT_1_ID = 1L;
+ public static final String UNIT_1_NAME = "millimetre";
+ public static final String UNIT_1_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/millimetre";
+ public static final String UNIT_1_DESCRIPTION = "The millimetre is a unit of length defined as 1.0e-3 metre.";
+ public static final Instant UNIT_1_CREATED = Instant.ofEpochSecond(1701976282L) /* 2023-12-07 19:11:22 */;
- public final static UnitSaveDto UNIT_1_SAVE_DTO = UnitSaveDto.builder()
+ public static final UnitSaveDto UNIT_1_SAVE_DTO = UnitSaveDto.builder()
.uri(UNIT_1_URI)
.name(UNIT_1_NAME)
.description(UNIT_1_DESCRIPTION)
.build();
- public final static UnitDto UNIT_1_DTO = UnitDto.builder()
+ public static final UnitDto UNIT_1_DTO = UnitDto.builder()
.id(UNIT_1_ID)
.uri(UNIT_1_URI)
.name(UNIT_1_NAME)
.description(UNIT_1_DESCRIPTION)
.build();
- public final static UnitBriefDto UNIT_1_BRIEF_DTO = UnitBriefDto.builder()
+ public static final UnitBriefDto UNIT_1_BRIEF_DTO = UnitBriefDto.builder()
.id(UNIT_1_ID)
.uri(UNIT_1_URI)
.name(UNIT_1_NAME)
.description(UNIT_1_DESCRIPTION)
.build();
- public final static TableColumnUnit UNIT_1 = TableColumnUnit.builder()
+ public static final TableColumnUnit UNIT_1 = TableColumnUnit.builder()
.id(UNIT_1_ID)
.uri(UNIT_1_URI)
.name(UNIT_1_NAME)
@@ -394,39 +394,39 @@ public abstract class BaseTest {
.created(UNIT_1_CREATED)
.build();
- public final static EntityDto UNIT_1_ENTITY_DTO = EntityDto.builder()
+ public static final EntityDto UNIT_1_ENTITY_DTO = EntityDto.builder()
.uri(UNIT_1_URI)
.description(UNIT_1_DESCRIPTION)
.label(UNIT_1_NAME)
.build();
- public final static Long UNIT_2_ID = 2L;
- public final static String UNIT_2_NAME = "tonne";
- public final static String UNIT_2_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/tonne";
- public final static String UNIT_2_DESCRIPTION = "The tonne is a unit of mass defined as 1000 kilogram.";
- public final static Instant UNIT_2_CREATED = Instant.ofEpochSecond(1701976462L) /* 2023-12-07 19:14:22 */;
+ public static final Long UNIT_2_ID = 2L;
+ public static final String UNIT_2_NAME = "tonne";
+ public static final String UNIT_2_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/tonne";
+ public static final String UNIT_2_DESCRIPTION = "The tonne is a unit of mass defined as 1000 kilogram.";
+ public static final Instant UNIT_2_CREATED = Instant.ofEpochSecond(1701976462L) /* 2023-12-07 19:14:22 */;
- public final static UnitSaveDto UNIT_2_SAVE_DTO = UnitSaveDto.builder()
+ public static final UnitSaveDto UNIT_2_SAVE_DTO = UnitSaveDto.builder()
.uri(UNIT_2_URI)
.name(UNIT_2_NAME)
.description(UNIT_2_DESCRIPTION)
.build();
- public final static UnitDto UNIT_2_DTO = UnitDto.builder()
+ public static final UnitDto UNIT_2_DTO = UnitDto.builder()
.id(UNIT_2_ID)
.uri(UNIT_2_URI)
.name(UNIT_2_NAME)
.description(UNIT_2_DESCRIPTION)
.build();
- public final static UnitBriefDto UNIT_2_BRIEF_DTO = UnitBriefDto.builder()
+ public static final UnitBriefDto UNIT_2_BRIEF_DTO = UnitBriefDto.builder()
.id(UNIT_2_ID)
.uri(UNIT_2_URI)
.name(UNIT_2_NAME)
.description(UNIT_2_DESCRIPTION)
.build();
- public final static TableColumnUnit UNIT_2 = TableColumnUnit.builder()
+ public static final TableColumnUnit UNIT_2 = TableColumnUnit.builder()
.id(UNIT_2_ID)
.uri(UNIT_2_URI)
.name(UNIT_2_NAME)
@@ -434,34 +434,34 @@ public abstract class BaseTest {
.created(UNIT_2_CREATED)
.build();
- public final static String USER_BROKER_USERNAME = "guest";
+ public static final String USER_BROKER_USERNAME = "guest";
@SuppressWarnings("java:S2068")
- public final static String USER_BROKER_PASSWORD = "guest";
+ public static final String USER_BROKER_PASSWORD = "guest";
- public final static UUID USER_LOCAL_ADMIN_ID = UUID.fromString("a54dcb2e-a644-4e82-87e7-05a96413983d");
- public final static UUID USER_LOCAL_ADMIN_KEYCLOAK_ID = UUID.fromString("703c2ca0-8fc3-4c03-9bc5-4dae6b211e78");
- public final static String USER_LOCAL_ADMIN_USERNAME = "admin";
+ public static final UUID USER_LOCAL_ADMIN_ID = UUID.fromString("a54dcb2e-a644-4e82-87e7-05a96413983d");
+ public static final UUID USER_LOCAL_ADMIN_KEYCLOAK_ID = UUID.fromString("703c2ca0-8fc3-4c03-9bc5-4dae6b211e78");
+ public static final String USER_LOCAL_ADMIN_USERNAME = "admin";
@SuppressWarnings("java:S2068")
- public final static String USER_LOCAL_ADMIN_PASSWORD = "admin";
- public final static String USER_LOCAL_ADMIN_THEME = "dark";
- public final static Boolean USER_LOCAL_ADMIN_IS_INTERNAL = true;
- public final static Boolean USER_LOCAL_ADMIN_ENABLED = true;
+ public static final String USER_LOCAL_ADMIN_PASSWORD = "admin";
+ public static final String USER_LOCAL_ADMIN_THEME = "dark";
+ public static final Boolean USER_LOCAL_ADMIN_IS_INTERNAL = true;
+ public static final Boolean USER_LOCAL_ADMIN_ENABLED = true;
@SuppressWarnings("java:S2068")
- public final static String USER_LOCAL_ADMIN_MARIADB_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA";
+ public static final String USER_LOCAL_ADMIN_MARIADB_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA";
- public final static LoginRequestDto USER_LOCAL_ADMIN_LOGIN_REQUEST_DTO = LoginRequestDto.builder()
+ public static final LoginRequestDto USER_LOCAL_ADMIN_LOGIN_REQUEST_DTO = LoginRequestDto.builder()
.username(USER_LOCAL_ADMIN_USERNAME)
.password(USER_LOCAL_ADMIN_PASSWORD)
.build();
- public final static UserDetails USER_LOCAL_ADMIN_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_LOCAL_ADMIN_DETAILS = UserDetailsDto.builder()
.id(USER_LOCAL_ADMIN_ID.toString())
.username(USER_LOCAL_ADMIN_USERNAME)
.password(USER_LOCAL_ADMIN_PASSWORD)
.authorities(AUTHORITY_DEFAULT_LOCAL_ADMIN_AUTHORITIES)
.build();
- public final static User USER_LOCAL = User.builder()
+ public static final User USER_LOCAL = User.builder()
.id(USER_LOCAL_ADMIN_ID)
.keycloakId(USER_LOCAL_ADMIN_KEYCLOAK_ID)
.username(USER_LOCAL_ADMIN_USERNAME)
@@ -470,34 +470,34 @@ public abstract class BaseTest {
.isInternal(USER_LOCAL_ADMIN_IS_INTERNAL)
.build();
- public final static Principal USER_LOCAL_ADMIN_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_LOCAL_ADMIN_DETAILS,
+ public static final Principal USER_LOCAL_ADMIN_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_LOCAL_ADMIN_DETAILS,
USER_LOCAL_ADMIN_PASSWORD, USER_LOCAL_ADMIN_DETAILS.getAuthorities());
- public final static UUID USER_1_ID = UUID.fromString("cd5bab0d-7799-4069-85fb-c5d738572a0b");
- public final static UUID USER_1_KEYCLOAK_ID = UUID.fromString("cd5bab0d-7799-4069-85fb-c5d738572a0b");
- public final static String USER_1_USERNAME = "junit1";
+ public static final UUID USER_1_ID = UUID.fromString("cd5bab0d-7799-4069-85fb-c5d738572a0b");
+ public static final UUID USER_1_KEYCLOAK_ID = UUID.fromString("cd5bab0d-7799-4069-85fb-c5d738572a0b");
+ public static final String USER_1_USERNAME = "junit1";
@SuppressWarnings("java:S2068")
- public final static String USER_1_PASSWORD = "junit1";
+ public static final String USER_1_PASSWORD = "junit1";
@SuppressWarnings("java:S2068")
- public final static String USER_1_DATABASE_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA" /* junit1 */;
- public final static String USER_1_FIRSTNAME = "John";
- public final static String USER_1_LASTNAME = "Doe";
- public final static String USER_1_QUALIFIED_NAME = USER_1_FIRSTNAME + " " + USER_1_LASTNAME + " — @" + USER_1_USERNAME;
- public final static String USER_1_NAME = "John Doe";
- public final static String USER_1_AFFILIATION = "TU Graz";
- public final static String USER_1_ORCID_URL = "https://orcid.org/0000-0003-4216-302X";
- public final static Boolean USER_1_ENABLED = true;
- public final static Boolean USER_1_IS_INTERNAL = false;
- public final static String USER_1_THEME = "light";
- public final static String USER_1_LANGUAGE = "en";
- public final static Instant USER_1_CREATED = Instant.ofEpochSecond(1677399441L) /* 2023-02-26 08:17:21 (UTC) */;
-
- public final static UpdateUserPasswordDto USER_1_UPDATE_PASSWORD_DTO = UpdateUserPasswordDto.builder()
+ public static final String USER_1_DATABASE_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA" /* junit1 */;
+ public static final String USER_1_FIRSTNAME = "John";
+ public static final String USER_1_LASTNAME = "Doe";
+ public static final String USER_1_QUALIFIED_NAME = USER_1_FIRSTNAME + " " + USER_1_LASTNAME + " — @" + USER_1_USERNAME;
+ public static final String USER_1_NAME = "John Doe";
+ public static final String USER_1_AFFILIATION = "TU Graz";
+ public static final String USER_1_ORCID_URL = "https://orcid.org/0000-0003-4216-302X";
+ public static final Boolean USER_1_ENABLED = true;
+ public static final Boolean USER_1_IS_INTERNAL = false;
+ public static final String USER_1_THEME = "light";
+ public static final String USER_1_LANGUAGE = "en";
+ public static final Instant USER_1_CREATED = Instant.ofEpochSecond(1677399441L) /* 2023-02-26 08:17:21 (UTC) */;
+
+ public static final UpdateUserPasswordDto USER_1_UPDATE_PASSWORD_DTO = UpdateUserPasswordDto.builder()
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
.build();
- public final static UserAttributesDto USER_1_ATTRIBUTES_DTO = UserAttributesDto.builder()
+ public static final UserAttributesDto USER_1_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_1_THEME)
.orcid(USER_1_ORCID_URL)
.affiliation(USER_1_AFFILIATION)
@@ -505,19 +505,19 @@ public abstract class BaseTest {
.language(USER_1_LANGUAGE)
.build();
- public final static CredentialDto USER_1_KEYCLOAK_CREDENTIAL_1 = CredentialDto.builder()
+ public static final CredentialDto USER_1_KEYCLOAK_CREDENTIAL_1 = CredentialDto.builder()
.type(CredentialTypeDto.PASSWORD)
.temporary(false)
.value(USER_1_PASSWORD)
.build();
- public final static CredentialDto USER_LOCAL_KEYCLOAK_CREDENTIAL_1 = CredentialDto.builder()
+ public static final CredentialDto USER_LOCAL_KEYCLOAK_CREDENTIAL_1 = CredentialDto.builder()
.type(CredentialTypeDto.PASSWORD)
.temporary(false)
.value(USER_LOCAL_ADMIN_PASSWORD)
.build();
- public final static UserCreateDto USER_1_KEYCLOAK_SIGNUP_REQUEST = UserCreateDto.builder()
+ public static final UserCreateDto USER_1_KEYCLOAK_SIGNUP_REQUEST = UserCreateDto.builder()
.username(USER_1_USERNAME)
.enabled(USER_1_ENABLED)
.credentials(new LinkedList<>(List.of(USER_1_KEYCLOAK_CREDENTIAL_1)))
@@ -526,7 +526,7 @@ public abstract class BaseTest {
.build())
.build();
- public final static UserCreateDto USER_LOCAL_KEYCLOAK_SIGNUP_REQUEST = UserCreateDto.builder()
+ public static final UserCreateDto USER_LOCAL_KEYCLOAK_SIGNUP_REQUEST = UserCreateDto.builder()
.username(USER_LOCAL_ADMIN_USERNAME)
.enabled(USER_LOCAL_ADMIN_ENABLED)
.credentials(new LinkedList<>(List.of(USER_LOCAL_KEYCLOAK_CREDENTIAL_1)))
@@ -536,7 +536,7 @@ public abstract class BaseTest {
.build())
.build();
- public final static User USER_1 = User.builder()
+ public static final User USER_1 = User.builder()
.id(USER_1_ID)
.keycloakId(USER_1_KEYCLOAK_ID)
.username(USER_1_USERNAME)
@@ -550,7 +550,7 @@ public abstract class BaseTest {
.isInternal(USER_1_IS_INTERNAL)
.build();
- public final static UserDto USER_1_DTO = UserDto.builder()
+ public static final UserDto USER_1_DTO = UserDto.builder()
.id(USER_1_ID)
.username(USER_1_USERNAME)
.firstname(USER_1_FIRSTNAME)
@@ -560,7 +560,7 @@ public abstract class BaseTest {
.qualifiedName(USER_1_QUALIFIED_NAME)
.build();
- public final static CreateUserDto USER_1_CREATE_USER_DTO = CreateUserDto.builder()
+ public static final CreateUserDto USER_1_CREATE_USER_DTO = CreateUserDto.builder()
.id(USER_1_KEYCLOAK_ID)
.ldapId(USER_1_ID)
.givenName(USER_1_FIRSTNAME)
@@ -568,7 +568,7 @@ public abstract class BaseTest {
.username(USER_1_USERNAME)
.build();
- public final static UserUpdateDto USER_1_UPDATE_DTO = UserUpdateDto.builder()
+ public static final UserUpdateDto USER_1_UPDATE_DTO = UserUpdateDto.builder()
.firstname(USER_1_FIRSTNAME)
.lastname(USER_1_LASTNAME)
.affiliation(USER_1_AFFILIATION)
@@ -577,11 +577,11 @@ public abstract class BaseTest {
.language(USER_1_LANGUAGE)
.build();
- public final static UserPasswordDto USER_1_PASSWORD_DTO = UserPasswordDto.builder()
+ public static final UserPasswordDto USER_1_PASSWORD_DTO = UserPasswordDto.builder()
.password(USER_1_PASSWORD)
.build();
- public final static UserBriefDto USER_1_BRIEF_DTO = UserBriefDto.builder()
+ public static final UserBriefDto USER_1_BRIEF_DTO = UserBriefDto.builder()
.id(USER_1_ID)
.username(USER_1_USERNAME)
.firstname(USER_1_FIRSTNAME)
@@ -591,39 +591,39 @@ public abstract class BaseTest {
.orcid(USER_1_ORCID_URL)
.build();
- public final static UserDetails USER_1_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_1_DETAILS = UserDetailsDto.builder()
.id(USER_1_ID.toString())
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
- public final static Principal USER_1_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_1_DETAILS,
+ public static final Principal USER_1_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_1_DETAILS,
USER_1_PASSWORD, USER_1_DETAILS.getAuthorities());
- public final static LoginRequestDto USER_1_LOGIN_REQUEST_DTO = LoginRequestDto.builder()
+ public static final LoginRequestDto USER_1_LOGIN_REQUEST_DTO = LoginRequestDto.builder()
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
.build();
- public final static UUID USER_2_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
- public final static UUID USER_2_KEYCLOAK_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
- public final static String USER_2_USERNAME = "junit2";
- public final static String USER_2_FIRSTNAME = "Jane";
- public final static String USER_2_LASTNAME = "Doe";
- public final static String USER_2_NAME = "Jane Doe";
- public final static String USER_2_AFFILIATION = "TU Wien";
- public final static String USER_2_ORCID_URL = "https://orcid.org/0000-0002-9272-6225";
+ public static final UUID USER_2_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
+ public static final UUID USER_2_KEYCLOAK_ID = UUID.fromString("eeb9a51b-4cd8-4039-90bf-e24f17372f7c");
+ public static final String USER_2_USERNAME = "junit2";
+ public static final String USER_2_FIRSTNAME = "Jane";
+ public static final String USER_2_LASTNAME = "Doe";
+ public static final String USER_2_NAME = "Jane Doe";
+ public static final String USER_2_AFFILIATION = "TU Wien";
+ public static final String USER_2_ORCID_URL = "https://orcid.org/0000-0002-9272-6225";
@SuppressWarnings("java:S2068")
- public final static String USER_2_PASSWORD = "junit2";
+ public static final String USER_2_PASSWORD = "junit2";
@SuppressWarnings("java:S2068")
- public final static String USER_2_DATABASE_PASSWORD = "*9AA70A8B0EEFAFCB5BED5BDEF6EE264D5DA915AE" /* junit2 */;
- public final static String USER_2_QUALIFIED_NAME = USER_2_FIRSTNAME + " " + USER_2_LASTNAME + " — @" + USER_2_USERNAME;
- public final static Boolean USER_2_IS_INTERNAL = false;
- public final static String USER_2_THEME = "light";
- public final static String USER_2_LANGUAGE = "de";
+ public static final String USER_2_DATABASE_PASSWORD = "*9AA70A8B0EEFAFCB5BED5BDEF6EE264D5DA915AE" /* junit2 */;
+ public static final String USER_2_QUALIFIED_NAME = USER_2_FIRSTNAME + " " + USER_2_LASTNAME + " — @" + USER_2_USERNAME;
+ public static final Boolean USER_2_IS_INTERNAL = false;
+ public static final String USER_2_THEME = "light";
+ public static final String USER_2_LANGUAGE = "de";
- public final static UserAttributesDto USER_2_ATTRIBUTES_DTO = UserAttributesDto.builder()
+ public static final UserAttributesDto USER_2_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_2_THEME)
.orcid(USER_2_ORCID_URL)
.affiliation(USER_2_AFFILIATION)
@@ -631,7 +631,7 @@ public abstract class BaseTest {
.language(USER_2_LANGUAGE)
.build();
- public final static User USER_2 = User.builder()
+ public static final User USER_2 = User.builder()
.id(USER_2_ID)
.keycloakId(USER_2_KEYCLOAK_ID)
.username(USER_2_USERNAME)
@@ -645,7 +645,7 @@ public abstract class BaseTest {
.isInternal(USER_2_IS_INTERNAL)
.build();
- public final static UserDto USER_2_DTO = UserDto.builder()
+ public static final UserDto USER_2_DTO = UserDto.builder()
.id(USER_2_ID)
.username(USER_2_USERNAME)
.firstname(USER_2_FIRSTNAME)
@@ -655,7 +655,7 @@ public abstract class BaseTest {
.attributes(USER_2_ATTRIBUTES_DTO)
.build();
- public final static UserBriefDto USER_2_BRIEF_DTO = UserBriefDto.builder()
+ public static final UserBriefDto USER_2_BRIEF_DTO = UserBriefDto.builder()
.id(USER_2_ID)
.username(USER_2_USERNAME)
.firstname(USER_2_FIRSTNAME)
@@ -665,46 +665,46 @@ public abstract class BaseTest {
.qualifiedName(USER_2_QUALIFIED_NAME)
.build();
- public final static UserDetails USER_2_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_2_DETAILS = UserDetailsDto.builder()
.id(USER_2_ID.toString())
.username(USER_2_USERNAME)
.password(USER_2_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
- public final static at.tuwien.api.amqp.UserDetailsDto USER_2_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
+ public static final at.tuwien.api.amqp.UserDetailsDto USER_2_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
.name(USER_2_USERNAME)
.tags(new String[]{})
.build();
- public final static Principal USER_2_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_2_DETAILS,
+ public static final Principal USER_2_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_2_DETAILS,
USER_2_PASSWORD, USER_2_DETAILS.getAuthorities());
- public final static UUID USER_3_ID = UUID.fromString("7b080e33-d8db-4276-9d53-47208e657006");
- public final static UUID USER_3_KEYCLOAK_ID = UUID.fromString("b0108bc3-95aa-4a3f-8868-dc301286aeca");
- public final static String USER_3_USERNAME = "junit3";
- public final static String USER_3_FIRSTNAME = "System";
- public final static String USER_3_LASTNAME = "System";
- public final static String USER_3_NAME = "System System";
- public final static String USER_3_AFFILIATION = "TU Wien";
- public final static String USER_3_ORCID_URL = null;
- public final static String USER_3_ORCID_UNCOMPRESSED = null;
+ public static final UUID USER_3_ID = UUID.fromString("7b080e33-d8db-4276-9d53-47208e657006");
+ public static final UUID USER_3_KEYCLOAK_ID = UUID.fromString("b0108bc3-95aa-4a3f-8868-dc301286aeca");
+ public static final String USER_3_USERNAME = "junit3";
+ public static final String USER_3_FIRSTNAME = "System";
+ public static final String USER_3_LASTNAME = "System";
+ public static final String USER_3_NAME = "System System";
+ public static final String USER_3_AFFILIATION = "TU Wien";
+ public static final String USER_3_ORCID_URL = null;
+ public static final String USER_3_ORCID_UNCOMPRESSED = null;
@SuppressWarnings("java:S2068")
- public final static String USER_3_PASSWORD = "password";
+ public static final String USER_3_PASSWORD = "password";
@SuppressWarnings("java:S2068")
- public final static String USER_3_DATABASE_PASSWORD = "*D65FCA043964B63E849DD6334699ECB065905DA4" /* junit3 */;
- public final static String USER_3_QUALIFIED_NAME = USER_3_FIRSTNAME + " " + USER_3_LASTNAME + " — @" + USER_3_USERNAME;
- public final static Boolean USER_3_IS_INTERNAL = false;
- public final static String USER_3_THEME = "light";
+ public static final String USER_3_DATABASE_PASSWORD = "*D65FCA043964B63E849DD6334699ECB065905DA4" /* junit3 */;
+ public static final String USER_3_QUALIFIED_NAME = USER_3_FIRSTNAME + " " + USER_3_LASTNAME + " — @" + USER_3_USERNAME;
+ public static final Boolean USER_3_IS_INTERNAL = false;
+ public static final String USER_3_THEME = "light";
- public final static UserAttributesDto USER_3_ATTRIBUTES_DTO = UserAttributesDto.builder()
+ public static final UserAttributesDto USER_3_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_3_THEME)
.orcid(USER_3_ORCID_UNCOMPRESSED)
.affiliation(USER_3_AFFILIATION)
.mariadbPassword(USER_3_DATABASE_PASSWORD)
.build();
- public final static User USER_3 = User.builder()
+ public static final User USER_3 = User.builder()
.id(USER_3_ID)
.keycloakId(USER_3_KEYCLOAK_ID)
.username(USER_3_USERNAME)
@@ -717,7 +717,7 @@ public abstract class BaseTest {
.isInternal(USER_3_IS_INTERNAL)
.build();
- public final static UserDto USER_3_DTO = UserDto.builder()
+ public static final UserDto USER_3_DTO = UserDto.builder()
.id(USER_3_ID)
.username(USER_3_USERNAME)
.firstname(USER_3_FIRSTNAME)
@@ -727,7 +727,7 @@ public abstract class BaseTest {
.attributes(USER_3_ATTRIBUTES_DTO)
.build();
- public final static UserBriefDto USER_3_BRIEF_DTO = UserBriefDto.builder()
+ public static final UserBriefDto USER_3_BRIEF_DTO = UserBriefDto.builder()
.id(USER_3_ID)
.username(USER_3_USERNAME)
.firstname(USER_3_FIRSTNAME)
@@ -736,45 +736,45 @@ public abstract class BaseTest {
.qualifiedName(USER_3_QUALIFIED_NAME)
.build();
- public final static UserDetails USER_3_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_3_DETAILS = UserDetailsDto.builder()
.id(USER_3_ID.toString())
.username(USER_3_USERNAME)
.password(USER_3_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
- public final static Principal USER_3_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_3_DETAILS,
+ public static final Principal USER_3_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_3_DETAILS,
USER_3_PASSWORD, USER_3_DETAILS.getAuthorities());
- public final static at.tuwien.api.amqp.UserDetailsDto USER_3_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
+ public static final at.tuwien.api.amqp.UserDetailsDto USER_3_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
.name(USER_3_USERNAME)
.tags(new String[]{})
.build();
- public final static UUID USER_4_ID = UUID.fromString("791d58c5-bfab-4520-b4fc-b44d4ab9feb0");
- public final static UUID USER_4_KEYCLOAK_ID = UUID.fromString("25040ad3-6d57-4052-b357-6b4c8a6e7f4d");
- public final static String USER_4_USERNAME = "junit4";
- public final static String USER_4_FIRSTNAME = "JUnit";
- public final static String USER_4_LASTNAME = "4";
- public final static String USER_4_NAME = "JUnit 4";
- public final static String USER_4_AFFILIATION = "TU Wien";
- public final static String USER_4_ORCID_URL = null;
+ public static final UUID USER_4_ID = UUID.fromString("791d58c5-bfab-4520-b4fc-b44d4ab9feb0");
+ public static final UUID USER_4_KEYCLOAK_ID = UUID.fromString("25040ad3-6d57-4052-b357-6b4c8a6e7f4d");
+ public static final String USER_4_USERNAME = "junit4";
+ public static final String USER_4_FIRSTNAME = "JUnit";
+ public static final String USER_4_LASTNAME = "4";
+ public static final String USER_4_NAME = "JUnit 4";
+ public static final String USER_4_AFFILIATION = "TU Wien";
+ public static final String USER_4_ORCID_URL = null;
@SuppressWarnings("java:S2068")
- public final static String USER_4_PASSWORD = "junit4";
+ public static final String USER_4_PASSWORD = "junit4";
@SuppressWarnings("java:S2068")
- public final static String USER_4_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit4 */;
- public final static String USER_4_QUALIFIED_NAME = USER_4_FIRSTNAME + " " + USER_4_LASTNAME + " — @" + USER_4_USERNAME;
- public final static Boolean USER_4_IS_INTERNAL = false;
- public final static String USER_4_THEME = "light";
+ public static final String USER_4_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit4 */;
+ public static final String USER_4_QUALIFIED_NAME = USER_4_FIRSTNAME + " " + USER_4_LASTNAME + " — @" + USER_4_USERNAME;
+ public static final Boolean USER_4_IS_INTERNAL = false;
+ public static final String USER_4_THEME = "light";
- public final static UserAttributesDto USER_4_ATTRIBUTES_DTO = UserAttributesDto.builder()
+ public static final UserAttributesDto USER_4_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_4_THEME)
.orcid(USER_4_ORCID_URL)
.affiliation(USER_4_AFFILIATION)
.mariadbPassword(USER_4_DATABASE_PASSWORD)
.build();
- public final static User USER_4 = User.builder()
+ public static final User USER_4 = User.builder()
.id(USER_4_ID)
.keycloakId(USER_4_KEYCLOAK_ID)
.username(USER_4_USERNAME)
@@ -787,7 +787,7 @@ public abstract class BaseTest {
.isInternal(USER_4_IS_INTERNAL)
.build();
- public final static UserDto USER_4_DTO = UserDto.builder()
+ public static final UserDto USER_4_DTO = UserDto.builder()
.id(USER_4_ID)
.username(USER_4_USERNAME)
.firstname(USER_4_FIRSTNAME)
@@ -797,7 +797,7 @@ public abstract class BaseTest {
.qualifiedName(USER_4_QUALIFIED_NAME)
.build();
- public final static UserBriefDto USER_4_BRIEF_DTO = UserBriefDto.builder()
+ public static final UserBriefDto USER_4_BRIEF_DTO = UserBriefDto.builder()
.id(USER_4_ID)
.username(USER_4_USERNAME)
.firstname(USER_4_FIRSTNAME)
@@ -806,38 +806,38 @@ public abstract class BaseTest {
.qualifiedName(USER_4_QUALIFIED_NAME)
.build();
- public final static UserDetails USER_4_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_4_DETAILS = UserDetailsDto.builder()
.id(USER_4_ID.toString())
.username(USER_4_USERNAME)
.password(USER_4_PASSWORD)
.authorities(new LinkedList<>())
.build();
- public final static Principal USER_4_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_4_DETAILS,
+ public static final Principal USER_4_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_4_DETAILS,
USER_4_PASSWORD, USER_4_DETAILS.getAuthorities());
- public final static UUID USER_5_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
- public final static UUID USER_5_KEYCLOAK_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
- public final static String USER_5_USERNAME = "nobody";
- public final static String USER_5_FIRSTNAME = "No";
- public final static String USER_5_LASTNAME = "Body";
- public final static String USER_5_NAME = "No Body";
- public final static String USER_5_AFFILIATION = "TU Wien";
+ public static final UUID USER_5_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
+ public static final UUID USER_5_KEYCLOAK_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
+ public static final String USER_5_USERNAME = "nobody";
+ public static final String USER_5_FIRSTNAME = "No";
+ public static final String USER_5_LASTNAME = "Body";
+ public static final String USER_5_NAME = "No Body";
+ public static final String USER_5_AFFILIATION = "TU Wien";
@SuppressWarnings("java:S2068")
- public final static String USER_5_PASSWORD = "junit5";
+ public static final String USER_5_PASSWORD = "junit5";
@SuppressWarnings("java:S2068")
- public final static String USER_5_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
- public final static String USER_5_QUALIFIED_NAME = USER_5_FIRSTNAME + " " + USER_5_LASTNAME + " — @" + USER_5_USERNAME;
- public final static Boolean USER_5_IS_INTERNAL = false;
- public final static String USER_5_THEME = "dark";
+ public static final String USER_5_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
+ public static final String USER_5_QUALIFIED_NAME = USER_5_FIRSTNAME + " " + USER_5_LASTNAME + " — @" + USER_5_USERNAME;
+ public static final Boolean USER_5_IS_INTERNAL = false;
+ public static final String USER_5_THEME = "dark";
- public final static UserAttributesDto USER_5_ATTRIBUTES_DTO = UserAttributesDto.builder()
+ public static final UserAttributesDto USER_5_ATTRIBUTES_DTO = UserAttributesDto.builder()
.theme(USER_5_THEME)
.affiliation(USER_5_AFFILIATION)
.mariadbPassword(USER_5_DATABASE_PASSWORD)
.build();
- public final static UserDto USER_5_DTO = UserDto.builder()
+ public static final UserDto USER_5_DTO = UserDto.builder()
.id(USER_5_ID)
.username(USER_5_USERNAME)
.firstname(USER_5_FIRSTNAME)
@@ -847,7 +847,7 @@ public abstract class BaseTest {
.attributes(USER_5_ATTRIBUTES_DTO)
.build();
- public final static UserBriefDto USER_5_BRIEF_DTO = UserBriefDto.builder()
+ public static final UserBriefDto USER_5_BRIEF_DTO = UserBriefDto.builder()
.id(USER_5_ID)
.username(USER_5_USERNAME)
.firstname(USER_5_FIRSTNAME)
@@ -855,17 +855,17 @@ public abstract class BaseTest {
.qualifiedName(USER_5_QUALIFIED_NAME)
.build();
- public final static UserDetails USER_5_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_5_DETAILS = UserDetailsDto.builder()
.id(USER_5_ID.toString())
.username(USER_5_USERNAME)
.password(USER_5_PASSWORD)
.authorities(AUTHORITY_DEFAULT_DEVELOPER_AUTHORITIES)
.build();
- public final static Principal USER_5_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_5_DETAILS,
+ public static final Principal USER_5_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_5_DETAILS,
USER_5_PASSWORD, USER_5_DETAILS.getAuthorities());
- public final static User USER_5 = User.builder()
+ public static final User USER_5 = User.builder()
.id(USER_5_ID)
.keycloakId(USER_5_KEYCLOAK_ID)
.username(USER_5_USERNAME)
@@ -877,52 +877,52 @@ public abstract class BaseTest {
.isInternal(USER_5_IS_INTERNAL)
.build();
- public final static UUID USER_6_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
- public final static String USER_6_USERNAME = "system";
- public final static String USER_6_FIRSTNAME = "System";
- public final static String USER_6_LASTNAME = "System";
- public final static String USER_6_NAME = "System System";
- public final static String USER_6_AFFILIATION = "TU Wien";
- public final static String USER_6_ORCID = null;
+ public static final UUID USER_6_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
+ public static final String USER_6_USERNAME = "system";
+ public static final String USER_6_FIRSTNAME = "System";
+ public static final String USER_6_LASTNAME = "System";
+ public static final String USER_6_NAME = "System System";
+ public static final String USER_6_AFFILIATION = "TU Wien";
+ public static final String USER_6_ORCID = null;
@SuppressWarnings("java:S2068")
- public final static String USER_6_PASSWORD = "junit5";
+ public static final String USER_6_PASSWORD = "junit5";
@SuppressWarnings("java:S2068")
- public final static String USER_6_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
- public final static Boolean USER_6_VERIFIED = true;
- public final static Boolean USER_6_ENABLED = true;
- public final static Boolean USER_6_IS_INTERNAL = false;
- public final static Boolean USER_6_THEME_DARK = false;
- public final static Instant USER_6_CREATED = Instant.ofEpochSecond(1677399592L) /* 2023-02-26 08:19:52 (UTC) */;
- public final static UUID USER_6_REALM_ID = REALM_DBREPO_ID;
-
- public final static UserDto USER_6_DTO = UserDto.builder()
+ public static final String USER_6_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
+ public static final Boolean USER_6_VERIFIED = true;
+ public static final Boolean USER_6_ENABLED = true;
+ public static final Boolean USER_6_IS_INTERNAL = false;
+ public static final Boolean USER_6_THEME_DARK = false;
+ public static final Instant USER_6_CREATED = Instant.ofEpochSecond(1677399592L) /* 2023-02-26 08:19:52 (UTC) */;
+ public static final UUID USER_6_REALM_ID = REALM_DBREPO_ID;
+
+ public static final UserDto USER_6_DTO = UserDto.builder()
.id(USER_6_ID)
.username(USER_6_USERNAME)
.firstname(USER_6_FIRSTNAME)
.lastname(USER_6_LASTNAME)
.build();
- public final static UserDetails USER_6_DETAILS = UserDetailsDto.builder()
+ public static final UserDetails USER_6_DETAILS = UserDetailsDto.builder()
.id(USER_6_ID.toString())
.username(USER_6_USERNAME)
.password(USER_6_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
- public final static Principal USER_6_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_6_DETAILS,
+ public static final Principal USER_6_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_6_DETAILS,
USER_6_PASSWORD, USER_6_DETAILS.getAuthorities());
- public final static Long IMAGE_1_ID = 1L;
- public final static String IMAGE_1_REGISTRY = "docker.io";
- public final static String IMAGE_1_NAME = "mariadb";
- public final static String IMAGE_1_VERSION = "11.1.3";
- public final static String IMAGE_1_DIALECT = "org.hibernate.dialect.MariaDBDialect";
- public final static String IMAGE_1_DRIVER = "org.mariadb.jdbc.Driver";
- public final static String IMAGE_1_JDBC = "mariadb";
- public final static Integer IMAGE_1_PORT = 3306;
- public final static Boolean IMAGE_1_IS_DEFAULT = true;
-
- public final static ImageCreateDto IMAGE_1_CREATE_DTO = ImageCreateDto.builder()
+ public static final Long IMAGE_1_ID = 1L;
+ public static final String IMAGE_1_REGISTRY = "docker.io";
+ public static final String IMAGE_1_NAME = "mariadb";
+ public static final String IMAGE_1_VERSION = "11.1.3";
+ public static final String IMAGE_1_DIALECT = "org.hibernate.dialect.MariaDBDialect";
+ public static final String IMAGE_1_DRIVER = "org.mariadb.jdbc.Driver";
+ public static final String IMAGE_1_JDBC = "mariadb";
+ public static final Integer IMAGE_1_PORT = 3306;
+ public static final Boolean IMAGE_1_IS_DEFAULT = true;
+
+ public static final ImageCreateDto IMAGE_1_CREATE_DTO = ImageCreateDto.builder()
.registry(IMAGE_1_REGISTRY)
.name(IMAGE_1_NAME)
.version(IMAGE_1_VERSION)
@@ -932,7 +932,7 @@ public abstract class BaseTest {
.defaultPort(IMAGE_1_PORT)
.build();
- public final static ImageChangeDto IMAGE_1_CHANGE_DTO = ImageChangeDto.builder()
+ public static final ImageChangeDto IMAGE_1_CHANGE_DTO = ImageChangeDto.builder()
.registry(IMAGE_1_REGISTRY)
.dialect(IMAGE_1_DIALECT)
.jdbcMethod(IMAGE_1_JDBC)
@@ -940,7 +940,7 @@ public abstract class BaseTest {
.defaultPort(IMAGE_1_PORT)
.build();
- public final static ContainerImage IMAGE_1 = ContainerImage.builder()
+ public static final ContainerImage IMAGE_1 = ContainerImage.builder()
.id(IMAGE_1_ID)
.name(IMAGE_1_NAME)
.registry(IMAGE_1_REGISTRY)
@@ -953,7 +953,7 @@ public abstract class BaseTest {
.operators(new LinkedList<>()) /* IMAGE_1_OPERATORS */
.build();
- public final static ImageDto IMAGE_1_DTO = ImageDto.builder()
+ public static final ImageDto IMAGE_1_DTO = ImageDto.builder()
.id(IMAGE_1_ID)
.registry(IMAGE_1_REGISTRY)
.name(IMAGE_1_NAME)
@@ -966,7 +966,7 @@ public abstract class BaseTest {
.operators(null)
.build();
- public final static ImageBriefDto IMAGE_1_BRIEF_DTO = ImageBriefDto.builder()
+ public static final ImageBriefDto IMAGE_1_BRIEF_DTO = ImageBriefDto.builder()
.id(IMAGE_1_ID)
.name(IMAGE_1_NAME)
.version(IMAGE_1_VERSION)
@@ -974,12 +974,12 @@ public abstract class BaseTest {
.jdbcMethod(IMAGE_1_JDBC)
.build();
- public final static Long IMAGE_1_OPERATORS_1_ID = 1L;
- public final static String IMAGE_1_OPERATORS_1_DISPLAY_NAME = "XOR";
- public final static String IMAGE_1_OPERATORS_1_VALUE = "XOR";
- public final static String IMAGE_1_OPERATORS_1_DOCUMENTATION = "https://mariadb.com/kb/en/xor/";
+ public static final Long IMAGE_1_OPERATORS_1_ID = 1L;
+ public static final String IMAGE_1_OPERATORS_1_DISPLAY_NAME = "XOR";
+ public static final String IMAGE_1_OPERATORS_1_VALUE = "XOR";
+ public static final String IMAGE_1_OPERATORS_1_DOCUMENTATION = "https://mariadb.com/kb/en/xor/";
- public final static List<Operator> IMAGE_1_OPERATORS = new LinkedList<>(List.of(
+ public static final List<Operator> IMAGE_1_OPERATORS = new LinkedList<>(List.of(
Operator.builder()
.id(IMAGE_1_OPERATORS_1_ID)
.image(IMAGE_1)
@@ -988,7 +988,7 @@ public abstract class BaseTest {
.documentation(IMAGE_1_OPERATORS_1_DOCUMENTATION)
.build()));
- public final static List<OperatorDto> IMAGE_1_OPERATORS_DTO = new LinkedList<>(List.of(
+ public static final List<OperatorDto> IMAGE_1_OPERATORS_DTO = new LinkedList<>(List.of(
OperatorDto.builder()
.id(IMAGE_1_OPERATORS_1_ID)
.displayName(IMAGE_1_OPERATORS_1_DISPLAY_NAME)
@@ -996,22 +996,22 @@ public abstract class BaseTest {
.documentation(IMAGE_1_OPERATORS_1_DOCUMENTATION)
.build()));
- public final static Long CONTAINER_1_ID = 1L;
- public final static String CONTAINER_1_NAME = "u01";
- public final static String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
- public final static String CONTAINER_1_UI_HOST = "localhost";
- public final static Integer CONTAINER_1_UI_PORT = 3306;
- public final static String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
- public final static Integer CONTAINER_1_QUOTA = 4;
- public final static Integer CONTAINER_1_COUNT = 3;
- public final static String CONTAINER_1_HOST = "localhost";
- public final static Integer CONTAINER_1_PORT = 3308;
- public final static String CONTAINER_1_PRIVILEGED_USERNAME = "root";
+ public static final Long CONTAINER_1_ID = 1L;
+ public static final String CONTAINER_1_NAME = "u01";
+ public static final String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
+ public static final String CONTAINER_1_UI_HOST = "localhost";
+ public static final Integer CONTAINER_1_UI_PORT = 3306;
+ public static final String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
+ public static final Integer CONTAINER_1_QUOTA = 4;
+ public static final Integer CONTAINER_1_COUNT = 3;
+ public static final String CONTAINER_1_HOST = "localhost";
+ public static final Integer CONTAINER_1_PORT = 3308;
+ public static final String CONTAINER_1_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
- public final static String CONTAINER_1_PRIVILEGED_PASSWORD = "dbrepo";
- public final static Instant CONTAINER_1_CREATED = Instant.ofEpochSecond(1677399629L) /* 2023-02-26 08:20:29 (UTC) */;
+ public static final String CONTAINER_1_PRIVILEGED_PASSWORD = "dbrepo";
+ public static final Instant CONTAINER_1_CREATED = Instant.ofEpochSecond(1677399629L) /* 2023-02-26 08:20:29 (UTC) */;
- public final static Container CONTAINER_1 = Container.builder()
+ public static final Container CONTAINER_1 = Container.builder()
.id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME)
@@ -1027,7 +1027,7 @@ public abstract class BaseTest {
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
- public final static ContainerDto CONTAINER_1_DTO = ContainerDto.builder()
+ public static final ContainerDto CONTAINER_1_DTO = ContainerDto.builder()
.id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME)
@@ -1036,7 +1036,7 @@ public abstract class BaseTest {
.port(CONTAINER_1_PORT)
.build();
- public final static ContainerBriefDto CONTAINER_1_BRIEF_DTO = ContainerBriefDto.builder()
+ public static final ContainerBriefDto CONTAINER_1_BRIEF_DTO = ContainerBriefDto.builder()
.id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME)
@@ -1045,7 +1045,7 @@ public abstract class BaseTest {
.image(IMAGE_1_BRIEF_DTO)
.build();
- public final static ContainerDto CONTAINER_1_PRIVILEGED_DTO = ContainerDto.builder()
+ public static final ContainerDto CONTAINER_1_PRIVILEGED_DTO = ContainerDto.builder()
.id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME)
@@ -1057,21 +1057,21 @@ public abstract class BaseTest {
.password(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
- public final static Long CONTAINER_2_ID = 2L;
- public final static ContainerImage CONTAINER_2_IMAGE = IMAGE_1;
- public final static ImageDto CONTAINER_2_IMAGE_DTO = IMAGE_1_DTO;
- public final static String CONTAINER_2_NAME = "u02";
- public final static String CONTAINER_2_INTERNALNAME = "dbrepo-userdb-u02";
- public final static String CONTAINER_2_HOST = "localhost";
- public final static Integer CONTAINER_2_PORT = 3309;
- public final static Integer CONTAINER_2_QUOTA = 3;
- public final static Integer CONTAINER_2_COUNT = 3;
- public final static String CONTAINER_2_PRIVILEGED_USERNAME = "root";
+ public static final Long CONTAINER_2_ID = 2L;
+ public static final ContainerImage CONTAINER_2_IMAGE = IMAGE_1;
+ public static final ImageDto CONTAINER_2_IMAGE_DTO = IMAGE_1_DTO;
+ public static final String CONTAINER_2_NAME = "u02";
+ public static final String CONTAINER_2_INTERNALNAME = "dbrepo-userdb-u02";
+ public static final String CONTAINER_2_HOST = "localhost";
+ public static final Integer CONTAINER_2_PORT = 3309;
+ public static final Integer CONTAINER_2_QUOTA = 3;
+ public static final Integer CONTAINER_2_COUNT = 3;
+ public static final String CONTAINER_2_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
- public final static String CONTAINER_2_PRIVILEGED_PASSWORD = "dbrepo";
- public final static Instant CONTAINER_2_CREATED = Instant.ofEpochSecond(1677399655L) /* 2023-02-26 08:20:55 (UTC) */;
+ public static final String CONTAINER_2_PRIVILEGED_PASSWORD = "dbrepo";
+ public static final Instant CONTAINER_2_CREATED = Instant.ofEpochSecond(1677399655L) /* 2023-02-26 08:20:55 (UTC) */;
- public final static Container CONTAINER_2 = Container.builder()
+ public static final Container CONTAINER_2 = Container.builder()
.id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME)
@@ -1085,7 +1085,7 @@ public abstract class BaseTest {
.privilegedPassword(CONTAINER_2_PRIVILEGED_PASSWORD)
.build();
- public final static ContainerDto CONTAINER_2_DTO = ContainerDto.builder()
+ public static final ContainerDto CONTAINER_2_DTO = ContainerDto.builder()
.id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME)
@@ -1094,14 +1094,14 @@ public abstract class BaseTest {
.port(CONTAINER_2_PORT)
.build();
- public final static ContainerBriefDto CONTAINER_2_DTO_BRIEF = ContainerBriefDto.builder()
+ public static final ContainerBriefDto CONTAINER_2_DTO_BRIEF = ContainerBriefDto.builder()
.id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME)
.quota(CONTAINER_2_QUOTA)
.build();
- public final static ContainerDto CONTAINER_2_PRIVILEGED_DTO = ContainerDto.builder()
+ public static final ContainerDto CONTAINER_2_PRIVILEGED_DTO = ContainerDto.builder()
.id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME)
@@ -1113,19 +1113,19 @@ public abstract class BaseTest {
.password(CONTAINER_2_PRIVILEGED_PASSWORD)
.build();
- public final static Long CONTAINER_3_ID = 3L;
- public final static ContainerImage CONTAINER_3_IMAGE = IMAGE_1;
- public final static String CONTAINER_3_NAME = "u03";
- public final static String CONTAINER_3_INTERNALNAME = "dbrepo-userdb-u03";
- public final static String CONTAINER_3_HOST = "localhost";
- public final static Integer CONTAINER_3_PORT = 3310;
- public final static Integer CONTAINER_3_QUOTA = 20;
- public final static String CONTAINER_3_PRIVILEGED_USERNAME = "root";
+ public static final Long CONTAINER_3_ID = 3L;
+ public static final ContainerImage CONTAINER_3_IMAGE = IMAGE_1;
+ public static final String CONTAINER_3_NAME = "u03";
+ public static final String CONTAINER_3_INTERNALNAME = "dbrepo-userdb-u03";
+ public static final String CONTAINER_3_HOST = "localhost";
+ public static final Integer CONTAINER_3_PORT = 3310;
+ public static final Integer CONTAINER_3_QUOTA = 20;
+ public static final String CONTAINER_3_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
- public final static String CONTAINER_3_PRIVILEGED_PASSWORD = "dbrepo";
- public final static Instant CONTAINER_3_CREATED = Instant.ofEpochSecond(1677399672L) /* 2023-02-26 08:21:12 (UTC) */;
+ public static final String CONTAINER_3_PRIVILEGED_PASSWORD = "dbrepo";
+ public static final Instant CONTAINER_3_CREATED = Instant.ofEpochSecond(1677399672L) /* 2023-02-26 08:21:12 (UTC) */;
- public final static Container CONTAINER_3 = Container.builder()
+ public static final Container CONTAINER_3 = Container.builder()
.id(CONTAINER_3_ID)
.name(CONTAINER_3_NAME)
.internalName(CONTAINER_3_INTERNALNAME)
@@ -1139,19 +1139,19 @@ public abstract class BaseTest {
.privilegedPassword(CONTAINER_3_PRIVILEGED_PASSWORD)
.build();
- public final static Long CONTAINER_4_ID = 4L;
- public final static ContainerImage CONTAINER_4_IMAGE = IMAGE_1;
- public final static String CONTAINER_4_NAME = "u04";
- public final static String CONTAINER_4_INTERNALNAME = "dbrepo-userdb-u04";
- public final static String CONTAINER_4_HOST = "localhost";
- public final static Integer CONTAINER_4_PORT = 3311;
- public final static Integer CONTAINER_4_QUOTA = 0;
- public final static String CONTAINER_4_PRIVILEGED_USERNAME = "root";
+ public static final Long CONTAINER_4_ID = 4L;
+ public static final ContainerImage CONTAINER_4_IMAGE = IMAGE_1;
+ public static final String CONTAINER_4_NAME = "u04";
+ public static final String CONTAINER_4_INTERNALNAME = "dbrepo-userdb-u04";
+ public static final String CONTAINER_4_HOST = "localhost";
+ public static final Integer CONTAINER_4_PORT = 3311;
+ public static final Integer CONTAINER_4_QUOTA = 0;
+ public static final String CONTAINER_4_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
- public final static String CONTAINER_4_PRIVILEGED_PASSWORD = "dbrepo";
- public final static Instant CONTAINER_4_CREATED = Instant.ofEpochSecond(1677399688L) /* 2023-02-26 08:21:28 (UTC) */;
+ public static final String CONTAINER_4_PRIVILEGED_PASSWORD = "dbrepo";
+ public static final Instant CONTAINER_4_CREATED = Instant.ofEpochSecond(1677399688L) /* 2023-02-26 08:21:28 (UTC) */;
- public final static Container CONTAINER_4 = Container.builder()
+ public static final Container CONTAINER_4 = Container.builder()
.id(CONTAINER_4_ID)
.name(CONTAINER_4_NAME)
.internalName(CONTAINER_4_INTERNALNAME)
@@ -1164,14 +1164,14 @@ public abstract class BaseTest {
.privilegedPassword(CONTAINER_4_PRIVILEGED_PASSWORD)
.build();
- public final static String EXCHANGE_DBREPO_NAME = "dbrepo";
- public final static Boolean EXCHANGE_DBREPO_AUTO_DELETE = true;
- public final static Boolean EXCHANGE_DBREPO_DURABLE = true;
- public final static Boolean EXCHANGE_DBREPO_INTERNAL = true;
- public final static String EXCHANGE_DBREPO_TYPE = "topic";
- public final static String EXCHANGE_DBREPO_VHOST = "dbrepo";
+ public static final String EXCHANGE_DBREPO_NAME = "dbrepo";
+ public static final Boolean EXCHANGE_DBREPO_AUTO_DELETE = true;
+ public static final Boolean EXCHANGE_DBREPO_DURABLE = true;
+ public static final Boolean EXCHANGE_DBREPO_INTERNAL = true;
+ public static final String EXCHANGE_DBREPO_TYPE = "topic";
+ public static final String EXCHANGE_DBREPO_VHOST = "dbrepo";
- public final static ExchangeDto EXCHANGE_DBREPO_DTO = ExchangeDto.builder()
+ public static final ExchangeDto EXCHANGE_DBREPO_DTO = ExchangeDto.builder()
.autoDelete(EXCHANGE_DBREPO_AUTO_DELETE)
.type(EXCHANGE_DBREPO_TYPE)
.name(EXCHANGE_DBREPO_NAME)
@@ -1180,24 +1180,24 @@ public abstract class BaseTest {
.internal(EXCHANGE_DBREPO_INTERNAL)
.build();
- public final static Long DATABASE_1_ID = 1L;
- public final static String DATABASE_1_NAME = "Weather";
- public final static String DATABASE_1_DESCRIPTION = "Weather in Australia";
- public final static String DATABASE_1_INTERNALNAME = "weather";
- public final static Boolean DATABASE_1_PUBLIC = false;
- public final static Boolean DATABASE_1_SCHEMA_PUBLIC = false;
- public final static String DATABASE_1_EXCHANGE = "dbrepo";
- public final static Instant DATABASE_1_CREATED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
- public final static Instant DATABASE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
- public final static UUID DATABASE_1_CREATED_BY = USER_1_ID;
+ public static final Long DATABASE_1_ID = 1L;
+ public static final String DATABASE_1_NAME = "Weather";
+ public static final String DATABASE_1_DESCRIPTION = "Weather in Australia";
+ public static final String DATABASE_1_INTERNALNAME = "weather";
+ public static final Boolean DATABASE_1_PUBLIC = false;
+ public static final Boolean DATABASE_1_SCHEMA_PUBLIC = false;
+ public static final String DATABASE_1_EXCHANGE = "dbrepo";
+ public static final Instant DATABASE_1_CREATED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
+ public static final Instant DATABASE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
+ public static final UUID DATABASE_1_CREATED_BY = USER_1_ID;
- public final static CreateDatabaseDto DATABASE_1_CREATE = CreateDatabaseDto.builder()
+ public static final CreateDatabaseDto DATABASE_1_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
.cid(CONTAINER_1_ID)
.build();
- public final static at.tuwien.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.tuwien.api.database.internal.CreateDatabaseDto.builder()
+ public static final 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)
@@ -1207,36 +1207,36 @@ public abstract class BaseTest {
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
- public final static Long DATABASE_2_ID = 2L;
- public final static String DATABASE_2_NAME = "Zoo";
- public final static String DATABASE_2_DESCRIPTION = "Zoo data";
- public final static String DATABASE_2_INTERNALNAME = "zoo";
- public final static Boolean DATABASE_2_PUBLIC = false;
- public final static Boolean DATABASE_2_SCHEMA_PUBLIC = true;
- public final static String DATABASE_2_EXCHANGE = "dbrepo";
- public final static Instant DATABASE_2_CREATED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
- public final static Instant DATABASE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
- public final static UUID DATABASE_2_OWNER = USER_2_ID;
- public final static UUID DATABASE_2_CREATOR = USER_2_ID;
+ public static final Long DATABASE_2_ID = 2L;
+ public static final String DATABASE_2_NAME = "Zoo";
+ public static final String DATABASE_2_DESCRIPTION = "Zoo data";
+ public static final String DATABASE_2_INTERNALNAME = "zoo";
+ public static final Boolean DATABASE_2_PUBLIC = false;
+ public static final Boolean DATABASE_2_SCHEMA_PUBLIC = true;
+ public static final String DATABASE_2_EXCHANGE = "dbrepo";
+ public static final Instant DATABASE_2_CREATED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
+ public static final Instant DATABASE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
+ public static final UUID DATABASE_2_OWNER = USER_2_ID;
+ public static final UUID DATABASE_2_CREATOR = USER_2_ID;
- public final static CreateDatabaseDto DATABASE_2_CREATE = CreateDatabaseDto.builder()
+ public static final CreateDatabaseDto DATABASE_2_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_2_NAME)
.isPublic(DATABASE_2_PUBLIC)
.cid(CONTAINER_1_ID)
.build();
- public final static Long DATABASE_3_ID = 3L;
- public final static String DATABASE_3_NAME = "Musicology";
- public final static String DATABASE_3_DESCRIPTION = "Musicology data";
- public final static String DATABASE_3_INTERNALNAME = "musicology";
- public final static Boolean DATABASE_3_PUBLIC = true;
- public final static Boolean DATABASE_3_SCHEMA_PUBLIC = false;
- public final static String DATABASE_3_EXCHANGE = "dbrepo";
- public final static Instant DATABASE_3_CREATED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
- public final static Instant DATABASE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
- public final static UUID DATABASE_3_OWNER = USER_3_ID;
+ public static final Long DATABASE_3_ID = 3L;
+ public static final String DATABASE_3_NAME = "Musicology";
+ public static final String DATABASE_3_DESCRIPTION = "Musicology data";
+ public static final String DATABASE_3_INTERNALNAME = "musicology";
+ public static final Boolean DATABASE_3_PUBLIC = true;
+ public static final Boolean DATABASE_3_SCHEMA_PUBLIC = false;
+ public static final String DATABASE_3_EXCHANGE = "dbrepo";
+ public static final Instant DATABASE_3_CREATED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
+ public static final Instant DATABASE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
+ public static final UUID DATABASE_3_OWNER = USER_3_ID;
- public final static DatabaseDto DATABASE_3_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_3_DTO = DatabaseDto.builder()
.id(DATABASE_3_ID)
.isPublic(DATABASE_3_PUBLIC)
.isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
@@ -1250,7 +1250,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>()) /* IDENTIFIER_6_DTO */
.build();
- public final static DatabaseDto DATABASE_3_PRIVILEGED_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_3_PRIVILEGED_DTO = DatabaseDto.builder()
.id(DATABASE_3_ID)
.isPublic(DATABASE_3_PUBLIC)
.isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
@@ -1265,7 +1265,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static DatabaseBriefDto DATABASE_3_BRIEF_DTO = DatabaseBriefDto.builder()
+ public static final DatabaseBriefDto DATABASE_3_BRIEF_DTO = DatabaseBriefDto.builder()
.id(DATABASE_3_ID)
.isPublic(DATABASE_3_PUBLIC)
.isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
@@ -1275,25 +1275,25 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static CreateDatabaseDto DATABASE_3_CREATE = CreateDatabaseDto.builder()
+ public static final CreateDatabaseDto DATABASE_3_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_3_NAME)
.isPublic(DATABASE_3_PUBLIC)
.cid(CONTAINER_1_ID)
.build();
- public final static Long DATABASE_4_ID = 4L;
- public final static String DATABASE_4_NAME = "Weather AT";
- public final static String DATABASE_4_DESCRIPTION = "Weather data";
- public final static Boolean DATABASE_4_PUBLIC = true;
- public final static Boolean DATABASE_4_SCHEMA_PUBLIC = true;
- public final static String DATABASE_4_INTERNALNAME = "weather_at";
- public final static String DATABASE_4_EXCHANGE = "dbrepo";
- public final static Instant DATABASE_4_CREATED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
- public final static Instant DATABASE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
- public final static UUID DATABASE_4_OWNER = USER_4_ID;
- public final static UUID DATABASE_4_CREATOR = USER_4_ID;
+ public static final Long DATABASE_4_ID = 4L;
+ public static final String DATABASE_4_NAME = "Weather AT";
+ public static final String DATABASE_4_DESCRIPTION = "Weather data";
+ public static final Boolean DATABASE_4_PUBLIC = true;
+ public static final Boolean DATABASE_4_SCHEMA_PUBLIC = true;
+ public static final String DATABASE_4_INTERNALNAME = "weather_at";
+ public static final String DATABASE_4_EXCHANGE = "dbrepo";
+ public static final Instant DATABASE_4_CREATED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
+ public static final Instant DATABASE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
+ public static final UUID DATABASE_4_OWNER = USER_4_ID;
+ public static final UUID DATABASE_4_CREATOR = USER_4_ID;
- public final static DatabaseBriefDto DATABASE_4_BRIEF_DTO = DatabaseBriefDto.builder()
+ public static final DatabaseBriefDto DATABASE_4_BRIEF_DTO = DatabaseBriefDto.builder()
.id(DATABASE_4_ID)
.isPublic(DATABASE_4_PUBLIC)
.isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
@@ -1304,7 +1304,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static DatabaseDto DATABASE_4_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_4_DTO = DatabaseDto.builder()
.id(DATABASE_4_ID)
.isPublic(DATABASE_4_PUBLIC)
.isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
@@ -1319,7 +1319,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>()) /* IDENTIFIER_7_DTO */
.build();
- public final static DatabaseDto DATABASE_4_PRIVILEGED_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_4_PRIVILEGED_DTO = DatabaseDto.builder()
.id(DATABASE_4_ID)
.isPublic(DATABASE_4_PUBLIC)
.isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
@@ -1335,7 +1335,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static CreateTableDto TABLE_0_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_0_CREATE_DTO = CreateTableDto.builder()
.name("full")
.description("full example")
.constraints(CreateTableConstraintsDto.builder()
@@ -1504,25 +1504,25 @@ public abstract class BaseTest {
.build()))
.build();
- public final static Long TABLE_1_ID = 1L;
- public final static String TABLE_1_NAME = "Weather AUS";
- public final static String TABLE_1_INTERNAL_NAME = "weather_aus";
- public final static Boolean TABLE_1_VERSIONED = true;
- public final static Boolean TABLE_1_IS_PUBLIC = false;
- public final static Boolean TABLE_1_SCHEMA_PUBLIC = false;
- public final static Boolean TABLE_1_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_1_DESCRIPTION = "Weather in Australia";
- public final static String TABLE_1_QUEUE_NAME = TABLE_1_INTERNAL_NAME;
- public final static String TABLE_1_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_1_ID;
- public final static Long TABLE_1_DATABASE_ID = DATABASE_1_ID;
- public final static Long TABLE_1_AVG_ROW_LENGTH = 3L;
- public final static Long TABLE_1_NUM_ROWS = 3L;
- public final static Long TABLE_1_DATA_LENGTH = 2000L;
- public final static Long TABLE_1_MAX_DATA_LENGTH = Long.MAX_VALUE;
- public final static Instant TABLE_1_CREATED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
- public final static Instant TABLE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
-
- public final static TableDto TABLE_1_PRIVILEGED_DTO = TableDto.builder()
+ public static final Long TABLE_1_ID = 1L;
+ public static final String TABLE_1_NAME = "Weather AUS";
+ public static final String TABLE_1_INTERNAL_NAME = "weather_aus";
+ public static final Boolean TABLE_1_VERSIONED = true;
+ public static final Boolean TABLE_1_IS_PUBLIC = false;
+ public static final Boolean TABLE_1_SCHEMA_PUBLIC = false;
+ public static final Boolean TABLE_1_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_1_DESCRIPTION = "Weather in Australia";
+ public static final String TABLE_1_QUEUE_NAME = TABLE_1_INTERNAL_NAME;
+ public static final String TABLE_1_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_1_ID;
+ public static final Long TABLE_1_DATABASE_ID = DATABASE_1_ID;
+ public static final Long TABLE_1_AVG_ROW_LENGTH = 3L;
+ public static final Long TABLE_1_NUM_ROWS = 3L;
+ public static final Long TABLE_1_DATA_LENGTH = 2000L;
+ public static final Long TABLE_1_MAX_DATA_LENGTH = Long.MAX_VALUE;
+ public static final Instant TABLE_1_CREATED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
+ public static final Instant TABLE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
+
+ public static final TableDto TABLE_1_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_1_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_1_INTERNAL_NAME)
@@ -1545,7 +1545,7 @@ public abstract class BaseTest {
.database(null) /* DATABASE_1_PRIVILEGED_DTO */
.build();
- public final static Table TABLE_1 = Table.builder()
+ public static final Table TABLE_1 = Table.builder()
.id(TABLE_1_ID)
.tdbid(DATABASE_1_ID)
.database(null /* DATABASE_1 */)
@@ -1569,7 +1569,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_1_MAX_DATA_LENGTH)
.build();
- public final static TableDto TABLE_1_DTO = TableDto.builder()
+ public static final TableDto TABLE_1_DTO = TableDto.builder()
.id(TABLE_1_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_1_INTERNAL_NAME)
@@ -1590,7 +1590,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_1_MAX_DATA_LENGTH)
.build();
- public final static List<ColumnDto> TABLE_1_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_1_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(1L)
.tableId(TABLE_1_ID)
.databaseId(DATABASE_1_ID)
@@ -1658,7 +1658,7 @@ public abstract class BaseTest {
.sets(null)
.build());
- public final static TableBriefDto TABLE_1_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_1_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_1_ID)
.databaseId(DATABASE_1_ID)
.internalName(TABLE_1_INTERNAL_NAME)
@@ -1670,9 +1670,9 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long TABLE_1_DATA_COUNT = 3L;
+ public static final Long TABLE_1_DATA_COUNT = 3L;
@SuppressWarnings("java:S3599")
- public final static List<Map<String, Object>> TABLE_1_DATA_DTO = new LinkedList<>(List.of(
+ public static final List<Map<String, Object>> TABLE_1_DATA_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("id", BigInteger.valueOf(1L));
put("date", LocalDate.of(2008, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC));
@@ -1696,24 +1696,24 @@ public abstract class BaseTest {
}}
));
- public final static Long TABLE_2_ID = 2L;
- public final static String TABLE_2_NAME = "Weather Location";
- public final static String TABLE_2_INTERNALNAME = "weather_location";
- public final static Boolean TABLE_2_VERSIONED = true;
- public final static Boolean TABLE_2_IS_PUBLIC = false;
- public final static Boolean TABLE_2_SCHEMA_PUBLIC = true;
- public final static Boolean TABLE_2_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_2_DESCRIPTION = "Weather location";
- public final static String TABLE_2_QUEUE_NAME = TABLE_2_INTERNALNAME;
- public final static String TABLE_2_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_2_ID;
- public final static Instant TABLE_2_CREATED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
- public final static Instant TABLE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
- public final static Long TABLE_2_AVG_ROW_LENGTH = 3L;
- public final static Long TABLE_2_NUM_ROWS = 3L;
- public final static Long TABLE_2_DATA_LENGTH = 2000L;
- public final static Long TABLE_2_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
- public final static Table TABLE_2 = Table.builder()
+ public static final Long TABLE_2_ID = 2L;
+ public static final String TABLE_2_NAME = "Weather Location";
+ public static final String TABLE_2_INTERNALNAME = "weather_location";
+ public static final Boolean TABLE_2_VERSIONED = true;
+ public static final Boolean TABLE_2_IS_PUBLIC = false;
+ public static final Boolean TABLE_2_SCHEMA_PUBLIC = true;
+ public static final Boolean TABLE_2_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_2_DESCRIPTION = "Weather location";
+ public static final String TABLE_2_QUEUE_NAME = TABLE_2_INTERNALNAME;
+ public static final String TABLE_2_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_2_ID;
+ public static final Instant TABLE_2_CREATED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
+ public static final Instant TABLE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
+ public static final Long TABLE_2_AVG_ROW_LENGTH = 3L;
+ public static final Long TABLE_2_NUM_ROWS = 3L;
+ public static final Long TABLE_2_DATA_LENGTH = 2000L;
+ public static final Long TABLE_2_MAX_DATA_LENGTH = Long.MAX_VALUE;
+
+ public static final Table TABLE_2 = Table.builder()
.id(TABLE_2_ID)
.tdbid(DATABASE_1_ID)
.database(null /* DATABASE_1 */)
@@ -1736,7 +1736,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_2_MAX_DATA_LENGTH)
.build();
- public final static TableDto TABLE_2_PRIVILEGED_DTO = TableDto.builder()
+ public static final TableDto TABLE_2_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_2_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_2_INTERNALNAME)
@@ -1759,7 +1759,7 @@ public abstract class BaseTest {
.database(null) /* DATABASE_1_PRIVILEGED_DTO */
.build();
- public final static TableDto TABLE_2_DTO = TableDto.builder()
+ public static final TableDto TABLE_2_DTO = TableDto.builder()
.id(TABLE_2_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_2_INTERNALNAME)
@@ -1779,7 +1779,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_2_MAX_DATA_LENGTH)
.build();
- public final static TableBriefDto TABLE_2_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_2_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
.internalName(TABLE_2_INTERNALNAME)
@@ -1791,24 +1791,24 @@ public abstract class BaseTest {
.ownedBy(USER_2_ID)
.build();
- public final static Long TABLE_3_ID = 3L;
- public final static String TABLE_3_NAME = "Sensor";
- public final static String TABLE_3_INTERNALNAME = "sensor";
- public final static Boolean TABLE_3_VERSIONED = true;
- public final static Boolean TABLE_3_IS_PUBLIC = false;
- public final static Boolean TABLE_3_SCHEMA_PUBLIC = false;
- public final static Boolean TABLE_3_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_3_DESCRIPTION = "Some sensor data";
- public final static String TABLE_3_QUEUE_NAME = TABLE_3_INTERNALNAME;
- public final static String TABLE_3_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_3_ID;
- public final static Instant TABLE_3_CREATED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
- public final static Instant TABLE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
- public final static Long TABLE_3_AVG_ROW_LENGTH = 6L;
- public final static Long TABLE_3_NUM_ROWS = 6L;
- public final static Long TABLE_3_DATA_LENGTH = 1800L;
- public final static Long TABLE_3_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
- public final static Table TABLE_3 = Table.builder()
+ public static final Long TABLE_3_ID = 3L;
+ public static final String TABLE_3_NAME = "Sensor";
+ public static final String TABLE_3_INTERNALNAME = "sensor";
+ public static final Boolean TABLE_3_VERSIONED = true;
+ public static final Boolean TABLE_3_IS_PUBLIC = false;
+ public static final Boolean TABLE_3_SCHEMA_PUBLIC = false;
+ public static final Boolean TABLE_3_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_3_DESCRIPTION = "Some sensor data";
+ public static final String TABLE_3_QUEUE_NAME = TABLE_3_INTERNALNAME;
+ public static final String TABLE_3_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_3_ID;
+ public static final Instant TABLE_3_CREATED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
+ public static final Instant TABLE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
+ public static final Long TABLE_3_AVG_ROW_LENGTH = 6L;
+ public static final Long TABLE_3_NUM_ROWS = 6L;
+ public static final Long TABLE_3_DATA_LENGTH = 1800L;
+ public static final Long TABLE_3_MAX_DATA_LENGTH = Long.MAX_VALUE;
+
+ public static final Table TABLE_3 = Table.builder()
.id(TABLE_3_ID)
.tdbid(DATABASE_1_ID)
.database(null /* DATABASE_1 */)
@@ -1831,7 +1831,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_3_MAX_DATA_LENGTH)
.build();
- public final static TableDto TABLE_3_DTO = TableDto.builder()
+ public static final TableDto TABLE_3_DTO = TableDto.builder()
.id(TABLE_3_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_3_INTERNALNAME)
@@ -1851,7 +1851,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_3_MAX_DATA_LENGTH)
.build();
- public final static TableBriefDto TABLE_3_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_3_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_3_ID)
.databaseId(DATABASE_1_ID)
.internalName(TABLE_3_INTERNALNAME)
@@ -1863,14 +1863,14 @@ public abstract class BaseTest {
.ownedBy(USER_3_ID)
.build();
- public final static CreateTableConstraintsDto TABLE_3_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
+ public static final CreateTableConstraintsDto TABLE_3_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
.build();
- public final static CreateTableConstraintsDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = CreateTableConstraintsDto.builder()
+ public static final CreateTableConstraintsDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = CreateTableConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.primaryKey(new LinkedHashSet<>()) // <<<<
.uniques(new LinkedList<>())
@@ -1881,38 +1881,38 @@ public abstract class BaseTest {
.build()))
.build();
- public final static CreateTableDto TABLE_3_CREATE_DTO = CreateTableDto.builder()
+ public static final 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 CreateTableDto TABLE_3_INVALID_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_3_INVALID_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_3_NAME)
.description(TABLE_3_DESCRIPTION)
.columns(new LinkedList<>())
.constraints(TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO)
.build();
- public final static Long TABLE_5_ID = 5L;
- public final static String TABLE_5_NAME = "zoo";
- public final static String TABLE_5_INTERNALNAME = "zoo";
- public final static Boolean TABLE_5_VERSIONED = true;
- public final static Boolean TABLE_5_IS_PUBLIC = true;
- public final static Boolean TABLE_5_SCHEMA_PUBLIC = true;
- public final static Boolean TABLE_5_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_5_DESCRIPTION = "Some Kaggle dataset";
- public final static String TABLE_5_QUEUE_NAME = TABLE_5_INTERNALNAME;
- public final static String TABLE_5_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_5_ID;
- public final static Instant TABLE_5_CREATED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
- public final static Instant TABLE_5_LAST_MODIFIED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
- public final static Long TABLE_5_AVG_ROW_LENGTH = 1080L;
- public final static Long TABLE_5_NUM_ROWS = 101L;
- public final static Long TABLE_5_DATA_LENGTH = 15200L;
- public final static Long TABLE_5_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
- public final static Table TABLE_5 = Table.builder()
+ public static final Long TABLE_5_ID = 5L;
+ public static final String TABLE_5_NAME = "zoo";
+ public static final String TABLE_5_INTERNALNAME = "zoo";
+ public static final Boolean TABLE_5_VERSIONED = true;
+ public static final Boolean TABLE_5_IS_PUBLIC = true;
+ public static final Boolean TABLE_5_SCHEMA_PUBLIC = true;
+ public static final Boolean TABLE_5_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_5_DESCRIPTION = "Some Kaggle dataset";
+ public static final String TABLE_5_QUEUE_NAME = TABLE_5_INTERNALNAME;
+ public static final String TABLE_5_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_5_ID;
+ public static final Instant TABLE_5_CREATED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
+ public static final Instant TABLE_5_LAST_MODIFIED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
+ public static final Long TABLE_5_AVG_ROW_LENGTH = 1080L;
+ public static final Long TABLE_5_NUM_ROWS = 101L;
+ public static final Long TABLE_5_DATA_LENGTH = 15200L;
+ public static final Long TABLE_5_MAX_DATA_LENGTH = Long.MAX_VALUE;
+
+ public static final Table TABLE_5 = Table.builder()
.id(TABLE_5_ID)
.tdbid(DATABASE_2_ID)
.created(Instant.now())
@@ -1930,7 +1930,7 @@ public abstract class BaseTest {
.owner(USER_1)
.build();
- public final static TableDto TABLE_5_DTO = TableDto.builder()
+ public static final TableDto TABLE_5_DTO = TableDto.builder()
.id(TABLE_5_ID)
.tdbid(DATABASE_2_ID)
.internalName(TABLE_5_INTERNALNAME)
@@ -1946,7 +1946,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static TableDto TABLE_5_PRIVILEGED_DTO = TableDto.builder()
+ public static final TableDto TABLE_5_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_5_ID)
.tdbid(DATABASE_2_ID)
.internalName(TABLE_5_INTERNALNAME)
@@ -1969,7 +1969,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static TableBriefDto TABLE_5_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_5_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_5_ID)
.databaseId(DATABASE_2_ID)
.internalName(TABLE_5_INTERNALNAME)
@@ -1981,20 +1981,20 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long TABLE_6_ID = 6L;
- public final static String TABLE_6_NAME = "names";
- public final static String TABLE_6_INTERNALNAME = "names";
- public final static Boolean TABLE_6_VERSIONED = true;
- public final static Boolean TABLE_6_IS_PUBLIC = true;
- public final static Boolean TABLE_6_SCHEMA_PUBLIC = false;
- public final static Boolean TABLE_6_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_6_DESCRIPTION = "Some names dataset";
- public final static String TABLE_6_QUEUE_NAME = TABLE_6_INTERNALNAME;
- public final static String TABLE_6_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_6_ID;
- public final static Instant TABLE_6_CREATED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
- public final static Instant TABLE_6_LAST_MODIFIED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
-
- public final static Table TABLE_6 = Table.builder()
+ public static final Long TABLE_6_ID = 6L;
+ public static final String TABLE_6_NAME = "names";
+ public static final String TABLE_6_INTERNALNAME = "names";
+ public static final Boolean TABLE_6_VERSIONED = true;
+ public static final Boolean TABLE_6_IS_PUBLIC = true;
+ public static final Boolean TABLE_6_SCHEMA_PUBLIC = false;
+ public static final Boolean TABLE_6_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_6_DESCRIPTION = "Some names dataset";
+ public static final String TABLE_6_QUEUE_NAME = TABLE_6_INTERNALNAME;
+ public static final String TABLE_6_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_6_ID;
+ public static final Instant TABLE_6_CREATED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
+ public static final Instant TABLE_6_LAST_MODIFIED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
+
+ public static final Table TABLE_6 = Table.builder()
.id(TABLE_6_ID)
.tdbid(DATABASE_2_ID)
.created(TABLE_6_CREATED)
@@ -2013,7 +2013,7 @@ public abstract class BaseTest {
.created(TABLE_6_CREATED)
.build();
- public final static TableDto TABLE_6_DTO = TableDto.builder()
+ public static final TableDto TABLE_6_DTO = TableDto.builder()
.id(TABLE_6_ID)
.tdbid(DATABASE_2_ID)
.internalName(TABLE_6_INTERNALNAME)
@@ -2029,7 +2029,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static TableBriefDto TABLE_6_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_6_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_6_ID)
.databaseId(DATABASE_2_ID)
.internalName(TABLE_6_INTERNALNAME)
@@ -2041,20 +2041,20 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long TABLE_7_ID = 7L;
- public final static String TABLE_7_NAME = "likes";
- public final static String TABLE_7_INTERNAL_NAME = "likes";
- public final static Boolean TABLE_7_VERSIONED = true;
- public final static Boolean TABLE_7_IS_PUBLIC = true;
- public final static Boolean TABLE_7_SCHEMA_PUBLIC = true;
- public final static Boolean TABLE_7_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_7_DESCRIPTION = "Some likes dataset";
- public final static String TABLE_7_QUEUE_NAME = TABLE_7_INTERNAL_NAME;
- public final static String TABLE_7_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_7_ID;
- public final static Instant TABLE_7_CREATED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
- public final static Instant TABLE_7_LAST_MODIFIED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
-
- public final static Table TABLE_7 = Table.builder()
+ public static final Long TABLE_7_ID = 7L;
+ public static final String TABLE_7_NAME = "likes";
+ public static final String TABLE_7_INTERNAL_NAME = "likes";
+ public static final Boolean TABLE_7_VERSIONED = true;
+ public static final Boolean TABLE_7_IS_PUBLIC = true;
+ public static final Boolean TABLE_7_SCHEMA_PUBLIC = true;
+ public static final Boolean TABLE_7_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_7_DESCRIPTION = "Some likes dataset";
+ public static final String TABLE_7_QUEUE_NAME = TABLE_7_INTERNAL_NAME;
+ public static final String TABLE_7_ROUTING_KEY = "dbrepo\\." + DATABASE_2_ID + "\\." + TABLE_7_ID;
+ public static final Instant TABLE_7_CREATED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
+ public static final Instant TABLE_7_LAST_MODIFIED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
+
+ public static final Table TABLE_7 = Table.builder()
.id(TABLE_7_ID)
.tdbid(DATABASE_2_ID)
.created(TABLE_7_CREATED)
@@ -2073,7 +2073,7 @@ public abstract class BaseTest {
.created(TABLE_7_CREATED)
.build();
- public final static TableDto TABLE_7_DTO = TableDto.builder()
+ public static final TableDto TABLE_7_DTO = TableDto.builder()
.id(TABLE_7_ID)
.tdbid(DATABASE_2_ID)
.internalName(TABLE_7_INTERNAL_NAME)
@@ -2089,7 +2089,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static TableBriefDto TABLE_7_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_7_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_7_ID)
.databaseId(DATABASE_2_ID)
.internalName(TABLE_7_INTERNAL_NAME)
@@ -2101,23 +2101,23 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long TABLE_4_ID = 4L;
- public final static String TABLE_4_NAME = "Sensor 2";
- public final static String TABLE_4_INTERNALNAME = "sensor_2";
- public final static Boolean TABLE_4_VERSIONED = true;
- public final static Boolean TABLE_4_IS_PUBLIC = true;
- public final static Boolean TABLE_4_SCHEMA_PUBLIC = false;
- public final static String TABLE_4_DESCRIPTION = "Hello sensor";
- public final static String TABLE_4_QUEUE_NAME = TABLE_4_INTERNALNAME;
- public final static String TABLE_4_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_4_ID;
- public final static Instant TABLE_4_CREATED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
- public final static Instant TABLE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
- public final static Long TABLE_4_AVG_ROW_LENGTH = 0L;
- public final static Long TABLE_4_NUM_ROWS = 0L;
- public final static Long TABLE_4_DATA_LENGTH = 1000L;
- public final static Long TABLE_4_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
- public final static Table TABLE_4 = Table.builder()
+ public static final Long TABLE_4_ID = 4L;
+ public static final String TABLE_4_NAME = "Sensor 2";
+ public static final String TABLE_4_INTERNALNAME = "sensor_2";
+ public static final Boolean TABLE_4_VERSIONED = true;
+ public static final Boolean TABLE_4_IS_PUBLIC = true;
+ public static final Boolean TABLE_4_SCHEMA_PUBLIC = false;
+ public static final String TABLE_4_DESCRIPTION = "Hello sensor";
+ public static final String TABLE_4_QUEUE_NAME = TABLE_4_INTERNALNAME;
+ public static final String TABLE_4_ROUTING_KEY = "dbrepo\\." + DATABASE_1_ID + "\\." + TABLE_4_ID;
+ public static final Instant TABLE_4_CREATED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
+ public static final Instant TABLE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
+ public static final Long TABLE_4_AVG_ROW_LENGTH = 0L;
+ public static final Long TABLE_4_NUM_ROWS = 0L;
+ public static final Long TABLE_4_DATA_LENGTH = 1000L;
+ public static final Long TABLE_4_MAX_DATA_LENGTH = Long.MAX_VALUE;
+
+ public static final Table TABLE_4 = Table.builder()
.id(TABLE_4_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_4_INTERNALNAME)
@@ -2140,7 +2140,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_4_MAX_DATA_LENGTH)
.build();
- public final static TableDto TABLE_4_DTO = TableDto.builder()
+ public static final TableDto TABLE_4_DTO = TableDto.builder()
.id(TABLE_4_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_4_INTERNALNAME)
@@ -2160,7 +2160,7 @@ public abstract class BaseTest {
.maxDataLength(TABLE_4_MAX_DATA_LENGTH)
.build();
- public final static TableDto TABLE_4_PRIVILEGED_DTO = TableDto.builder()
+ public static final TableDto TABLE_4_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_4_ID)
.tdbid(DATABASE_1_ID)
.internalName(TABLE_4_INTERNALNAME)
@@ -2182,7 +2182,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static TableBriefDto TABLE_4_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_4_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_4_ID)
.databaseId(DATABASE_1_ID)
.internalName(TABLE_4_INTERNALNAME)
@@ -2194,18 +2194,18 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static ColumnBriefDto TABLE_4_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_4_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(44L)
.name("Timestamp")
.internalName("timestamp")
.columnType(ColumnTypeDto.TIMESTAMP)
.build();
- public final static Long COLUMN_4_1_ID = 44L;
+ public static final Long COLUMN_4_1_ID = 44L;
- public final static Long COLUMN_4_2_ID = 45L;
+ public static final Long COLUMN_4_2_ID = 45L;
- public final static List<TableColumn> TABLE_4_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_4_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_4_1_ID)
.ordinalPosition(0)
.table(TABLE_4)
@@ -2224,7 +2224,7 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<CreateTableColumnDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
+ public static final List<CreateTableColumnDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
.name("Timestamp")
.type(ColumnTypeDto.TIMESTAMP)
.nullAllowed(false)
@@ -2237,28 +2237,28 @@ public abstract class BaseTest {
.d(10L)
.build());
- public final static CreateTableConstraintsDto TABLE_4_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
+ public static final 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 CreateTableDto TABLE_4_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_4_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_4_NAME)
.description(TABLE_4_DESCRIPTION)
.columns(TABLE_4_COLUMNS_CREATE_DTO)
.constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
.build();
- public final static at.tuwien.api.database.table.internal.TableCreateDto TABLE_4_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_4_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_4_NAME)
.description(TABLE_4_DESCRIPTION)
.columns(TABLE_4_COLUMNS_CREATE_DTO)
.constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
.build();
- public final static List<ColumnDto> TABLE_4_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_4_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_4_1_ID)
.databaseId(DATABASE_1_ID)
.tableId(TABLE_4_ID)
@@ -2277,20 +2277,20 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static Long TABLE_8_ID = 8L;
- public final static Long TABLE_8_DATABASE_ID = DATABASE_3_ID;
- public final static String TABLE_8_NAME = "location";
- public final static String TABLE_8_INTERNAL_NAME = "mfcc";
- public final static Boolean TABLE_8_VERSIONED = true;
- public final static Boolean TABLE_8_IS_PUBLIC = false;
- public final static Boolean TABLE_8_SCHEMA_PUBLIC = false;
- public final static String TABLE_8_DESCRIPTION = "Hello mfcc";
- public final static String TABLE_8_QUEUE_NAME = TABLE_8_INTERNAL_NAME;
- public final static String TABLE_8_ROUTING_KEY = "dbrepo\\." + DATABASE_3_ID + "\\." + TABLE_8_ID;
- public final static Instant TABLE_8_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
- public final static Instant TABLE_8_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-
- public final static Table TABLE_8 = Table.builder()
+ public static final Long TABLE_8_ID = 8L;
+ public static final Long TABLE_8_DATABASE_ID = DATABASE_3_ID;
+ public static final String TABLE_8_NAME = "location";
+ public static final String TABLE_8_INTERNAL_NAME = "mfcc";
+ public static final Boolean TABLE_8_VERSIONED = true;
+ public static final Boolean TABLE_8_IS_PUBLIC = false;
+ public static final Boolean TABLE_8_SCHEMA_PUBLIC = false;
+ public static final String TABLE_8_DESCRIPTION = "Hello mfcc";
+ public static final String TABLE_8_QUEUE_NAME = TABLE_8_INTERNAL_NAME;
+ public static final String TABLE_8_ROUTING_KEY = "dbrepo\\." + DATABASE_3_ID + "\\." + TABLE_8_ID;
+ public static final Instant TABLE_8_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
+ public static final Instant TABLE_8_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
+
+ public static final Table TABLE_8 = Table.builder()
.id(TABLE_8_ID)
.tdbid(TABLE_8_DATABASE_ID)
.internalName(TABLE_8_INTERNAL_NAME)
@@ -2309,7 +2309,7 @@ public abstract class BaseTest {
.lastModified(TABLE_8_LAST_MODIFIED)
.build();
- public final static TableDto TABLE_8_DTO = TableDto.builder()
+ public static final TableDto TABLE_8_DTO = TableDto.builder()
.id(TABLE_8_ID)
.tdbid(TABLE_8_DATABASE_ID)
.internalName(TABLE_8_INTERNAL_NAME)
@@ -2324,7 +2324,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static TableBriefDto TABLE_8_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_8_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_8_ID)
.databaseId(DATABASE_3_ID)
.internalName(TABLE_8_INTERNAL_NAME)
@@ -2336,7 +2336,7 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static TableDto TABLE_8_PRIVILEGED_DTO = TableDto.builder()
+ public static final TableDto TABLE_8_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_8_ID)
.tdbid(TABLE_8_DATABASE_ID)
.internalName(TABLE_8_INTERNAL_NAME)
@@ -2352,21 +2352,21 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static Long TABLE_9_ID = 9L;
- public final static Long TABLE_9_DATABASE_ID = DATABASE_4_ID;
- public final static String TABLE_9_NAME = "mfcc";
- public final static String TABLE_9_INTERNAL_NAME = "mfcc";
- public final static Boolean TABLE_9_VERSIONED = true;
- public final static Boolean TABLE_9_IS_PUBLIC = false;
- public final static Boolean TABLE_9_SCHEMA_PUBLIC = true;
- public final static Boolean TABLE_9_PROCESSED_CONSTRAINTS = true;
- public final static String TABLE_9_DESCRIPTION = "Hello mfcc";
- public final static String TABLE_9_QUEUE_NAME = TABLE_9_INTERNAL_NAME;
- public final static String TABLE_9_ROUTING_KEY = "dbrepo\\." + DATABASE_3_ID + "\\." + TABLE_9_ID;
- public final static Instant TABLE_9_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
- public final static Instant TABLE_9_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-
- public final static Table TABLE_9 = Table.builder()
+ public static final Long TABLE_9_ID = 9L;
+ public static final Long TABLE_9_DATABASE_ID = DATABASE_4_ID;
+ public static final String TABLE_9_NAME = "mfcc";
+ public static final String TABLE_9_INTERNAL_NAME = "mfcc";
+ public static final Boolean TABLE_9_VERSIONED = true;
+ public static final Boolean TABLE_9_IS_PUBLIC = false;
+ public static final Boolean TABLE_9_SCHEMA_PUBLIC = true;
+ public static final Boolean TABLE_9_PROCESSED_CONSTRAINTS = true;
+ public static final String TABLE_9_DESCRIPTION = "Hello mfcc";
+ public static final String TABLE_9_QUEUE_NAME = TABLE_9_INTERNAL_NAME;
+ public static final String TABLE_9_ROUTING_KEY = "dbrepo\\." + DATABASE_3_ID + "\\." + TABLE_9_ID;
+ public static final Instant TABLE_9_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
+ public static final Instant TABLE_9_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
+
+ public static final Table TABLE_9 = Table.builder()
.id(TABLE_9_ID)
.tdbid(TABLE_9_DATABASE_ID)
.internalName(TABLE_9_INTERNAL_NAME)
@@ -2385,7 +2385,7 @@ public abstract class BaseTest {
.lastModified(TABLE_9_LAST_MODIFIED)
.build();
- public final static TableDto TABLE_9_DTO = TableDto.builder()
+ public static final TableDto TABLE_9_DTO = TableDto.builder()
.id(TABLE_9_ID)
.tdbid(TABLE_9_DATABASE_ID)
.internalName(TABLE_9_INTERNAL_NAME)
@@ -2400,7 +2400,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static TableBriefDto TABLE_9_BRIEF_DTO = TableBriefDto.builder()
+ public static final TableBriefDto TABLE_9_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_9_ID)
.databaseId(DATABASE_4_ID)
.internalName(TABLE_9_INTERNAL_NAME)
@@ -2412,7 +2412,7 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static TableDto TABLE_9_PRIVILEGED_DTO = TableDto.builder()
+ public static final TableDto TABLE_9_PRIVILEGED_DTO = TableDto.builder()
.id(TABLE_9_ID)
.tdbid(TABLE_9_DATABASE_ID)
.internalName(TABLE_9_INTERNAL_NAME)
@@ -2428,22 +2428,22 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static Long COLUMN_9_1_ID = 78L;
- public final static String COLUMN_9_1_NAME = "location";
- public final static String COLUMN_9_1_INTERNAL_NAME = "location";
+ public static final Long COLUMN_9_1_ID = 78L;
+ public static final String COLUMN_9_1_NAME = "location";
+ public static final String COLUMN_9_1_INTERNAL_NAME = "location";
- public final static ColumnBriefDto TABLE_9_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_9_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_9_1_ID)
.name(COLUMN_9_1_NAME)
.internalName(COLUMN_9_1_INTERNAL_NAME)
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static Long COLUMN_9_2_ID = 79L;
+ public static final Long COLUMN_9_2_ID = 79L;
- public final static Long COLUMN_9_3_ID = 80L;
+ public static final Long COLUMN_9_3_ID = 80L;
- public final static List<TableColumn> TABLE_9_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_9_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_9_1_ID)
.ordinalPosition(0)
.table(TABLE_9)
@@ -2482,7 +2482,7 @@ public abstract class BaseTest {
.sets(null)
.build());
- public final static List<ColumnDto> TABLE_9_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_9_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_9_1_ID)
.ordinalPosition(0)
.name(COLUMN_9_1_NAME)
@@ -2518,7 +2518,7 @@ public abstract class BaseTest {
.sets(null)
.build());
- public final static Constraints TABLE_9_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_9_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -2529,7 +2529,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_9_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_9_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -2540,14 +2540,14 @@ public abstract class BaseTest {
.build())))
.build();
- public final static String QUEUE_NAME = "dbrepo";
- public final static String QUEUE_VHOST = "dbrepo";
- public final static Boolean QUEUE_AUTO_DELETE = false;
- public final static Boolean QUEUE_DURABLE = true;
- public final static Boolean QUEUE_EXCLUSIVE = false;
- public final static String QUEUE_TYPE = "quorum";
+ public static final String QUEUE_NAME = "dbrepo";
+ public static final String QUEUE_VHOST = "dbrepo";
+ public static final Boolean QUEUE_AUTO_DELETE = false;
+ public static final Boolean QUEUE_DURABLE = true;
+ public static final Boolean QUEUE_EXCLUSIVE = false;
+ public static final String QUEUE_TYPE = "quorum";
- public final static QueueDto QUEUE_DTO = QueueDto.builder()
+ public static final QueueDto QUEUE_DTO = QueueDto.builder()
.name(QUEUE_NAME)
.vhost(QUEUE_VHOST)
.autoDelete(QUEUE_AUTO_DELETE)
@@ -2556,18 +2556,18 @@ public abstract class BaseTest {
.type(QUEUE_TYPE)
.build();
- public final static Long ONTOLOGY_1_ID = 1L;
- public final static String ONTOLOGY_1_PREFIX = "om2";
- public final static String ONTOLOGY_1_NEW_PREFIX = "om-2";
- public final static String ONTOLOGY_1_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/";
- public final static String ONTOLOGY_1_URI_PATTERN = "http://www.ontology-of-units-of-measure.org/resource/om-2/.*";
- public final static String ONTOLOGY_1_SPARQL_ENDPOINT = null;
- public final static Boolean ONTOLOGY_1_SPARQL = false;
- public final static String ONTOLOGY_1_RDF_PATH = "rdf/om-2.0.rdf";
- public final static Boolean ONTOLOGY_1_RDF = true;
- public final static UUID ONTOLOGY_1_CREATED_BY = USER_1_ID;
+ public static final Long ONTOLOGY_1_ID = 1L;
+ public static final String ONTOLOGY_1_PREFIX = "om2";
+ public static final String ONTOLOGY_1_NEW_PREFIX = "om-2";
+ public static final String ONTOLOGY_1_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/";
+ public static final String ONTOLOGY_1_URI_PATTERN = "http://www.ontology-of-units-of-measure.org/resource/om-2/.*";
+ public static final String ONTOLOGY_1_SPARQL_ENDPOINT = null;
+ public static final Boolean ONTOLOGY_1_SPARQL = false;
+ public static final String ONTOLOGY_1_RDF_PATH = "rdf/om-2.0.rdf";
+ public static final Boolean ONTOLOGY_1_RDF = true;
+ public static final UUID ONTOLOGY_1_CREATED_BY = USER_1_ID;
- public final static Ontology ONTOLOGY_1 = Ontology.builder()
+ public static final Ontology ONTOLOGY_1 = Ontology.builder()
.id(ONTOLOGY_1_ID)
.prefix(ONTOLOGY_1_PREFIX)
.uri(ONTOLOGY_1_URI)
@@ -2576,7 +2576,7 @@ public abstract class BaseTest {
.rdfPath(ONTOLOGY_1_RDF_PATH)
.build();
- public final static OntologyDto ONTOLOGY_1_DTO = OntologyDto.builder()
+ public static final OntologyDto ONTOLOGY_1_DTO = OntologyDto.builder()
.id(ONTOLOGY_1_ID)
.prefix(ONTOLOGY_1_PREFIX)
.uri(ONTOLOGY_1_URI)
@@ -2587,7 +2587,7 @@ public abstract class BaseTest {
.rdf(ONTOLOGY_1_RDF)
.build();
- public final static OntologyBriefDto ONTOLOGY_1_BRIEF_DTO = OntologyBriefDto.builder()
+ public static final OntologyBriefDto ONTOLOGY_1_BRIEF_DTO = OntologyBriefDto.builder()
.id(ONTOLOGY_1_ID)
.prefix(ONTOLOGY_1_PREFIX)
.uri(ONTOLOGY_1_URI)
@@ -2596,131 +2596,131 @@ public abstract class BaseTest {
.rdf(ONTOLOGY_1_RDF)
.build();
- public final static OntologyCreateDto ONTOLOGY_1_CREATE_DTO = OntologyCreateDto.builder()
+ public static final OntologyCreateDto ONTOLOGY_1_CREATE_DTO = OntologyCreateDto.builder()
.prefix(ONTOLOGY_1_PREFIX)
.uri(ONTOLOGY_1_URI)
.sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
.build();
- public final static OntologyModifyDto ONTOLOGY_1_MODIFY_DTO = OntologyModifyDto.builder()
+ public static final OntologyModifyDto ONTOLOGY_1_MODIFY_DTO = OntologyModifyDto.builder()
.prefix(ONTOLOGY_1_NEW_PREFIX)
.uri(ONTOLOGY_1_URI)
.sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
.build();
- public final static Long ONTOLOGY_2_ID = 2L;
- public final static String ONTOLOGY_2_PREFIX = "wd";
- public final static String ONTOLOGY_2_URI = "http://www.wikidata.org/";
- public final static String ONTOLOGY_2_SPARQL_ENDPOINT = "https://query.wikidata.org/sparql";
- public final static UUID ONTOLOGY_2_CREATED_BY = USER_1_ID;
+ public static final Long ONTOLOGY_2_ID = 2L;
+ public static final String ONTOLOGY_2_PREFIX = "wd";
+ public static final String ONTOLOGY_2_URI = "http://www.wikidata.org/";
+ public static final String ONTOLOGY_2_SPARQL_ENDPOINT = "https://query.wikidata.org/sparql";
+ public static final UUID ONTOLOGY_2_CREATED_BY = USER_1_ID;
- public final static Ontology ONTOLOGY_2 = Ontology.builder()
+ public static final Ontology ONTOLOGY_2 = Ontology.builder()
.id(ONTOLOGY_2_ID)
.prefix(ONTOLOGY_2_PREFIX)
.uri(ONTOLOGY_2_URI)
.sparqlEndpoint(ONTOLOGY_2_SPARQL_ENDPOINT)
.build();
- public final static OntologyCreateDto ONTOLOGY_2_CREATE_DTO = OntologyCreateDto.builder()
+ public static final OntologyCreateDto ONTOLOGY_2_CREATE_DTO = OntologyCreateDto.builder()
.prefix(ONTOLOGY_2_PREFIX)
.uri(ONTOLOGY_2_URI)
.sparqlEndpoint(ONTOLOGY_2_SPARQL_ENDPOINT)
.build();
- public final static Long ONTOLOGY_3_ID = 3L;
- public final static String ONTOLOGY_3_PREFIX = "rdfs";
- public final static String ONTOLOGY_3_URI = "http://www.w3.org/2000/01/rdf-schema#";
- public final static String ONTOLOGY_3_SPARQL_ENDPOINT = null;
- public final static UUID ONTOLOGY_3_CREATED_BY = USER_1_ID;
+ public static final Long ONTOLOGY_3_ID = 3L;
+ public static final String ONTOLOGY_3_PREFIX = "rdfs";
+ public static final String ONTOLOGY_3_URI = "http://www.w3.org/2000/01/rdf-schema#";
+ public static final String ONTOLOGY_3_SPARQL_ENDPOINT = null;
+ public static final UUID ONTOLOGY_3_CREATED_BY = USER_1_ID;
- public final static Ontology ONTOLOGY_3 = Ontology.builder()
+ public static final Ontology ONTOLOGY_3 = Ontology.builder()
.id(ONTOLOGY_3_ID)
.prefix(ONTOLOGY_3_PREFIX)
.uri(ONTOLOGY_3_URI)
.sparqlEndpoint(ONTOLOGY_3_SPARQL_ENDPOINT)
.build();
- public final static OntologyCreateDto ONTOLOGY_3_CREATE_DTO = OntologyCreateDto.builder()
+ public static final OntologyCreateDto ONTOLOGY_3_CREATE_DTO = OntologyCreateDto.builder()
.prefix(ONTOLOGY_3_PREFIX)
.uri(ONTOLOGY_3_URI)
.sparqlEndpoint(ONTOLOGY_3_SPARQL_ENDPOINT)
.build();
- public final static Long ONTOLOGY_4_ID = 4L;
- public final static String ONTOLOGY_4_PREFIX = "schema";
- public final static String ONTOLOGY_4_URI = "http://schema.org/";
- public final static String ONTOLOGY_4_SPARQL_ENDPOINT = null;
- public final static UUID ONTOLOGY_4_CREATED_BY = USER_1_ID;
+ public static final Long ONTOLOGY_4_ID = 4L;
+ public static final String ONTOLOGY_4_PREFIX = "schema";
+ public static final String ONTOLOGY_4_URI = "http://schema.org/";
+ public static final String ONTOLOGY_4_SPARQL_ENDPOINT = null;
+ public static final UUID ONTOLOGY_4_CREATED_BY = USER_1_ID;
- public final static Ontology ONTOLOGY_4 = Ontology.builder()
+ public static final Ontology ONTOLOGY_4 = Ontology.builder()
.id(ONTOLOGY_4_ID)
.prefix(ONTOLOGY_4_PREFIX)
.uri(ONTOLOGY_4_URI)
.sparqlEndpoint(ONTOLOGY_4_SPARQL_ENDPOINT)
.build();
- public final static OntologyCreateDto ONTOLOGY_4_CREATE_DTO = OntologyCreateDto.builder()
+ public static final OntologyCreateDto ONTOLOGY_4_CREATE_DTO = OntologyCreateDto.builder()
.prefix(ONTOLOGY_4_PREFIX)
.uri(ONTOLOGY_4_URI)
.sparqlEndpoint(ONTOLOGY_4_SPARQL_ENDPOINT)
.build();
- public final static Long ONTOLOGY_5_ID = 5L;
- public final static String ONTOLOGY_5_PREFIX = "db";
- public final static String ONTOLOGY_5_URI = "http://dbpedia.org";
- public final static String ONTOLOGY_5_SPARQL_ENDPOINT = "http://dbpedia.org/sparql";
- public final static UUID ONTOLOGY_5_CREATED_BY = USER_1_ID;
+ public static final Long ONTOLOGY_5_ID = 5L;
+ public static final String ONTOLOGY_5_PREFIX = "db";
+ public static final String ONTOLOGY_5_URI = "http://dbpedia.org";
+ public static final String ONTOLOGY_5_SPARQL_ENDPOINT = "http://dbpedia.org/sparql";
+ public static final UUID ONTOLOGY_5_CREATED_BY = USER_1_ID;
- public final static Ontology ONTOLOGY_5 = Ontology.builder()
+ public static final Ontology ONTOLOGY_5 = Ontology.builder()
.id(ONTOLOGY_5_ID)
.prefix(ONTOLOGY_5_PREFIX)
.uri(ONTOLOGY_5_URI)
.sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
.build();
- public final static OntologyCreateDto ONTOLOGY_5_CREATE_DTO = OntologyCreateDto.builder()
+ public static final OntologyCreateDto ONTOLOGY_5_CREATE_DTO = OntologyCreateDto.builder()
.prefix(ONTOLOGY_5_PREFIX)
.uri(ONTOLOGY_5_URI)
.sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
.build();
- public final static Long COLUMN_8_1_ID = 75L;
- public final static Integer COLUMN_8_1_ORDINALPOS = 0;
- public final static String COLUMN_8_1_NAME = "ID";
- public final static String COLUMN_8_1_INTERNAL_NAME = "id";
- public final static TableColumnType COLUMN_8_1_TYPE = TableColumnType.BIGINT;
- public final static ColumnTypeDto COLUMN_8_1_TYPE_DTO = ColumnTypeDto.BIGINT;
- public final static Boolean COLUMN_8_1_NULL = false;
- public final static Boolean COLUMN_8_1_AUTO_GENERATED = true;
-
- public final static Long COLUMN_8_2_ID = 76L;
- public final static Integer COLUMN_8_2_ORDINALPOS = 1;
- public final static String COLUMN_8_2_NAME = "Value";
- public final static String COLUMN_8_2_INTERNAL_NAME = "value";
- public final static TableColumnType COLUMN_8_2_TYPE = TableColumnType.DECIMAL;
- public final static ColumnTypeDto COLUMN_8_2_TYPE_DTO = ColumnTypeDto.DECIMAL;
- public final static Long COLUMN_8_2_SIZE = 10L;
- public final static Long COLUMN_8_2_D = 10L;
- public final static Boolean COLUMN_8_2_NULL = false;
- public final static Boolean COLUMN_8_2_AUTO_GENERATED = false;
-
- public final static Long COLUMN_8_3_ID = 77L;
- public final static Integer COLUMN_8_3_ORDINALPOS = 2;
- public final static String COLUMN_8_3_NAME = "raw";
- public final static String COLUMN_8_3_INTERNAL_NAME = "raw";
- public final static TableColumnType COLUMN_8_3_TYPE = TableColumnType.LONGBLOB;
- public final static ColumnTypeDto COLUMN_8_3_TYPE_DTO = ColumnTypeDto.LONGBLOB;
- public final static Boolean COLUMN_8_3_NULL = true;
- public final static Boolean COLUMN_8_3_AUTO_GENERATED = false;
-
- public final static ColumnBriefDto TABLE_8_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final Long COLUMN_8_1_ID = 75L;
+ public static final Integer COLUMN_8_1_ORDINALPOS = 0;
+ public static final String COLUMN_8_1_NAME = "ID";
+ public static final String COLUMN_8_1_INTERNAL_NAME = "id";
+ public static final TableColumnType COLUMN_8_1_TYPE = TableColumnType.BIGINT;
+ public static final ColumnTypeDto COLUMN_8_1_TYPE_DTO = ColumnTypeDto.BIGINT;
+ public static final Boolean COLUMN_8_1_NULL = false;
+ public static final Boolean COLUMN_8_1_AUTO_GENERATED = true;
+
+ public static final Long COLUMN_8_2_ID = 76L;
+ public static final Integer COLUMN_8_2_ORDINALPOS = 1;
+ public static final String COLUMN_8_2_NAME = "Value";
+ public static final String COLUMN_8_2_INTERNAL_NAME = "value";
+ public static final TableColumnType COLUMN_8_2_TYPE = TableColumnType.DECIMAL;
+ public static final ColumnTypeDto COLUMN_8_2_TYPE_DTO = ColumnTypeDto.DECIMAL;
+ public static final Long COLUMN_8_2_SIZE = 10L;
+ public static final Long COLUMN_8_2_D = 10L;
+ public static final Boolean COLUMN_8_2_NULL = false;
+ public static final Boolean COLUMN_8_2_AUTO_GENERATED = false;
+
+ public static final Long COLUMN_8_3_ID = 77L;
+ public static final Integer COLUMN_8_3_ORDINALPOS = 2;
+ public static final String COLUMN_8_3_NAME = "raw";
+ public static final String COLUMN_8_3_INTERNAL_NAME = "raw";
+ public static final TableColumnType COLUMN_8_3_TYPE = TableColumnType.LONGBLOB;
+ public static final ColumnTypeDto COLUMN_8_3_TYPE_DTO = ColumnTypeDto.LONGBLOB;
+ public static final Boolean COLUMN_8_3_NULL = true;
+ public static final Boolean COLUMN_8_3_AUTO_GENERATED = false;
+
+ public static final ColumnBriefDto TABLE_8_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_8_1_ID)
.name(COLUMN_8_1_NAME)
.internalName(COLUMN_8_1_INTERNAL_NAME)
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static List<TableColumn> TABLE_8_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_8_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_8_1_ID)
.ordinalPosition(COLUMN_8_1_ORDINALPOS)
.table(TABLE_8)
@@ -2750,7 +2750,7 @@ public abstract class BaseTest {
.isNullAllowed(COLUMN_8_3_NULL)
.build());
- public final static List<ColumnDto> TABLE_8_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_8_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_8_1_ID)
.ordinalPosition(COLUMN_8_1_ORDINALPOS)
.name(COLUMN_8_1_NAME)
@@ -2775,9 +2775,9 @@ public abstract class BaseTest {
.isNullAllowed(COLUMN_8_3_NULL)
.build());
- public final static Long TABLE_8_DATA_COUNT = 6L;
+ public static final Long TABLE_8_DATA_COUNT = 6L;
@SuppressWarnings("java:S3599")
- public final static List<Map<String, Object>> TABLE_8_DATA_DTO = new LinkedList<>(List.of(
+ public static final List<Map<String, Object>> TABLE_8_DATA_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, BigInteger.valueOf(1L));
put(COLUMN_8_2_INTERNAL_NAME, 11.2);
@@ -2811,7 +2811,7 @@ public abstract class BaseTest {
));
@SuppressWarnings("java:S3599")
- public final static TableStatisticDto TABLE_8_STATISTIC_DTO = TableStatisticDto.builder()
+ public static final TableStatisticDto TABLE_8_STATISTIC_DTO = TableStatisticDto.builder()
.columns(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, ColumnStatisticDto.builder()
.min(BigDecimal.valueOf(11.2))
@@ -2823,19 +2823,19 @@ public abstract class BaseTest {
}})
.build();
- public final static Long QUERY_1_ID = 1L;
- public final static String QUERY_1_STATEMENT = "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC";
- public final static String QUERY_1_DOI = null;
- public final static Long QUERY_1_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long QUERY_1_DATABASE_ID = DATABASE_1_ID;
- public final static Long QUERY_1_RESULT_NUMBER = 2L;
- public final static String QUERY_1_QUERY_HASH = "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992";
- public final static String QUERY_1_RESULT_HASH = "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a";
- public final static Instant QUERY_1_CREATED = Instant.ofEpochSecond(1677648377L);
- public final static Instant QUERY_1_EXECUTION = Instant.now();
- public final static Boolean QUERY_1_PERSISTED = true;
+ public static final Long QUERY_1_ID = 1L;
+ public static final String QUERY_1_STATEMENT = "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC";
+ public static final String QUERY_1_DOI = null;
+ public static final Long QUERY_1_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long QUERY_1_DATABASE_ID = DATABASE_1_ID;
+ public static final Long QUERY_1_RESULT_NUMBER = 2L;
+ public static final String QUERY_1_QUERY_HASH = "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992";
+ public static final String QUERY_1_RESULT_HASH = "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a";
+ public static final Instant QUERY_1_CREATED = Instant.ofEpochSecond(1677648377L);
+ public static final Instant QUERY_1_EXECUTION = Instant.now();
+ public static final Boolean QUERY_1_PERSISTED = true;
- public final static QueryDto QUERY_1_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_1_DTO = QueryDto.builder()
.id(QUERY_1_ID)
.databaseId(QUERY_1_DATABASE_ID)
.query(QUERY_1_STATEMENT)
@@ -2847,7 +2847,7 @@ public abstract class BaseTest {
.resultNumber(3L)
.build();
- public final static ViewDto QUERY_1_VIEW_DTO = ViewDto.builder()
+ public static final ViewDto QUERY_1_VIEW_DTO = ViewDto.builder()
.vdbid(QUERY_1_DATABASE_ID)
.query(QUERY_1_STATEMENT)
.queryHash(QUERY_1_QUERY_HASH)
@@ -2874,7 +2874,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static QueryBriefDto QUERY_1_BRIEF_DTO = QueryBriefDto.builder()
+ public static final QueryBriefDto QUERY_1_BRIEF_DTO = QueryBriefDto.builder()
.id(QUERY_1_ID)
.databaseId(QUERY_1_DATABASE_ID)
.query(QUERY_1_STATEMENT)
@@ -2886,17 +2886,17 @@ public abstract class BaseTest {
.resultNumber(3L)
.build();
- public final static Long QUERY_2_ID = 2L;
- public final static String QUERY_2_STATEMENT = "SELECT `location` FROM `weather_aus`";
- public final static String QUERY_2_QUERY_HASH = "a2d2dd94ebc7653bb5a3b55dd8ed5e91d3d13c225c6855a1eb4eb7ca14c36ced";
- public final static Long QUERY_2_RESULT_NUMBER = 2L;
- public final static String QUERY_2_RESULT_HASH = "ff3f7cbe1b96d296957f6e39e55b8b1b577fa3d205d4795af99594cfd20cb80d";
- public final static Instant QUERY_2_CREATED = Instant.now().minus(2, MINUTES);
- public final static Instant QUERY_2_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_2_LAST_MODIFIED = Instant.ofEpochSecond(1541588352L);
- public final static Boolean QUERY_2_PERSISTED = false;
+ public static final Long QUERY_2_ID = 2L;
+ public static final String QUERY_2_STATEMENT = "SELECT `location` FROM `weather_aus`";
+ public static final String QUERY_2_QUERY_HASH = "a2d2dd94ebc7653bb5a3b55dd8ed5e91d3d13c225c6855a1eb4eb7ca14c36ced";
+ public static final Long QUERY_2_RESULT_NUMBER = 2L;
+ public static final String QUERY_2_RESULT_HASH = "ff3f7cbe1b96d296957f6e39e55b8b1b577fa3d205d4795af99594cfd20cb80d";
+ public static final Instant QUERY_2_CREATED = Instant.now().minus(2, MINUTES);
+ public static final Instant QUERY_2_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_2_LAST_MODIFIED = Instant.ofEpochSecond(1541588352L);
+ public static final Boolean QUERY_2_PERSISTED = false;
- public final static QueryDto QUERY_2_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_2_DTO = QueryDto.builder()
.id(QUERY_2_ID)
.databaseId(DATABASE_2_ID)
.query(QUERY_2_STATEMENT)
@@ -2910,19 +2910,19 @@ public abstract class BaseTest {
.resultNumber(3L)
.build();
- public final static Long QUERY_3_ID = 3L;
- public final static String QUERY_3_STATEMENT = "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10";
- public final static String QUERY_3_QUERY_HASH = "a3d3dd94ebc7653bb5a3b55dd8ed5e91d3d13c335c6855a1eb4eb7ca14c36ced";
- public final static Long QUERY_3_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long QUERY_3_DATABASE_ID = DATABASE_1_ID;
- public final static String QUERY_3_RESULT_HASH = "ff3f7cbe1b96d396957f6e39e55b8b1b577fa3d305d4795af99594cfd30cb80d";
- public final static Instant QUERY_3_CREATED = Instant.now().minus(3, MINUTES);
- public final static Instant QUERY_3_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_3_LAST_MODIFIED = Instant.ofEpochSecond(1541588353L);
- public final static Long QUERY_3_RESULT_NUMBER = 2L;
- public final static Boolean QUERY_3_PERSISTED = true;
+ public static final Long QUERY_3_ID = 3L;
+ public static final String QUERY_3_STATEMENT = "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10";
+ public static final String QUERY_3_QUERY_HASH = "a3d3dd94ebc7653bb5a3b55dd8ed5e91d3d13c335c6855a1eb4eb7ca14c36ced";
+ public static final Long QUERY_3_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long QUERY_3_DATABASE_ID = DATABASE_1_ID;
+ public static final String QUERY_3_RESULT_HASH = "ff3f7cbe1b96d396957f6e39e55b8b1b577fa3d305d4795af99594cfd30cb80d";
+ public static final Instant QUERY_3_CREATED = Instant.now().minus(3, MINUTES);
+ public static final Instant QUERY_3_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_3_LAST_MODIFIED = Instant.ofEpochSecond(1541588353L);
+ public static final Long QUERY_3_RESULT_NUMBER = 2L;
+ public static final Boolean QUERY_3_PERSISTED = true;
- public final static QueryDto QUERY_3_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_3_DTO = QueryDto.builder()
.id(QUERY_3_ID)
.databaseId(QUERY_3_DATABASE_ID)
.query(QUERY_3_STATEMENT)
@@ -2936,18 +2936,18 @@ public abstract class BaseTest {
.resultNumber(2L)
.build();
- public final static Long QUERY_7_ID = 7L;
- public final static String QUERY_7_STATEMENT = "SELECT id, date, a.location, lat, lng FROM weather_aus a JOIN weather_location l on a.location = l.location WHERE date = '2008-12-01'";
- public final static String QUERY_7_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
- public final static String QUERY_7_RESULT_HASH = "ff4f7cbe1b96d496957f6e49e55b8b1b577fa4d405d4795af99594cfd40cb80d";
- public final static Instant QUERY_7_CREATED = Instant.now().minus(4, MINUTES);
- public final static Instant QUERY_7_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_7_LAST_MODIFIED = Instant.ofEpochSecond(1541588454L);
- public final static Long QUERY_7_RESULT_NUMBER = 6L;
- public final static Long QUERY_7_RESULT_ID = 4L;
- public final static Boolean QUERY_7_PERSISTED = false;
+ public static final Long QUERY_7_ID = 7L;
+ public static final String QUERY_7_STATEMENT = "SELECT id, date, a.location, lat, lng FROM weather_aus a JOIN weather_location l on a.location = l.location WHERE date = '2008-12-01'";
+ public static final String QUERY_7_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
+ public static final String QUERY_7_RESULT_HASH = "ff4f7cbe1b96d496957f6e49e55b8b1b577fa4d405d4795af99594cfd40cb80d";
+ public static final Instant QUERY_7_CREATED = Instant.now().minus(4, MINUTES);
+ public static final Instant QUERY_7_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_7_LAST_MODIFIED = Instant.ofEpochSecond(1541588454L);
+ public static final Long QUERY_7_RESULT_NUMBER = 6L;
+ public static final Long QUERY_7_RESULT_ID = 4L;
+ public static final Boolean QUERY_7_PERSISTED = false;
- public final static QueryDto QUERY_7_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_7_DTO = QueryDto.builder()
.id(QUERY_7_ID)
.databaseId(DATABASE_4_ID)
.query(QUERY_7_STATEMENT)
@@ -2961,20 +2961,20 @@ public abstract class BaseTest {
.resultNumber(2L)
.build();
- public final static Long QUERY_4_ID = 4L;
- public final static String QUERY_4_STATEMENT = "SELECT `id`, `value` FROM `mfcc`";
- public final static String QUERY_4_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
- public final static Long QUERY_4_CONTAINER_ID = CONTAINER_3_ID;
- public final static Long QUERY_4_DATABASE_ID = DATABASE_3_ID;
- public final static String QUERY_4_RESULT_HASH = "ff4f7cbe1b96d496957f6e49e55b8b1b577fa4d405d4795af99594cfd40cb80d";
- public final static Instant QUERY_4_CREATED = Instant.now().minus(4, MINUTES);
- public final static Instant QUERY_4_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_4_LAST_MODIFIED = Instant.ofEpochSecond(1541588454L);
- public final static Long QUERY_4_RESULT_NUMBER = 6L;
- public final static Long QUERY_4_RESULT_ID = 4L;
- public final static Boolean QUERY_4_PERSISTED = false;
-
- public final static QueryDto QUERY_4 = QueryDto.builder()
+ public static final Long QUERY_4_ID = 4L;
+ public static final String QUERY_4_STATEMENT = "SELECT `id`, `value` FROM `mfcc`";
+ public static final String QUERY_4_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
+ public static final Long QUERY_4_CONTAINER_ID = CONTAINER_3_ID;
+ public static final Long QUERY_4_DATABASE_ID = DATABASE_3_ID;
+ public static final String QUERY_4_RESULT_HASH = "ff4f7cbe1b96d496957f6e49e55b8b1b577fa4d405d4795af99594cfd40cb80d";
+ public static final Instant QUERY_4_CREATED = Instant.now().minus(4, MINUTES);
+ public static final Instant QUERY_4_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_4_LAST_MODIFIED = Instant.ofEpochSecond(1541588454L);
+ public static final Long QUERY_4_RESULT_NUMBER = 6L;
+ public static final Long QUERY_4_RESULT_ID = 4L;
+ public static final Boolean QUERY_4_PERSISTED = false;
+
+ public static final QueryDto QUERY_4 = QueryDto.builder()
.id(QUERY_4_ID)
.query(QUERY_4_STATEMENT)
.queryHash(QUERY_4_QUERY_HASH)
@@ -2986,7 +2986,7 @@ public abstract class BaseTest {
.isPersisted(QUERY_4_PERSISTED)
.build();
- public final static List<Map<String, Object>> QUERY_4_RESULT_DTO = new LinkedList<>(List.of(
+ public static final List<Map<String, Object>> QUERY_4_RESULT_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("id", BigInteger.valueOf(1L));
put("value", 11.2);
@@ -3007,7 +3007,7 @@ public abstract class BaseTest {
put("value", 23.1);
}}));
- public final static QueryDto QUERY_4_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_4_DTO = QueryDto.builder()
.id(QUERY_4_ID)
.databaseId(QUERY_4_DATABASE_ID)
.query(QUERY_4_STATEMENT)
@@ -3020,19 +3020,19 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static Long QUERY_5_ID = 5L;
- public final static String QUERY_5_STATEMENT = "SELECT `id`, `value` FROM `mfcc` WHERE `value` > 0";
- public final static String QUERY_5_QUERY_HASH = "6d6dc48b12cdfd959d39a62887334a6bbd529b93eed4f211f3f671bd9e7d6225";
- public final static Long QUERY_5_CONTAINER_ID = CONTAINER_3_ID;
- public final static Long QUERY_5_DATABASE_ID = DATABASE_3_ID;
- public final static String QUERY_5_RESULT_HASH = "ff5f7cbe1b96d596957f6e59e55b8b1b577fa5d505d5795af99595cfd50cb80d";
- public final static Instant QUERY_5_CREATED = Instant.now().minus(5, MINUTES);
- public final static Instant QUERY_5_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_5_LAST_MODIFIED = Instant.ofEpochSecond(1551588555L);
- public final static Long QUERY_5_RESULT_NUMBER = 6L;
- public final static Boolean QUERY_5_PERSISTED = true;
+ public static final Long QUERY_5_ID = 5L;
+ public static final String QUERY_5_STATEMENT = "SELECT `id`, `value` FROM `mfcc` WHERE `value` > 0";
+ public static final String QUERY_5_QUERY_HASH = "6d6dc48b12cdfd959d39a62887334a6bbd529b93eed4f211f3f671bd9e7d6225";
+ public static final Long QUERY_5_CONTAINER_ID = CONTAINER_3_ID;
+ public static final Long QUERY_5_DATABASE_ID = DATABASE_3_ID;
+ public static final String QUERY_5_RESULT_HASH = "ff5f7cbe1b96d596957f6e59e55b8b1b577fa5d505d5795af99595cfd50cb80d";
+ public static final Instant QUERY_5_CREATED = Instant.now().minus(5, MINUTES);
+ public static final Instant QUERY_5_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_5_LAST_MODIFIED = Instant.ofEpochSecond(1551588555L);
+ public static final Long QUERY_5_RESULT_NUMBER = 6L;
+ public static final Boolean QUERY_5_PERSISTED = true;
- public final static QueryDto QUERY_5_DTO = QueryDto.builder()
+ public static final QueryDto QUERY_5_DTO = QueryDto.builder()
.id(QUERY_5_ID)
.databaseId(QUERY_5_DATABASE_ID)
.query(QUERY_5_STATEMENT)
@@ -3045,7 +3045,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static ViewDto QUERY_5_VIEW_DTO = ViewDto.builder()
+ public static final ViewDto QUERY_5_VIEW_DTO = ViewDto.builder()
.vdbid(DATABASE_3_ID)
.query(QUERY_5_STATEMENT)
.queryHash(QUERY_5_QUERY_HASH)
@@ -3060,7 +3060,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static List<Map<String, Object>> QUERY_5_RESULT_DTO = new LinkedList<>(List.of(
+ public static final List<Map<String, Object>> QUERY_5_RESULT_DTO = new LinkedList<>(List.of(
Map.of("id", BigInteger.valueOf(1L), "value", 11.2),
Map.of("id", BigInteger.valueOf(2L), "value", 11.3),
Map.of("id", BigInteger.valueOf(3L), "value", 11.4),
@@ -3069,17 +3069,17 @@ public abstract class BaseTest {
Map.of("id", BigInteger.valueOf(6L), "value", 23.1)
));
- public final static Long QUERY_6_ID = 6L;
- public final static String QUERY_6_STATEMENT = "SELECT `location` FROM `weather_aus` WHERE `id` = 1";
- public final static String QUERY_6_QUERY_HASH = "6d6dc48b12cdfd959d39a62887334a6bbd529b93eed4f211f3f671bd9e7d6225";
- public final static String QUERY_6_RESULT_HASH = "ff5f7cbe1b96d596957f6e59e55b8b1b577fa5d505d5795af99595cfd50cb80d";
- public final static Instant QUERY_6_CREATED = Instant.now().minus(5, MINUTES);
- public final static Instant QUERY_6_EXECUTION = Instant.now().minus(1, MINUTES);
- public final static Instant QUERY_6_LAST_MODIFIED = Instant.ofEpochSecond(1551588555L);
- public final static Long QUERY_6_RESULT_NUMBER = 1L;
- public final static Boolean QUERY_6_PERSISTED = true;
-
- public final static QueryDto QUERY_6_DTO = QueryDto.builder()
+ public static final Long QUERY_6_ID = 6L;
+ public static final String QUERY_6_STATEMENT = "SELECT `location` FROM `weather_aus` WHERE `id` = 1";
+ public static final String QUERY_6_QUERY_HASH = "6d6dc48b12cdfd959d39a62887334a6bbd529b93eed4f211f3f671bd9e7d6225";
+ public static final String QUERY_6_RESULT_HASH = "ff5f7cbe1b96d596957f6e59e55b8b1b577fa5d505d5795af99595cfd50cb80d";
+ public static final Instant QUERY_6_CREATED = Instant.now().minus(5, MINUTES);
+ public static final Instant QUERY_6_EXECUTION = Instant.now().minus(1, MINUTES);
+ public static final Instant QUERY_6_LAST_MODIFIED = Instant.ofEpochSecond(1551588555L);
+ public static final Long QUERY_6_RESULT_NUMBER = 1L;
+ public static final Boolean QUERY_6_PERSISTED = true;
+
+ public static final QueryDto QUERY_6_DTO = QueryDto.builder()
.id(QUERY_6_ID)
.databaseId(DATABASE_2_ID)
.query(QUERY_6_STATEMENT)
@@ -3092,24 +3092,24 @@ public abstract class BaseTest {
.isPersisted(QUERY_6_PERSISTED)
.build();
- public final static ColumnBriefDto TABLE_1_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_1_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(1L)
.name("id")
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static Long COLUMN_1_1_ID = 1L;
+ public static final Long COLUMN_1_1_ID = 1L;
- public final static Long COLUMN_1_2_ID = 2L;
+ public static final Long COLUMN_1_2_ID = 2L;
- public final static Long COLUMN_1_3_ID = 3L;
+ public static final Long COLUMN_1_3_ID = 3L;
- public final static Long COLUMN_1_4_ID = 4L;
+ public static final Long COLUMN_1_4_ID = 4L;
- public final static Long COLUMN_1_5_ID = 5L;
+ public static final Long COLUMN_1_5_ID = 5L;
- public final static List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_1_1_ID)
.ordinalPosition(0)
.table(TABLE_1)
@@ -3162,7 +3162,7 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<CreateTableColumnDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
+ public static final List<CreateTableColumnDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
.name("id")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(false)
@@ -3197,48 +3197,48 @@ public abstract class BaseTest {
.unitUri(UNIT_1_URI)
.build());
- public final static CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
+ public static final 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 CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO = CreateTableConstraintsDto.builder()
+ public static final 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 CreateTableDto TABLE_1_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_1_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
.constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
.build();
- public final static at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
.constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
.build();
- public final static at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_INVALID_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_INVALID_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
.constraints(TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO)
.build();
- public final static Long COLUMN_2_1_ID = 6L;
+ public static final Long COLUMN_2_1_ID = 6L;
- public final static Long COLUMN_2_2_ID = 7L;
+ public static final Long COLUMN_2_2_ID = 7L;
- public final static Long COLUMN_2_3_ID = 8L;
+ public static final Long COLUMN_2_3_ID = 8L;
- public final static List<TableColumn> TABLE_2_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_2_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_2_1_ID)
.ordinalPosition(0)
.table(TABLE_2)
@@ -3277,21 +3277,21 @@ public abstract class BaseTest {
.sets(null)
.build());
- public final static ColumnBriefDto TABLE_2_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_2_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_2_1_ID)
.name("location")
.internalName("location")
.columnType(ColumnTypeDto.VARCHAR)
.build();
- public final static ColumnBriefDto TABLE_2_COLUMNS_BRIEF_2_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_2_COLUMNS_BRIEF_2_DTO = ColumnBriefDto.builder()
.id(COLUMN_2_3_ID)
.name("lng")
.internalName("lng")
.columnType(ColumnTypeDto.DECIMAL)
.build();
- public final static List<ColumnDto> TABLE_2_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_2_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_2_1_ID)
.tableId(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
@@ -3331,7 +3331,7 @@ public abstract class BaseTest {
.sets(null)
.build());
- public final static List<ColumnBriefDto> TABLE_2_COLUMNS_BRIEF_DTO = List.of(ColumnBriefDto.builder()
+ public static final List<ColumnBriefDto> TABLE_2_COLUMNS_BRIEF_DTO = List.of(ColumnBriefDto.builder()
.id(COLUMN_2_1_ID)
.tableId(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
@@ -3356,84 +3356,84 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.DOUBLE)
.build());
- public final static Long COLUMN_3_1_ID = 9L;
+ public static final Long COLUMN_3_1_ID = 9L;
- public final static Long COLUMN_3_2_ID = 10L;
+ public static final Long COLUMN_3_2_ID = 10L;
- public final static Long COLUMN_3_3_ID = 11L;
+ public static final Long COLUMN_3_3_ID = 11L;
- public final static Long COLUMN_3_4_ID = 12L;
+ public static final Long COLUMN_3_4_ID = 12L;
- public final static Long COLUMN_3_5_ID = 13L;
+ public static final Long COLUMN_3_5_ID = 13L;
- public final static Long COLUMN_3_6_ID = 14L;
+ public static final Long COLUMN_3_6_ID = 14L;
- public final static Long COLUMN_3_7_ID = 15L;
+ public static final Long COLUMN_3_7_ID = 15L;
- public final static Long COLUMN_3_8_ID = 16L;
+ public static final Long COLUMN_3_8_ID = 16L;
- public final static Long COLUMN_3_9_ID = 17L;
+ public static final Long COLUMN_3_9_ID = 17L;
- public final static Long COLUMN_3_10_ID = 18L;
+ public static final Long COLUMN_3_10_ID = 18L;
- public final static Long COLUMN_3_11_ID = 19L;
+ public static final Long COLUMN_3_11_ID = 19L;
- public final static Long COLUMN_3_12_ID = 20L;
+ public static final Long COLUMN_3_12_ID = 20L;
- public final static Long COLUMN_3_13_ID = 21L;
+ public static final Long COLUMN_3_13_ID = 21L;
- public final static Long COLUMN_3_14_ID = 22L;
+ public static final Long COLUMN_3_14_ID = 22L;
- public final static Long COLUMN_3_15_ID = 23L;
+ public static final Long COLUMN_3_15_ID = 23L;
- public final static Long COLUMN_3_16_ID = 24L;
+ public static final Long COLUMN_3_16_ID = 24L;
- public final static Long COLUMN_3_17_ID = 25L;
+ public static final Long COLUMN_3_17_ID = 25L;
- public final static Long COLUMN_3_18_ID = 26L;
+ public static final Long COLUMN_3_18_ID = 26L;
- public final static Long COLUMN_3_19_ID = 27L;
+ public static final Long COLUMN_3_19_ID = 27L;
- public final static Long COLUMN_3_20_ID = 28L;
+ public static final Long COLUMN_3_20_ID = 28L;
- public final static Long COLUMN_3_21_ID = 29L;
+ public static final Long COLUMN_3_21_ID = 29L;
- public final static Long COLUMN_3_22_ID = 30L;
+ public static final Long COLUMN_3_22_ID = 30L;
- public final static Long COLUMN_3_23_ID = 31L;
+ public static final Long COLUMN_3_23_ID = 31L;
- public final static Long COLUMN_3_24_ID = 32L;
+ public static final Long COLUMN_3_24_ID = 32L;
- public final static Long COLUMN_3_25_ID = 33L;
+ public static final Long COLUMN_3_25_ID = 33L;
- public final static Long COLUMN_3_26_ID = 34L;
+ public static final Long COLUMN_3_26_ID = 34L;
- public final static Long COLUMN_3_27_ID = 35L;
+ public static final Long COLUMN_3_27_ID = 35L;
- public final static Long COLUMN_3_28_ID = 36L;
+ public static final Long COLUMN_3_28_ID = 36L;
- public final static Long COLUMN_3_29_ID = 37L;
+ public static final Long COLUMN_3_29_ID = 37L;
- public final static Long COLUMN_3_30_ID = 38L;
+ public static final Long COLUMN_3_30_ID = 38L;
- public final static Long COLUMN_3_31_ID = 39L;
+ public static final Long COLUMN_3_31_ID = 39L;
- public final static Long COLUMN_3_32_ID = 40L;
+ public static final Long COLUMN_3_32_ID = 40L;
- public final static Long COLUMN_3_33_ID = 41L;
+ public static final Long COLUMN_3_33_ID = 41L;
- public final static Long COLUMN_3_34_ID = 42L;
+ public static final Long COLUMN_3_34_ID = 42L;
- public final static Long COLUMN_3_35_ID = 43L;
+ public static final Long COLUMN_3_35_ID = 43L;
- public final static ColumnBriefDto TABLE_3_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_3_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_3_1_ID)
.columnType(ColumnTypeDto.BIGINT)
.name("id")
.internalName("id")
.build();
- public final static List<TableColumn> TABLE_3_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_3_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_3_1_ID)
.table(TABLE_3)
.ordinalPosition(0)
@@ -3819,7 +3819,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build());
- public final static List<ColumnDto> TABLE_3_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_3_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_3_1_ID)
.tableId(TABLE_3_ID)
.databaseId(DATABASE_1_ID)
@@ -4205,56 +4205,56 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build());
- public final static Long COLUMN_5_1_ID = 46L;
+ public static final Long COLUMN_5_1_ID = 46L;
- public final static Long COLUMN_5_2_ID = 47L;
+ public static final Long COLUMN_5_2_ID = 47L;
- public final static Long COLUMN_5_3_ID = 48L;
+ public static final Long COLUMN_5_3_ID = 48L;
- public final static Long COLUMN_5_4_ID = 49L;
+ public static final Long COLUMN_5_4_ID = 49L;
- public final static Long COLUMN_5_5_ID = 50L;
+ public static final Long COLUMN_5_5_ID = 50L;
- public final static Long COLUMN_5_6_ID = 51L;
+ public static final Long COLUMN_5_6_ID = 51L;
- public final static Long COLUMN_5_7_ID = 52L;
+ public static final Long COLUMN_5_7_ID = 52L;
- public final static Long COLUMN_5_8_ID = 53L;
+ public static final Long COLUMN_5_8_ID = 53L;
- public final static Long COLUMN_5_9_ID = 54L;
+ public static final Long COLUMN_5_9_ID = 54L;
- public final static Long COLUMN_5_10_ID = 55L;
+ public static final Long COLUMN_5_10_ID = 55L;
- public final static Long COLUMN_5_11_ID = 56L;
+ public static final Long COLUMN_5_11_ID = 56L;
- public final static Long COLUMN_5_12_ID = 57L;
+ public static final Long COLUMN_5_12_ID = 57L;
- public final static Long COLUMN_5_13_ID = 58L;
+ public static final Long COLUMN_5_13_ID = 58L;
- public final static Long COLUMN_5_14_ID = 59L;
+ public static final Long COLUMN_5_14_ID = 59L;
- public final static Long COLUMN_5_15_ID = 60L;
+ public static final Long COLUMN_5_15_ID = 60L;
- public final static Long COLUMN_5_16_ID = 61L;
+ public static final Long COLUMN_5_16_ID = 61L;
- public final static Long COLUMN_5_17_ID = 62L;
+ public static final Long COLUMN_5_17_ID = 62L;
- public final static Long COLUMN_5_18_ID = 63L;
+ public static final Long COLUMN_5_18_ID = 63L;
- public final static Long COLUMN_5_19_ID = 64L;
+ public static final Long COLUMN_5_19_ID = 64L;
- public final static Long COLUMN_5_20_ID = 65L;
+ public static final Long COLUMN_5_20_ID = 65L;
- public final static Long COLUMN_5_21_ID = 66L;
+ public static final Long COLUMN_5_21_ID = 66L;
- public final static ColumnBriefDto TABLE_5_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_5_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_5_1_ID)
.name("id")
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static List<TableColumn> TABLE_5_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_5_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_5_1_ID)
.ordinalPosition(0)
.table(TABLE_5)
@@ -4444,7 +4444,7 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<ColumnDto> TABLE_5_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_5_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_5_1_ID)
.ordinalPosition(0)
.tableId(TABLE_5_ID)
@@ -4634,17 +4634,17 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<CreateForeignKeyDto> TABLE_5_FOREIGN_KEYS_INVALID_CREATE = List.of(CreateForeignKeyDto.builder()
+ public static final 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 CreateTableConstraintsDto TABLE_5_CONSTRAINTS_INVALID_CREATE = CreateTableConstraintsDto.builder()
+ public static final CreateTableConstraintsDto TABLE_5_CONSTRAINTS_INVALID_CREATE = CreateTableConstraintsDto.builder()
.foreignKeys(TABLE_5_FOREIGN_KEYS_INVALID_CREATE)
.build();
- public final static List<CreateTableColumnDto> TABLE_5_COLUMNS_CREATE = List.of(CreateTableColumnDto.builder()
+ public static final List<CreateTableColumnDto> TABLE_5_COLUMNS_CREATE = List.of(CreateTableColumnDto.builder()
.name("id")
.type(ColumnTypeDto.BIGINT)
.nullAllowed(false)
@@ -4750,28 +4750,28 @@ public abstract class BaseTest {
.nullAllowed(true)
.build());
- public final static CreateTableConstraintsDto TABLE_5_CREATE_CONSTRAINTS_DTO = CreateTableConstraintsDto.builder()
+ public static final 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 CreateTableDto TABLE_5_CREATE_DTO = CreateTableDto.builder()
+ public static final 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 CreateTableDto TABLE_5_INVALID_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_5_INVALID_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_5_NAME)
.description(TABLE_5_DESCRIPTION)
.columns(TABLE_5_COLUMNS_CREATE)
.constraints(TABLE_5_CONSTRAINTS_INVALID_CREATE)
.build();
- public final static List<TableColumn> TABLE_6_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_6_COLUMNS = List.of(TableColumn.builder()
.id(67L)
.ordinalPosition(0)
.table(TABLE_6)
@@ -4826,14 +4826,14 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static ColumnBriefDto TABLE_6_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_6_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(67L)
.name("id")
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static List<ColumnDto> TABLE_6_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_6_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(67L)
.ordinalPosition(0)
.tableId(TABLE_6_ID)
@@ -4888,25 +4888,25 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<List<String>> TABLE_6_UNIQUES_CREATE = List.of(
+ public static final List<List<String>> TABLE_6_UNIQUES_CREATE = List.of(
List.of("firstname", "lastname"));
- public final static List<CreateForeignKeyDto> TABLE_6_FOREIGN_KEYS_CREATE = List.of(CreateForeignKeyDto.builder()
+ public static final 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")))
.build());
- public final static Set<String> TABLE_6_CHECKS_CREATE = Set.of("firstname != lastname");
+ public static final Set<String> TABLE_6_CHECKS_CREATE = Set.of("firstname != lastname");
- public final static CreateTableConstraintsDto TABLE_6_CONSTRAINTS_CREATE = CreateTableConstraintsDto.builder()
+ public static final 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<CreateTableColumnDto> TABLE_6_COLUMNS_CREATE = List.of(
+ public static final List<CreateTableColumnDto> TABLE_6_COLUMNS_CREATE = List.of(
CreateTableColumnDto.builder()
.name("name_id")
.type(ColumnTypeDto.BIGINT)
@@ -4919,32 +4919,32 @@ public abstract class BaseTest {
.nullAllowed(false)
.build());
- public final static CreateTableDto TABLE_6_CREATE_DTO = CreateTableDto.builder()
+ public static final CreateTableDto TABLE_6_CREATE_DTO = CreateTableDto.builder()
.name(TABLE_6_NAME)
.description(TABLE_6_DESCRIPTION)
.columns(TABLE_6_COLUMNS_CREATE)
.constraints(TABLE_6_CONSTRAINTS_CREATE)
.build();
- public final static Long COLUMN_7_1_ID = 73L;
+ public static final Long COLUMN_7_1_ID = 73L;
- public final static Long COLUMN_7_2_ID = 74L;
+ public static final Long COLUMN_7_2_ID = 74L;
- public final static ColumnBriefDto TABLE_7_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_7_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
.id(COLUMN_7_1_ID)
.name("name_id")
.internalName("name_id")
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static ColumnBriefDto TABLE_7_COLUMNS_BRIEF_1_DTO = ColumnBriefDto.builder()
+ public static final ColumnBriefDto TABLE_7_COLUMNS_BRIEF_1_DTO = ColumnBriefDto.builder()
.id(COLUMN_7_2_ID)
.name("zoo_id")
.internalName("zoo_id")
.columnType(ColumnTypeDto.BIGINT)
.build();
- public final static List<TableColumn> TABLE_7_COLUMNS = List.of(TableColumn.builder()
+ public static final List<TableColumn> TABLE_7_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_7_1_ID)
.ordinalPosition(0)
.table(TABLE_7)
@@ -4963,7 +4963,7 @@ public abstract class BaseTest {
.isNullAllowed(false)
.build());
- public final static List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
+ public static final List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
.id(COLUMN_7_1_ID)
.ordinalPosition(0)
.tableId(TABLE_7_ID)
@@ -4982,18 +4982,18 @@ public abstract class BaseTest {
.isNullAllowed(false)
.build());
- public final static Long VIEW_1_ID = 1L;
- public final static Boolean VIEW_1_INITIAL_VIEW = false;
- public final static String VIEW_1_NAME = "JUnit";
- public final static String VIEW_1_INTERNAL_NAME = "junit";
- public final static Long VIEW_1_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long VIEW_1_DATABASE_ID = DATABASE_1_ID;
- public final static Boolean VIEW_1_PUBLIC = false;
- public final static Boolean VIEW_1_SCHEMA_PUBLIC = false;
- public final static String VIEW_1_QUERY = "select `location`, `lat`, `lng` from `weather_location`";
- public final static String VIEW_1_QUERY_HASH = "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23";
-
- public final static List<ViewColumnDto> VIEW_1_COLUMNS_DTO = List.of(
+ public static final Long VIEW_1_ID = 1L;
+ public static final Boolean VIEW_1_INITIAL_VIEW = false;
+ public static final String VIEW_1_NAME = "JUnit";
+ public static final String VIEW_1_INTERNAL_NAME = "junit";
+ public static final Long VIEW_1_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long VIEW_1_DATABASE_ID = DATABASE_1_ID;
+ public static final Boolean VIEW_1_PUBLIC = false;
+ public static final Boolean VIEW_1_SCHEMA_PUBLIC = false;
+ public static final String VIEW_1_QUERY = "select `location`, `lat`, `lng` from `weather_location`";
+ public static final String VIEW_1_QUERY_HASH = "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23";
+
+ public static final List<ViewColumnDto> VIEW_1_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(1L)
.ordinalPosition(0)
@@ -5028,7 +5028,7 @@ public abstract class BaseTest {
.build()
);
- public final static View VIEW_1 = View.builder()
+ public static final View VIEW_1 = View.builder()
.id(VIEW_1_ID)
.isInitialView(VIEW_1_INITIAL_VIEW)
.name(VIEW_1_NAME)
@@ -5044,8 +5044,8 @@ public abstract class BaseTest {
.columns(null) /* VIEW_1_COLUMNS */
.build();
- public final static Long VIEW_1_DATA_COUNT = 3L;
- public final static List<Map<String, Object>> VIEW_1_DATA_DTO = new LinkedList<>(List.of(
+ public static final Long VIEW_1_DATA_COUNT = 3L;
+ public static final List<Map<String, Object>> VIEW_1_DATA_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("location", "Albury");
put("lat", -36.0653583);
@@ -5063,7 +5063,7 @@ public abstract class BaseTest {
}}
));
- public final static List<ViewColumn> VIEW_1_COLUMNS = List.of(
+ public static final List<ViewColumn> VIEW_1_COLUMNS = List.of(
ViewColumn.builder()
.id(1L)
.ordinalPosition(0)
@@ -5098,7 +5098,7 @@ public abstract class BaseTest {
.build()
);
- public final static ViewDto VIEW_1_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_1_DTO = ViewDto.builder()
.id(VIEW_1_ID)
.isInitialView(VIEW_1_INITIAL_VIEW)
.name(VIEW_1_NAME)
@@ -5113,7 +5113,7 @@ public abstract class BaseTest {
.columns(VIEW_1_COLUMNS_DTO)
.build();
- public final static ViewDto VIEW_1_PRIVILEGED_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_1_PRIVILEGED_DTO = ViewDto.builder()
.id(VIEW_1_ID)
.isInitialView(VIEW_1_INITIAL_VIEW)
.name(VIEW_1_NAME)
@@ -5128,7 +5128,7 @@ public abstract class BaseTest {
.database(null) /* DATABASE_1_PRIVILEGED_DTO */
.build();
- public final static ViewBriefDto VIEW_1_BRIEF_DTO = ViewBriefDto.builder()
+ public static final ViewBriefDto VIEW_1_BRIEF_DTO = ViewBriefDto.builder()
.id(VIEW_1_ID)
.isInitialView(VIEW_1_INITIAL_VIEW)
.name(VIEW_1_NAME)
@@ -5141,24 +5141,24 @@ public abstract class BaseTest {
.queryHash(VIEW_1_QUERY_HASH)
.build();
- public final static CreateViewDto VIEW_1_CREATE_DTO = CreateViewDto.builder()
+ public static final CreateViewDto VIEW_1_CREATE_DTO = CreateViewDto.builder()
.isPublic(VIEW_1_PUBLIC)
.name(VIEW_1_NAME)
.query(VIEW_1_QUERY)
.build();
- public final static Long VIEW_2_ID = 2L;
- public final static Boolean VIEW_2_INITIAL_VIEW = false;
- public final static String VIEW_2_NAME = "JUnit2";
- public final static String VIEW_2_INTERNAL_NAME = "junit2";
- public final static Long VIEW_2_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long VIEW_2_DATABASE_ID = DATABASE_1_ID;
- public final static Boolean VIEW_2_PUBLIC = true;
- public final static Boolean VIEW_2_SCHEMA_PUBLIC = true;
- public final static String VIEW_2_QUERY = "select `date`, `location` as loc, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
- public final static String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
+ public static final Long VIEW_2_ID = 2L;
+ public static final Boolean VIEW_2_INITIAL_VIEW = false;
+ public static final String VIEW_2_NAME = "JUnit2";
+ public static final String VIEW_2_INTERNAL_NAME = "junit2";
+ public static final Long VIEW_2_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long VIEW_2_DATABASE_ID = DATABASE_1_ID;
+ public static final Boolean VIEW_2_PUBLIC = true;
+ public static final Boolean VIEW_2_SCHEMA_PUBLIC = true;
+ public static final String VIEW_2_QUERY = "select `date`, `location` as loc, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
+ public static final String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
- public final static List<ViewColumnDto> VIEW_2_COLUMNS_DTO = List.of(
+ public static final List<ViewColumnDto> VIEW_2_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(4L)
.databaseId(DATABASE_1_ID)
@@ -5202,7 +5202,7 @@ public abstract class BaseTest {
.build()
);
- public final static View VIEW_2 = View.builder()
+ public static final View VIEW_2 = View.builder()
.id(VIEW_2_ID)
.isInitialView(VIEW_2_INITIAL_VIEW)
.name(VIEW_2_NAME)
@@ -5217,7 +5217,7 @@ public abstract class BaseTest {
.owner(USER_1)
.build();
- public final static List<ViewColumn> VIEW_2_COLUMNS = List.of(
+ public static final List<ViewColumn> VIEW_2_COLUMNS = List.of(
ViewColumn.builder()
.id(4L)
.ordinalPosition(0)
@@ -5261,7 +5261,7 @@ public abstract class BaseTest {
.build()
);
- public final static ViewDto VIEW_2_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_2_DTO = ViewDto.builder()
.id(VIEW_2_ID)
.isInitialView(VIEW_2_INITIAL_VIEW)
.name(VIEW_2_NAME)
@@ -5275,7 +5275,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static ViewDto VIEW_2_PRIVILEGED_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_2_PRIVILEGED_DTO = ViewDto.builder()
.id(VIEW_2_ID)
.isInitialView(VIEW_2_INITIAL_VIEW)
.name(VIEW_2_NAME)
@@ -5291,7 +5291,7 @@ public abstract class BaseTest {
.database(null) /* DATABASE_1_PRIVILEGED_DTO */
.build();
- public final static ViewBriefDto VIEW_2_BRIEF_DTO = ViewBriefDto.builder()
+ public static final ViewBriefDto VIEW_2_BRIEF_DTO = ViewBriefDto.builder()
.id(VIEW_2_ID)
.isInitialView(VIEW_2_INITIAL_VIEW)
.name(VIEW_2_NAME)
@@ -5304,20 +5304,20 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long VIEW_3_ID = 3L;
- public final static Boolean VIEW_3_INITIAL_VIEW = false;
- public final static String VIEW_3_NAME = "JUnit3";
- public final static String VIEW_3_INTERNAL_NAME = "junit3";
- public final static Long VIEW_3_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long VIEW_3_DATABASE_ID = DATABASE_1_ID;
- public final static Boolean VIEW_3_PUBLIC = true;
- public final static Boolean VIEW_3_SCHEMA_PUBLIC = false;
- public final static String VIEW_3_QUERY = "select w.`mintemp`, w.`rainfall`, w.`location`, m.`date` from `weather_aus` w join `junit2` m on m.`location` = w.`location` and m.`date` = w.`date`";
- public final static String VIEW_3_QUERY_HASH = "bbbaa56a5206b3dc3e6cf9301b0db9344eb6f19b100c7b88550ffb597a0bd255";
+ public static final Long VIEW_3_ID = 3L;
+ public static final Boolean VIEW_3_INITIAL_VIEW = false;
+ public static final String VIEW_3_NAME = "JUnit3";
+ public static final String VIEW_3_INTERNAL_NAME = "junit3";
+ public static final Long VIEW_3_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long VIEW_3_DATABASE_ID = DATABASE_1_ID;
+ public static final Boolean VIEW_3_PUBLIC = true;
+ public static final Boolean VIEW_3_SCHEMA_PUBLIC = false;
+ public static final String VIEW_3_QUERY = "select w.`mintemp`, w.`rainfall`, w.`location`, m.`date` from `weather_aus` w join `junit2` m on m.`location` = w.`location` and m.`date` = w.`date`";
+ public static final String VIEW_3_QUERY_HASH = "bbbaa56a5206b3dc3e6cf9301b0db9344eb6f19b100c7b88550ffb597a0bd255";
- public final static Long VIEW_3_DATA_COUNT = 3L;
+ public static final Long VIEW_3_DATA_COUNT = 3L;
- public final static List<ViewColumnDto> VIEW_3_COLUMNS_DTO = List.of(
+ public static final List<ViewColumnDto> VIEW_3_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(8L)
.databaseId(DATABASE_1_ID)
@@ -5361,7 +5361,7 @@ public abstract class BaseTest {
.build()
);
- public final static View VIEW_3 = View.builder()
+ public static final View VIEW_3 = View.builder()
.id(VIEW_3_ID)
.isInitialView(VIEW_3_INITIAL_VIEW)
.name(VIEW_3_NAME)
@@ -5376,7 +5376,7 @@ public abstract class BaseTest {
.owner(USER_1)
.build();
- public final static ViewDto VIEW_3_PRIVILEGED_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_3_PRIVILEGED_DTO = ViewDto.builder()
.id(VIEW_3_ID)
.isInitialView(VIEW_3_INITIAL_VIEW)
.name(VIEW_3_NAME)
@@ -5392,7 +5392,7 @@ public abstract class BaseTest {
.database(null) /* DATABASE_1_PRIVILEGED_DTO */
.build();
- public final static List<ViewColumn> VIEW_3_COLUMNS = List.of(
+ public static final List<ViewColumn> VIEW_3_COLUMNS = List.of(
ViewColumn.builder()
.id(8L)
.ordinalPosition(0)
@@ -5436,7 +5436,7 @@ public abstract class BaseTest {
.build()
);
- public final static ViewDto VIEW_3_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_3_DTO = ViewDto.builder()
.id(VIEW_3_ID)
.isInitialView(VIEW_3_INITIAL_VIEW)
.name(VIEW_3_NAME)
@@ -5450,7 +5450,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static ViewBriefDto VIEW_3_BRIEF_DTO = ViewBriefDto.builder()
+ public static final ViewBriefDto VIEW_3_BRIEF_DTO = ViewBriefDto.builder()
.id(VIEW_3_ID)
.isInitialView(VIEW_3_INITIAL_VIEW)
.name(VIEW_3_NAME)
@@ -5463,20 +5463,20 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static Long VIEW_4_ID = 4L;
- public final static Boolean VIEW_4_INITIAL_VIEW = false;
- public final static String VIEW_4_NAME = "Mock View";
- public final static String VIEW_4_INTERNAL_NAME = "mock_view";
- public final static Long VIEW_4_CONTAINER_ID = CONTAINER_2_ID;
- public final static Long VIEW_4_DATABASE_ID = DATABASE_2_ID;
- public final static Long VIEW_4_TABLE_ID = TABLE_5_ID;
- public final static Table VIEW_4_TABLE = TABLE_5;
- public final static Boolean VIEW_4_PUBLIC = true;
- public final static Boolean VIEW_4_SCHEMA_PUBLIC = false;
- public final static String VIEW_4_QUERY = "SELECT `animal_name`, `hair`, `feathers`, `eggs`, `milk`, `airborne`, `aquatic`, `predator`, `backbone`, `breathes`, `venomous`, `fins`, `legs`, `tail`, `domestic`, `catsize`, `class_type` FROM `zoo` WHERE `class_type` = 1";
- public final static String VIEW_4_QUERY_HASH = "3561cd0bb0b0e94d6f15ae602134252a5760d09d660a71a4fb015b6991c8ba0b";
-
- public final static List<ViewColumnDto> VIEW_4_COLUMNS_DTO = List.of(
+ public static final Long VIEW_4_ID = 4L;
+ public static final Boolean VIEW_4_INITIAL_VIEW = false;
+ public static final String VIEW_4_NAME = "Mock View";
+ public static final String VIEW_4_INTERNAL_NAME = "mock_view";
+ public static final Long VIEW_4_CONTAINER_ID = CONTAINER_2_ID;
+ public static final Long VIEW_4_DATABASE_ID = DATABASE_2_ID;
+ public static final Long VIEW_4_TABLE_ID = TABLE_5_ID;
+ public static final Table VIEW_4_TABLE = TABLE_5;
+ public static final Boolean VIEW_4_PUBLIC = true;
+ public static final Boolean VIEW_4_SCHEMA_PUBLIC = false;
+ public static final String VIEW_4_QUERY = "SELECT `animal_name`, `hair`, `feathers`, `eggs`, `milk`, `airborne`, `aquatic`, `predator`, `backbone`, `breathes`, `venomous`, `fins`, `legs`, `tail`, `domestic`, `catsize`, `class_type` FROM `zoo` WHERE `class_type` = 1";
+ public static final String VIEW_4_QUERY_HASH = "3561cd0bb0b0e94d6f15ae602134252a5760d09d660a71a4fb015b6991c8ba0b";
+
+ public static final List<ViewColumnDto> VIEW_4_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(12L)
.databaseId(DATABASE_2_ID)
@@ -5631,7 +5631,7 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static View VIEW_4 = View.builder()
+ public static final View VIEW_4 = View.builder()
.id(VIEW_4_ID)
.isInitialView(VIEW_4_INITIAL_VIEW)
.name(VIEW_4_NAME)
@@ -5646,7 +5646,7 @@ public abstract class BaseTest {
.columns(null) /* VIEW_4_COLUMNS */
.build();
- public final static ViewDto VIEW_4_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_4_DTO = ViewDto.builder()
.id(VIEW_4_ID)
.isInitialView(VIEW_4_INITIAL_VIEW)
.name(VIEW_4_NAME)
@@ -5660,7 +5660,7 @@ public abstract class BaseTest {
.columns(VIEW_4_COLUMNS_DTO)
.build();
- public final static ViewBriefDto VIEW_4_BRIEF_DTO = ViewBriefDto.builder()
+ public static final ViewBriefDto VIEW_4_BRIEF_DTO = ViewBriefDto.builder()
.id(VIEW_4_ID)
.isInitialView(VIEW_4_INITIAL_VIEW)
.name(VIEW_4_NAME)
@@ -5673,7 +5673,7 @@ public abstract class BaseTest {
.ownedBy(USER_1_ID)
.build();
- public final static List<ViewColumn> VIEW_4_COLUMNS = List.of(
+ public static final List<ViewColumn> VIEW_4_COLUMNS = List.of(
ViewColumn.builder()
.id(12L)
.ordinalPosition(0)
@@ -5828,18 +5828,18 @@ public abstract class BaseTest {
.view(VIEW_4)
.build());
- public final static Long VIEW_5_ID = 5L;
- public final static Boolean VIEW_5_INITIAL_VIEW = false;
- public final static String VIEW_5_NAME = "Mock View";
- public final static String VIEW_5_INTERNAL_NAME = "mock_view";
- public final static Long VIEW_5_CONTAINER_ID = CONTAINER_2_ID;
- public final static Long VIEW_5_DATABASE_ID = DATABASE_3_ID;
- public final static Boolean VIEW_5_PUBLIC = true;
- public final static Boolean VIEW_5_SCHEMA_PUBLIC = true;
- public final static String VIEW_5_QUERY = "SELECT `location`, `lat`, `lng` FROM `weather_location` WHERE `location` = 'Albury'";
- public final static String VIEW_5_QUERY_HASH = "120f32478aaff874c25ab32eceb9f00b64cc9d422831046f2f5d43953aca01e7";
-
- public final static View VIEW_5 = View.builder()
+ public static final Long VIEW_5_ID = 5L;
+ public static final Boolean VIEW_5_INITIAL_VIEW = false;
+ public static final String VIEW_5_NAME = "Mock View";
+ public static final String VIEW_5_INTERNAL_NAME = "mock_view";
+ public static final Long VIEW_5_CONTAINER_ID = CONTAINER_2_ID;
+ public static final Long VIEW_5_DATABASE_ID = DATABASE_3_ID;
+ public static final Boolean VIEW_5_PUBLIC = true;
+ public static final Boolean VIEW_5_SCHEMA_PUBLIC = true;
+ public static final String VIEW_5_QUERY = "SELECT `location`, `lat`, `lng` FROM `weather_location` WHERE `location` = 'Albury'";
+ public static final String VIEW_5_QUERY_HASH = "120f32478aaff874c25ab32eceb9f00b64cc9d422831046f2f5d43953aca01e7";
+
+ public static final View VIEW_5 = View.builder()
.id(VIEW_5_ID)
.isInitialView(VIEW_5_INITIAL_VIEW)
.name(VIEW_5_NAME)
@@ -5854,7 +5854,7 @@ public abstract class BaseTest {
.columns(null)
.build();
- public final static ViewDto VIEW_5_DTO = ViewDto.builder()
+ public static final ViewDto VIEW_5_DTO = ViewDto.builder()
.id(VIEW_5_ID)
.isInitialView(VIEW_5_INITIAL_VIEW)
.name(VIEW_5_NAME)
@@ -5868,7 +5868,7 @@ public abstract class BaseTest {
.columns(new LinkedList<>())
.build();
- public final static ViewBriefDto VIEW_5_BRIEF_DTO = ViewBriefDto.builder()
+ public static final ViewBriefDto VIEW_5_BRIEF_DTO = ViewBriefDto.builder()
.id(VIEW_5_ID)
.isInitialView(VIEW_5_INITIAL_VIEW)
.name(VIEW_5_NAME)
@@ -5880,7 +5880,7 @@ public abstract class BaseTest {
.queryHash(VIEW_5_QUERY_HASH)
.build();
- public final static List<ViewColumn> VIEW_5_COLUMNS = List.of(
+ public static final List<ViewColumn> VIEW_5_COLUMNS = List.of(
ViewColumn.builder()
.id(29L)
.ordinalPosition(0)
@@ -5914,7 +5914,7 @@ public abstract class BaseTest {
.view(VIEW_5)
.build());
- public final static List<ViewColumnDto> VIEW_5_COLUMNS_DTO = List.of(
+ public static final List<ViewColumnDto> VIEW_5_COLUMNS_DTO = List.of(
ViewColumnDto.builder()
.id(29L)
.databaseId(DATABASE_3_ID)
@@ -5948,8 +5948,8 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static Long QUERY_1_RESULT_ID = 1L;
- public final static List<Map<String, Object>> QUERY_1_RESULT_DTO = new LinkedList<>(List.of(
+ public static final Long QUERY_1_RESULT_ID = 1L;
+ public static final List<Map<String, Object>> QUERY_1_RESULT_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("location", "Albury");
put("lat", -36.0653583);
@@ -5960,34 +5960,34 @@ public abstract class BaseTest {
put("lng", 150.6517942);
}}));
- public final static String LICENSE_1_IDENTIFIER = "MIT";
- public final static String LICENSE_1_URI = "https://opensource.org/license/mit/";
+ public static final String LICENSE_1_IDENTIFIER = "MIT";
+ public static final String LICENSE_1_URI = "https://opensource.org/license/mit/";
- public final static License LICENSE_1 = License.builder()
+ public static final License LICENSE_1 = License.builder()
.identifier(LICENSE_1_IDENTIFIER)
.uri(LICENSE_1_URI)
.build();
- public final static LicenseDto LICENSE_1_DTO = LicenseDto.builder()
+ public static final LicenseDto LICENSE_1_DTO = LicenseDto.builder()
.identifier(LICENSE_1_IDENTIFIER)
.uri(LICENSE_1_URI)
.build();
- public final static Long CREATOR_1_ID = 1L;
- public final static Long CREATOR_1_QUERY_ID = 1L;
- public final static String CREATOR_1_ORCID = "00000-00000-00000";
- public final static String CREATOR_1_AFFIL = "TU Graz";
- public final static String CREATOR_1_AFFIL_ROR = "https://ror.org/04wn28048";
- public final static String CREATOR_1_AFFIL_URI = "https://ror.org/";
- public final static AffiliationIdentifierSchemeType CREATOR_1_AFFIL_TYPE = AffiliationIdentifierSchemeType.ROR;
- public final static AffiliationIdentifierSchemeTypeDto CREATOR_1_AFFIL_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
- public final static String CREATOR_1_FIRSTNAME = "Max";
- public final static String CREATOR_1_LASTNAME = "Mustermann";
- public final static String CREATOR_1_NAME = CREATOR_1_LASTNAME + ", " + CREATOR_1_FIRSTNAME;
- public final static Instant CREATOR_1_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant CREATOR_1_MODIFIED = Instant.ofEpochSecond(1541588352L);
-
- public final static OrcidDto ORCID_1_DTO = OrcidDto.builder()
+ public static final Long CREATOR_1_ID = 1L;
+ public static final Long CREATOR_1_QUERY_ID = 1L;
+ public static final String CREATOR_1_ORCID = "00000-00000-00000";
+ public static final String CREATOR_1_AFFIL = "TU Graz";
+ public static final String CREATOR_1_AFFIL_ROR = "https://ror.org/04wn28048";
+ public static final String CREATOR_1_AFFIL_URI = "https://ror.org/";
+ public static final AffiliationIdentifierSchemeType CREATOR_1_AFFIL_TYPE = AffiliationIdentifierSchemeType.ROR;
+ public static final AffiliationIdentifierSchemeTypeDto CREATOR_1_AFFIL_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
+ public static final String CREATOR_1_FIRSTNAME = "Max";
+ public static final String CREATOR_1_LASTNAME = "Mustermann";
+ public static final String CREATOR_1_NAME = CREATOR_1_LASTNAME + ", " + CREATOR_1_FIRSTNAME;
+ public static final Instant CREATOR_1_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant CREATOR_1_MODIFIED = Instant.ofEpochSecond(1541588352L);
+
+ public static final OrcidDto ORCID_1_DTO = OrcidDto.builder()
.person(OrcidPersonDto.builder()
.name(OrcidNameDto.builder()
.givenNames(OrcidValueDto.builder()
@@ -6017,201 +6017,201 @@ public abstract class BaseTest {
.build())
.build();
- public final static Long CREATOR_2_ID = 2L;
- public final static Long CREATOR_2_QUERY_ID = 1L;
- public final static String CREATOR_2_ORCID = "00000-00000-00000";
- public final static String CREATOR_2_AFFIL = "TU Wien";
- public final static String CREATOR_2_FIRSTNAME = "Martina";
- public final static String CREATOR_2_LASTNAME = "Mustermann";
- public final static String CREATOR_2_NAME = CREATOR_2_LASTNAME + ", " + CREATOR_2_FIRSTNAME;
- public final static Instant CREATOR_2_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant CREATOR_2_MODIFIED = Instant.ofEpochSecond(1541588352L);
-
- public final static Long CREATOR_3_ID = 3L;
- public final static Long CREATOR_3_QUERY_ID = 1L;
- public final static String CREATOR_3_ORCID = "00000-00000-00000";
- public final static String CREATOR_3_AFFIL = "TU Graz";
- public final static String CREATOR_3_AFFIL_ROR = "https://ror.org/04wn28048";
- public final static AffiliationIdentifierSchemeType CREATOR_3_AFFIL_SCHEME_TYPE = AffiliationIdentifierSchemeType.ROR;
- public final static AffiliationIdentifierSchemeTypeDto CREATOR_3_AFFIL_SCHEME_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
- public final static String CREATOR_3_AFFIL_URI = "https://ror.org/";
- public final static String CREATOR_3_FIRSTNAME = "Max";
- public final static String CREATOR_3_LASTNAME = "Mustermann";
- public final static String CREATOR_3_NAME = CREATOR_3_LASTNAME + ", " + CREATOR_3_FIRSTNAME;
- public final static Instant CREATOR_3_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant CREATOR_3_MODIFIED = Instant.ofEpochSecond(1541588352L);
-
- public final static Long CREATOR_4_ID = 4L;
- public final static Long CREATOR_4_QUERY_ID = 1L;
- public final static String CREATOR_4_ORCID = "00000-00000-00000";
- public final static String CREATOR_4_AFFIL = "TU Wien";
- public final static String CREATOR_4_AFFIL_ROR = "https://ror.org/04d836q62";
- public final static String CREATOR_4_AFFIL_URI = "https://ror.org/";
- public final static AffiliationIdentifierSchemeType CREATOR_4_AFFIL_TYPE = AffiliationIdentifierSchemeType.ROR;
- public final static AffiliationIdentifierSchemeTypeDto CREATOR_4_AFFIL_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
- public final static String CREATOR_4_FIRSTNAME = "Martina";
- public final static String CREATOR_4_LASTNAME = "Mustermann";
- public final static String CREATOR_4_NAME = CREATOR_4_LASTNAME + ", " + CREATOR_4_FIRSTNAME;
- public final static Instant CREATOR_4_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant CREATOR_4_MODIFIED = Instant.ofEpochSecond(1541588352L);
-
- public final static Long IDENTIFIER_1_ID = 1L;
- public final static Long IDENTIFIER_1_QUERY_ID = null;
- public final static Long IDENTIFIER_1_CONTAINER_ID = CONTAINER_1_ID;
- public final static Long IDENTIFIER_1_DATABASE_ID = DATABASE_1_ID;
- public final static String IDENTIFIER_1_DOI = "10.12345/183";
- public final static Instant IDENTIFIER_1_CREATED = Instant.ofEpochSecond(1641588352L) /* 2022-01-07 20:45:52 */;
- public final static Instant IDENTIFIER_1_MODIFIED = Instant.ofEpochSecond(1541588352L) /* 2022-01-07 20:45:52 */;
- public final static Instant IDENTIFIER_1_EXECUTION = Instant.ofEpochSecond(1541588352L) /* 2022-01-07 20:45:52 */;
- public final static Integer IDENTIFIER_1_PUBLICATION_MONTH = 5;
- public final static Integer IDENTIFIER_1_PUBLICATION_YEAR = 2022;
- public final static Integer IDENTIFIER_1_PUBLICATION_DAY = null;
- public final static String IDENTIFIER_1_QUERY_HASH = QUERY_1_QUERY_HASH;
- public final static String IDENTIFIER_1_RESULT_HASH = QUERY_1_RESULT_HASH;
- public final static String IDENTIFIER_1_QUERY = QUERY_1_STATEMENT;
- public final static String IDENTIFIER_1_NORMALIZED = QUERY_1_STATEMENT;
- public final static Long IDENTIFIER_1_RESULT_NUMBER = QUERY_1_RESULT_NUMBER;
- public final static String IDENTIFIER_1_PUBLISHER = "Austrian Government";
- public final static IdentifierType IDENTIFIER_1_TYPE = IdentifierType.DATABASE;
- public final static IdentifierTypeDto IDENTIFIER_1_TYPE_DTO = IdentifierTypeDto.DATABASE;
- public final static IdentifierStatusType IDENTIFIER_1_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
- public final static IdentifierStatusTypeDto IDENTIFIER_1_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
-
- public final static Long IDENTIFIER_1_TITLE_1_ID = 1L;
- public final static Long IDENTIFIER_1_TITLE_1_IDENTIFIER_ID = IDENTIFIER_1_ID;
- public final static String IDENTIFIER_1_TITLE_1_TITLE = "Austrian weather data";
- public final static String IDENTIFIER_1_TITLE_1_TITLE_MODIFY = "Austrian weather some data";
- public final static TitleType IDENTIFIER_1_TITLE_1_TYPE = null;
- public final static TitleTypeDto IDENTIFIER_1_TITLE_1_TYPE_DTO = null;
- public final static LanguageType IDENTIFIER_1_TITLE_1_LANG = LanguageType.EN;
- public final static LanguageTypeDto IDENTIFIER_1_TITLE_1_LANG_DTO = LanguageTypeDto.EN;
-
- public final static IdentifierTitle IDENTIFIER_1_TITLE_1 = IdentifierTitle.builder()
+ public static final Long CREATOR_2_ID = 2L;
+ public static final Long CREATOR_2_QUERY_ID = 1L;
+ public static final String CREATOR_2_ORCID = "00000-00000-00000";
+ public static final String CREATOR_2_AFFIL = "TU Wien";
+ public static final String CREATOR_2_FIRSTNAME = "Martina";
+ public static final String CREATOR_2_LASTNAME = "Mustermann";
+ public static final String CREATOR_2_NAME = CREATOR_2_LASTNAME + ", " + CREATOR_2_FIRSTNAME;
+ public static final Instant CREATOR_2_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant CREATOR_2_MODIFIED = Instant.ofEpochSecond(1541588352L);
+
+ public static final Long CREATOR_3_ID = 3L;
+ public static final Long CREATOR_3_QUERY_ID = 1L;
+ public static final String CREATOR_3_ORCID = "00000-00000-00000";
+ public static final String CREATOR_3_AFFIL = "TU Graz";
+ public static final String CREATOR_3_AFFIL_ROR = "https://ror.org/04wn28048";
+ public static final AffiliationIdentifierSchemeType CREATOR_3_AFFIL_SCHEME_TYPE = AffiliationIdentifierSchemeType.ROR;
+ public static final AffiliationIdentifierSchemeTypeDto CREATOR_3_AFFIL_SCHEME_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
+ public static final String CREATOR_3_AFFIL_URI = "https://ror.org/";
+ public static final String CREATOR_3_FIRSTNAME = "Max";
+ public static final String CREATOR_3_LASTNAME = "Mustermann";
+ public static final String CREATOR_3_NAME = CREATOR_3_LASTNAME + ", " + CREATOR_3_FIRSTNAME;
+ public static final Instant CREATOR_3_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant CREATOR_3_MODIFIED = Instant.ofEpochSecond(1541588352L);
+
+ public static final Long CREATOR_4_ID = 4L;
+ public static final Long CREATOR_4_QUERY_ID = 1L;
+ public static final String CREATOR_4_ORCID = "00000-00000-00000";
+ public static final String CREATOR_4_AFFIL = "TU Wien";
+ public static final String CREATOR_4_AFFIL_ROR = "https://ror.org/04d836q62";
+ public static final String CREATOR_4_AFFIL_URI = "https://ror.org/";
+ public static final AffiliationIdentifierSchemeType CREATOR_4_AFFIL_TYPE = AffiliationIdentifierSchemeType.ROR;
+ public static final AffiliationIdentifierSchemeTypeDto CREATOR_4_AFFIL_TYPE_DTO = AffiliationIdentifierSchemeTypeDto.ROR;
+ public static final String CREATOR_4_FIRSTNAME = "Martina";
+ public static final String CREATOR_4_LASTNAME = "Mustermann";
+ public static final String CREATOR_4_NAME = CREATOR_4_LASTNAME + ", " + CREATOR_4_FIRSTNAME;
+ public static final Instant CREATOR_4_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant CREATOR_4_MODIFIED = Instant.ofEpochSecond(1541588352L);
+
+ public static final Long IDENTIFIER_1_ID = 1L;
+ public static final Long IDENTIFIER_1_QUERY_ID = null;
+ public static final Long IDENTIFIER_1_CONTAINER_ID = CONTAINER_1_ID;
+ public static final Long IDENTIFIER_1_DATABASE_ID = DATABASE_1_ID;
+ public static final String IDENTIFIER_1_DOI = "10.12345/183";
+ public static final Instant IDENTIFIER_1_CREATED = Instant.ofEpochSecond(1641588352L) /* 2022-01-07 20:45:52 */;
+ public static final Instant IDENTIFIER_1_MODIFIED = Instant.ofEpochSecond(1541588352L) /* 2022-01-07 20:45:52 */;
+ public static final Instant IDENTIFIER_1_EXECUTION = Instant.ofEpochSecond(1541588352L) /* 2022-01-07 20:45:52 */;
+ public static final Integer IDENTIFIER_1_PUBLICATION_MONTH = 5;
+ public static final Integer IDENTIFIER_1_PUBLICATION_YEAR = 2022;
+ public static final Integer IDENTIFIER_1_PUBLICATION_DAY = null;
+ public static final String IDENTIFIER_1_QUERY_HASH = QUERY_1_QUERY_HASH;
+ public static final String IDENTIFIER_1_RESULT_HASH = QUERY_1_RESULT_HASH;
+ public static final String IDENTIFIER_1_QUERY = QUERY_1_STATEMENT;
+ public static final String IDENTIFIER_1_NORMALIZED = QUERY_1_STATEMENT;
+ public static final Long IDENTIFIER_1_RESULT_NUMBER = QUERY_1_RESULT_NUMBER;
+ public static final String IDENTIFIER_1_PUBLISHER = "Austrian Government";
+ public static final IdentifierType IDENTIFIER_1_TYPE = IdentifierType.DATABASE;
+ public static final IdentifierTypeDto IDENTIFIER_1_TYPE_DTO = IdentifierTypeDto.DATABASE;
+ public static final IdentifierStatusType IDENTIFIER_1_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
+ public static final IdentifierStatusTypeDto IDENTIFIER_1_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
+
+ public static final Long IDENTIFIER_1_TITLE_1_ID = 1L;
+ public static final Long IDENTIFIER_1_TITLE_1_IDENTIFIER_ID = IDENTIFIER_1_ID;
+ public static final String IDENTIFIER_1_TITLE_1_TITLE = "Austrian weather data";
+ public static final String IDENTIFIER_1_TITLE_1_TITLE_MODIFY = "Austrian weather some data";
+ public static final TitleType IDENTIFIER_1_TITLE_1_TYPE = null;
+ public static final TitleTypeDto IDENTIFIER_1_TITLE_1_TYPE_DTO = null;
+ public static final LanguageType IDENTIFIER_1_TITLE_1_LANG = LanguageType.EN;
+ public static final LanguageTypeDto IDENTIFIER_1_TITLE_1_LANG_DTO = LanguageTypeDto.EN;
+
+ public static final IdentifierTitle IDENTIFIER_1_TITLE_1 = IdentifierTitle.builder()
.id(IDENTIFIER_1_TITLE_1_ID)
.title(IDENTIFIER_1_TITLE_1_TITLE)
.titleType(IDENTIFIER_1_TITLE_1_TYPE)
.language(IDENTIFIER_1_TITLE_1_LANG)
.build();
- public final static IdentifierTitleDto IDENTIFIER_1_TITLE_1_DTO = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_1_TITLE_1_DTO = IdentifierTitleDto.builder()
.id(IDENTIFIER_1_TITLE_1_ID)
.title(IDENTIFIER_1_TITLE_1_TITLE)
.titleType(IDENTIFIER_1_TITLE_1_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_1_LANG_DTO)
.build();
- public final static IdentifierTitleDto IDENTIFIER_1_TITLE_1_DTO_MODIFY = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_1_TITLE_1_DTO_MODIFY = IdentifierTitleDto.builder()
.id(IDENTIFIER_1_TITLE_1_ID)
.title(IDENTIFIER_1_TITLE_1_TITLE_MODIFY)
.titleType(IDENTIFIER_1_TITLE_1_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_1_LANG_DTO)
.build();
- public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final 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 SaveIdentifierTitleDto IDENTIFIER_1_TITLE_1_UPDATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final 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)
.build();
- public final static Long IDENTIFIER_1_TITLE_2_ID = 2L;
- public final static Long IDENTIFIER_1_TITLE_2_IDENTIFIER_ID = IDENTIFIER_1_ID;
- public final static String IDENTIFIER_1_TITLE_2_TITLE = "Österreichische Wetterdaten";
- public final static String IDENTIFIER_1_TITLE_2_TITLE_MODIFY = "Österreichische Wetterdaten übersetzt";
- public final static TitleType IDENTIFIER_1_TITLE_2_TYPE = TitleType.TRANSLATED_TITLE;
- public final static TitleTypeDto IDENTIFIER_1_TITLE_2_TYPE_DTO = TitleTypeDto.TRANSLATED_TITLE;
- public final static LanguageType IDENTIFIER_1_TITLE_2_LANG = LanguageType.EN;
- public final static LanguageTypeDto IDENTIFIER_1_TITLE_2_LANG_DTO = LanguageTypeDto.EN;
+ public static final Long IDENTIFIER_1_TITLE_2_ID = 2L;
+ public static final Long IDENTIFIER_1_TITLE_2_IDENTIFIER_ID = IDENTIFIER_1_ID;
+ public static final String IDENTIFIER_1_TITLE_2_TITLE = "Österreichische Wetterdaten";
+ public static final String IDENTIFIER_1_TITLE_2_TITLE_MODIFY = "Österreichische Wetterdaten übersetzt";
+ public static final TitleType IDENTIFIER_1_TITLE_2_TYPE = TitleType.TRANSLATED_TITLE;
+ public static final TitleTypeDto IDENTIFIER_1_TITLE_2_TYPE_DTO = TitleTypeDto.TRANSLATED_TITLE;
+ public static final LanguageType IDENTIFIER_1_TITLE_2_LANG = LanguageType.EN;
+ public static final LanguageTypeDto IDENTIFIER_1_TITLE_2_LANG_DTO = LanguageTypeDto.EN;
- public final static IdentifierTitle IDENTIFIER_1_TITLE_2 = IdentifierTitle.builder()
+ public static final IdentifierTitle IDENTIFIER_1_TITLE_2 = IdentifierTitle.builder()
.id(IDENTIFIER_1_TITLE_2_ID)
.title(IDENTIFIER_1_TITLE_2_TITLE)
.titleType(IDENTIFIER_1_TITLE_2_TYPE)
.language(IDENTIFIER_1_TITLE_2_LANG)
.build();
- public final static IdentifierTitleDto IDENTIFIER_1_TITLE_2_DTO = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_1_TITLE_2_DTO = IdentifierTitleDto.builder()
.id(IDENTIFIER_1_TITLE_2_ID)
.title(IDENTIFIER_1_TITLE_2_TITLE)
.titleType(IDENTIFIER_1_TITLE_2_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_2_LANG_DTO)
.build();
- public final static IdentifierTitleDto IDENTIFIER_1_TITLE_2_DTO_MODIFY = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_1_TITLE_2_DTO_MODIFY = IdentifierTitleDto.builder()
.id(IDENTIFIER_1_TITLE_2_ID)
.title(IDENTIFIER_1_TITLE_2_TITLE_MODIFY)
.titleType(IDENTIFIER_1_TITLE_2_TYPE_DTO)
.language(IDENTIFIER_1_TITLE_2_LANG_DTO)
.build();
- public final static SaveIdentifierTitleDto IDENTIFIER_1_TITLE_2_CREATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final 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 SaveIdentifierTitleDto IDENTIFIER_1_TITLE_2_UPDATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final 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)
.build();
- public final static Long IDENTIFIER_1_DESCRIPTION_1_ID = 1L;
- public final static Long IDENTIFIER_1_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_1_ID;
- public final static String IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION = "Selecting all from the weather Austrian table";
- public final static String IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION_MODIFY = "Selecting some from the weather Austrian table";
- public final static DescriptionType IDENTIFIER_1_DESCRIPTION_1_TYPE = null;
- public final static DescriptionTypeDto IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO = null;
- public final static LanguageType IDENTIFIER_1_DESCRIPTION_1_LANG = LanguageType.EN;
- public final static LanguageTypeDto IDENTIFIER_1_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.EN;
+ public static final Long IDENTIFIER_1_DESCRIPTION_1_ID = 1L;
+ public static final Long IDENTIFIER_1_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_1_ID;
+ public static final String IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION = "Selecting all from the weather Austrian table";
+ public static final String IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION_MODIFY = "Selecting some from the weather Austrian table";
+ public static final DescriptionType IDENTIFIER_1_DESCRIPTION_1_TYPE = null;
+ public static final DescriptionTypeDto IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO = null;
+ public static final LanguageType IDENTIFIER_1_DESCRIPTION_1_LANG = LanguageType.EN;
+ public static final LanguageTypeDto IDENTIFIER_1_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.EN;
- public final static IdentifierDescription IDENTIFIER_1_DESCRIPTION_1 = IdentifierDescription.builder()
+ public static final IdentifierDescription IDENTIFIER_1_DESCRIPTION_1 = IdentifierDescription.builder()
.id(IDENTIFIER_1_DESCRIPTION_1_ID)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE)
.language(IDENTIFIER_1_DESCRIPTION_1_LANG)
.build();
- public final static IdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
+ public static final IdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
.id(IDENTIFIER_1_DESCRIPTION_1_ID)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO)
.language(IDENTIFIER_1_DESCRIPTION_1_LANG_DTO)
.build();
- public final static IdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_DTO_MODIFY = IdentifierDescriptionDto.builder()
+ public static final IdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_DTO_MODIFY = IdentifierDescriptionDto.builder()
.id(IDENTIFIER_1_DESCRIPTION_1_ID)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION_MODIFY)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO)
.language(IDENTIFIER_1_DESCRIPTION_1_LANG_DTO)
.build();
- public final static SaveIdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
+ public static final SaveIdentifierDescriptionDto IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
.id(null)
.description(IDENTIFIER_1_DESCRIPTION_1_DESCRIPTION)
.descriptionType(IDENTIFIER_1_DESCRIPTION_1_TYPE_DTO)
.language(IDENTIFIER_1_DESCRIPTION_1_LANG_DTO)
.build();
- public final static Long IDENTIFIER_1_CREATOR_1_ID = 1L;
- public final static String IDENTIFIER_1_CREATOR_1_FIRSTNAME = CREATOR_1_FIRSTNAME;
- public final static String IDENTIFIER_1_CREATOR_1_LASTNAME = CREATOR_1_LASTNAME;
- public final static String IDENTIFIER_1_CREATOR_1_NAME = CREATOR_1_NAME;
- public final static String IDENTIFIER_1_CREATOR_1_ORCID = CREATOR_1_ORCID;
- public final static NameIdentifierSchemeType IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE = NameIdentifierSchemeType.ORCID;
- public final static NameIdentifierSchemeTypeDto IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE_DTO = NameIdentifierSchemeTypeDto.ORCID;
- public final static String IDENTIFIER_1_CREATOR_1_AFFILIATION = CREATOR_1_AFFIL;
- public final static String IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER = CREATOR_1_AFFIL_ROR;
- public final static AffiliationIdentifierSchemeType IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME = CREATOR_1_AFFIL_TYPE;
- public final static AffiliationIdentifierSchemeTypeDto IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_DTO = CREATOR_1_AFFIL_TYPE_DTO;
- public final static String IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI = CREATOR_1_AFFIL_URI;
-
- public final static Creator IDENTIFIER_1_CREATOR_1 = Creator.builder()
+ public static final Long IDENTIFIER_1_CREATOR_1_ID = 1L;
+ public static final String IDENTIFIER_1_CREATOR_1_FIRSTNAME = CREATOR_1_FIRSTNAME;
+ public static final String IDENTIFIER_1_CREATOR_1_LASTNAME = CREATOR_1_LASTNAME;
+ public static final String IDENTIFIER_1_CREATOR_1_NAME = CREATOR_1_NAME;
+ public static final String IDENTIFIER_1_CREATOR_1_ORCID = CREATOR_1_ORCID;
+ public static final NameIdentifierSchemeType IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE = NameIdentifierSchemeType.ORCID;
+ public static final NameIdentifierSchemeTypeDto IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE_DTO = NameIdentifierSchemeTypeDto.ORCID;
+ public static final String IDENTIFIER_1_CREATOR_1_AFFILIATION = CREATOR_1_AFFIL;
+ public static final String IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER = CREATOR_1_AFFIL_ROR;
+ public static final AffiliationIdentifierSchemeType IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME = CREATOR_1_AFFIL_TYPE;
+ public static final AffiliationIdentifierSchemeTypeDto IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_DTO = CREATOR_1_AFFIL_TYPE_DTO;
+ public static final String IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI = CREATOR_1_AFFIL_URI;
+
+ public static final Creator IDENTIFIER_1_CREATOR_1 = Creator.builder()
.id(IDENTIFIER_1_CREATOR_1_ID)
.firstname(IDENTIFIER_1_CREATOR_1_FIRSTNAME)
.lastname(IDENTIFIER_1_CREATOR_1_LASTNAME)
@@ -6225,7 +6225,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI)
.build();
- public final static CreatorDto IDENTIFIER_1_CREATOR_1_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_1_CREATOR_1_DTO = CreatorDto.builder()
.id(IDENTIFIER_1_CREATOR_1_ID)
.firstname(IDENTIFIER_1_CREATOR_1_FIRSTNAME)
.lastname(IDENTIFIER_1_CREATOR_1_LASTNAME)
@@ -6239,7 +6239,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_1_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_1_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.id(null)
.firstname(IDENTIFIER_1_CREATOR_1_FIRSTNAME)
.lastname(IDENTIFIER_1_CREATOR_1_LASTNAME)
@@ -6252,15 +6252,15 @@ public abstract class BaseTest {
.affiliationIdentifierScheme(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_DTO)
.build();
- public final static Long FUNDER_1_ID = 1L;
- public final static String FUNDER_1_NAME = "European Commission";
- public final static String FUNDER_1_IDENTIFIER = "https://doi.org/10.13039/501100000780";
- public final static String FUNDER_1_IDENTIFIER_ID_ONLY = "10.13039/501100000780";
- public final static IdentifierFunderType FUNDER_1_IDENTIFIER_TYPE = IdentifierFunderType.CROSSREF_FUNDER_ID;
- public final static IdentifierFunderTypeDto FUNDER_1_IDENTIFIER_TYPE_DTO = IdentifierFunderTypeDto.CROSSREF_FUNDER_ID;
- public final static String FUNDER_1_AWARD_TITLE = "Institutionalizing global genetic-resource commons. Global Strategies for accessing and using essential public knowledge assets in the life science";
+ public static final Long FUNDER_1_ID = 1L;
+ public static final String FUNDER_1_NAME = "European Commission";
+ public static final String FUNDER_1_IDENTIFIER = "https://doi.org/10.13039/501100000780";
+ public static final String FUNDER_1_IDENTIFIER_ID_ONLY = "10.13039/501100000780";
+ public static final IdentifierFunderType FUNDER_1_IDENTIFIER_TYPE = IdentifierFunderType.CROSSREF_FUNDER_ID;
+ public static final IdentifierFunderTypeDto FUNDER_1_IDENTIFIER_TYPE_DTO = IdentifierFunderTypeDto.CROSSREF_FUNDER_ID;
+ public static final String FUNDER_1_AWARD_TITLE = "Institutionalizing global genetic-resource commons. Global Strategies for accessing and using essential public knowledge assets in the life science";
- public final static IdentifierFunder IDENTIFIER_1_FUNDER_1 = IdentifierFunder.builder()
+ public static final IdentifierFunder IDENTIFIER_1_FUNDER_1 = IdentifierFunder.builder()
.id(FUNDER_1_ID)
.funderName(FUNDER_1_NAME)
.funderIdentifier(FUNDER_1_IDENTIFIER)
@@ -6268,7 +6268,7 @@ public abstract class BaseTest {
.awardTitle(FUNDER_1_AWARD_TITLE)
.build();
- public final static IdentifierFunderDto IDENTIFIER_1_FUNDER_1_DTO = IdentifierFunderDto.builder()
+ public static final IdentifierFunderDto IDENTIFIER_1_FUNDER_1_DTO = IdentifierFunderDto.builder()
.id(FUNDER_1_ID)
.funderName(FUNDER_1_NAME)
.funderIdentifier(FUNDER_1_IDENTIFIER)
@@ -6276,14 +6276,14 @@ public abstract class BaseTest {
.awardTitle(FUNDER_1_AWARD_TITLE)
.build();
- public final static SaveIdentifierFunderDto IDENTIFIER_1_FUNDER_1_CREATE_DTO = SaveIdentifierFunderDto.builder()
+ public static final SaveIdentifierFunderDto IDENTIFIER_1_FUNDER_1_CREATE_DTO = SaveIdentifierFunderDto.builder()
.funderName(FUNDER_1_NAME)
.funderIdentifier(FUNDER_1_IDENTIFIER)
.funderIdentifierType(FUNDER_1_IDENTIFIER_TYPE_DTO)
.awardTitle(FUNDER_1_AWARD_TITLE)
.build();
- public final static DataCiteBody<DataCiteDoi> IDENTIFIER_1_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
+ public static final DataCiteBody<DataCiteDoi> IDENTIFIER_1_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
.data(DataCiteData.<DataCiteDoi>builder()
.type("dois")
.attributes(DataCiteDoi.builder()
@@ -6292,7 +6292,7 @@ public abstract class BaseTest {
.build())
.build();
- public final static Identifier IDENTIFIER_1 = Identifier.builder()
+ public static final Identifier IDENTIFIER_1 = Identifier.builder()
.id(IDENTIFIER_1_ID)
.queryId(IDENTIFIER_1_QUERY_ID)
.titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1, IDENTIFIER_1_TITLE_2)))
@@ -6319,7 +6319,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_1_STATUS_TYPE)
.build();
- public final static Identifier IDENTIFIER_1_WITH_DOI = Identifier.builder()
+ public static final Identifier IDENTIFIER_1_WITH_DOI = Identifier.builder()
.id(IDENTIFIER_1_ID)
.queryId(IDENTIFIER_1_QUERY_ID)
.descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1)))
@@ -6345,7 +6345,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_1_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_1_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_1_DTO = IdentifierDto.builder()
.id(IDENTIFIER_1_ID)
.databaseId(DATABASE_1_ID)
.queryId(IDENTIFIER_1_QUERY_ID)
@@ -6369,7 +6369,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_1_STATUS_TYPE_DTO)
.build();
- public final static IdentifierBriefDto IDENTIFIER_1_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_1_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_1_ID)
.databaseId(DATABASE_1_ID)
.queryId(IDENTIFIER_1_QUERY_ID)
@@ -6381,7 +6381,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_1_STATUS_TYPE_DTO)
.build();
- public final static CreateIdentifierDto IDENTIFIER_1_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_1_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_1_DATABASE_ID)
.type(IDENTIFIER_1_TYPE_DTO)
.publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
@@ -6398,7 +6398,7 @@ public abstract class BaseTest {
.funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
.build();
- public final static CreateIdentifierDto IDENTIFIER_1_CREATE_WITH_DOI_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_1_CREATE_WITH_DOI_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_1_DATABASE_ID)
.type(IDENTIFIER_1_TYPE_DTO)
.doi(IDENTIFIER_1_DOI)
@@ -6415,7 +6415,7 @@ public abstract class BaseTest {
.funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
.build();
- public final static IdentifierSaveDto IDENTIFIER_1_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_1_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_1_ID)
.databaseId(IDENTIFIER_1_DATABASE_ID)
.descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO)))
@@ -6430,7 +6430,7 @@ public abstract class BaseTest {
.licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
.build();
- public final static IdentifierSaveDto IDENTIFIER_1_SAVE_MODIFY_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_1_SAVE_MODIFY_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_1_ID)
.databaseId(IDENTIFIER_1_DATABASE_ID)
.descriptions(new LinkedList<>(List.of())) // <<<
@@ -6445,89 +6445,89 @@ public abstract class BaseTest {
.licenses(new LinkedList<>(List.of())) // <<<
.build();
- public final static Long IDENTIFIER_5_ID = 5L;
- public final static Long IDENTIFIER_5_QUERY_ID = QUERY_2_ID;
- public final static Long IDENTIFIER_5_CONTAINER_ID = CONTAINER_2_ID;
- public final static Long IDENTIFIER_5_DATABASE_ID = DATABASE_2_ID;
- public final static String IDENTIFIER_5_DOI = "10.12345/13/50BBFCFE08A12";
- public final static Instant IDENTIFIER_5_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant IDENTIFIER_5_MODIFIED = Instant.ofEpochSecond(1541588352L);
- public final static Instant IDENTIFIER_5_EXECUTION = Instant.ofEpochSecond(1541588352L);
- public final static Integer IDENTIFIER_5_PUBLICATION_DAY = 14;
- public final static Integer IDENTIFIER_5_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_5_PUBLICATION_YEAR = 2022;
- public final static String IDENTIFIER_5_QUERY_HASH = QUERY_2_QUERY_HASH;
- public final static String IDENTIFIER_5_RESULT_HASH = QUERY_2_RESULT_HASH;
- public final static String IDENTIFIER_5_QUERY = QUERY_2_STATEMENT;
- public final static String IDENTIFIER_5_NORMALIZED = QUERY_2_STATEMENT;
- public final static Long IDENTIFIER_5_RESULT_NUMBER = QUERY_2_RESULT_NUMBER;
- public final static String IDENTIFIER_5_PUBLISHER = "Australian Government";
- public final static IdentifierType IDENTIFIER_5_TYPE = IdentifierType.SUBSET;
- public final static IdentifierTypeDto IDENTIFIER_5_TYPE_DTO = IdentifierTypeDto.SUBSET;
- public final static IdentifierStatusType IDENTIFIER_5_STATUS_TYPE = IdentifierStatusType.DRAFT;
- public final static IdentifierStatusTypeDto IDENTIFIER_5_STATUS_TYPE_DTO = IdentifierStatusTypeDto.DRAFT;
- public final static UUID IDENTIFIER_5_CREATED_BY = USER_2_ID;
-
- public final static Long IDENTIFIER_5_TITLE_1_ID = 3L;
- public final static Long IDENTIFIER_5_TITLE_1_IDENTIFIER_ID = IDENTIFIER_5_ID;
- public final static String IDENTIFIER_5_TITLE_1_TITLE = "Australische Wetterdaten";
- public final static LanguageType IDENTIFIER_5_TITLE_1_LANG = LanguageType.DE;
- public final static LanguageTypeDto IDENTIFIER_5_TITLE_1_LANG_DTO = LanguageTypeDto.DE;
- public final static TitleType IDENTIFIER_5_TITLE_1_TYPE = TitleType.SUBTITLE;
- public final static TitleTypeDto IDENTIFIER_5_TITLE_1_TYPE_DTO = TitleTypeDto.SUBTITLE;
-
- public final static IdentifierTitle IDENTIFIER_5_TITLE_1 = IdentifierTitle.builder()
+ public static final Long IDENTIFIER_5_ID = 5L;
+ public static final Long IDENTIFIER_5_QUERY_ID = QUERY_2_ID;
+ public static final Long IDENTIFIER_5_CONTAINER_ID = CONTAINER_2_ID;
+ public static final Long IDENTIFIER_5_DATABASE_ID = DATABASE_2_ID;
+ public static final String IDENTIFIER_5_DOI = "10.12345/13/50BBFCFE08A12";
+ public static final Instant IDENTIFIER_5_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant IDENTIFIER_5_MODIFIED = Instant.ofEpochSecond(1541588352L);
+ public static final Instant IDENTIFIER_5_EXECUTION = Instant.ofEpochSecond(1541588352L);
+ public static final Integer IDENTIFIER_5_PUBLICATION_DAY = 14;
+ public static final Integer IDENTIFIER_5_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_5_PUBLICATION_YEAR = 2022;
+ public static final String IDENTIFIER_5_QUERY_HASH = QUERY_2_QUERY_HASH;
+ public static final String IDENTIFIER_5_RESULT_HASH = QUERY_2_RESULT_HASH;
+ public static final String IDENTIFIER_5_QUERY = QUERY_2_STATEMENT;
+ public static final String IDENTIFIER_5_NORMALIZED = QUERY_2_STATEMENT;
+ public static final Long IDENTIFIER_5_RESULT_NUMBER = QUERY_2_RESULT_NUMBER;
+ public static final String IDENTIFIER_5_PUBLISHER = "Australian Government";
+ public static final IdentifierType IDENTIFIER_5_TYPE = IdentifierType.SUBSET;
+ public static final IdentifierTypeDto IDENTIFIER_5_TYPE_DTO = IdentifierTypeDto.SUBSET;
+ public static final IdentifierStatusType IDENTIFIER_5_STATUS_TYPE = IdentifierStatusType.DRAFT;
+ public static final IdentifierStatusTypeDto IDENTIFIER_5_STATUS_TYPE_DTO = IdentifierStatusTypeDto.DRAFT;
+ public static final UUID IDENTIFIER_5_CREATED_BY = USER_2_ID;
+
+ public static final Long IDENTIFIER_5_TITLE_1_ID = 3L;
+ public static final Long IDENTIFIER_5_TITLE_1_IDENTIFIER_ID = IDENTIFIER_5_ID;
+ public static final String IDENTIFIER_5_TITLE_1_TITLE = "Australische Wetterdaten";
+ public static final LanguageType IDENTIFIER_5_TITLE_1_LANG = LanguageType.DE;
+ public static final LanguageTypeDto IDENTIFIER_5_TITLE_1_LANG_DTO = LanguageTypeDto.DE;
+ public static final TitleType IDENTIFIER_5_TITLE_1_TYPE = TitleType.SUBTITLE;
+ public static final TitleTypeDto IDENTIFIER_5_TITLE_1_TYPE_DTO = TitleTypeDto.SUBTITLE;
+
+ public static final IdentifierTitle IDENTIFIER_5_TITLE_1 = IdentifierTitle.builder()
.id(IDENTIFIER_5_TITLE_1_ID)
.title(IDENTIFIER_5_TITLE_1_TITLE)
.language(IDENTIFIER_5_TITLE_1_LANG)
.titleType(IDENTIFIER_5_TITLE_1_TYPE)
.build();
- public final static IdentifierTitleDto IDENTIFIER_5_TITLE_1_DTO = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_5_TITLE_1_DTO = IdentifierTitleDto.builder()
.id(IDENTIFIER_5_TITLE_1_ID)
.title(IDENTIFIER_5_TITLE_1_TITLE)
.language(IDENTIFIER_5_TITLE_1_LANG_DTO)
.titleType(IDENTIFIER_5_TITLE_1_TYPE_DTO)
.build();
- public final static SaveIdentifierTitleDto IDENTIFIER_5_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final 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)
.build();
- public final static Long IDENTIFIER_5_DESCRIPTION_1_ID = 2L;
- public final static Long IDENTIFIER_5_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_5_ID;
- public final static String IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION = "Alle Wetterdaten in Australien";
- public final static LanguageType IDENTIFIER_5_DESCRIPTION_1_LANG = LanguageType.DE;
- public final static LanguageTypeDto IDENTIFIER_5_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.DE;
- public final static DescriptionType IDENTIFIER_5_DESCRIPTION_1_TYPE = DescriptionType.ABSTRACT;
- public final static DescriptionTypeDto IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO = DescriptionTypeDto.ABSTRACT;
+ public static final Long IDENTIFIER_5_DESCRIPTION_1_ID = 2L;
+ public static final Long IDENTIFIER_5_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_5_ID;
+ public static final String IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION = "Alle Wetterdaten in Australien";
+ public static final LanguageType IDENTIFIER_5_DESCRIPTION_1_LANG = LanguageType.DE;
+ public static final LanguageTypeDto IDENTIFIER_5_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.DE;
+ public static final DescriptionType IDENTIFIER_5_DESCRIPTION_1_TYPE = DescriptionType.ABSTRACT;
+ public static final DescriptionTypeDto IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO = DescriptionTypeDto.ABSTRACT;
- public final static IdentifierDescription IDENTIFIER_5_DESCRIPTION_1 = IdentifierDescription.builder()
+ public static final IdentifierDescription IDENTIFIER_5_DESCRIPTION_1 = IdentifierDescription.builder()
.id(IDENTIFIER_5_DESCRIPTION_1_ID)
.description(IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_5_DESCRIPTION_1_LANG)
.descriptionType(IDENTIFIER_5_DESCRIPTION_1_TYPE)
.build();
- public final static IdentifierDescriptionDto IDENTIFIER_5_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
+ public static final IdentifierDescriptionDto IDENTIFIER_5_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
.id(IDENTIFIER_5_DESCRIPTION_1_ID)
.description(IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_5_DESCRIPTION_1_LANG_DTO)
.descriptionType(IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO)
.build();
- public final static SaveIdentifierDescriptionDto IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
+ public static final SaveIdentifierDescriptionDto IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
.id(null)
.description(IDENTIFIER_5_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_5_DESCRIPTION_1_LANG_DTO)
.descriptionType(IDENTIFIER_5_DESCRIPTION_1_TYPE_DTO)
.build();
- public final static Long IDENTIFIER_5_CREATOR_1_ID = 2L;
+ public static final Long IDENTIFIER_5_CREATOR_1_ID = 2L;
- public final static Creator IDENTIFIER_5_CREATOR_1 = Creator.builder()
+ public static final Creator IDENTIFIER_5_CREATOR_1 = Creator.builder()
.id(IDENTIFIER_5_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -6540,7 +6540,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static CreatorDto IDENTIFIER_5_CREATOR_1_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_5_CREATOR_1_DTO = CreatorDto.builder()
.id(IDENTIFIER_5_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -6553,7 +6553,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6562,7 +6562,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_1_AFFIL)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6571,9 +6571,9 @@ public abstract class BaseTest {
.affiliation(CREATOR_1_AFFIL)
.build();
- public final static Long IDENTIFIER_5_CREATOR_2_ID = 3L;
+ public static final Long IDENTIFIER_5_CREATOR_2_ID = 3L;
- public final static Creator IDENTIFIER_5_CREATOR_2 = Creator.builder()
+ public static final Creator IDENTIFIER_5_CREATOR_2 = Creator.builder()
.id(IDENTIFIER_5_CREATOR_2_ID)
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
@@ -6583,7 +6583,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static CreatorDto IDENTIFIER_5_CREATOR_2_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_5_CREATOR_2_DTO = CreatorDto.builder()
.id(IDENTIFIER_5_CREATOR_2_ID)
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
@@ -6593,7 +6593,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_CREATE_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
.creatorName(CREATOR_2_NAME)
@@ -6602,7 +6602,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
.creatorName(CREATOR_2_NAME)
@@ -6611,7 +6611,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static Identifier IDENTIFIER_5 = Identifier.builder()
+ public static final Identifier IDENTIFIER_5 = Identifier.builder()
.id(IDENTIFIER_5_ID)
.queryId(IDENTIFIER_5_QUERY_ID)
.descriptions(new LinkedList<>(List.of(IDENTIFIER_5_DESCRIPTION_1)))
@@ -6636,7 +6636,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_5_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_5_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_5_DTO = IdentifierDto.builder()
.id(IDENTIFIER_5_ID)
.databaseId(DATABASE_2_ID)
.queryId(IDENTIFIER_5_QUERY_ID)
@@ -6659,7 +6659,7 @@ public abstract class BaseTest {
.creators(new LinkedList<>(List.of(IDENTIFIER_5_CREATOR_1_DTO, IDENTIFIER_5_CREATOR_2_DTO)))
.build();
- public final static IdentifierBriefDto IDENTIFIER_5_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_5_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_5_ID)
.databaseId(DATABASE_2_ID)
.queryId(IDENTIFIER_5_QUERY_ID)
@@ -6670,15 +6670,15 @@ public abstract class BaseTest {
.type(IDENTIFIER_5_TYPE_DTO)
.build();
- public final static Long RELATED_IDENTIFIER_5_ID = 1L;
- public final static Long RELATED_IDENTIFIER_5_IDENTIFIER_ID = 2L;
- public final static String RELATED_IDENTIFIER_5_VALUE = "10.5281/zenodo.6637333";
- public final static RelatedType RELATED_IDENTIFIER_5_TYPE = RelatedType.DOI;
- public final static RelatedTypeDto RELATED_IDENTIFIER_5_TYPE_DTO = RelatedTypeDto.DOI;
- public final static RelationType RELATED_IDENTIFIER_5_RELATION_TYPE = RelationType.CITES;
- public final static RelationTypeDto RELATED_IDENTIFIER_5_RELATION_TYPE_DTO = RelationTypeDto.CITES;
+ public static final Long RELATED_IDENTIFIER_5_ID = 1L;
+ public static final Long RELATED_IDENTIFIER_5_IDENTIFIER_ID = 2L;
+ public static final String RELATED_IDENTIFIER_5_VALUE = "10.5281/zenodo.6637333";
+ public static final RelatedType RELATED_IDENTIFIER_5_TYPE = RelatedType.DOI;
+ public static final RelatedTypeDto RELATED_IDENTIFIER_5_TYPE_DTO = RelatedTypeDto.DOI;
+ public static final RelationType RELATED_IDENTIFIER_5_RELATION_TYPE = RelationType.CITES;
+ public static final RelationTypeDto RELATED_IDENTIFIER_5_RELATION_TYPE_DTO = RelationTypeDto.CITES;
- public final static RelatedIdentifier IDENTIFIER_1_RELATED_IDENTIFIER_1 = RelatedIdentifier.builder()
+ public static final RelatedIdentifier IDENTIFIER_1_RELATED_IDENTIFIER_1 = RelatedIdentifier.builder()
.id(RELATED_IDENTIFIER_5_ID)
.identifier(IDENTIFIER_5)
.type(RELATED_IDENTIFIER_5_TYPE)
@@ -6686,19 +6686,19 @@ public abstract class BaseTest {
.value(RELATED_IDENTIFIER_5_VALUE)
.build();
- public final static SaveRelatedIdentifierDto IDENTIFIER_1_RELATED_IDENTIFIER_5_CREATE_DTO = SaveRelatedIdentifierDto.builder()
+ public static final 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 CreateIdentifierDto IDENTIFIER_5_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_5_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_5_DATABASE_ID)
.publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
.publisher(IDENTIFIER_5_PUBLISHER)
.build();
- public final static IdentifierSaveDto IDENTIFIER_5_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_5_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_5_ID)
.queryId(IDENTIFIER_5_QUERY_ID)
.databaseId(IDENTIFIER_5_DATABASE_ID)
@@ -6714,84 +6714,84 @@ public abstract class BaseTest {
.type(IDENTIFIER_5_TYPE_DTO)
.build();
- public final static Long IDENTIFIER_6_ID = 6L;
- public final static Long IDENTIFIER_6_QUERY_ID = QUERY_3_ID;
- public final static Long IDENTIFIER_6_CONTAINER_ID = CONTAINER_3_ID;
- public final static Long IDENTIFIER_6_DATABASE_ID = DATABASE_3_ID;
- public final static String IDENTIFIER_6_DOI = null;
- public final static Instant IDENTIFIER_6_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant IDENTIFIER_6_MODIFIED = Instant.ofEpochSecond(1541588352L);
- public final static Instant IDENTIFIER_6_EXECUTION = Instant.ofEpochSecond(1541588352L);
- public final static Integer IDENTIFIER_6_PUBLICATION_DAY = 14;
- public final static Integer IDENTIFIER_6_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_6_PUBLICATION_YEAR = 2022;
- public final static String IDENTIFIER_6_QUERY_HASH = QUERY_3_QUERY_HASH;
- public final static String IDENTIFIER_6_RESULT_HASH = QUERY_3_RESULT_HASH;
- public final static String IDENTIFIER_6_QUERY = QUERY_3_STATEMENT;
- public final static String IDENTIFIER_6_NORMALIZED = QUERY_3_STATEMENT;
- public final static Long IDENTIFIER_6_RESULT_NUMBER = QUERY_3_RESULT_NUMBER;
- public final static String IDENTIFIER_6_PUBLISHER = "Norwegian Government";
- public final static IdentifierType IDENTIFIER_6_TYPE = IdentifierType.SUBSET;
- public final static IdentifierTypeDto IDENTIFIER_6_TYPE_DTO = IdentifierTypeDto.SUBSET;
- public final static IdentifierStatusType IDENTIFIER_6_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
- public final static IdentifierStatusTypeDto IDENTIFIER_6_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
-
- public final static Long IDENTIFIER_6_TITLE_1_ID = 4L;
- public final static Long IDENTIFIER_6_TITLE_1_IDENTIFIER_ID = IDENTIFIER_6_ID;
- public final static String IDENTIFIER_6_TITLE_1_TITLE = "Norwegian weather data";
- public final static String IDENTIFIER_6_TITLE_1_TITLE_MODIFY = "Norwegian weather some data";
- public final static LanguageType IDENTIFIER_6_TITLE_1_LANG = LanguageType.EN;
- public final static LanguageTypeDto IDENTIFIER_6_TITLE_1_LANG_DTO = LanguageTypeDto.EN;
-
- public final static IdentifierTitle IDENTIFIER_6_TITLE_1 = IdentifierTitle.builder()
+ public static final Long IDENTIFIER_6_ID = 6L;
+ public static final Long IDENTIFIER_6_QUERY_ID = QUERY_3_ID;
+ public static final Long IDENTIFIER_6_CONTAINER_ID = CONTAINER_3_ID;
+ public static final Long IDENTIFIER_6_DATABASE_ID = DATABASE_3_ID;
+ public static final String IDENTIFIER_6_DOI = null;
+ public static final Instant IDENTIFIER_6_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant IDENTIFIER_6_MODIFIED = Instant.ofEpochSecond(1541588352L);
+ public static final Instant IDENTIFIER_6_EXECUTION = Instant.ofEpochSecond(1541588352L);
+ public static final Integer IDENTIFIER_6_PUBLICATION_DAY = 14;
+ public static final Integer IDENTIFIER_6_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_6_PUBLICATION_YEAR = 2022;
+ public static final String IDENTIFIER_6_QUERY_HASH = QUERY_3_QUERY_HASH;
+ public static final String IDENTIFIER_6_RESULT_HASH = QUERY_3_RESULT_HASH;
+ public static final String IDENTIFIER_6_QUERY = QUERY_3_STATEMENT;
+ public static final String IDENTIFIER_6_NORMALIZED = QUERY_3_STATEMENT;
+ public static final Long IDENTIFIER_6_RESULT_NUMBER = QUERY_3_RESULT_NUMBER;
+ public static final String IDENTIFIER_6_PUBLISHER = "Norwegian Government";
+ public static final IdentifierType IDENTIFIER_6_TYPE = IdentifierType.SUBSET;
+ public static final IdentifierTypeDto IDENTIFIER_6_TYPE_DTO = IdentifierTypeDto.SUBSET;
+ public static final IdentifierStatusType IDENTIFIER_6_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
+ public static final IdentifierStatusTypeDto IDENTIFIER_6_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
+
+ public static final Long IDENTIFIER_6_TITLE_1_ID = 4L;
+ public static final Long IDENTIFIER_6_TITLE_1_IDENTIFIER_ID = IDENTIFIER_6_ID;
+ public static final String IDENTIFIER_6_TITLE_1_TITLE = "Norwegian weather data";
+ public static final String IDENTIFIER_6_TITLE_1_TITLE_MODIFY = "Norwegian weather some data";
+ public static final LanguageType IDENTIFIER_6_TITLE_1_LANG = LanguageType.EN;
+ public static final LanguageTypeDto IDENTIFIER_6_TITLE_1_LANG_DTO = LanguageTypeDto.EN;
+
+ public static final IdentifierTitle IDENTIFIER_6_TITLE_1 = IdentifierTitle.builder()
.id(IDENTIFIER_6_TITLE_1_ID)
.title(IDENTIFIER_6_TITLE_1_TITLE)
.language(IDENTIFIER_6_TITLE_1_LANG)
.build();
- public final static IdentifierTitleDto IDENTIFIER_6_TITLE_1_DTO = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_6_TITLE_1_DTO = IdentifierTitleDto.builder()
.id(IDENTIFIER_6_TITLE_1_ID)
.title(IDENTIFIER_6_TITLE_1_TITLE)
.language(IDENTIFIER_6_TITLE_1_LANG_DTO)
.build();
- public final static IdentifierTitleDto IDENTIFIER_6_TITLE_1_DTO_MODIFY = IdentifierTitleDto.builder()
+ public static final IdentifierTitleDto IDENTIFIER_6_TITLE_1_DTO_MODIFY = IdentifierTitleDto.builder()
.id(IDENTIFIER_6_TITLE_1_ID)
.title(IDENTIFIER_6_TITLE_1_TITLE_MODIFY)
.language(IDENTIFIER_6_TITLE_1_LANG_DTO)
.build();
- public final static SaveIdentifierTitleDto IDENTIFIER_6_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
+ public static final SaveIdentifierTitleDto IDENTIFIER_6_TITLE_1_CREATE_DTO = SaveIdentifierTitleDto.builder()
.title(IDENTIFIER_6_TITLE_1_TITLE_MODIFY)
.language(IDENTIFIER_6_TITLE_1_LANG_DTO)
.build();
- public final static Long IDENTIFIER_6_DESCRIPTION_1_ID = 3L;
- public final static Long IDENTIFIER_6_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_6_ID;
- public final static String IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION = "Selecting all from the weather Norwegian table";
- public final static String IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION_MODIFY = "Selecting some from the weather Norwegian table";
- public final static LanguageType IDENTIFIER_6_DESCRIPTION_1_LANG = LanguageType.EN;
- public final static LanguageTypeDto IDENTIFIER_6_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.EN;
+ public static final Long IDENTIFIER_6_DESCRIPTION_1_ID = 3L;
+ public static final Long IDENTIFIER_6_DESCRIPTION_1_IDENTIFIER_ID = IDENTIFIER_6_ID;
+ public static final String IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION = "Selecting all from the weather Norwegian table";
+ public static final String IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION_MODIFY = "Selecting some from the weather Norwegian table";
+ public static final LanguageType IDENTIFIER_6_DESCRIPTION_1_LANG = LanguageType.EN;
+ public static final LanguageTypeDto IDENTIFIER_6_DESCRIPTION_1_LANG_DTO = LanguageTypeDto.EN;
- public final static IdentifierDescription IDENTIFIER_6_DESCRIPTION_1 = IdentifierDescription.builder()
+ public static final IdentifierDescription IDENTIFIER_6_DESCRIPTION_1 = IdentifierDescription.builder()
.id(IDENTIFIER_6_DESCRIPTION_1_ID)
.description(IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_6_DESCRIPTION_1_LANG)
.build();
- public final static IdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
+ public static final IdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_DTO = IdentifierDescriptionDto.builder()
.id(IDENTIFIER_6_DESCRIPTION_1_ID)
.description(IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION)
.language(IDENTIFIER_6_DESCRIPTION_1_LANG_DTO)
.build();
- public final static IdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_DTO_MODIFY = IdentifierDescriptionDto.builder()
+ public static final IdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_DTO_MODIFY = IdentifierDescriptionDto.builder()
.id(IDENTIFIER_6_DESCRIPTION_1_ID)
.description(IDENTIFIER_6_DESCRIPTION_1_DESCRIPTION_MODIFY)
.language(IDENTIFIER_6_DESCRIPTION_1_LANG_DTO)
.build();
- public final static SaveIdentifierDescriptionDto IDENTIFIER_6_DESCRIPTION_1_CREATE_DTO = SaveIdentifierDescriptionDto.builder()
+ public static final 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)
@@ -6799,7 +6799,7 @@ public abstract class BaseTest {
private final static Long IDENTIFIER_6_CREATOR_1_ID = 4L;
- public final static Creator IDENTIFIER_6_CREATOR_1 = Creator.builder()
+ public static final Creator IDENTIFIER_6_CREATOR_1 = Creator.builder()
.id(IDENTIFIER_6_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -6812,7 +6812,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static CreatorDto IDENTIFIER_6_CREATOR_1_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_6_CREATOR_1_DTO = CreatorDto.builder()
.id(IDENTIFIER_6_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -6825,7 +6825,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6836,7 +6836,7 @@ public abstract class BaseTest {
.affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -6849,7 +6849,7 @@ public abstract class BaseTest {
private final static Long IDENTIFIER_6_CREATOR_2_ID = 5L;
- public final static Creator IDENTIFIER_6_CREATOR_2 = Creator.builder()
+ public static final Creator IDENTIFIER_6_CREATOR_2 = Creator.builder()
.id(IDENTIFIER_6_CREATOR_2_ID)
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
@@ -6859,7 +6859,7 @@ public abstract class BaseTest {
.affiliation(CREATOR_2_AFFIL)
.build();
- public final static CreatorDto IDENTIFIER_6_CREATOR_2_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_6_CREATOR_2_DTO = CreatorDto.builder()
.id(IDENTIFIER_6_CREATOR_2_ID)
.firstname(CREATOR_2_FIRSTNAME)
.lastname(CREATOR_2_LASTNAME)
@@ -6871,7 +6871,7 @@ public abstract class BaseTest {
private final static Long IDENTIFIER_6_CREATOR_3_ID = 6L;
- public final static Creator IDENTIFIER_6_CREATOR_3 = Creator.builder()
+ public static final Creator IDENTIFIER_6_CREATOR_3 = Creator.builder()
.id(IDENTIFIER_6_CREATOR_3_ID)
.firstname(CREATOR_3_FIRSTNAME)
.lastname(CREATOR_3_LASTNAME)
@@ -6884,7 +6884,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_3_AFFIL_URI)
.build();
- public final static CreatorDto IDENTIFIER_6_CREATOR_3_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_6_CREATOR_3_DTO = CreatorDto.builder()
.id(IDENTIFIER_6_CREATOR_3_ID)
.firstname(CREATOR_3_FIRSTNAME)
.lastname(CREATOR_3_LASTNAME)
@@ -6897,7 +6897,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_3_AFFIL_URI)
.build();
- public final static Identifier IDENTIFIER_6 = Identifier.builder()
+ public static final Identifier IDENTIFIER_6 = Identifier.builder()
.id(IDENTIFIER_6_ID)
.queryId(IDENTIFIER_6_QUERY_ID)
.descriptions(new LinkedList<>(List.of(IDENTIFIER_6_DESCRIPTION_1)))
@@ -6923,7 +6923,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_6_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_6_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_6_DTO = IdentifierDto.builder()
.id(IDENTIFIER_6_ID)
.databaseId(DATABASE_3_ID)
.queryId(IDENTIFIER_6_QUERY_ID)
@@ -6948,7 +6948,7 @@ public abstract class BaseTest {
.build();
- public final static IdentifierBriefDto IDENTIFIER_6_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_6_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_6_ID)
.databaseId(DATABASE_3_ID)
.queryId(IDENTIFIER_6_QUERY_ID)
@@ -6960,13 +6960,13 @@ public abstract class BaseTest {
.status(IDENTIFIER_6_STATUS_TYPE_DTO)
.build();
- public final static CreateIdentifierDto IDENTIFIER_6_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_6_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_6_DATABASE_ID)
.publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
.publisher(IDENTIFIER_6_PUBLISHER)
.build();
- public final static IdentifierSaveDto IDENTIFIER_6_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_6_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_6_ID)
.databaseId(IDENTIFIER_6_DATABASE_ID)
.queryId(IDENTIFIER_6_QUERY_ID)
@@ -6981,23 +6981,23 @@ public abstract class BaseTest {
.licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
.build();
- public final static Long IDENTIFIER_7_ID = 7L;
- public final static Long IDENTIFIER_7_DATABASE_ID = DATABASE_4_ID;
- public final static String IDENTIFIER_7_DOI = null;
- public final static Instant IDENTIFIER_7_CREATED = Instant.ofEpochSecond(1641588352L);
- public final static Instant IDENTIFIER_7_MODIFIED = Instant.ofEpochSecond(1541588352L);
- public final static Instant IDENTIFIER_7_EXECUTION = Instant.ofEpochSecond(1541588352L);
- public final static Integer IDENTIFIER_7_PUBLICATION_DAY = 14;
- public final static Integer IDENTIFIER_7_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_7_PUBLICATION_YEAR = 2022;
- public final static Long IDENTIFIER_7_RESULT_NUMBER = 2L;
- public final static String IDENTIFIER_7_PUBLISHER = "Swedish Government";
- public final static IdentifierType IDENTIFIER_7_TYPE = IdentifierType.DATABASE;
- public final static IdentifierTypeDto IDENTIFIER_7_TYPE_DTO = IdentifierTypeDto.DATABASE;
- public final static IdentifierStatusType IDENTIFIER_7_STATUS_TYPE = IdentifierStatusType.DRAFT;
- public final static IdentifierStatusTypeDto IDENTIFIER_7_STATUS_TYPE_DTO = IdentifierStatusTypeDto.DRAFT;
-
- public final static DataCiteBody<DataCiteDoi> IDENTIFIER_7_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
+ public static final Long IDENTIFIER_7_ID = 7L;
+ public static final Long IDENTIFIER_7_DATABASE_ID = DATABASE_4_ID;
+ public static final String IDENTIFIER_7_DOI = null;
+ public static final Instant IDENTIFIER_7_CREATED = Instant.ofEpochSecond(1641588352L);
+ public static final Instant IDENTIFIER_7_MODIFIED = Instant.ofEpochSecond(1541588352L);
+ public static final Instant IDENTIFIER_7_EXECUTION = Instant.ofEpochSecond(1541588352L);
+ public static final Integer IDENTIFIER_7_PUBLICATION_DAY = 14;
+ public static final Integer IDENTIFIER_7_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_7_PUBLICATION_YEAR = 2022;
+ public static final Long IDENTIFIER_7_RESULT_NUMBER = 2L;
+ public static final String IDENTIFIER_7_PUBLISHER = "Swedish Government";
+ public static final IdentifierType IDENTIFIER_7_TYPE = IdentifierType.DATABASE;
+ public static final IdentifierTypeDto IDENTIFIER_7_TYPE_DTO = IdentifierTypeDto.DATABASE;
+ public static final IdentifierStatusType IDENTIFIER_7_STATUS_TYPE = IdentifierStatusType.DRAFT;
+ public static final IdentifierStatusTypeDto IDENTIFIER_7_STATUS_TYPE_DTO = IdentifierStatusTypeDto.DRAFT;
+
+ public static final DataCiteBody<DataCiteDoi> IDENTIFIER_7_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
.data(DataCiteData.<DataCiteDoi>builder()
.type("dois")
.attributes(DataCiteDoi.builder()
@@ -7008,7 +7008,7 @@ public abstract class BaseTest {
private final static Long IDENTIFIER_7_CREATOR_1_ID = 6L;
- public final static Creator IDENTIFIER_7_CREATOR_1 = Creator.builder()
+ public static final Creator IDENTIFIER_7_CREATOR_1 = Creator.builder()
.id(IDENTIFIER_7_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -7021,7 +7021,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static CreatorDto IDENTIFIER_7_CREATOR_1_DTO = CreatorDto.builder()
+ public static final CreatorDto IDENTIFIER_7_CREATOR_1_DTO = CreatorDto.builder()
.id(IDENTIFIER_7_CREATOR_1_ID)
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
@@ -7034,7 +7034,7 @@ public abstract class BaseTest {
.affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
.build();
- public final static IdentifierDto IDENTIFIER_7_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_7_DTO = IdentifierDto.builder()
.id(IDENTIFIER_7_ID)
.databaseId(DATABASE_4_ID)
.descriptions(new LinkedList<>())
@@ -7055,7 +7055,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_7_STATUS_TYPE_DTO)
.build();
- public final static SaveIdentifierCreatorDto IDENTIFIER_7_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
+ public static final SaveIdentifierCreatorDto IDENTIFIER_7_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
.firstname(CREATOR_1_FIRSTNAME)
.lastname(CREATOR_1_LASTNAME)
.creatorName(CREATOR_1_NAME)
@@ -7065,13 +7065,13 @@ public abstract class BaseTest {
.affiliationIdentifier(CREATOR_1_AFFIL_ROR)
.build();
- public final static CreateIdentifierDto IDENTIFIER_7_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_7_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_7_DATABASE_ID)
.publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
.publisher(IDENTIFIER_7_PUBLISHER)
.build();
- public final static IdentifierSaveDto IDENTIFIER_7_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_7_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_7_ID)
.databaseId(IDENTIFIER_7_DATABASE_ID)
.descriptions(new LinkedList<>())
@@ -7086,29 +7086,29 @@ public abstract class BaseTest {
.type(IDENTIFIER_7_TYPE_DTO)
.build();
- public final static Long IDENTIFIER_2_ID = 2L;
- public final static Long IDENTIFIER_2_DATABASE_ID = DATABASE_1_ID;
- public final static String IDENTIFIER_2_DOI = null;
- public final static Instant IDENTIFIER_2_CREATED = Instant.ofEpochSecond(1651588352L);
- public final static Instant IDENTIFIER_2_MODIFIED = Instant.ofEpochSecond(1551588352L);
- public final static Instant IDENTIFIER_2_EXECUTION = Instant.ofEpochSecond(1551588352L);
- public final static Integer IDENTIFIER_2_PUBLICATION_DAY = 10;
- public final static Integer IDENTIFIER_2_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_2_PUBLICATION_YEAR = 2023;
- public final static String IDENTIFIER_2_QUERY_HASH = QUERY_1_QUERY_HASH;
- public final static String IDENTIFIER_2_RESULT_HASH = QUERY_1_RESULT_HASH;
- public final static String IDENTIFIER_2_QUERY = QUERY_1_STATEMENT;
- public final static Long IDENTIFIER_2_QUERY_ID = QUERY_1_ID;
- public final static String IDENTIFIER_2_NORMALIZED = QUERY_1_STATEMENT;
- public final static Long IDENTIFIER_2_RESULT_NUMBER = QUERY_1_RESULT_NUMBER;
- public final static String IDENTIFIER_2_PUBLISHER = "Swedish Government";
- public final static IdentifierType IDENTIFIER_2_TYPE = IdentifierType.SUBSET;
- public final static IdentifierTypeDto IDENTIFIER_2_TYPE_DTO = IdentifierTypeDto.SUBSET;
- public final static IdentifierStatusType IDENTIFIER_2_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
- 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 CreateIdentifierDto IDENTIFIER_2_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final Long IDENTIFIER_2_ID = 2L;
+ public static final Long IDENTIFIER_2_DATABASE_ID = DATABASE_1_ID;
+ public static final String IDENTIFIER_2_DOI = null;
+ public static final Instant IDENTIFIER_2_CREATED = Instant.ofEpochSecond(1651588352L);
+ public static final Instant IDENTIFIER_2_MODIFIED = Instant.ofEpochSecond(1551588352L);
+ public static final Instant IDENTIFIER_2_EXECUTION = Instant.ofEpochSecond(1551588352L);
+ public static final Integer IDENTIFIER_2_PUBLICATION_DAY = 10;
+ public static final Integer IDENTIFIER_2_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_2_PUBLICATION_YEAR = 2023;
+ public static final String IDENTIFIER_2_QUERY_HASH = QUERY_1_QUERY_HASH;
+ public static final String IDENTIFIER_2_RESULT_HASH = QUERY_1_RESULT_HASH;
+ public static final String IDENTIFIER_2_QUERY = QUERY_1_STATEMENT;
+ public static final Long IDENTIFIER_2_QUERY_ID = QUERY_1_ID;
+ public static final String IDENTIFIER_2_NORMALIZED = QUERY_1_STATEMENT;
+ public static final Long IDENTIFIER_2_RESULT_NUMBER = QUERY_1_RESULT_NUMBER;
+ public static final String IDENTIFIER_2_PUBLISHER = "Swedish Government";
+ public static final IdentifierType IDENTIFIER_2_TYPE = IdentifierType.SUBSET;
+ public static final IdentifierTypeDto IDENTIFIER_2_TYPE_DTO = IdentifierTypeDto.SUBSET;
+ public static final IdentifierStatusType IDENTIFIER_2_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
+ public static final IdentifierStatusTypeDto IDENTIFIER_2_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
+ public static final UUID IDENTIFIER_2_CREATED_BY = USER_1_ID;
+
+ public static final CreateIdentifierDto IDENTIFIER_2_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_2_DATABASE_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
.type(IDENTIFIER_2_TYPE_DTO)
@@ -7116,7 +7116,7 @@ public abstract class BaseTest {
.publisher(IDENTIFIER_2_PUBLISHER)
.build();
- public final static Identifier IDENTIFIER_2 = Identifier.builder()
+ public static final Identifier IDENTIFIER_2 = Identifier.builder()
.id(IDENTIFIER_2_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
.descriptions(new LinkedList<>())
@@ -7143,7 +7143,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_2_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_2_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_2_DTO = IdentifierDto.builder()
.id(IDENTIFIER_2_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
.databaseId(IDENTIFIER_2_DATABASE_ID)
@@ -7167,7 +7167,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_2_STATUS_TYPE_DTO)
.build();
- public final static IdentifierBriefDto IDENTIFIER_2_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_2_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_2_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
.databaseId(IDENTIFIER_2_DATABASE_ID)
@@ -7179,7 +7179,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_2_STATUS_TYPE_DTO)
.build();
- public final static IdentifierSaveDto IDENTIFIER_2_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_2_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_2_ID)
.databaseId(IDENTIFIER_2_DATABASE_ID)
.queryId(IDENTIFIER_2_QUERY_ID)
@@ -7195,29 +7195,29 @@ public abstract class BaseTest {
.queryId(QUERY_1_ID)
.build();
- public final static Long IDENTIFIER_3_ID = 3L;
- public final static Long IDENTIFIER_3_DATABASE_ID = DATABASE_1_ID;
- public final static Long IDENTIFIER_3_VIEW_ID = VIEW_1_ID;
- public final static String IDENTIFIER_3_DOI = null;
- public final static Instant IDENTIFIER_3_CREATED = Instant.ofEpochSecond(1651588352L);
- public final static Instant IDENTIFIER_3_MODIFIED = Instant.ofEpochSecond(1551588352L);
- public final static Instant IDENTIFIER_3_EXECUTION = Instant.ofEpochSecond(1551588352L);
- public final static Integer IDENTIFIER_3_PUBLICATION_DAY = 10;
- public final static Integer IDENTIFIER_3_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_3_PUBLICATION_YEAR = 2023;
- public final static String IDENTIFIER_3_QUERY_HASH = VIEW_1_QUERY_HASH;
- public final static String IDENTIFIER_3_RESULT_HASH = null;
- public final static String IDENTIFIER_3_QUERY = VIEW_1_QUERY;
- public final static String IDENTIFIER_3_NORMALIZED = VIEW_1_QUERY;
- public final static Long IDENTIFIER_3_RESULT_NUMBER = null;
- public final static String IDENTIFIER_3_PUBLISHER = "Polish Government";
- public final static IdentifierType IDENTIFIER_3_TYPE = IdentifierType.VIEW;
- public final static IdentifierTypeDto IDENTIFIER_3_TYPE_DTO = IdentifierTypeDto.VIEW;
- public final static IdentifierStatusType IDENTIFIER_3_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
- public final static IdentifierStatusTypeDto IDENTIFIER_3_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
- public final static UUID IDENTIFIER_3_CREATED_BY = USER_1_ID;
-
- public final static Identifier IDENTIFIER_3 = Identifier.builder()
+ public static final Long IDENTIFIER_3_ID = 3L;
+ public static final Long IDENTIFIER_3_DATABASE_ID = DATABASE_1_ID;
+ public static final Long IDENTIFIER_3_VIEW_ID = VIEW_1_ID;
+ public static final String IDENTIFIER_3_DOI = null;
+ public static final Instant IDENTIFIER_3_CREATED = Instant.ofEpochSecond(1651588352L);
+ public static final Instant IDENTIFIER_3_MODIFIED = Instant.ofEpochSecond(1551588352L);
+ public static final Instant IDENTIFIER_3_EXECUTION = Instant.ofEpochSecond(1551588352L);
+ public static final Integer IDENTIFIER_3_PUBLICATION_DAY = 10;
+ public static final Integer IDENTIFIER_3_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_3_PUBLICATION_YEAR = 2023;
+ public static final String IDENTIFIER_3_QUERY_HASH = VIEW_1_QUERY_HASH;
+ public static final String IDENTIFIER_3_RESULT_HASH = null;
+ public static final String IDENTIFIER_3_QUERY = VIEW_1_QUERY;
+ public static final String IDENTIFIER_3_NORMALIZED = VIEW_1_QUERY;
+ public static final Long IDENTIFIER_3_RESULT_NUMBER = null;
+ public static final String IDENTIFIER_3_PUBLISHER = "Polish Government";
+ public static final IdentifierType IDENTIFIER_3_TYPE = IdentifierType.VIEW;
+ public static final IdentifierTypeDto IDENTIFIER_3_TYPE_DTO = IdentifierTypeDto.VIEW;
+ public static final IdentifierStatusType IDENTIFIER_3_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
+ public static final IdentifierStatusTypeDto IDENTIFIER_3_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
+ public static final UUID IDENTIFIER_3_CREATED_BY = USER_1_ID;
+
+ public static final Identifier IDENTIFIER_3 = Identifier.builder()
.id(IDENTIFIER_3_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
.descriptions(new LinkedList<>())
@@ -7244,7 +7244,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_3_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_3_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_3_DTO = IdentifierDto.builder()
.id(IDENTIFIER_3_ID)
.databaseId(IDENTIFIER_3_DATABASE_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
@@ -7268,7 +7268,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_3_STATUS_TYPE_DTO)
.build();
- public final static IdentifierBriefDto IDENTIFIER_3_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_3_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_3_ID)
.databaseId(IDENTIFIER_3_DATABASE_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
@@ -7280,7 +7280,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_3_STATUS_TYPE_DTO)
.build();
- public final static CreateIdentifierDto IDENTIFIER_3_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_3_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_3_DATABASE_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
.type(IDENTIFIER_3_TYPE_DTO)
@@ -7288,7 +7288,7 @@ public abstract class BaseTest {
.publisher(IDENTIFIER_3_PUBLISHER)
.build();
- public final static IdentifierSaveDto IDENTIFIER_3_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_3_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_3_ID)
.databaseId(IDENTIFIER_3_DATABASE_ID)
.viewId(IDENTIFIER_3_VIEW_ID)
@@ -7303,26 +7303,26 @@ public abstract class BaseTest {
.licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
.build();
- public final static Long IDENTIFIER_4_ID = 4L;
- public final static Long IDENTIFIER_4_DATABASE_ID = DATABASE_1_ID;
- public final static Long IDENTIFIER_4_TABLE_ID = TABLE_1_ID;
- public final static String IDENTIFIER_4_DOI = null;
- public final static Instant IDENTIFIER_4_CREATED = Instant.ofEpochSecond(1751588352L);
- public final static Instant IDENTIFIER_4_MODIFIED = Instant.ofEpochSecond(1551588352L);
- public final static Instant IDENTIFIER_4_EXECUTION = Instant.ofEpochSecond(1551588352L);
- public final static Integer IDENTIFIER_4_PUBLICATION_DAY = 10;
- public final static Integer IDENTIFIER_4_PUBLICATION_MONTH = 7;
- public final static Integer IDENTIFIER_4_PUBLICATION_YEAR = 2023;
- public final static String IDENTIFIER_4_RESULT_HASH = null;
- public final static Long IDENTIFIER_4_RESULT_NUMBER = null;
- public final static String IDENTIFIER_4_PUBLISHER = "Example Publisher";
- public final static IdentifierType IDENTIFIER_4_TYPE = IdentifierType.TABLE;
- public final static IdentifierTypeDto IDENTIFIER_4_TYPE_DTO = IdentifierTypeDto.TABLE;
- public final static IdentifierStatusType IDENTIFIER_4_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
- public final static IdentifierStatusTypeDto IDENTIFIER_4_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
- public final static UUID IDENTIFIER_4_CREATED_BY = USER_1_ID;
-
- public final static Identifier IDENTIFIER_4 = Identifier.builder()
+ public static final Long IDENTIFIER_4_ID = 4L;
+ public static final Long IDENTIFIER_4_DATABASE_ID = DATABASE_1_ID;
+ public static final Long IDENTIFIER_4_TABLE_ID = TABLE_1_ID;
+ public static final String IDENTIFIER_4_DOI = null;
+ public static final Instant IDENTIFIER_4_CREATED = Instant.ofEpochSecond(1751588352L);
+ public static final Instant IDENTIFIER_4_MODIFIED = Instant.ofEpochSecond(1551588352L);
+ public static final Instant IDENTIFIER_4_EXECUTION = Instant.ofEpochSecond(1551588352L);
+ public static final Integer IDENTIFIER_4_PUBLICATION_DAY = 10;
+ public static final Integer IDENTIFIER_4_PUBLICATION_MONTH = 7;
+ public static final Integer IDENTIFIER_4_PUBLICATION_YEAR = 2023;
+ public static final String IDENTIFIER_4_RESULT_HASH = null;
+ public static final Long IDENTIFIER_4_RESULT_NUMBER = null;
+ public static final String IDENTIFIER_4_PUBLISHER = "Example Publisher";
+ public static final IdentifierType IDENTIFIER_4_TYPE = IdentifierType.TABLE;
+ public static final IdentifierTypeDto IDENTIFIER_4_TYPE_DTO = IdentifierTypeDto.TABLE;
+ public static final IdentifierStatusType IDENTIFIER_4_STATUS_TYPE = IdentifierStatusType.PUBLISHED;
+ public static final IdentifierStatusTypeDto IDENTIFIER_4_STATUS_TYPE_DTO = IdentifierStatusTypeDto.PUBLISHED;
+ public static final UUID IDENTIFIER_4_CREATED_BY = USER_1_ID;
+
+ public static final Identifier IDENTIFIER_4 = Identifier.builder()
.id(IDENTIFIER_4_ID)
.tableId(IDENTIFIER_4_TABLE_ID)
.descriptions(new LinkedList<>())
@@ -7346,7 +7346,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_4_STATUS_TYPE)
.build();
- public final static IdentifierDto IDENTIFIER_4_DTO = IdentifierDto.builder()
+ public static final IdentifierDto IDENTIFIER_4_DTO = IdentifierDto.builder()
.id(IDENTIFIER_4_ID)
.databaseId(IDENTIFIER_4_DATABASE_ID)
.tableId(IDENTIFIER_4_TABLE_ID)
@@ -7367,7 +7367,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_4_STATUS_TYPE_DTO)
.build();
- public final static IdentifierBriefDto IDENTIFIER_4_BRIEF_DTO = IdentifierBriefDto.builder()
+ public static final IdentifierBriefDto IDENTIFIER_4_BRIEF_DTO = IdentifierBriefDto.builder()
.id(IDENTIFIER_4_ID)
.databaseId(IDENTIFIER_4_DATABASE_ID)
.tableId(IDENTIFIER_4_TABLE_ID)
@@ -7379,13 +7379,13 @@ public abstract class BaseTest {
.status(IDENTIFIER_4_STATUS_TYPE_DTO)
.build();
- public final static CreateIdentifierDto IDENTIFIER_4_CREATE_DTO = CreateIdentifierDto.builder()
+ public static final CreateIdentifierDto IDENTIFIER_4_CREATE_DTO = CreateIdentifierDto.builder()
.databaseId(IDENTIFIER_4_DATABASE_ID)
.publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
.publisher(IDENTIFIER_4_PUBLISHER)
.build();
- public final static IdentifierSaveDto IDENTIFIER_4_SAVE_DTO = IdentifierSaveDto.builder()
+ public static final IdentifierSaveDto IDENTIFIER_4_SAVE_DTO = IdentifierSaveDto.builder()
.id(IDENTIFIER_4_ID)
.databaseId(IDENTIFIER_4_DATABASE_ID)
.tableId(IDENTIFIER_4_TABLE_ID)
@@ -7400,36 +7400,36 @@ public abstract class BaseTest {
.licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
.build();
- public final static String VIRTUAL_HOST_NAME = "fda";
- public final static String VIRTUAL_HOST_DESCRIPTION = "FAIR Data Austria";
- public final static String VIRTUAL_HOST_TAGS = "";
+ public static final String VIRTUAL_HOST_NAME = "fda";
+ public static final String VIRTUAL_HOST_DESCRIPTION = "FAIR Data Austria";
+ public static final String VIRTUAL_HOST_TAGS = "";
- public final static CreateVirtualHostDto VIRTUAL_HOST_CREATE_DTO = CreateVirtualHostDto.builder()
+ public static final CreateVirtualHostDto VIRTUAL_HOST_CREATE_DTO = CreateVirtualHostDto.builder()
.name(VIRTUAL_HOST_NAME)
.description(VIRTUAL_HOST_DESCRIPTION)
.tags(VIRTUAL_HOST_TAGS)
.build();
- public final static ExchangeUpdatePermissionsDto VIRTUAL_HOST_EXCHANGE_UPDATE_DTO = ExchangeUpdatePermissionsDto.builder()
+ public static final ExchangeUpdatePermissionsDto VIRTUAL_HOST_EXCHANGE_UPDATE_DTO = ExchangeUpdatePermissionsDto.builder()
.exchange(DATABASE_1_EXCHANGE)
.read(".*")
.write(".*")
.build();
- public final static GrantVirtualHostPermissionsDto VIRTUAL_HOST_GRANT_DTO = GrantVirtualHostPermissionsDto.builder()
+ public static final GrantVirtualHostPermissionsDto VIRTUAL_HOST_GRANT_DTO = GrantVirtualHostPermissionsDto.builder()
.read(".*")
.write(".*")
.configure(".*")
.build();
- public final static Long BANNER_MESSAGE_1_ID = 1L;
- public final static String BANNER_MESSAGE_1_MESSAGE = "Next maintenance in 7 days!";
- public final static BannerMessageType BANNER_MESSAGE_1_TYPE = BannerMessageType.INFO;
- public final static BannerMessageTypeDto BANNER_MESSAGE_1_TYPE_DTO = BannerMessageTypeDto.INFO;
- public final static Instant BANNER_MESSAGE_1_START = Instant.ofEpochSecond(1684577786L) /* 2022-12-23 22:00:00 (UTC) */;
- public final static Instant BANNER_MESSAGE_1_END = null;
+ public static final Long BANNER_MESSAGE_1_ID = 1L;
+ public static final String BANNER_MESSAGE_1_MESSAGE = "Next maintenance in 7 days!";
+ public static final BannerMessageType BANNER_MESSAGE_1_TYPE = BannerMessageType.INFO;
+ public static final BannerMessageTypeDto BANNER_MESSAGE_1_TYPE_DTO = BannerMessageTypeDto.INFO;
+ public static final Instant BANNER_MESSAGE_1_START = Instant.ofEpochSecond(1684577786L) /* 2022-12-23 22:00:00 (UTC) */;
+ public static final Instant BANNER_MESSAGE_1_END = null;
- public final static BannerMessage BANNER_MESSAGE_1 = BannerMessage.builder()
+ public static final BannerMessage BANNER_MESSAGE_1 = BannerMessage.builder()
.id(BANNER_MESSAGE_1_ID)
.message(BANNER_MESSAGE_1_MESSAGE)
.type(BANNER_MESSAGE_1_TYPE)
@@ -7437,7 +7437,7 @@ public abstract class BaseTest {
.displayEnd(BANNER_MESSAGE_1_END)
.build();
- public final static BannerMessageDto BANNER_MESSAGE_1_DTO = BannerMessageDto.builder()
+ public static final BannerMessageDto BANNER_MESSAGE_1_DTO = BannerMessageDto.builder()
.id(BANNER_MESSAGE_1_ID)
.message(BANNER_MESSAGE_1_MESSAGE)
.type(BANNER_MESSAGE_1_TYPE_DTO)
@@ -7445,28 +7445,28 @@ public abstract class BaseTest {
.displayEnd(BANNER_MESSAGE_1_END)
.build();
- public final static BannerMessageCreateDto BANNER_MESSAGE_1_CREATE_DTO = BannerMessageCreateDto.builder()
+ public static final BannerMessageCreateDto BANNER_MESSAGE_1_CREATE_DTO = BannerMessageCreateDto.builder()
.message(BANNER_MESSAGE_1_MESSAGE)
.type(BANNER_MESSAGE_1_TYPE_DTO)
.displayStart(BANNER_MESSAGE_1_START)
.displayEnd(BANNER_MESSAGE_1_END)
.build();
- public final static BannerMessageUpdateDto BANNER_MESSAGE_1_UPDATE_DTO = BannerMessageUpdateDto.builder()
+ public static final BannerMessageUpdateDto BANNER_MESSAGE_1_UPDATE_DTO = BannerMessageUpdateDto.builder()
.message(BANNER_MESSAGE_1_MESSAGE)
.type(BannerMessageTypeDto.WARNING)
.displayStart(BANNER_MESSAGE_1_START)
.displayEnd(BANNER_MESSAGE_1_END)
.build();
- public final static Long BANNER_MESSAGE_2_ID = 2L;
- public final static String BANNER_MESSAGE_2_MESSAGE = "No operation on Christmas 2022!";
- public final static BannerMessageType BANNER_MESSAGE_2_TYPE = BannerMessageType.ERROR;
- public final static BannerMessageTypeDto BANNER_MESSAGE_2_TYPE_DTO = BannerMessageTypeDto.ERROR;
- public final static Instant BANNER_MESSAGE_2_START = Instant.ofEpochSecond(1671836400L) /* 2022-12-23 22:00:00 (UTC) */;
- public final static Instant BANNER_MESSAGE_2_END = Instant.ofEpochSecond(1672009200L) /* 2022-12-25 22:00:00 (UTC) */;
+ public static final Long BANNER_MESSAGE_2_ID = 2L;
+ public static final String BANNER_MESSAGE_2_MESSAGE = "No operation on Christmas 2022!";
+ public static final BannerMessageType BANNER_MESSAGE_2_TYPE = BannerMessageType.ERROR;
+ public static final BannerMessageTypeDto BANNER_MESSAGE_2_TYPE_DTO = BannerMessageTypeDto.ERROR;
+ public static final Instant BANNER_MESSAGE_2_START = Instant.ofEpochSecond(1671836400L) /* 2022-12-23 22:00:00 (UTC) */;
+ public static final Instant BANNER_MESSAGE_2_END = Instant.ofEpochSecond(1672009200L) /* 2022-12-25 22:00:00 (UTC) */;
- public final static BannerMessage BANNER_MESSAGE_2 = BannerMessage.builder()
+ public static final BannerMessage BANNER_MESSAGE_2 = BannerMessage.builder()
.id(BANNER_MESSAGE_2_ID)
.message(BANNER_MESSAGE_2_MESSAGE)
.type(BANNER_MESSAGE_2_TYPE)
@@ -7474,14 +7474,14 @@ public abstract class BaseTest {
.displayEnd(BANNER_MESSAGE_2_END)
.build();
- public final static BannerMessageCreateDto BANNER_MESSAGE_2_CREATE_DTO = BannerMessageCreateDto.builder()
+ public static final BannerMessageCreateDto BANNER_MESSAGE_2_CREATE_DTO = BannerMessageCreateDto.builder()
.message(BANNER_MESSAGE_2_MESSAGE)
.type(BANNER_MESSAGE_2_TYPE_DTO)
.displayStart(BANNER_MESSAGE_2_START)
.displayEnd(BANNER_MESSAGE_2_END)
.build();
- public final static Database DATABASE_1 = Database.builder()
+ public static final Database DATABASE_1 = Database.builder()
.id(DATABASE_1_ID)
.created(Instant.now().minus(1, HOURS))
.lastModified(Instant.now())
@@ -7510,7 +7510,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static DatabaseDto DATABASE_1_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_1_DTO = DatabaseDto.builder()
.id(DATABASE_1_ID)
.isPublic(DATABASE_1_PUBLIC)
.isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
@@ -7524,7 +7524,7 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
- public final static DatabaseDto DATABASE_1_PRIVILEGED_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_1_PRIVILEGED_DTO = DatabaseDto.builder()
.id(DATABASE_1_ID)
.isPublic(DATABASE_1_PUBLIC)
.isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
@@ -7540,7 +7540,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static DatabaseBriefDto DATABASE_1_BRIEF_DTO = DatabaseBriefDto.builder()
+ public static final DatabaseBriefDto DATABASE_1_BRIEF_DTO = DatabaseBriefDto.builder()
.id(DATABASE_1_ID)
.isPublic(DATABASE_1_PUBLIC)
.isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
@@ -7549,7 +7549,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>(List.of(IDENTIFIER_1_BRIEF_DTO, IDENTIFIER_2_BRIEF_DTO, IDENTIFIER_3_BRIEF_DTO, IDENTIFIER_4_BRIEF_DTO)))
.build();
- public final static DatabaseAccess DATABASE_1_USER_1_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_1_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7557,14 +7557,14 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_1_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_1_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_1_ID)
.huserid(USER_1_ID)
.user(USER_1_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_1_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7572,7 +7572,7 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccess DATABASE_1_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7580,7 +7580,7 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccess DATABASE_1_USER_2_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_2_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7588,14 +7588,14 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_2_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_2_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_1_ID)
.huserid(USER_2_ID)
.user(USER_2_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_1_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7603,14 +7603,14 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_2_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_2_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_OWN)
.hdbid(DATABASE_1_ID)
.huserid(USER_2_ID)
.user(USER_2_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_1_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7618,14 +7618,14 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_2_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_2_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.hdbid(DATABASE_1_ID)
.huserid(USER_2_ID)
.user(USER_2_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_1_USER_3_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_3_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7633,7 +7633,7 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccess DATABASE_1_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7641,7 +7641,7 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccess DATABASE_1_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7649,14 +7649,14 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_3_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_3_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.hdbid(DATABASE_1_ID)
.huserid(USER_3_ID)
.user(USER_3_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_1_USER_4_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_1_USER_4_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_1_ID)
.database(DATABASE_1)
@@ -7664,14 +7664,14 @@ public abstract class BaseTest {
.user(USER_4)
.build();
- public final static DatabaseAccessDto DATABASE_1_USER_4_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_1_USER_4_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_1_ID)
.huserid(USER_4_ID)
.user(USER_4_BRIEF_DTO)
.build();
- public final static Database DATABASE_2 = Database.builder()
+ public static final Database DATABASE_2 = Database.builder()
.id(DATABASE_2_ID)
.created(DATABASE_2_CREATED)
.lastModified(Instant.now())
@@ -7695,7 +7695,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static DatabaseDto DATABASE_2_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_2_DTO = DatabaseDto.builder()
.id(DATABASE_2_ID)
.isPublic(DATABASE_2_PUBLIC)
.isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
@@ -7710,7 +7710,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static DatabaseDto DATABASE_2_PRIVILEGED_DTO = DatabaseDto.builder()
+ public static final DatabaseDto DATABASE_2_PRIVILEGED_DTO = DatabaseDto.builder()
.id(DATABASE_2_ID)
.isPublic(DATABASE_2_PUBLIC)
.isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
@@ -7725,7 +7725,7 @@ public abstract class BaseTest {
.lastRetrieved(Instant.now())
.build();
- public final static DatabaseBriefDto DATABASE_2_BRIEF_DTO = DatabaseBriefDto.builder()
+ public static final DatabaseBriefDto DATABASE_2_BRIEF_DTO = DatabaseBriefDto.builder()
.id(DATABASE_2_ID)
.isPublic(DATABASE_2_PUBLIC)
.isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
@@ -7735,7 +7735,7 @@ public abstract class BaseTest {
.ownerId(USER_2_ID)
.build();
- public final static DatabaseAccess DATABASE_2_USER_1_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_1_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7743,7 +7743,7 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccess DATABASE_2_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7751,7 +7751,7 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccess DATABASE_2_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7759,7 +7759,7 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccess DATABASE_2_USER_2_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_2_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7767,13 +7767,13 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccessDto DATABASE_2_USER_2_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_2_USER_2_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_2_ID)
.huserid(USER_2_ID)
.build();
- public final static DatabaseAccess DATABASE_2_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7781,7 +7781,7 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccess DATABASE_2_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7789,14 +7789,14 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccessDto DATABASE_2_USER_2_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_2_USER_2_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.hdbid(DATABASE_2_ID)
.huserid(USER_2_ID)
.user(USER_2_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_2_USER_3_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_3_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7804,14 +7804,14 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccessDto DATABASE_2_USER_3_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_2_USER_3_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_2_ID)
.huserid(USER_3_ID)
.user(USER_3_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_2_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7819,7 +7819,7 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccess DATABASE_2_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_2_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_2_ID)
.database(DATABASE_2)
@@ -7827,7 +7827,7 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static Database DATABASE_3 = Database.builder()
+ public static final Database DATABASE_3 = Database.builder()
.id(DATABASE_3_ID)
.created(Instant.now().minus(1, HOURS))
.lastModified(Instant.now())
@@ -7851,7 +7851,7 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>()) /* IDENTIFIER_6 */
.build();
- public final static DatabaseAccess DATABASE_3_USER_1_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_1_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7859,14 +7859,14 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_1_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_1_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_3_ID)
.huserid(USER_1_ID)
.user(USER_1_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_3_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7874,14 +7874,14 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_1_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_1_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_OWN)
.hdbid(DATABASE_3_ID)
.huserid(USER_1_ID)
.user(USER_1_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_3_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7889,14 +7889,14 @@ public abstract class BaseTest {
.user(USER_1)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_1_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_1_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.hdbid(DATABASE_3_ID)
.huserid(USER_1_ID)
.user(USER_1_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_3_USER_2_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_2_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7904,7 +7904,7 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccess DATABASE_3_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7912,7 +7912,7 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccess DATABASE_3_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7920,7 +7920,7 @@ public abstract class BaseTest {
.user(USER_2)
.build();
- public final static DatabaseAccess DATABASE_3_USER_3_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_3_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7928,14 +7928,14 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_3_READ_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_3_READ_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.READ)
.hdbid(DATABASE_3_ID)
.huserid(USER_3_ID)
.user(USER_3_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_3_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7943,14 +7943,14 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_3_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_3_WRITE_OWN_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_OWN)
.hdbid(DATABASE_3_ID)
.huserid(USER_3_ID)
.user(USER_3_BRIEF_DTO)
.build();
- public final static DatabaseAccess DATABASE_3_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_3_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_3_ID)
.database(DATABASE_3)
@@ -7958,14 +7958,14 @@ public abstract class BaseTest {
.user(USER_3)
.build();
- public final static DatabaseAccessDto DATABASE_3_USER_3_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
+ public static final DatabaseAccessDto DATABASE_3_USER_3_WRITE_ALL_ACCESS_DTO = DatabaseAccessDto.builder()
.type(AccessTypeDto.WRITE_ALL)
.hdbid(DATABASE_3_ID)
.huserid(USER_3_ID)
.user(USER_3_BRIEF_DTO)
.build();
- public final static Identifier IDENTIFIER_7 = Identifier.builder()
+ public static final Identifier IDENTIFIER_7 = Identifier.builder()
.id(IDENTIFIER_7_ID)
.descriptions(new LinkedList<>())
.titles(new LinkedList<>())
@@ -7988,7 +7988,7 @@ public abstract class BaseTest {
.status(IDENTIFIER_7_STATUS_TYPE)
.build();
- public final static Database DATABASE_4 = Database.builder()
+ public static final Database DATABASE_4 = Database.builder()
.id(DATABASE_4_ID)
.created(Instant.now().minus(4, HOURS))
.lastModified(Instant.now())
@@ -8011,72 +8011,72 @@ public abstract class BaseTest {
.identifiers(new LinkedList<>())
.build();
- public final static DatabaseAccess DATABASE_4_USER_1_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_1_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_1_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_1_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_1_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_2_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_2_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_2_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_2_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_2_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_3_READ_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_3_READ_ACCESS = DatabaseAccess.builder()
.type(AccessType.READ)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_3_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_OWN)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_3_ID)
.build();
- public final static DatabaseAccess DATABASE_4_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
+ public static final DatabaseAccess DATABASE_4_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
.type(AccessType.WRITE_ALL)
.hdbid(DATABASE_4_ID)
.database(DATABASE_4)
.huserid(USER_3_ID)
.build();
- public final static List<IdentifierDto> VIEW_1_DTO_IDENTIFIERS = List.of(IDENTIFIER_3_DTO);
+ public static final List<IdentifierDto> VIEW_1_DTO_IDENTIFIERS = List.of(IDENTIFIER_3_DTO);
- public final static Constraints TABLE_1_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_1_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8087,7 +8087,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_1_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_1_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8098,7 +8098,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_2_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_2_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>(List.of("`mintemp` > 0")))
.foreignKeys(new LinkedList<>(List.of(ForeignKey.builder()
.id(1L)
@@ -8127,7 +8127,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_2_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_2_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>(List.of("`mintemp` > 0")))
.foreignKeys(new LinkedList<>(List.of(ForeignKeyDto.builder()
.id(1L)
@@ -8156,7 +8156,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_3_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_3_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8167,7 +8167,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_3_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_3_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8178,7 +8178,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_4_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_4_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8189,7 +8189,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_4_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_4_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8200,7 +8200,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_5_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_5_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8211,7 +8211,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_5_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_5_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8222,7 +8222,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_6_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_6_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>(List.of()))
.uniques(new LinkedList<>())
@@ -8233,7 +8233,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_6_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_6_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8244,7 +8244,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_7_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_7_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>(List.of(ForeignKey.builder()
.id(8L)
@@ -8282,7 +8282,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_0_DTO = ForeignKeyDto.builder()
+ public static final ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_0_DTO = ForeignKeyDto.builder()
.id(2L)
.name("fk_name_id")
.onDelete(ReferenceTypeDto.NO_ACTION)
@@ -8297,11 +8297,11 @@ public abstract class BaseTest {
.onUpdate(ReferenceTypeDto.NO_ACTION)
.build();
- public final static ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_0_DTO = ForeignKeyBriefDto.builder()
+ public static final ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_0_DTO = ForeignKeyBriefDto.builder()
.id(2L)
.build();
- public final static ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_1_DTO = ForeignKeyDto.builder()
+ public static final ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_1_DTO = ForeignKeyDto.builder()
.id(3L)
.name("fk_zoo_id")
.onDelete(ReferenceTypeDto.NO_ACTION)
@@ -8316,11 +8316,11 @@ public abstract class BaseTest {
.onUpdate(ReferenceTypeDto.NO_ACTION)
.build();
- public final static ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_1_DTO = ForeignKeyBriefDto.builder()
+ public static final ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_1_DTO = ForeignKeyBriefDto.builder()
.id(3L)
.build();
- public final static ConstraintsDto TABLE_7_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_7_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>(List.of(TABLE_7_CONSTRAINTS_FOREIGN_KEY_0_DTO,
TABLE_7_CONSTRAINTS_FOREIGN_KEY_1_DTO)))
@@ -8332,7 +8332,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static Constraints TABLE_8_CONSTRAINTS = Constraints.builder()
+ public static final Constraints TABLE_8_CONSTRAINTS = Constraints.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8343,7 +8343,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ConstraintsDto TABLE_8_CONSTRAINTS_DTO = ConstraintsDto.builder()
+ public static final ConstraintsDto TABLE_8_CONSTRAINTS_DTO = ConstraintsDto.builder()
.checks(new LinkedHashSet<>())
.foreignKeys(new LinkedList<>())
.uniques(new LinkedList<>())
@@ -8354,7 +8354,7 @@ public abstract class BaseTest {
.build())))
.build();
- public final static ExportResourceDto EXPORT_RESOURCE_DTO = ExportResourceDto.builder()
+ public static final ExportResourceDto EXPORT_RESOURCE_DTO = ExportResourceDto.builder()
.filename("68b329da9893e34099c7d8ad5cb9c940")
.resource(new InputStreamResource(InputStream.nullInputStream()))
.build();
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index 85d530e74d..85be5cd6b0 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -141,23 +141,6 @@
</v-form>
<v-main>
<v-container>
- <div
- v-cloak>
- <v-alert
- v-if="isNotFinishedAccountSetup"
- border="start"
- color="info"
- class="mb-4">
- {{ $t('pages.settings.subpages.authentication.setup.text') }}
- <v-btn
- variant="flat"
- size="small"
- to="/user/authentication">
- {{ $t('pages.settings.subpages.authentication.setup.action') }}
- </v-btn>
- .
- </v-alert>
- </div>
<JumboBox
v-if="error"
:title="$t(errorCodeKey(error).title, { resource })"
@@ -269,15 +252,6 @@ export default {
commitShort () {
return this.$config.public.commit.substr(0, 8)
},
- isNotFinishedAccountSetup () {
- if (!this.cacheUser) {
- return false
- }
- if (!('setup_finished' in this.cacheUser)) {
- return true
- }
- return this.cacheUser.setup_finished === false
- },
error () {
if (this.identifier) {
return null
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index a970096eeaa5015d9e95064f6b341fffdf8aae5f..7b332886dd5aca385115460c47692fdef8522e0b 100644
GIT binary patch
delta 4412
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
delta 4508
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
--
GitLab
From 5e2aa10d026f8348825978244c4219f0b4b93ede Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 16 Feb 2025 09:37:50 +0000
Subject: [PATCH 3/3] Fixed the sync
---
.docs/changelog.md | 6 +-
.gitlab-ci.yml | 6 +-
dbrepo-auth-service/init/.coveragerc | 4 +
dbrepo-auth-service/init/.gitignore | 4 +-
dbrepo-auth-service/init/Pipfile | 1 +
dbrepo-auth-service/init/Pipfile.lock | 418 ++++++++++++++----
dbrepo-auth-service/init/app.py | 4 +-
dbrepo-auth-service/init/test/conftest.py | 51 +++
.../init/test/test_integration_app.py | 14 +
.../init/test/test_unit_app.py | 33 ++
.../target/create-event-listener.jar | Bin 10146 -> 10145 bytes
dbrepo-metadata-service/metrics.md | 1 -
.../java/at/tuwien/mapper/MetadataMapper.java | 1 +
.../at/tuwien/endpoints/UserEndpoint.java | 62 +--
.../tuwien/handlers/ApiExceptionHandler.java | 15 +
.../endpoints/UserEndpointUnitTest.java | 70 +--
.../gateway/DataServiceGatewayUnitTest.java | 101 ++++-
.../KeycloakGatewayIntegrationTest.java | 24 +-
.../handlers/ApiExceptionHandlerTest.java | 78 +---
.../tuwien/mvc/PrometheusEndpointMvcTest.java | 8 +-
.../service/UserServicePersistenceTest.java | 17 -
.../tuwien/service/UserServiceUnitTest.java | 25 +-
.../java/at/tuwien/utils/KeycloakUtils.java | 10 +
.../gateway/ApiTemplateInterceptor.java | 7 -
.../at/tuwien/gateway/KeycloakGateway.java | 2 -
.../impl/ApiTemplateInterceptorImpl.java | 24 -
.../gateway/impl/KeycloakGatewayImpl.java | 22 -
.../interceptor/KeycloakInterceptor.java | 60 ---
.../tuwien/service/AuthenticationService.java | 10 +-
.../java/at/tuwien/service/UserService.java | 16 -
.../impl/AuthenticationServiceImpl.java | 5 -
.../tuwien/service/impl/UserServiceImpl.java | 17 -
.../main/java/at/tuwien/test/BaseTest.java | 11 +-
dbrepo-search-service/.gitignore | 6 +
dbrepo-search-service/Dockerfile | 2 +-
dbrepo-search-service/app.py | 2 +-
dbrepo-search-service/init/.coveragerc | 5 +
dbrepo-search-service/init/Pipfile | 4 +-
dbrepo-search-service/init/Pipfile.lock | 389 +++++++++++++---
.../init/clients/keycloak_client.py | 12 +-
.../{ => init}/friendly_names_overrides.json | 0
.../{ => init}/test/rsa/rs256.key | 0
.../init/test/rsa/rsa/rs256.key | 3 +
.../{test => init/test/rsa}/rsa/rsa256.pkey | 0
.../init/test/rsa/rsa256.pkey | 3 +
.../init/test/test_keycloak_client.py | 53 +++
.../init/test/test_opensearch_client.py | 206 +++++++++
dbrepo-search-service/test.sh | 7 -
dbrepo-search-service/test/test_jwt.py | 2 +-
.../test/test_keycloak_client.py | 57 ---
.../test/test_opensearch_client.py | 215 ---------
dbrepo-ui/components/user/UserToolbar.vue | 3 -
dbrepo-ui/pages/user/authentication.vue | 138 ------
helm/dbrepo/files/create-event-listener.jar | Bin 10146 -> 10145 bytes
make/build.mk | 1 +
55 files changed, 1263 insertions(+), 972 deletions(-)
create mode 100644 dbrepo-auth-service/init/.coveragerc
create mode 100644 dbrepo-auth-service/init/test/conftest.py
create mode 100644 dbrepo-auth-service/init/test/test_integration_app.py
delete mode 100644 dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/ApiTemplateInterceptor.java
delete mode 100644 dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
delete mode 100644 dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
create mode 100644 dbrepo-search-service/init/.coveragerc
rename dbrepo-search-service/{ => init}/friendly_names_overrides.json (100%)
rename dbrepo-search-service/{ => init}/test/rsa/rs256.key (100%)
create mode 100644 dbrepo-search-service/init/test/rsa/rsa/rs256.key
rename dbrepo-search-service/{test => init/test/rsa}/rsa/rsa256.pkey (100%)
create mode 100644 dbrepo-search-service/init/test/rsa/rsa256.pkey
create mode 100644 dbrepo-search-service/init/test/test_keycloak_client.py
create mode 100644 dbrepo-search-service/init/test/test_opensearch_client.py
delete mode 100644 dbrepo-search-service/test.sh
delete mode 100644 dbrepo-search-service/test/test_keycloak_client.py
delete mode 100644 dbrepo-search-service/test/test_opensearch_client.py
delete mode 100644 dbrepo-ui/pages/user/authentication.vue
diff --git a/.docs/changelog.md b/.docs/changelog.md
index e1452dd12c..3e3d479073 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -2,7 +2,7 @@
author: Martin Weise
---
-## v1.6.4 (2025-02-13)
+## v1.6.4 (2025-02-14)
[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.4)
@@ -10,8 +10,8 @@ author: Martin Weise
#### Fixes
-* Fixed a bug where the users were not synced with the Metadata Database and the API Password was not recommended on
- first login in [#489](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/489).
+* Fixed a bug where the users were not synced with the Metadata Database
+ in [#489](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/489).
## v1.6.3 (2025-02-05)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74cfb6df9a..5a47aa19e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,6 +348,10 @@ test-search-service:
before_script:
- "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service/clients"
- "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service/omlib"
+ - "cp -r ./dbrepo-search-service/init/test/rsa ./dbrepo-search-service/test/rsa"
+ - "cp ./dbrepo-search-service/init/test/test_keycloak_client.py ./dbrepo-search-service/test"
+ - "cp ./dbrepo-search-service/init/test/test_opensearch_client.py ./dbrepo-search-service/test"
+ - "cp ./dbrepo-search-service/init/friendly_names_overrides.json ./dbrepo-search-service/friendly_names_overrides.json"
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
@@ -375,7 +379,7 @@ test-search-service-init:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+ - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py test/test_keycloak_client.py test/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
diff --git a/dbrepo-auth-service/init/.coveragerc b/dbrepo-auth-service/init/.coveragerc
new file mode 100644
index 0000000000..5951051c8d
--- /dev/null
+++ b/dbrepo-auth-service/init/.coveragerc
@@ -0,0 +1,4 @@
+[report]
+
+exclude_lines =
+ if __name__ == .__main__.:
\ No newline at end of file
diff --git a/dbrepo-auth-service/init/.gitignore b/dbrepo-auth-service/init/.gitignore
index 83faa6688b..fc979e4856 100644
--- a/dbrepo-auth-service/init/.gitignore
+++ b/dbrepo-auth-service/init/.gitignore
@@ -1,5 +1,7 @@
# IDE
.idea/
+
# artifacts
.coverage
-report.xml
\ No newline at end of file
+coverage.txt
+report.xml
diff --git a/dbrepo-auth-service/init/Pipfile b/dbrepo-auth-service/init/Pipfile
index f7b4b54ee1..58eea6e6a6 100644
--- a/dbrepo-auth-service/init/Pipfile
+++ b/dbrepo-auth-service/init/Pipfile
@@ -10,6 +10,7 @@ mariadb = "*"
[dev-packages]
coverage = "*"
pytest = "*"
+testcontainers-mysql = "*"
requests-mock = "*"
[requires]
diff --git a/dbrepo-auth-service/init/Pipfile.lock b/dbrepo-auth-service/init/Pipfile.lock
index 57631a0555..32613b0117 100644
--- a/dbrepo-auth-service/init/Pipfile.lock
+++ b/dbrepo-auth-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "d87ee7c247235a203e58f7d0133891024afc72a1331d3d4b2edb01a401bb0c1a"
+ "sha256": "e3dbdaa3974910c1b12957342fa5b2227b215c4e0a774f836b242bc6925cf90c"
},
"pipfile-spec": 6,
"requires": {
@@ -132,20 +132,20 @@
},
"mariadb": {
"hashes": [
- "sha256:0f8de8d66ca71bd102f34a970a331b7d75bdf7f8050d80e37cdcc6ff3c85cf7a",
- "sha256:2e72ea65f1d7d8563ee84e172f2a583193092bdb6ff83c470ca9722873273ecc",
- "sha256:3f64b520089cb60c4f8302f365ed0ae057c4c859ab70fc8b1c4358192c3c8f27",
- "sha256:579420293fa790d5ae0a6cb4bdb7e8be8facc2ceefb6123c2b0e8042b3fa725d",
- "sha256:6f28d8ccc597a3a1368be14078110f743900dbb3b0c7f1cce3072d83bec59c8a",
- "sha256:c1992ebf9c6f012ac158e33fef9f2c4ba899f721064c4ae3a3489233793296c0",
- "sha256:cf6647cee081e21d0994b409ba8c8fa2077f3972f1de3627c5502fb31d14f806",
- "sha256:d7302ccd15f0beee7b286885cbf6ac71ddc240374691d669784d99f89ba34d79",
- "sha256:dbc4cf0e302ca82d46f9431a0b04f048e9c21ee56d6f3162c29605f84d63b40c",
- "sha256:e94f1738bec09c97b601ddbb1908eb24524ba4630f507a775d82ffdb6c5794b3",
- "sha256:f6dfdc954edf02b6519419a054798cda6034dc459d1d482e3329e37aa27d34f0"
+ "sha256:194045d2f59b2c9100dad210dbd8ba3008120f8a434e792dae15b711e5449022",
+ "sha256:50b02ff2c78b1b4f4628a054e3c8c7dd92972137727a5cc309a64c9ed20c878c",
+ "sha256:5ae99af48ba92e3e2edad1dcda293f352c1b65e335007943b9def4cdde622fab",
+ "sha256:69b284ed12e6ef8dda6314cb1ca9d20d53b8a32a07bed2924beb25488e7d9502",
+ "sha256:8b49fc1e8c38bf5a779d46f8cea61c99660adb08d5d15cb7dbc7911a6439ffc2",
+ "sha256:8cc4068bdd14f4907746ec3bb37005682e47f84438cf56bdc6d901c2587f792a",
+ "sha256:992064971e0ff4b4154b80b16589ec86237ce4bd33debe1be5212141c056858a",
+ "sha256:b69bc18418e72fcf359d17736cdc3f601a271203aff13ef7c57a415c8fd52ab0",
+ "sha256:ba43c42130d41352f32a5786c339cc931d05472ef7640fa3764d428dc294b88e",
+ "sha256:dd9d0ca112eb670dfa99a2fb7c4398bcc2a8c452dbf5507a8e4b5c4ae991bb2a",
+ "sha256:e3ce7c47be58897822d07f119461b2aa6aa41a53f3505bec517b14fc6c3611a6"
],
"index": "pypi",
- "version": "==1.1.11"
+ "version": "==1.1.12"
},
"packaging": {
"hashes": [
@@ -281,71 +281,159 @@
},
"coverage": {
"hashes": [
- "sha256:05fca8ba6a87aabdd2d30d0b6c838b50510b56cdcfc604d40760dae7153b73d9",
- "sha256:0aa9692b4fdd83a4647eeb7db46410ea1322b5ed94cd1715ef09d1d5922ba87f",
- "sha256:0c807ca74d5a5e64427c8805de15b9ca140bba13572d6d74e262f46f50b13273",
- "sha256:0d7a2bf79378d8fb8afaa994f91bfd8215134f8631d27eba3e0e2c13546ce994",
- "sha256:0f460286cb94036455e703c66988851d970fdfd8acc2a1122ab7f4f904e4029e",
- "sha256:204a8238afe787323a8b47d8be4df89772d5c1e4651b9ffa808552bdf20e1d50",
- "sha256:2396e8116db77789f819d2bc8a7e200232b7a282c66e0ae2d2cd84581a89757e",
- "sha256:254f1a3b1eef5f7ed23ef265eaa89c65c8c5b6b257327c149db1ca9d4a35f25e",
- "sha256:26bcf5c4df41cad1b19c84af71c22cbc9ea9a547fc973f1f2cc9a290002c8b3c",
- "sha256:27c6e64726b307782fa5cbe531e7647aee385a29b2107cd87ba7c0105a5d3853",
- "sha256:299e91b274c5c9cdb64cbdf1b3e4a8fe538a7a86acdd08fae52301b28ba297f8",
- "sha256:2bcfa46d7709b5a7ffe089075799b902020b62e7ee56ebaed2f4bdac04c508d8",
- "sha256:2ccf240eb719789cedbb9fd1338055de2761088202a9a0b73032857e53f612fe",
- "sha256:32ee6d8491fcfc82652a37109f69dee9a830e9379166cb73c16d8dc5c2915165",
- "sha256:3f7b444c42bbc533aaae6b5a2166fd1a797cdb5eb58ee51a92bee1eb94a1e1cb",
- "sha256:457574f4599d2b00f7f637a0700a6422243b3565509457b2dbd3f50703e11f59",
- "sha256:489a01f94aa581dbd961f306e37d75d4ba16104bbfa2b0edb21d29b73be83609",
- "sha256:4bcc276261505d82f0ad426870c3b12cb177752834a633e737ec5ee79bbdff18",
- "sha256:4e0de1e902669dccbf80b0415fb6b43d27edca2fbd48c74da378923b05316098",
- "sha256:4e4630c26b6084c9b3cb53b15bd488f30ceb50b73c35c5ad7871b869cb7365fd",
- "sha256:4eea95ef275de7abaef630c9b2c002ffbc01918b726a39f5a4353916ec72d2f3",
- "sha256:507a20fc863cae1d5720797761b42d2d87a04b3e5aeb682ef3b7332e90598f43",
- "sha256:54a5f0f43950a36312155dae55c505a76cd7f2b12d26abeebbe7a0b36dbc868d",
- "sha256:55b201b97286cf61f5e76063f9e2a1d8d2972fc2fcfd2c1272530172fd28c359",
- "sha256:59af35558ba08b758aec4d56182b222976330ef8d2feacbb93964f576a7e7a90",
- "sha256:5c912978f7fbf47ef99cec50c4401340436d200d41d714c7a4766f377c5b7b78",
- "sha256:656c82b8a0ead8bba147de9a89bda95064874c91a3ed43a00e687f23cc19d53a",
- "sha256:6713ba4b4ebc330f3def51df1d5d38fad60b66720948112f114968feb52d3f99",
- "sha256:675cefc4c06e3b4c876b85bfb7c59c5e2218167bbd4da5075cbe3b5790a28988",
- "sha256:6f93531882a5f68c28090f901b1d135de61b56331bba82028489bc51bdd818d2",
- "sha256:714f942b9c15c3a7a5fe6876ce30af831c2ad4ce902410b7466b662358c852c0",
- "sha256:79109c70cc0882e4d2d002fe69a24aa504dec0cc17169b3c7f41a1d341a73694",
- "sha256:7bbd8c8f1b115b892e34ba66a097b915d3871db7ce0e6b9901f462ff3a975377",
- "sha256:7ed2f37cfce1ce101e6dffdfd1c99e729dd2ffc291d02d3e2d0af8b53d13840d",
- "sha256:7fb105327c8f8f0682e29843e2ff96af9dcbe5bab8eeb4b398c6a33a16d80a23",
- "sha256:89d76815a26197c858f53c7f6a656686ec392b25991f9e409bcef020cd532312",
- "sha256:9a7cfb50515f87f7ed30bc882f68812fd98bc2852957df69f3003d22a2aa0abf",
- "sha256:9e1747bab246d6ff2c4f28b4d186b205adced9f7bd9dc362051cc37c4a0c7bd6",
- "sha256:9e80eba8801c386f72e0712a0453431259c45c3249f0009aff537a517b52942b",
- "sha256:a01ec4af7dfeb96ff0078ad9a48810bb0cc8abcb0115180c6013a6b26237626c",
- "sha256:a372c89c939d57abe09e08c0578c1d212e7a678135d53aa16eec4430adc5e690",
- "sha256:a3b204c11e2b2d883946fe1d97f89403aa1811df28ce0447439178cc7463448a",
- "sha256:a534738b47b0de1995f85f582d983d94031dffb48ab86c95bdf88dc62212142f",
- "sha256:a5e37dc41d57ceba70956fa2fc5b63c26dba863c946ace9705f8eca99daecdc4",
- "sha256:aa744da1820678b475e4ba3dfd994c321c5b13381d1041fe9c608620e6676e25",
- "sha256:ab32947f481f7e8c763fa2c92fd9f44eeb143e7610c4ca9ecd6a36adab4081bd",
- "sha256:abb02e2f5a3187b2ac4cd46b8ced85a0858230b577ccb2c62c81482ca7d18852",
- "sha256:b330368cb99ef72fcd2dc3ed260adf67b31499584dc8a20225e85bfe6f6cfed0",
- "sha256:bc67deb76bc3717f22e765ab3e07ee9c7a5e26b9019ca19a3b063d9f4b874244",
- "sha256:c0b1818063dc9e9d838c09e3a473c1422f517889436dd980f5d721899e66f315",
- "sha256:c56e097019e72c373bae32d946ecf9858fda841e48d82df7e81c63ac25554078",
- "sha256:c7827a5bc7bdb197b9e066cdf650b2887597ad124dd99777332776f7b7c7d0d0",
- "sha256:ccc2b70a7ed475c68ceb548bf69cec1e27305c1c2606a5eb7c3afff56a1b3b27",
- "sha256:d37a84878285b903c0fe21ac8794c6dab58150e9359f1aaebbeddd6412d53132",
- "sha256:e2f0280519e42b0a17550072861e0bc8a80a0870de260f9796157d3fca2733c5",
- "sha256:e4ae5ac5e0d1e4edfc9b4b57b4cbecd5bc266a6915c500f358817a8496739247",
- "sha256:e67926f51821b8e9deb6426ff3164870976fe414d033ad90ea75e7ed0c2e5022",
- "sha256:e78b270eadb5702938c3dbe9367f878249b5ef9a2fcc5360ac7bff694310d17b",
- "sha256:ea3c8f04b3e4af80e17bab607c386a830ffc2fb88a5484e1df756478cf70d1d3",
- "sha256:ec22b5e7fe7a0fa8509181c4aac1db48f3dd4d3a566131b313d1efc102892c18",
- "sha256:f4f620668dbc6f5e909a0946a877310fb3d57aea8198bde792aae369ee1c23b5",
- "sha256:fd34e7b3405f0cc7ab03d54a334c17a9e802897580d964bd8c2001f4b9fd488f"
+ "sha256:00b2086892cf06c7c2d74983c9595dc511acca00665480b3ddff749ec4fb2a95",
+ "sha256:0533adc29adf6a69c1baa88c3d7dbcaadcffa21afbed3ca7a225a440e4744bf9",
+ "sha256:06097c7abfa611c91edb9e6920264e5be1d6ceb374efb4986f38b09eed4cb2fe",
+ "sha256:07e92ae5a289a4bc4c0aae710c0948d3c7892e20fd3588224ebe242039573bf0",
+ "sha256:0a9d8be07fb0832636a0f72b80d2a652fe665e80e720301fb22b191c3434d924",
+ "sha256:0e549f54ac5f301e8e04c569dfdb907f7be71b06b88b5063ce9d6953d2d58574",
+ "sha256:0ef01d70198431719af0b1f5dcbefc557d44a190e749004042927b2a3fed0702",
+ "sha256:0f16f44025c06792e0fb09571ae454bcc7a3ec75eeb3c36b025eccf501b1a4c3",
+ "sha256:14d47376a4f445e9743f6c83291e60adb1b127607a3618e3185bbc8091f0467b",
+ "sha256:1a936309a65cc5ca80fa9f20a442ff9e2d06927ec9a4f54bcba9c14c066323f2",
+ "sha256:1ceeb90c3eda1f2d8c4c578c14167dbd8c674ecd7d38e45647543f19839dd6ea",
+ "sha256:1f7ffa05da41754e20512202c866d0ebfc440bba3b0ed15133070e20bf5aeb5f",
+ "sha256:200e10beb6ddd7c3ded322a4186313d5ca9e63e33d8fab4faa67ef46d3460af3",
+ "sha256:220fa6c0ad7d9caef57f2c8771918324563ef0d8272c94974717c3909664e674",
+ "sha256:2251fabcfee0a55a8578a9d29cecfee5f2de02f11530e7d5c5a05859aa85aee9",
+ "sha256:2458f275944db8129f95d91aee32c828a408481ecde3b30af31d552c2ce284a0",
+ "sha256:299cf973a7abff87a30609879c10df0b3bfc33d021e1adabc29138a48888841e",
+ "sha256:2b996819ced9f7dbb812c701485d58f261bef08f9b85304d41219b1496b591ef",
+ "sha256:3688b99604a24492bcfe1c106278c45586eb819bf66a654d8a9a1433022fb2eb",
+ "sha256:3a1e465f398c713f1b212400b4e79a09829cd42aebd360362cd89c5bdc44eb87",
+ "sha256:488c27b3db0ebee97a830e6b5a3ea930c4a6e2c07f27a5e67e1b3532e76b9ef1",
+ "sha256:48cfc4641d95d34766ad41d9573cc0f22a48aa88d22657a1fe01dca0dbae4de2",
+ "sha256:4b467a8c56974bf06e543e69ad803c6865249d7a5ccf6980457ed2bc50312703",
+ "sha256:53c56358d470fa507a2b6e67a68fd002364d23c83741dbc4c2e0680d80ca227e",
+ "sha256:5d1095bbee1851269f79fd8e0c9b5544e4c00c0c24965e66d8cba2eb5bb535fd",
+ "sha256:641dfe0ab73deb7069fb972d4d9725bf11c239c309ce694dd50b1473c0f641c3",
+ "sha256:64cbb1a3027c79ca6310bf101014614f6e6e18c226474606cf725238cf5bc2d4",
+ "sha256:66fe626fd7aa5982cdebad23e49e78ef7dbb3e3c2a5960a2b53632f1f703ea45",
+ "sha256:676f92141e3c5492d2a1596d52287d0d963df21bf5e55c8b03075a60e1ddf8aa",
+ "sha256:69e62c5034291c845fc4df7f8155e8544178b6c774f97a99e2734b05eb5bed31",
+ "sha256:704c8c8c6ce6569286ae9622e534b4f5b9759b6f2cd643f1c1a61f666d534fe8",
+ "sha256:78f5243bb6b1060aed6213d5107744c19f9571ec76d54c99cc15938eb69e0e86",
+ "sha256:79cac3390bfa9836bb795be377395f28410811c9066bc4eefd8015258a7578c6",
+ "sha256:7ae6eabf519bc7871ce117fb18bf14e0e343eeb96c377667e3e5dd12095e0288",
+ "sha256:7e39e845c4d764208e7b8f6a21c541ade741e2c41afabdfa1caa28687a3c98cf",
+ "sha256:8161d9fbc7e9fe2326de89cd0abb9f3599bccc1287db0aba285cb68d204ce929",
+ "sha256:8bec2ac5da793c2685ce5319ca9bcf4eee683b8a1679051f8e6ec04c4f2fd7dc",
+ "sha256:959244a17184515f8c52dcb65fb662808767c0bd233c1d8a166e7cf74c9ea985",
+ "sha256:9b148068e881faa26d878ff63e79650e208e95cf1c22bd3f77c3ca7b1d9821a3",
+ "sha256:aa6f302a3a0b5f240ee201297fff0bbfe2fa0d415a94aeb257d8b461032389bd",
+ "sha256:ace9048de91293e467b44bce0f0381345078389814ff6e18dbac8fdbf896360e",
+ "sha256:ad7525bf0241e5502168ae9c643a2f6c219fa0a283001cee4cf23a9b7da75879",
+ "sha256:b01a840ecc25dce235ae4c1b6a0daefb2a203dba0e6e980637ee9c2f6ee0df57",
+ "sha256:b076e625396e787448d27a411aefff867db2bffac8ed04e8f7056b07024eed5a",
+ "sha256:b172f8e030e8ef247b3104902cc671e20df80163b60a203653150d2fc204d1ad",
+ "sha256:b1f097878d74fe51e1ddd1be62d8e3682748875b461232cf4b52ddc6e6db0bba",
+ "sha256:b95574d06aa9d2bd6e5cc35a5bbe35696342c96760b69dc4287dbd5abd4ad51d",
+ "sha256:bda1c5f347550c359f841d6614fb8ca42ae5cb0b74d39f8a1e204815ebe25750",
+ "sha256:cec6b9ce3bd2b7853d4a4563801292bfee40b030c05a3d29555fd2a8ee9bd68c",
+ "sha256:d1a987778b9c71da2fc8948e6f2656da6ef68f59298b7e9786849634c35d2c3c",
+ "sha256:d74c08e9aaef995f8c4ef6d202dbd219c318450fe2a76da624f2ebb9c8ec5d9f",
+ "sha256:e18aafdfb3e9ec0d261c942d35bd7c28d031c5855dadb491d2723ba54f4c3015",
+ "sha256:e216c5c45f89ef8971373fd1c5d8d1164b81f7f5f06bbf23c37e7908d19e8558",
+ "sha256:e695df2c58ce526eeab11a2e915448d3eb76f75dffe338ea613c1201b33bab2f",
+ "sha256:e7575ab65ca8399c8c4f9a7d61bbd2d204c8b8e447aab9d355682205c9dd948d",
+ "sha256:e995b3b76ccedc27fe4f477b349b7d64597e53a43fc2961db9d3fbace085d69d",
+ "sha256:ea31689f05043d520113e0552f039603c4dd71fa4c287b64cb3606140c66f425",
+ "sha256:eb5507795caabd9b2ae3f1adc95f67b1104971c22c624bb354232d65c4fc90b3",
+ "sha256:eb8668cfbc279a536c633137deeb9435d2962caec279c3f8cf8b91fff6ff8953",
+ "sha256:ecea0c38c9079570163d663c0433a9af4094a60aafdca491c6a3d248c7432827",
+ "sha256:f25d8b92a4e31ff1bd873654ec367ae811b3a943583e05432ea29264782dc32c",
+ "sha256:f60a297c3987c6c02ffb29effc70eadcbb412fe76947d394a1091a3615948e2f",
+ "sha256:f973643ef532d4f9be71dd88cf7588936685fdb576d93a79fe9f65bc337d9d73"
],
"index": "pypi",
- "version": "==7.6.10"
+ "version": "==7.6.12"
+ },
+ "docker": {
+ "hashes": [
+ "sha256:ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c",
+ "sha256:c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==7.1.0"
+ },
+ "greenlet": {
+ "hashes": [
+ "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e",
+ "sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7",
+ "sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01",
+ "sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1",
+ "sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159",
+ "sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563",
+ "sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83",
+ "sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9",
+ "sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395",
+ "sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa",
+ "sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942",
+ "sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1",
+ "sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441",
+ "sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22",
+ "sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9",
+ "sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0",
+ "sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba",
+ "sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3",
+ "sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1",
+ "sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6",
+ "sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291",
+ "sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39",
+ "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d",
+ "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467",
+ "sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475",
+ "sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef",
+ "sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c",
+ "sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511",
+ "sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c",
+ "sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822",
+ "sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a",
+ "sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8",
+ "sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d",
+ "sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01",
+ "sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145",
+ "sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80",
+ "sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13",
+ "sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e",
+ "sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b",
+ "sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1",
+ "sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef",
+ "sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc",
+ "sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff",
+ "sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120",
+ "sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437",
+ "sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd",
+ "sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981",
+ "sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36",
+ "sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a",
+ "sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798",
+ "sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7",
+ "sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761",
+ "sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0",
+ "sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e",
+ "sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af",
+ "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa",
+ "sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c",
+ "sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42",
+ "sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e",
+ "sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81",
+ "sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e",
+ "sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617",
+ "sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc",
+ "sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de",
+ "sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111",
+ "sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383",
+ "sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70",
+ "sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6",
+ "sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4",
+ "sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011",
+ "sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803",
+ "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79",
+ "sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"
+ ],
+ "markers": "python_version < '3.14' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
+ "version": "==3.1.1"
},
"idna": {
"hashes": [
@@ -379,6 +467,14 @@
"markers": "python_version >= '3.8'",
"version": "==1.5.0"
},
+ "pymysql": {
+ "hashes": [
+ "sha256:4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c",
+ "sha256:e127611aaf2b417403c60bf4dc570124aeb4a57f5f37b8e95ae399a42f904cd0"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==1.1.1"
+ },
"pytest": {
"hashes": [
"sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6",
@@ -403,6 +499,91 @@
"index": "pypi",
"version": "==1.12.1"
},
+ "sqlalchemy": {
+ "hashes": [
+ "sha256:0398361acebb42975deb747a824b5188817d32b5c8f8aba767d51ad0cc7bb08d",
+ "sha256:0561832b04c6071bac3aad45b0d3bb6d2c4f46a8409f0a7a9c9fa6673b41bc03",
+ "sha256:07258341402a718f166618470cde0c34e4cec85a39767dce4e24f61ba5e667ea",
+ "sha256:0a826f21848632add58bef4f755a33d45105d25656a0c849f2dc2df1c71f6f50",
+ "sha256:1052723e6cd95312f6a6eff9a279fd41bbae67633415373fdac3c430eca3425d",
+ "sha256:12d5b06a1f3aeccf295a5843c86835033797fea292c60e72b07bcb5d820e6dd3",
+ "sha256:12f5c9ed53334c3ce719155424dc5407aaa4f6cadeb09c5b627e06abb93933a1",
+ "sha256:2a0ef3f98175d77180ffdc623d38e9f1736e8d86b6ba70bff182a7e68bed7727",
+ "sha256:2f2951dc4b4f990a4b394d6b382accb33141d4d3bd3ef4e2b27287135d6bdd68",
+ "sha256:3868acb639c136d98107c9096303d2d8e5da2880f7706f9f8c06a7f961961149",
+ "sha256:386b7d136919bb66ced64d2228b92d66140de5fefb3c7df6bd79069a269a7b06",
+ "sha256:3d3043375dd5bbcb2282894cbb12e6c559654c67b5fffb462fda815a55bf93f7",
+ "sha256:3e35d5565b35b66905b79ca4ae85840a8d40d31e0b3e2990f2e7692071b179ca",
+ "sha256:402c2316d95ed90d3d3c25ad0390afa52f4d2c56b348f212aa9c8d072a40eee5",
+ "sha256:40310db77a55512a18827488e592965d3dec6a3f1e3d8af3f8243134029daca3",
+ "sha256:40e9cdbd18c1f84631312b64993f7d755d85a3930252f6276a77432a2b25a2f3",
+ "sha256:49aa2cdd1e88adb1617c672a09bf4ebf2f05c9448c6dbeba096a3aeeb9d4d443",
+ "sha256:57dd41ba32430cbcc812041d4de8d2ca4651aeefad2626921ae2a23deb8cd6ff",
+ "sha256:5dba1cdb8f319084f5b00d41207b2079822aa8d6a4667c0f369fce85e34b0c86",
+ "sha256:5e1d9e429028ce04f187a9f522818386c8b076723cdbe9345708384f49ebcec6",
+ "sha256:63178c675d4c80def39f1febd625a6333f44c0ba269edd8a468b156394b27753",
+ "sha256:6493bc0eacdbb2c0f0d260d8988e943fee06089cd239bd7f3d0c45d1657a70e2",
+ "sha256:64aa8934200e222f72fcfd82ee71c0130a9c07d5725af6fe6e919017d095b297",
+ "sha256:665255e7aae5f38237b3a6eae49d2358d83a59f39ac21036413fab5d1e810578",
+ "sha256:6db316d6e340f862ec059dc12e395d71f39746a20503b124edc255973977b728",
+ "sha256:70065dfabf023b155a9c2a18f573e47e6ca709b9e8619b2e04c54d5bcf193178",
+ "sha256:8455aa60da49cb112df62b4721bd8ad3654a3a02b9452c783e651637a1f21fa2",
+ "sha256:8b0ac78898c50e2574e9f938d2e5caa8fe187d7a5b69b65faa1ea4648925b096",
+ "sha256:8bf312ed8ac096d674c6aa9131b249093c1b37c35db6a967daa4c84746bc1bc9",
+ "sha256:92f99f2623ff16bd4aaf786ccde759c1f676d39c7bf2855eb0b540e1ac4530c8",
+ "sha256:9c8bcad7fc12f0cc5896d8e10fdf703c45bd487294a986903fe032c72201596b",
+ "sha256:9cd136184dd5f58892f24001cdce986f5d7e96059d004118d5410671579834a4",
+ "sha256:9eb4fa13c8c7a2404b6a8e3772c17a55b1ba18bc711e25e4d6c0c9f5f541b02a",
+ "sha256:a2bc4e49e8329f3283d99840c136ff2cd1a29e49b5624a46a290f04dff48e079",
+ "sha256:a5645cd45f56895cfe3ca3459aed9ff2d3f9aaa29ff7edf557fa7a23515a3725",
+ "sha256:a9afbc3909d0274d6ac8ec891e30210563b2c8bdd52ebbda14146354e7a69373",
+ "sha256:aa498d1392216fae47eaf10c593e06c34476ced9549657fca713d0d1ba5f7248",
+ "sha256:afd776cf1ebfc7f9aa42a09cf19feadb40a26366802d86c1fba080d8e5e74bdd",
+ "sha256:b335a7c958bc945e10c522c069cd6e5804f4ff20f9a744dd38e748eb602cbbda",
+ "sha256:b3c4817dff8cef5697f5afe5fec6bc1783994d55a68391be24cb7d80d2dbc3a6",
+ "sha256:b79ee64d01d05a5476d5cceb3c27b5535e6bb84ee0f872ba60d9a8cd4d0e6579",
+ "sha256:b87a90f14c68c925817423b0424381f0e16d80fc9a1a1046ef202ab25b19a444",
+ "sha256:bf89e0e4a30714b357f5d46b6f20e0099d38b30d45fa68ea48589faf5f12f62d",
+ "sha256:c058b84c3b24812c859300f3b5abf300daa34df20d4d4f42e9652a4d1c48c8a4",
+ "sha256:c09a6ea87658695e527104cf857c70f79f14e9484605e205217aae0ec27b45fc",
+ "sha256:c57b8e0841f3fce7b703530ed70c7c36269c6d180ea2e02e36b34cb7288c50c7",
+ "sha256:c9cea5b756173bb86e2235f2f871b406a9b9d722417ae31e5391ccaef5348f2c",
+ "sha256:cb39ed598aaf102251483f3e4675c5dd6b289c8142210ef76ba24aae0a8f8aba",
+ "sha256:e036549ad14f2b414c725349cce0772ea34a7ab008e9cd67f9084e4f371d1f32",
+ "sha256:e185ea07a99ce8b8edfc788c586c538c4b1351007e614ceb708fd01b095ef33e",
+ "sha256:e5a4d82bdb4bf1ac1285a68eab02d253ab73355d9f0fe725a97e1e0fa689decb",
+ "sha256:eae27ad7580529a427cfdd52c87abb2dfb15ce2b7a3e0fc29fbb63e2ed6f8120",
+ "sha256:ecef029b69843b82048c5b347d8e6049356aa24ed644006c9a9d7098c3bd3bfd",
+ "sha256:ee3bee874cb1fadee2ff2b79fc9fc808aa638670f28b2145074538d4a6a5028e",
+ "sha256:f0d3de936b192980209d7b5149e3c98977c3810d401482d05fb6d668d53c1c63",
+ "sha256:f53c0d6a859b2db58332e0e6a921582a02c1677cc93d4cbb36fdf49709b327b2",
+ "sha256:f9d57f1b3061b3e21476b0ad5f0397b112b94ace21d1f439f2db472e568178ae"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==2.0.38"
+ },
+ "testcontainers-core": {
+ "hashes": [
+ "sha256:69a8bf2ddb52ac2d03c26401b12c70db0453cced40372ad783d6dce417e52095"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==0.0.1rc1"
+ },
+ "testcontainers-mysql": {
+ "hashes": [
+ "sha256:d22894e0d8c7b4f7424afef99f713aa7e7a19ff987b7723aed863b9c478a2c91"
+ ],
+ "index": "pypi",
+ "version": "==0.0.1rc1"
+ },
+ "typing-extensions": {
+ "hashes": [
+ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+ "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==4.12.2"
+ },
"urllib3": {
"hashes": [
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
@@ -410,6 +591,91 @@
],
"markers": "python_version >= '3.9'",
"version": "==2.3.0"
+ },
+ "wrapt": {
+ "hashes": [
+ "sha256:08e7ce672e35efa54c5024936e559469436f8b8096253404faeb54d2a878416f",
+ "sha256:0a6e821770cf99cc586d33833b2ff32faebdbe886bd6322395606cf55153246c",
+ "sha256:0b929ac182f5ace000d459c59c2c9c33047e20e935f8e39371fa6e3b85d56f4a",
+ "sha256:129a150f5c445165ff941fc02ee27df65940fcb8a22a61828b1853c98763a64b",
+ "sha256:13e6afb7fe71fe7485a4550a8844cc9ffbe263c0f1a1eea569bc7091d4898555",
+ "sha256:1473400e5b2733e58b396a04eb7f35f541e1fb976d0c0724d0223dd607e0f74c",
+ "sha256:18983c537e04d11cf027fbb60a1e8dfd5190e2b60cc27bc0808e653e7b218d1b",
+ "sha256:1a7ed2d9d039bd41e889f6fb9364554052ca21ce823580f6a07c4ec245c1f5d6",
+ "sha256:1e1fe0e6ab7775fd842bc39e86f6dcfc4507ab0ffe206093e76d61cde37225c8",
+ "sha256:1fb5699e4464afe5c7e65fa51d4f99e0b2eadcc176e4aa33600a3df7801d6662",
+ "sha256:2696993ee1eebd20b8e4ee4356483c4cb696066ddc24bd70bcbb80fa56ff9061",
+ "sha256:35621ae4c00e056adb0009f8e86e28eb4a41a4bfa8f9bfa9fca7d343fe94f998",
+ "sha256:36ccae62f64235cf8ddb682073a60519426fdd4725524ae38874adf72b5f2aeb",
+ "sha256:3cedbfa9c940fdad3e6e941db7138e26ce8aad38ab5fe9dcfadfed9db7a54e62",
+ "sha256:3d57c572081fed831ad2d26fd430d565b76aa277ed1d30ff4d40670b1c0dd984",
+ "sha256:3fc7cb4c1c744f8c05cd5f9438a3caa6ab94ce8344e952d7c45a8ed59dd88392",
+ "sha256:4011d137b9955791f9084749cba9a367c68d50ab8d11d64c50ba1688c9b457f2",
+ "sha256:40d615e4fe22f4ad3528448c193b218e077656ca9ccb22ce2cb20db730f8d306",
+ "sha256:410a92fefd2e0e10d26210e1dfb4a876ddaf8439ef60d6434f21ef8d87efc5b7",
+ "sha256:41388e9d4d1522446fe79d3213196bd9e3b301a336965b9e27ca2788ebd122f3",
+ "sha256:468090021f391fe0056ad3e807e3d9034e0fd01adcd3bdfba977b6fdf4213ea9",
+ "sha256:49703ce2ddc220df165bd2962f8e03b84c89fee2d65e1c24a7defff6f988f4d6",
+ "sha256:4a721d3c943dae44f8e243b380cb645a709ba5bd35d3ad27bc2ed947e9c68192",
+ "sha256:4afd5814270fdf6380616b321fd31435a462019d834f83c8611a0ce7484c7317",
+ "sha256:4c82b8785d98cdd9fed4cac84d765d234ed3251bd6afe34cb7ac523cb93e8b4f",
+ "sha256:4db983e7bca53819efdbd64590ee96c9213894272c776966ca6306b73e4affda",
+ "sha256:582530701bff1dec6779efa00c516496968edd851fba224fbd86e46cc6b73563",
+ "sha256:58455b79ec2661c3600e65c0a716955adc2410f7383755d537584b0de41b1d8a",
+ "sha256:58705da316756681ad3c9c73fd15499aa4d8c69f9fd38dc8a35e06c12468582f",
+ "sha256:5bb1d0dbf99411f3d871deb6faa9aabb9d4e744d67dcaaa05399af89d847a91d",
+ "sha256:5c803c401ea1c1c18de70a06a6f79fcc9c5acfc79133e9869e730ad7f8ad8ef9",
+ "sha256:5cbabee4f083b6b4cd282f5b817a867cf0b1028c54d445b7ec7cfe6505057cf8",
+ "sha256:612dff5db80beef9e649c6d803a8d50c409082f1fedc9dbcdfde2983b2025b82",
+ "sha256:62c2caa1585c82b3f7a7ab56afef7b3602021d6da34fbc1cf234ff139fed3cd9",
+ "sha256:69606d7bb691b50a4240ce6b22ebb319c1cfb164e5f6569835058196e0f3a845",
+ "sha256:6d9187b01bebc3875bac9b087948a2bccefe464a7d8f627cf6e48b1bbae30f82",
+ "sha256:6ed6ffac43aecfe6d86ec5b74b06a5be33d5bb9243d055141e8cabb12aa08125",
+ "sha256:703919b1633412ab54bcf920ab388735832fdcb9f9a00ae49387f0fe67dad504",
+ "sha256:766d8bbefcb9e00c3ac3b000d9acc51f1b399513f44d77dfe0eb026ad7c9a19b",
+ "sha256:80dd7db6a7cb57ffbc279c4394246414ec99537ae81ffd702443335a61dbf3a7",
+ "sha256:8112e52c5822fc4253f3901b676c55ddf288614dc7011634e2719718eaa187dc",
+ "sha256:8c8b293cd65ad716d13d8dd3624e42e5a19cc2a2f1acc74b30c2c13f15cb61a6",
+ "sha256:8fdbdb757d5390f7c675e558fd3186d590973244fab0c5fe63d373ade3e99d40",
+ "sha256:91bd7d1773e64019f9288b7a5101f3ae50d3d8e6b1de7edee9c2ccc1d32f0c0a",
+ "sha256:95c658736ec15602da0ed73f312d410117723914a5c91a14ee4cdd72f1d790b3",
+ "sha256:99039fa9e6306880572915728d7f6c24a86ec57b0a83f6b2491e1d8ab0235b9a",
+ "sha256:9a2bce789a5ea90e51a02dfcc39e31b7f1e662bc3317979aa7e5538e3a034f72",
+ "sha256:9a7d15bbd2bc99e92e39f49a04653062ee6085c0e18b3b7512a4f2fe91f2d681",
+ "sha256:9abc77a4ce4c6f2a3168ff34b1da9b0f311a8f1cfd694ec96b0603dff1c79438",
+ "sha256:9e8659775f1adf02eb1e6f109751268e493c73716ca5761f8acb695e52a756ae",
+ "sha256:9fee687dce376205d9a494e9c121e27183b2a3df18037f89d69bd7b35bcf59e2",
+ "sha256:a5aaeff38654462bc4b09023918b7f21790efb807f54c000a39d41d69cf552cb",
+ "sha256:a604bf7a053f8362d27eb9fefd2097f82600b856d5abe996d623babd067b1ab5",
+ "sha256:abbb9e76177c35d4e8568e58650aa6926040d6a9f6f03435b7a522bf1c487f9a",
+ "sha256:acc130bc0375999da18e3d19e5a86403667ac0c4042a094fefb7eec8ebac7cf3",
+ "sha256:b18f2d1533a71f069c7f82d524a52599053d4c7166e9dd374ae2136b7f40f7c8",
+ "sha256:b4e42a40a5e164cbfdb7b386c966a588b1047558a990981ace551ed7e12ca9c2",
+ "sha256:b5e251054542ae57ac7f3fba5d10bfff615b6c2fb09abeb37d2f1463f841ae22",
+ "sha256:b60fb58b90c6d63779cb0c0c54eeb38941bae3ecf7a73c764c52c88c2dcb9d72",
+ "sha256:b870b5df5b71d8c3359d21be8f0d6c485fa0ebdb6477dda51a1ea54a9b558061",
+ "sha256:ba0f0eb61ef00ea10e00eb53a9129501f52385c44853dbd6c4ad3f403603083f",
+ "sha256:bb87745b2e6dc56361bfde481d5a378dc314b252a98d7dd19a651a3fa58f24a9",
+ "sha256:bb90fb8bda722a1b9d48ac1e6c38f923ea757b3baf8ebd0c82e09c5c1a0e7a04",
+ "sha256:bc570b5f14a79734437cb7b0500376b6b791153314986074486e0b0fa8d71d98",
+ "sha256:c86563182421896d73858e08e1db93afdd2b947a70064b813d515d66549e15f9",
+ "sha256:c958bcfd59bacc2d0249dcfe575e71da54f9dcf4a8bdf89c4cb9a68a1170d73f",
+ "sha256:d18a4865f46b8579d44e4fe1e2bcbc6472ad83d98e22a26c963d46e4c125ef0b",
+ "sha256:d5e2439eecc762cd85e7bd37161d4714aa03a33c5ba884e26c81559817ca0925",
+ "sha256:e3890b508a23299083e065f435a492b5435eba6e304a7114d2f919d400888cc6",
+ "sha256:e496a8ce2c256da1eb98bd15803a79bee00fc351f5dfb9ea82594a3f058309e0",
+ "sha256:e8b2816ebef96d83657b56306152a93909a83f23994f4b30ad4573b00bd11bb9",
+ "sha256:eaf675418ed6b3b31c7a989fd007fa7c3be66ce14e5c3b27336383604c9da85c",
+ "sha256:ec89ed91f2fa8e3f52ae53cd3cf640d6feff92ba90d62236a81e4e563ac0e991",
+ "sha256:ecc840861360ba9d176d413a5489b9a0aff6d6303d7e733e2c4623cfa26904a6",
+ "sha256:f09b286faeff3c750a879d336fb6d8713206fc97af3adc14def0cdd349df6000",
+ "sha256:f393cda562f79828f38a819f4788641ac7c4085f30f1ce1a68672baa686482bb",
+ "sha256:f917c1180fdb8623c2b75a99192f4025e412597c50b2ac870f156de8fb101119",
+ "sha256:fc78a84e2dfbc27afe4b2bd7c80c8db9bca75cc5b85df52bfe634596a1da846b",
+ "sha256:ff04ef6eec3eee8a5efef2401495967a916feaa353643defcc03fc74fe213b58"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==1.17.2"
}
}
}
diff --git a/dbrepo-auth-service/init/app.py b/dbrepo-auth-service/init/app.py
index 5e42003a19..65252a5ccd 100644
--- a/dbrepo-auth-service/init/app.py
+++ b/dbrepo-auth-service/init/app.py
@@ -42,8 +42,8 @@ def fetch() -> (str, str):
def save(user_id: str, keycloak_id: str) -> None:
conn = mariadb.connect(user=os.getenv('METADATA_USERNAME', 'root'),
password=os.getenv('METADATA_DB_PASSWORD', 'dbrepo'),
- host="metadata-db",
- port=3306,
+ host=os.getenv('METADATA_HOST', 'metadata-db'),
+ port=int(os.getenv('METADATA_PORT', '3306')),
database=os.getenv('METADATA_DB', 'dbrepo'))
cursor = conn.cursor()
cursor.execute(
diff --git a/dbrepo-auth-service/init/test/conftest.py b/dbrepo-auth-service/init/test/conftest.py
new file mode 100644
index 0000000000..72cdcebe21
--- /dev/null
+++ b/dbrepo-auth-service/init/test/conftest.py
@@ -0,0 +1,51 @@
+import logging
+import os
+from os.path import abspath
+
+import mariadb
+import pytest
+from testcontainers.mysql import MySqlContainer
+
+schema_location = abspath("../../dbrepo-metadata-db/1_setup-schema.sql")
+
+
+@pytest.fixture(scope="session", autouse=True)
+def session(request):
+ """
+ Create one MariaDB container per test run only (root:dbrepo)
+ :param request: /
+ :return: The MariaDB container
+ """
+ logging.debug("[fixture] creating mariadb container")
+ container = (MySqlContainer(image="mariadb:11.3.2",
+ MYSQL_DATABASE=os.getenv('METADATA_DB', 'dbrepo'),
+ MYSQL_ROOT_PASSWORD=os.getenv('METADATA_DB_PASSWORD', 'dbrepo'))
+ .with_env('MARIADB_DATABASE', os.getenv('METADATA_DB', 'dbrepo'))
+ .with_env('MARIADB_ROOT_PASSWORD', os.getenv('METADATA_DB_PASSWORD', 'dbrepo'))
+ .with_volume_mapping(schema_location, "/docker-entrypoint-initdb.d/1_setup-schema.sql"))
+ logging.debug("[fixture] starting mariadb container")
+ container.start()
+
+ os.environ['METADATA_HOST'] = '127.0.0.1'
+ os.environ['METADATA_PORT'] = container.get_exposed_port(3306)
+
+ # destructor
+ def stop_mariadb():
+ container.stop()
+
+ request.addfinalizer(stop_mariadb)
+ return container
+
+
+def execute_single_result(query: str) -> any:
+ conn = mariadb.connect(user=os.getenv('METADATA_USERNAME', 'root'),
+ password=os.getenv('METADATA_DB_PASSWORD', 'dbrepo'),
+ host=os.getenv('METADATA_HOST', 'metadata-db'),
+ port=int(os.getenv('METADATA_PORT', '3306')),
+ database=os.getenv('METADATA_DB', 'dbrepo'))
+ cursor = conn.cursor()
+ cursor.execute(query)
+ rows = cursor.fetchone()
+ conn.commit()
+ conn.close()
+ return rows
diff --git a/dbrepo-auth-service/init/test/test_integration_app.py b/dbrepo-auth-service/init/test/test_integration_app.py
new file mode 100644
index 0000000000..330578ef52
--- /dev/null
+++ b/dbrepo-auth-service/init/test/test_integration_app.py
@@ -0,0 +1,14 @@
+import unittest
+
+from app import save
+from conftest import execute_single_result
+
+
+class AppUnitTest(unittest.TestCase):
+
+ def test_save_succeeds(self):
+ # test
+ save("7a0b4b7f-77cd-4f28-a665-2da443024621", "65408e0f-2990-42cd-9533-a667c85b46b3")
+ user_id, keycloak_id = execute_single_result("SELECT id, keycloak_id FROM mdb_users LIMIT 1")
+ self.assertEqual("7a0b4b7f-77cd-4f28-a665-2da443024621", user_id)
+ self.assertEqual("65408e0f-2990-42cd-9533-a667c85b46b3", keycloak_id)
diff --git a/dbrepo-auth-service/init/test/test_unit_app.py b/dbrepo-auth-service/init/test/test_unit_app.py
index af6aed379a..4fb38ac2f4 100644
--- a/dbrepo-auth-service/init/test/test_unit_app.py
+++ b/dbrepo-auth-service/init/test/test_unit_app.py
@@ -101,3 +101,36 @@ class AppUnitTest(unittest.TestCase):
fetch()
except ImportError:
pass
+
+ def test_fetch_user_malformed_attr_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post(f'{endpoint}/realms/master/protocol/openid-connect/token', json=self.token_res, status_code=200)
+ mock.get(f'{endpoint}/admin/realms/dbrepo/users/?username=admin', json=[{
+ "id": "5b516520-67cb-4aa0-86a6-d12f8b8f1a20",
+ "attributes": {
+ "LDAP_ID": []
+ }
+ }], status_code=200)
+
+ # test
+ try:
+ fetch()
+ except EnvironmentError:
+ pass
+
+ def test_fetch_succeeds(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post(f'{endpoint}/realms/master/protocol/openid-connect/token', json=self.token_res, status_code=200)
+ mock.get(f'{endpoint}/admin/realms/dbrepo/users/?username=admin', json=[{
+ "id": "5b516520-67cb-4aa0-86a6-d12f8b8f1a20",
+ "attributes": {
+ "LDAP_ID": ["7a0b4b7f-77cd-4f28-a665-2da443024621"]
+ }
+ }], status_code=200)
+
+ # test
+ ldap_user_id, user_id = fetch()
+ self.assertEqual("7a0b4b7f-77cd-4f28-a665-2da443024621", ldap_user_id)
+ self.assertEqual("5b516520-67cb-4aa0-86a6-d12f8b8f1a20", user_id)
diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index 7b332886dd5aca385115460c47692fdef8522e0b..f370c8825750a431296ef68c3d482a2e4eee9389 100644
GIT binary patch
delta 972
zcmZ4FztCSgz?+#xgn@yBgQ45oFKYecl+T5X3=C(O7#Kt*KU5O0?+rSgcUVDSPxL4I
z56lj)Ec#wWUzWSIf?u=tj(CK*hFM?2Ta)_uM_blOh34`fIK*dtSf~6!PHW>2?q3Pf
z;hT&NJtuqjJ7oMwir-}Y;^Ic`_1Cw#pI@eAuOK#eEpPlR-ugR>`mR6AEb7QfH4RvE
zWWLVT2&2U|dC`2bYbzb@N7wf*KQYl-+H1br+|1gO)4I)AmVL`<ZHr}IdeV3E+KrCx
z^`GZD>=*31$^Wyy$Zma}_cpa#Z9%8*=Bek1vXokP`!$F;T-tTYS>b->D;u`TDe9M1
zq+*Yxa@zLPgs;%q@$tiE<%_r45Ae%sNSZ7=(f-%g<m1lm*Glsb*Bud8`ZgiGzW85b
z?G@hrIdh$To$X#MtJ!M8qxpExyD1lPmCbitFXf(XC}61h^@F&@x4_~Wi}kq*B`^A0
z!*ASHUaOgAag=GbWY|tS^BF5|ssv}vOJ8s$g{yMesz-m`RJ^}=J^tL^WsZ~Fr}%ym
z_&a@?qld_sg{o3B)!u`mgo}ZJgMp#jo6&FbMn)CpE^oidHyCx9yS@D;b1=z)X-y_o
zFdfLG1*YqmOu+P3CNHphCg!tX`Vw<DNPKew%N!;!<3AfWCz!!2&?E?AOrE4T3ry=P
zP3D9rgUP3rEUiF11|+}<XA3aAbzIEIz~Ji|;;8HC=cXUv&B!Fe3~@Nfy>`mdOs5zp
zKV%k}oUhCSHos0;TI?4i14Cj7ifWLr)+<XhN>4tmEE$7tB|nOl&P+&F<|dY<=Aj!E
z1y|3&z#s|dfZSU!*+E4E?2>F1X{O~&lNTx)PTr})qtNB;7xiaen^PA91H%Uf1_lkd
zHU@?zjbE513o>g>=2ztb2dJE?G}960$q$)bCfBP%Jl3Zw%@o8kIiJO3@_ne#J5_0>
zk8G3q*d=rzA%n<ePF9AlQM?QcDsl`A+9)>t=b!Aa7S6OtcJe|+)5&+$_`!~SuO`jZ
eqBwb>qWxrVb%=#g>e7sglgrfA*tRNxOaK6RmP7mi
delta 980
zcmZ4JzsO%Yz?+#xgn@yBgQ23tH)_*<rs5(-28J_C3=ATZA1H~}_Xha}A65|9o38f1
z(VpST617>guQr$cnX&TPZ#J`OnNC(4Jm2o0zRa{w*4>tY`}d9S6{ndaf)}d)>pD04
zn%Em3pGPllDGFrS-4=brSheNNsg+Y-UfdYs^SvW7J?rfAs<ZRWR~*`E)Aw!S${r@J
zsXw|GN^vjqZl68P*<JhH#jkGl4>gOP__bYH?zuWTe8bN*U*}D=-sW&Nukq1~bvLiv
zSg>^ePrn8CIgbA1|5;z8C;pu^S}?ap@oCv^(Pf{ScCB^PcHmUV%z1iX@@tV&zP&al
zCKrnIoI7OHF6XvST8H<>#}Av858hHg|6Nu?!o+Ge-*5MfL&fiV-`;Eg+i~9Ig`$6b
zQQZ-{)ot<HuPs`n_&zjvkEB%Fl*G8wr2)Ch*LMV$a=$hdP}IEoLEPe-V{wJW`d;-d
zFZf!;Z_HjieR|}q<)M=v9CZnQZZVfhEp^&l$EiM_bgpJjogSsyUhN%TZ~1*Tn<rnO
z*+J)$_$W3-#|wep21b2$44^pSVqoB4V5nd!@twSZQH8m@#CP&_MqMz?&Ljt>HJDVH
zD@uGP2QX=Y=~^ZeFujGz3oOsbd=^Y!WbOvho8wvLFo7BW*tj{t3?6|dL9mvIinGA9
zp3-DacsiJTO3Bg+#A84LoN%@P!&}ECj0_CEt|5-Po_=on0p5&EBFqqngWPMYEX{P9
zaq<IZk;!?=JRl1v*D6bk{bpofNG!ony-r!WUWN%QRZ?1>nVN^90^J$>D9&(ULUKlK
zVi^I=k|>%B;hHCVsK|qZAxlM?X$8~d1&W4~cc}0vl$ZEM{h8P1)WyKS@PUDWK?AOz
zfniDGSEk7V%vzKAR3ToJRh4Es$~^f2v&-Z<s8Fw}G*d9k<UAIW$@ic_Z&jt4KCw;a
zWtZTG1REp|f`ZLZO`3^8V6vZDIMZU;$qN)sC*M)y2RrMXnlw|Z;^YO2_LIHTdB8%E
S>e7r#lS|dr*tRKwTm=9Sl1q62
diff --git a/dbrepo-metadata-service/metrics.md b/dbrepo-metadata-service/metrics.md
index f3e0a3130f..2c244804b9 100644
--- a/dbrepo-metadata-service/metrics.md
+++ b/dbrepo-metadata-service/metrics.md
@@ -58,7 +58,6 @@
| `dbrepo_user_create` | Create user |
| `dbrepo_user_find` | Get user |
| `dbrepo_user_modify` | Update user |
-| `dbrepo_user_password_modify` | Update user password |
| `dbrepo_users_list` | List users |
| `dbrepo_view_create` | Create view |
| `dbrepo_view_delete` | Delete view |
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 cfbf858000..cff05b8d6f 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
@@ -97,6 +97,7 @@ public interface MetadataMapper {
DataTypeDto dataTypeToDataTypeDto(DataType data);
@Mappings({
+ @Mapping(target = "id", ignore = true), /* id attribute is ignored by the library anyway, just making it explicit */
@Mapping(target = "attributes", ignore = true)
})
UserRepresentation userCreateDtoToUserRepresentation(UserCreateDto data);
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 5ca14a5a34..3636aa63a3 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
@@ -4,11 +4,11 @@ import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.database.Database;
import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.tuwien.exception.AuthServiceException;
+import at.tuwien.exception.NotAllowedException;
+import at.tuwien.exception.UserNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.AuthenticationService;
import at.tuwien.service.DatabaseService;
@@ -212,60 +212,4 @@ public class UserEndpoint extends AbstractEndpoint {
userService.modify(user, data)));
}
- @PutMapping("/{userId}/password")
- @Transactional(rollbackFor = {Exception.class})
- @PreAuthorize("isAuthenticated()")
- @Observed(name = "dbrepo_user_password_modify")
- @Operation(summary = "Update user password",
- description = "Updates password of user with id. Requires authentication.",
- security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
- @ApiResponses(value = {
- @ApiResponse(responseCode = "202",
- description = "Modified user password"),
- @ApiResponse(responseCode = "400",
- description = "Invalid password payload",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "403",
- description = "Not allowed to change foreign user password",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "404",
- description = "Failed to find database/user in metadata database",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "502",
- description = "Connection to auth service failed",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "503",
- description = "Failed to get user in auth service",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- })
- public ResponseEntity<Void> password(@NotNull @PathVariable("userId") UUID userId,
- @NotNull @Valid @RequestBody UserPasswordDto data,
- @NotNull Principal principal) throws NotAllowedException,
- UserNotFoundException, DatabaseNotFoundException, DataServiceException,
- DataServiceConnectionException, AuthServiceException {
- log.debug("endpoint modify a user password, userId={}, principal.name={}", userId, principal.getName());
- final User user = userService.findById(userId);
- if (!user.getUsername().equals(principal.getName())) {
- log.error("Failed to modify user password: not current user");
- throw new NotAllowedException("Failed to modify user password: not current user");
- }
- for (Database database : databaseService.findAllAtLestReadAccess(userId)) {
- databaseService.updatePassword(database, user);
- }
- userService.updatePassword(user, data);
- authenticationService.setupFinished(user);
- return ResponseEntity.accepted()
- .build();
- }
-
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index 44e35f3a29..aca2f9f356 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -4,6 +4,7 @@ import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
import com.auth0.jwt.exceptions.TokenExpiredException;
import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.ws.rs.NotAuthorizedException;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -31,6 +32,20 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
return new ResponseEntity<>(response, headers, response.getStatus());
}
+ @Hidden
+ @ResponseStatus(code = HttpStatus.UNAUTHORIZED)
+ @ExceptionHandler(NotAuthorizedException.class)
+ public ResponseEntity<ApiErrorDto> handle(NotAuthorizedException e) {
+ final HttpHeaders headers = new HttpHeaders();
+ headers.set("Content-Type", "application/problem+json");
+ final ApiErrorDto response = ApiErrorDto.builder()
+ .status(HttpStatus.UNAUTHORIZED)
+ .message(e.getLocalizedMessage())
+ .code("error.authentication.invalid")
+ .build();
+ return new ResponseEntity<>(response, headers, response.getStatus());
+ }
+
@Hidden
@ResponseStatus(code = HttpStatus.NOT_FOUND)
@ExceptionHandler(AccessNotFoundException.class)
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 de5c8993a1..c69701e6dd 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
@@ -3,10 +3,11 @@ package at.tuwien.endpoints;
import at.tuwien.api.auth.CreateUserDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.api.user.UserDto;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.tuwien.exception.AuthServiceException;
+import at.tuwien.exception.NotAllowedException;
+import at.tuwien.exception.UserNotFoundException;
import at.tuwien.service.AuthenticationService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.UserService;
@@ -32,7 +33,8 @@ import java.util.List;
import java.util.UUID;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
@Log4j2
@SpringBootTest
@@ -227,44 +229,6 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
modify_generic(USER_1_ID, USER_1, USER_1_PRINCIPAL, request);
}
- @Test
- @WithAnonymousUser
- public void password_anonymous_fails() {
- final UserPasswordDto request = UserPasswordDto.builder()
- .password(USER_1_PASSWORD)
- .build();
-
- /* test */
- assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- password_generic(null, request);
- });
- }
-
- @Test
- @WithMockUser(username = USER_4_USERNAME)
- public void password_noRoleForeign_fails() {
- final UserPasswordDto request = UserPasswordDto.builder()
- .password(USER_1_PASSWORD)
- .build();
-
- /* test */
- assertThrows(NotAllowedException.class, () -> {
- password_generic(USER_4_PRINCIPAL, request);
- });
- }
-
- @Test
- @WithMockUser(username = USER_1_USERNAME)
- public void password_succeeds() throws NotAllowedException, DataServiceException, DataServiceConnectionException,
- UserNotFoundException, DatabaseNotFoundException, AuthServiceException {
- final UserPasswordDto request = UserPasswordDto.builder()
- .password(USER_1_PASSWORD)
- .build();
-
- /* test */
- password_generic(USER_1_PRINCIPAL, request);
- }
-
@Test
@WithAnonymousUser
public void create_anonymous_fails() {
@@ -364,30 +328,6 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
assertNotNull(body);
}
- protected void password_generic(Principal principal, UserPasswordDto data) throws NotAllowedException,
- DataServiceException, DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
- AuthServiceException {
-
- /* mock */
- when(userService.findById(USER_1_ID))
- .thenReturn(USER_1);
- doNothing()
- .when(authenticationService)
- .setupFinished(USER_1);
- doNothing()
- .when(userService)
- .updatePassword(USER_1, data);
- when(databaseService.findAllAtLestReadAccess(USER_1_ID))
- .thenReturn(List.of(DATABASE_1));
- doNothing()
- .when(databaseService)
- .updatePassword(DATABASE_1, USER_1);
-
- /* test */
- final ResponseEntity<?> response = userEndpoint.password(USER_1_ID, data, principal);
- assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
- }
-
protected void generic_create(CreateUserDto data) {
/* test */
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
index daeb1c1a96..8db76d729a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
@@ -27,7 +27,6 @@ import org.springframework.web.client.RestTemplate;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
@@ -316,6 +315,20 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
});
}
+ @Test
+ public void createDatabase_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(DatabaseDto.class));
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ dataServiceGateway.createDatabase(DATABASE_1_CREATE_INTERNAL);
+ });
+ }
+
@Test
public void updateDatabase_succeeds() throws DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException {
@@ -1103,7 +1116,8 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
}
@Test
- public void getTableStatistics_emptyBody_fails() throws TableNotFoundException, DataServiceException, DataServiceConnectionException {
+ public void getTableStatistics_emptyBody_fails() throws TableNotFoundException, DataServiceException,
+ DataServiceConnectionException {
/* mock */
when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableStatisticDto.class)))
@@ -1114,4 +1128,87 @@ public class DataServiceGatewayUnitTest extends AbstractUnitTest {
dataServiceGateway.getTableStatistics(DATABASE_3_ID, TABLE_8_ID);
}
+ @Test
+ public void updateTable_succeeds() throws DataServiceException, DataServiceConnectionException,
+ DatabaseNotFoundException {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.ACCEPTED)
+ .build());
+
+ /* test */
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ }
+
+ @Test
+ public void updateTable_connection_fails() {
+
+ /* mock */
+ doThrow(HttpServerErrorException.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceConnectionException.class, () -> {
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ });
+ }
+
+ @Test
+ public void updateTable_notFound_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.NotFound.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ });
+ }
+
+ @Test
+ public void updateTable_malformed_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.BadRequest.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ });
+ }
+
+ @Test
+ public void updateTable_unauthorized_fails() {
+
+ /* mock */
+ doThrow(HttpClientErrorException.Unauthorized.class)
+ .when(dataServiceRestTemplate)
+ .exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ });
+ }
+
+ @Test
+ public void updateTable_responseCode_fails() {
+
+ /* mock */
+ when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
+ .thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .build());
+
+ /* test */
+ assertThrows(DataServiceException.class, () -> {
+ dataServiceGateway.updateTable(DATABASE_3_ID, TABLE_8_ID, TABLE_8_UPDATE_DTO);
+ });
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
index 58701adfc3..583fa4c440 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
@@ -1,5 +1,6 @@
package at.tuwien.gateway;
+import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.gateway.impl.KeycloakGatewayImpl;
import at.tuwien.test.AbstractUnitTest;
@@ -9,6 +10,7 @@ import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.keycloak.representations.idm.UserRepresentation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.DynamicPropertyRegistry;
@@ -18,7 +20,9 @@ import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
@Log4j2
@SpringBootTest
@@ -92,4 +96,22 @@ public class KeycloakGatewayIntegrationTest extends AbstractUnitTest {
});
}
+ @Test
+ public void updateUser_succeeds() throws UserNotFoundException, AuthServiceException {
+
+ /* mock */
+ keycloakUtils.createUser(USER_1_ID, USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ keycloakGateway.updateUser(keycloakUtils.getUserId(USER_1_USERNAME), USER_1_UPDATE_DTO);
+ final UserRepresentation user = keycloakUtils.getUser(USER_1_USERNAME);
+ assertNotNull(user.getId());
+ assertEquals(USER_1_FIRSTNAME, user.getFirstName());
+ assertEquals(USER_1_LASTNAME, user.getLastName());
+ assertEquals(USER_1_THEME, user.firstAttribute("THEME"));
+ assertEquals(USER_1_ORCID_URL, user.firstAttribute("ORCID"));
+ assertEquals(USER_1_LANGUAGE, user.firstAttribute("LANGUAGE"));
+ assertEquals(USER_1_AFFILIATION, user.firstAttribute("AFFILIATION"));
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
index 06a4e377b0..87d7d0185a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
@@ -4,6 +4,7 @@ import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
import at.tuwien.test.AbstractUnitTest;
import com.auth0.jwt.exceptions.TokenExpiredException;
+import jakarta.ws.rs.NotAuthorizedException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -24,8 +25,7 @@ import java.util.Optional;
import static at.tuwien.test.utils.EndpointUtils.getErrorCodes;
import static at.tuwien.test.utils.EndpointUtils.getExceptions;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
@Log4j2
@ExtendWith(SpringExtension.class)
@@ -51,7 +51,7 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
Assertions.assertNotNull(exception.getDeclaredAnnotation(ResponseStatus.class).code());
Assertions.assertNotEquals(exception.getDeclaredAnnotation(ResponseStatus.class).code(), HttpStatus.INTERNAL_SERVER_ERROR);
Assertions.assertNotNull(exception.getDeclaredAnnotation(ResponseStatus.class).reason(), "Exception " + exception.getName() + " does not provide a reason code");
- Assertions.assertTrue(errorCodes.contains(exception.getDeclaredAnnotation(ResponseStatus.class).reason()), "Exception code " + exception.getDeclaredAnnotation(ResponseStatus.class).reason() + " does have a reason code mapped in localized ui error messages");
+ assertTrue(errorCodes.contains(exception.getDeclaredAnnotation(ResponseStatus.class).reason()), "Exception code " + exception.getDeclaredAnnotation(ResponseStatus.class).reason() + " does have a reason code mapped in localized ui error messages");
/* handler method */
assertEquals(method.getDeclaredAnnotation(ResponseStatus.class).code(), exception.getDeclaredAnnotation(ResponseStatus.class).code());
}
@@ -70,6 +70,19 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.token.expired", body.getCode());
}
+ @Test
+ public void handle_notAuthorizedException_succeeds() {
+
+ /* test */
+ final ResponseEntity<ApiErrorDto> response = apiExceptionHandler.handle(new NotAuthorizedException("msg"));
+ assertEquals(HttpStatus.UNAUTHORIZED, response.getStatusCode());
+ final ApiErrorDto body = response.getBody();
+ assertNotNull(body);
+ assertNotNull(body.getMessage());
+ assertEquals(HttpStatus.UNAUTHORIZED, body.getStatus());
+ assertEquals("error.authentication.invalid", body.getCode());
+ }
+
@Test
public void handle_accessNotFoundException_succeeds() {
@@ -135,7 +148,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.auth.invalid", body.getCode());
}
-
@Test
public void handle_brokerServiceConnectionException_succeeds() {
@@ -149,7 +161,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.broker.connection", body.getCode());
}
-
@Test
public void handle_brokerServiceException_succeeds() {
@@ -163,7 +174,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.broker.invalid", body.getCode());
}
-
@Test
public void handle_conceptNotFoundException_succeeds() {
@@ -177,7 +187,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.concept.missing", body.getCode());
}
-
@Test
public void handle_containerAlreadyExistsException_succeeds() {
@@ -191,7 +200,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.container.exists", body.getCode());
}
-
@Test
public void handle_containerNotFoundException_succeeds() {
@@ -205,7 +213,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.container.missing", body.getCode());
}
-
@Test
public void handle_containerQuotaException_succeeds() {
@@ -219,7 +226,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.container.quota", body.getCode());
}
-
@Test
public void handle_credentialsInvalidException_succeeds() {
@@ -233,7 +239,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.user.credentials", body.getCode());
}
-
@Test
public void handle_dataServiceConnectionException_succeeds() {
@@ -247,7 +252,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.data.connection", body.getCode());
}
-
@Test
public void handle_dataServiceException_succeeds() {
@@ -261,7 +265,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.data.invalid", body.getCode());
}
-
@Test
public void handle_databaseMalformedException_succeeds() {
@@ -275,7 +278,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.database.invalid", body.getCode());
}
-
@Test
public void handle_databaseNotFoundException_succeeds() {
@@ -289,7 +291,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.database.missing", body.getCode());
}
-
@Test
public void handle_databaseUnavailableException_succeeds() {
@@ -303,7 +304,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.database.connection", body.getCode());
}
-
@Test
public void handle_doiNotFoundException_succeeds() {
@@ -317,7 +317,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.doi.missing", body.getCode());
}
-
@Test
public void handle_emailExistsException_succeeds() {
@@ -331,7 +330,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.user.email-exists", body.getCode());
}
-
@Test
public void handle_exchangeNotFoundException_succeeds() {
@@ -345,7 +343,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.exchange.missing", body.getCode());
}
-
@Test
public void handle_externalServiceException_succeeds() {
@@ -359,7 +356,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.external.invalid", body.getCode());
}
-
@Test
public void handle_filterBadRequestException_succeeds() {
@@ -373,7 +369,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.semantic.filter", body.getCode());
}
-
@Test
public void handle_formatNotAvailableException_succeeds() {
@@ -387,7 +382,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.identifier.format", body.getCode());
}
-
@Test
public void handle_identifierNotFoundException_succeeds() {
@@ -401,7 +395,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.identifier.missing", body.getCode());
}
-
@Test
public void handle_identifierNotSupportedException_succeeds() {
@@ -415,7 +408,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.identifier.unsupported", body.getCode());
}
-
@Test
public void handle_imageAlreadyExistsException_succeeds() {
@@ -429,7 +421,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.image.exists", body.getCode());
}
-
@Test
public void handle_imageInvalidException_succeeds() {
@@ -443,7 +434,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.image.invalid", body.getCode());
}
-
@Test
public void handle_imageNotFoundException_succeeds() {
@@ -457,7 +447,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.image.missing", body.getCode());
}
-
@Test
public void handle_licenseNotFoundException_succeeds() {
@@ -471,7 +460,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.license.missing", body.getCode());
}
-
@Test
public void handle_malformedException_succeeds() {
@@ -485,7 +473,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.request.invalid", body.getCode());
}
-
@Test
public void handle_messageNotFoundException_succeeds() {
@@ -499,7 +486,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.message.missing", body.getCode());
}
-
@Test
public void handle_metadataServiceConnectionException_succeeds() {
@@ -513,7 +499,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.metadata.connection", body.getCode());
}
-
@Test
public void handle_metadataServiceException_succeeds() {
@@ -527,7 +512,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.metadata.invalid", body.getCode());
}
-
@Test
public void handle_notAllowedException_succeeds() {
@@ -541,7 +525,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.request.forbidden", body.getCode());
}
-
@Test
public void handle_ontologyNotFoundException_succeeds() {
@@ -555,7 +538,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.ontology.missing", body.getCode());
}
-
@Test
public void handle_orcidNotFoundException_succeeds() {
@@ -569,7 +551,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.orcid.missing", body.getCode());
}
-
@Test
public void handle_paginationException_succeeds() {
@@ -583,7 +564,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.request.pagination", body.getCode());
}
-
@Test
public void handle_queryMalformedException_succeeds() {
@@ -597,7 +577,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.query.invalid", body.getCode());
}
-
@Test
public void handle_queryNotFoundException_succeeds() {
@@ -611,7 +590,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.query.missing", body.getCode());
}
-
@Test
public void handle_queryNotSupportedException_succeeds() {
@@ -625,7 +603,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.query.invalid", body.getCode());
}
-
@Test
public void handle_queryStoreCreateException_succeeds() {
@@ -639,7 +616,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.store.invalid", body.getCode());
}
-
@Test
public void handle_queryStoreGCException_succeeds() {
@@ -653,7 +629,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.store.clean", body.getCode());
}
-
@Test
public void handle_queryStoreInsertException_succeeds() {
@@ -667,7 +642,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.store.insert", body.getCode());
}
-
@Test
public void handle_queryStorePersistException_succeeds() {
@@ -681,7 +655,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.store.persist", body.getCode());
}
-
@Test
public void handle_queueNotFoundException_succeeds() {
@@ -695,7 +668,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.queue.missing", body.getCode());
}
-
@Test
public void handle_remoteUnavailableException_succeeds() {
@@ -709,7 +681,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.metadata.privileged", body.getCode());
}
-
@Test
public void handle_rorNotFoundException_succeeds() {
@@ -723,7 +694,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.ror.missing", body.getCode());
}
-
@Test
public void handle_searchServiceConnectionException_succeeds() {
@@ -737,7 +707,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.search.connection", body.getCode());
}
-
@Test
public void handle_searchServiceException_succeeds() {
@@ -751,7 +720,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.search.invalid", body.getCode());
}
-
@Test
public void handle_semanticEntityNotFoundException_succeeds() {
@@ -765,7 +733,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.semantic.missing", body.getCode());
}
-
@Test
public void handle_sortException_succeeds() {
@@ -779,7 +746,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.request.sort", body.getCode());
}
-
@Test
public void handle_storageNotFoundException_succeeds() {
@@ -793,7 +759,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.storage.missing", body.getCode());
}
-
@Test
public void handle_storageUnavailableException_succeeds() {
@@ -807,7 +772,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.storage.invalid", body.getCode());
}
-
@Test
public void handle_tableExistsException_succeeds() {
@@ -821,7 +785,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.table.exists", body.getCode());
}
-
@Test
public void handle_tableMalformedException_succeeds() {
@@ -835,7 +798,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.table.invalid", body.getCode());
}
-
@Test
public void handle_tableNotFoundException_succeeds() {
@@ -849,7 +811,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.table.missing", body.getCode());
}
-
@Test
public void handle_tableSchemaException_succeeds() {
@@ -863,7 +824,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.schema.table", body.getCode());
}
-
@Test
public void handle_unitNotFoundException_succeeds() {
@@ -877,7 +837,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.unit.missing", body.getCode());
}
-
@Test
public void handle_uriMalformedException_succeeds() {
@@ -891,7 +850,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.semantics.uri", body.getCode());
}
-
@Test
public void handle_userExistsException_succeeds() {
@@ -905,7 +863,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.user.exists", body.getCode());
}
-
@Test
public void handle_userNotFoundException_succeeds() {
@@ -919,7 +876,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.user.missing", body.getCode());
}
-
@Test
public void handle_viewMalformedException_succeeds() {
@@ -933,7 +889,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.view.invalid", body.getCode());
}
-
@Test
public void handle_viewNotFoundException_succeeds() {
@@ -947,7 +902,6 @@ public class ApiExceptionHandlerTest extends AbstractUnitTest {
assertEquals("error.view.missing", body.getCode());
}
-
@Test
public void handle_viewSchemaException_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index 790262c739..7611a0a8b5 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -586,15 +586,9 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
} catch (Exception e) {
/* ignore */
}
- try {
- userEndpoint.password(USER_1_ID, USER_1_PASSWORD_DTO, USER_1_PRINCIPAL);
- } catch (Exception e) {
- /* ignore */
- }
/* test */
- for (String metric : List.of("dbrepo_users_list", "dbrepo_user_find", "dbrepo_user_modify",
- "dbrepo_user_password_modify")) {
+ for (String metric : List.of("dbrepo_users_list", "dbrepo_user_find", "dbrepo_user_modify")) {
assertThat(registry)
.hasObservationWithNameEqualTo(metric);
}
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 eb228ab3c3..c224fa9a85 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
@@ -3,7 +3,6 @@ package at.tuwien.service;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserExistsException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
@@ -124,20 +123,4 @@ public class UserServicePersistenceTest extends AbstractUnitTest {
userService.findById(USER_2_ID);
});
}
-
- @Test
- public void validateUsernameNotExists_succeeds() throws UserExistsException {
-
- /* test */
- userService.validateUsernameNotExists(USER_2_USERNAME);
- }
-
- @Test
- public void validateUsernameNotExists_fails() {
-
- /* test */
- assertThrows(UserExistsException.class, () -> {
- userService.validateUsernameNotExists(USER_1_USERNAME);
- });
- }
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index df13d00b08..c610f3ee95 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -1,5 +1,6 @@
package at.tuwien.service;
+import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserNotFoundException;
@@ -16,6 +17,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.List;
import java.util.Optional;
+import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -26,10 +28,10 @@ import static org.mockito.Mockito.*;
public class UserServiceUnitTest extends AbstractUnitTest {
@MockBean
- private KeycloakGateway keycloakGateway;
+ private UserRepository userRepository;
@MockBean
- private UserRepository userRepository;
+ private KeycloakGateway keycloakGateway;
@Autowired
private UserService userService;
@@ -85,6 +87,9 @@ public class UserServiceUnitTest extends AbstractUnitTest {
.thenReturn(Optional.of(USER_1));
when(userRepository.save(any(User.class)))
.thenReturn(USER_1);
+ doNothing()
+ .when(keycloakGateway)
+ .updateUser(any(UUID.class), any(UserUpdateDto.class));
/* test */
final User response = userService.modify(USER_1, USER_1_UPDATE_DTO);
@@ -92,22 +97,6 @@ public class UserServiceUnitTest extends AbstractUnitTest {
assertEquals(USER_1_USERNAME, response.getUsername());
}
- @Test
- public void updatePassword_succeeds() throws UserNotFoundException, AuthServiceException {
-
- /* mock */
- doNothing()
- .when(keycloakGateway)
- .setupFinished(USER_1_ID);
- when(userRepository.findById(USER_1_ID))
- .thenReturn(Optional.of(USER_1));
- when(userRepository.save(any(User.class)))
- .thenReturn(USER_1);
-
- /* test */
- userService.updatePassword(USER_1, USER_1_PASSWORD_DTO);
- }
-
@Test
public void findByUsername_fails() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
index b3612fcc0f..100178a337 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
@@ -52,6 +52,16 @@ public class KeycloakUtils {
return UUID.fromString(users.get(0).getId());
}
+ public UserRepresentation getUser(String username) throws UserNotFoundException {
+ final List<UserRepresentation> users = keycloak.realm(keycloakConfig.getRealm())
+ .users()
+ .search(username);
+ if (users.isEmpty()) {
+ throw new UserNotFoundException("Failed to find user: " + username);
+ }
+ return users.get(0);
+ }
+
public void deleteUser(String username) {
final List<UserRepresentation> users = keycloak.realm(keycloakConfig.getRealm())
.users()
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/ApiTemplateInterceptor.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/ApiTemplateInterceptor.java
deleted file mode 100644
index 2ffd0f6a0f..0000000000
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/ApiTemplateInterceptor.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package at.tuwien.gateway;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public interface ApiTemplateInterceptor {
-}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 296457b3d8..9436db80cb 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -21,7 +21,5 @@ public interface KeycloakGateway {
*/
void deleteUser(UUID id) throws UserNotFoundException;
- void setupFinished(UUID id) throws AuthServiceException, UserNotFoundException;
-
void updateUser(UUID id, UserUpdateDto data) throws AuthServiceException, UserNotFoundException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
deleted file mode 100644
index 8a2bf70637..0000000000
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/ApiTemplateInterceptorImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.tuwien.gateway.impl;
-
-import at.tuwien.gateway.ApiTemplateInterceptor;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.List;
-
-@Service
-public class ApiTemplateInterceptorImpl implements ApiTemplateInterceptor, ClientHttpRequestInterceptor {
-
- @Override
- public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
- throws IOException {
- request.getHeaders().setAccept(List.of(MediaType.APPLICATION_JSON));
- request.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- return execution.execute(request, body);
- }
-}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 270653ee8f..d088fb63ef 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -76,28 +76,6 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
log.info("Deleted user {} at auth service", id);
}
- @Override
- public void setupFinished(UUID id) throws AuthServiceException, UserNotFoundException {
- final UserResource resource = keycloak.realm(keycloakConfig.getRealm())
- .users()
- .get(String.valueOf(id));
- final UserRepresentation user;
- try {
- user = resource.toRepresentation();
- } catch (NotFoundException e) {
- log.error("Failed to update user setup: not found: {}", e.getMessage());
- throw new UserNotFoundException("Failed to update user setup: not found", e);
- }
- user.singleAttribute("SETUP_FINISHED", "true");
- try {
- resource.update(user);
- } catch (ForbiddenException e) {
- log.error("Failed to update user setup: forbidden: {}", e.getMessage());
- throw new AuthServiceException("Failed to update user setup: forbidden", e);
- }
- log.info("Updated user {} setup at auth service", id);
- }
-
@Override
public void updateUser(UUID id, UserUpdateDto data) throws AuthServiceException, UserNotFoundException {
final UserResource resource = keycloak.realm(keycloakConfig.getRealm())
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
deleted file mode 100644
index f73f8bd0da..0000000000
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/interceptor/KeycloakInterceptor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.tuwien.interceptor;
-
-import at.tuwien.api.keycloak.TokenDto;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.http.*;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.ResourceAccessException;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.DefaultUriBuilderFactory;
-
-import java.io.IOException;
-
-@Log4j2
-public class KeycloakInterceptor implements ClientHttpRequestInterceptor {
-
- private final String adminUsername;
- private final String adminPassword;
- private final String keycloakEndpoint;
- private final RestTemplate restTemplate;
-
- public KeycloakInterceptor(RestTemplate restTemplate, String adminUsername, String adminPassword,
- String keycloakEndpoint) {
- this.adminUsername = adminUsername;
- this.adminPassword = adminPassword;
- this.keycloakEndpoint = keycloakEndpoint;
- this.restTemplate = restTemplate;
- }
-
- @Override
- public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
- throws IOException {
- restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(keycloakEndpoint));
- final HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- final MultiValueMap<String, String> payload = new LinkedMultiValueMap<>();
- payload.add("username", adminUsername);
- payload.add("password", adminPassword);
- payload.add("grant_type", "password");
- payload.add("client_id", "admin-cli");
- final String path = "/realms/master/protocol/openid-connect/token";
- log.trace("obtain admin token at endpoint {} with path {}", keycloakEndpoint, path);
- final ResponseEntity<TokenDto> response;
- try {
- response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
- } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
- log.error("Failed to obtain admin token: {}", e.getMessage());
- return execution.execute(request, body);
- }
- if (response.getBody() == null) {
- return execution.execute(request, body);
- }
- request.getHeaders().set("Authorization", "Bearer " + response.getBody().getAccessToken());
- return execution.execute(request, body);
- }
-}
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 3abe07a10a..f93e81b69f 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
@@ -16,13 +16,7 @@ public interface AuthenticationService {
* @throws AuthServiceConnectionException The connection with the auth service could not be established.
* @throws UserNotFoundException The user was not found after creation in the auth database.
*/
- void delete(User user) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException, CredentialsInvalidException;
+ void delete(User user) throws AuthServiceException, AuthServiceConnectionException, UserNotFoundException,
+ CredentialsInvalidException;
- /**
- * Updates the password of a user with given id.
- *
- * @param user The user.
- * @throws UserNotFoundException The user was not found after creation in the auth database.
- */
- void setupFinished(User user) throws UserNotFoundException, AuthServiceException;
}
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 c6ca0ff21e..f38268c000 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
@@ -57,21 +57,5 @@ public interface UserService {
*/
User modify(User user, UserUpdateDto data) throws UserNotFoundException, AuthServiceException;
- /**
- * Updates the user password for a user with given id in the metadata database.
- *
- * @param user The user.
- * @param data The new password.
- */
- void updatePassword(User user, UserPasswordDto data);
-
- /**
- * Validates if a user with the given username already exists in the metadata database.
- *
- * @param username The username.
- * @throws UserExistsException The user with this username already exists.
- */
- void validateUsernameNotExists(String username) throws UserExistsException;
-
String getMariaDbPassword(String password);
}
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 dec3577886..e6bb056bfe 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
@@ -25,9 +25,4 @@ public class AuthenticationServiceImpl implements AuthenticationService {
keycloakGateway.deleteUser(user.getKeycloakId());
}
- @Override
- public void setupFinished(User user) throws AuthServiceException, UserNotFoundException {
- keycloakGateway.setupFinished(user.getKeycloakId());
- }
-
}
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 e79dd9bd84..ad05c4fd46 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,11 +1,9 @@
package at.tuwien.service.impl;
import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserExistsException;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
@@ -100,21 +98,6 @@ public class UserServiceImpl implements UserService {
return user;
}
- @Override
- public void updatePassword(User user, UserPasswordDto data) {
- user.setMariadbPassword(getMariaDbPassword(data.getPassword()));
- /* update at metadata database */
- userRepository.save(user);
- log.info("Updated password of user with id: {}", user.getId());
- }
-
- @Override
- public void validateUsernameNotExists(String username) throws UserExistsException {
- if (userRepository.existsByUsername(username)) {
- throw new UserExistsException("User with username " + username + " already exists");
- }
- }
-
@Override
public String getMariaDbPassword(String password) {
final byte[] utf8 = password.getBytes(StandardCharsets.UTF_8);
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 2921447017..7440de878b 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
@@ -14,10 +14,7 @@ import at.tuwien.api.container.image.*;
import at.tuwien.api.database.*;
import at.tuwien.api.database.query.QueryBriefDto;
import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
+import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.columns.*;
import at.tuwien.api.database.table.columns.concepts.*;
import at.tuwien.api.database.table.constraints.ConstraintsDto;
@@ -2324,6 +2321,12 @@ public abstract class BaseTest {
.owner(USER_1_BRIEF_DTO)
.build();
+ public static final TableUpdateDto TABLE_8_UPDATE_DTO = TableUpdateDto.builder()
+ .description(TABLE_8_DESCRIPTION)
+ .isPublic(true)
+ .isSchemaPublic(true)
+ .build();
+
public static final TableBriefDto TABLE_8_BRIEF_DTO = TableBriefDto.builder()
.id(TABLE_8_ID)
.databaseId(DATABASE_3_ID)
diff --git a/dbrepo-search-service/.gitignore b/dbrepo-search-service/.gitignore
index e4a1bfbd16..726e588cd1 100644
--- a/dbrepo-search-service/.gitignore
+++ b/dbrepo-search-service/.gitignore
@@ -38,6 +38,12 @@ MANIFEST
*.manifest
*.spec
+# generate
+/friendly_names_overrides.json
+/test/rsa
+/test/test_keycloak_client.py
+/test/test_opensearch_client.py
+
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
diff --git a/dbrepo-search-service/Dockerfile b/dbrepo-search-service/Dockerfile
index 0efe76bc88..3e46d8fc90 100644
--- a/dbrepo-search-service/Dockerfile
+++ b/dbrepo-search-service/Dockerfile
@@ -19,9 +19,9 @@ WORKDIR /app
COPY --chown=1001 ./init/clients ./clients
COPY --chown=1001 ./init/omlib ./omlib
+COPY --chown=1001 ./init/friendly_names_overrides.json ./friendly_names_overrides.json
COPY --chown=1001 ./os-yml ./os-yml
COPY --chown=1001 ./app.py ./app.py
-COPY --chown=1001 ./friendly_names_overrides.json ./friendly_names_overrides.json
# non-root port
EXPOSE 8080
diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py
index f9e2dbcc77..13a9be8704 100644
--- a/dbrepo-search-service/app.py
+++ b/dbrepo-search-service/app.py
@@ -186,7 +186,7 @@ app.config["METADATA_SERVICE_ENDPOINT"] = os.getenv("METADATA_SERVICE_ENDPOINT",
app.config["JWT_ALGORITHM"] = "HS256"
app.config["JWT_PUBKEY"] = '-----BEGIN PUBLIC KEY-----\n' + os.getenv("JWT_PUBKEY",
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB") + '\n-----END PUBLIC KEY-----'
-app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://auth-service:8080/api/auth")
+app.config["AUTH_SERVICE_ENDPOINT"] = os.getenv("AUTH_SERVICE_ENDPOINT", "http://auth-service:8080")
app.config["AUTH_SERVICE_CLIENT"] = os.getenv("AUTH_SERVICE_CLIENT", "dbrepo-client")
app.config["AUTH_SERVICE_CLIENT_SECRET"] = os.getenv("AUTH_SERVICE_CLIENT_SECRET", "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG")
app.config["OPENSEARCH_HOST"] = os.getenv('OPENSEARCH_HOST', 'search-db')
diff --git a/dbrepo-search-service/init/.coveragerc b/dbrepo-search-service/init/.coveragerc
new file mode 100644
index 0000000000..b5a0e606be
--- /dev/null
+++ b/dbrepo-search-service/init/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+
+omit =
+ # omit tests
+ ./test/*
\ No newline at end of file
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index b74ed7bc40..171460cd23 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,12 +9,14 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.3.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
rdflib = "*"
[dev-packages]
coverage = "*"
pytest = "*"
+requests-mock = "*"
+jwt = "~=1.3"
[requires]
python_version = "3.11"
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index 77017b6d15..c565195173 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "dac534d1eb6a0942c0e296c8a58491847c65d3ca23315039a3725591c86f694f"
+ "sha256": "e9b86cb78a55fb9906d294b2ce675933832658ad12ad1ed4f7f3d5893bc0a301"
},
"pipfile-spec": 6,
"requires": {
@@ -259,11 +259,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:199a5e4d4ede04d871681880f3797a4bdbb09317ee3796df14c8c501756216d6",
- "sha256:7d62d00d51c1f0a178c795a8cc09b3b4c93ee0a18aed6514e2cb60465cd877f7"
+ "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
],
- "markers": "python_version >= '3.11'",
- "path": "./lib/dbrepo-1.6.3.tar.gz"
+ "path": "./lib/dbrepo-1.6.4.tar.gz"
},
"docker": {
"hashes": [
@@ -585,64 +583,64 @@
},
"numpy": {
"hashes": [
- "sha256:02935e2c3c0c6cbe9c7955a8efa8908dd4221d7755644c59d1bba28b94fd334f",
- "sha256:0349b025e15ea9d05c3d63f9657707a4e1d471128a3b1d876c095f328f8ff7f0",
- "sha256:09d6a2032faf25e8d0cadde7fd6145118ac55d2740132c1d845f98721b5ebcfd",
- "sha256:0bc61b307655d1a7f9f4b043628b9f2b721e80839914ede634e3d485913e1fb2",
- "sha256:0eec19f8af947a61e968d5429f0bd92fec46d92b0008d0a6685b40d6adf8a4f4",
- "sha256:106397dbbb1896f99e044efc90360d098b3335060375c26aa89c0d8a97c5f648",
- "sha256:128c41c085cab8a85dc29e66ed88c05613dccf6bc28b3866cd16050a2f5448be",
- "sha256:149d1113ac15005652e8d0d3f6fd599360e1a708a4f98e43c9c77834a28238cb",
- "sha256:159ff6ee4c4a36a23fe01b7c3d07bd8c14cc433d9720f977fcd52c13c0098160",
- "sha256:22ea3bb552ade325530e72a0c557cdf2dea8914d3a5e1fecf58fa5dbcc6f43cd",
- "sha256:23ae9f0c2d889b7b2d88a3791f6c09e2ef827c2446f1c4a3e3e76328ee4afd9a",
- "sha256:250c16b277e3b809ac20d1f590716597481061b514223c7badb7a0f9993c7f84",
- "sha256:2ec6c689c61df613b783aeb21f945c4cbe6c51c28cb70aae8430577ab39f163e",
- "sha256:2ffbb1acd69fdf8e89dd60ef6182ca90a743620957afb7066385a7bbe88dc748",
- "sha256:3074634ea4d6df66be04f6728ee1d173cfded75d002c75fac79503a880bf3825",
- "sha256:356ca982c188acbfa6af0d694284d8cf20e95b1c3d0aefa8929376fea9146f60",
- "sha256:3fbe72d347fbc59f94124125e73fc4976a06927ebc503ec5afbfb35f193cd957",
- "sha256:40c7ff5da22cd391944a28c6a9c638a5eef77fcf71d6e3a79e1d9d9e82752715",
- "sha256:41184c416143defa34cc8eb9d070b0a5ba4f13a0fa96a709e20584638254b317",
- "sha256:451e854cfae0febe723077bd0cf0a4302a5d84ff25f0bfece8f29206c7bed02e",
- "sha256:4525b88c11906d5ab1b0ec1f290996c0020dd318af8b49acaa46f198b1ffc283",
- "sha256:463247edcee4a5537841d5350bc87fe8e92d7dd0e8c71c995d2c6eecb8208278",
- "sha256:4dbd80e453bd34bd003b16bd802fac70ad76bd463f81f0c518d1245b1c55e3d9",
- "sha256:57b4012e04cc12b78590a334907e01b3a85efb2107df2b8733ff1ed05fce71de",
- "sha256:5a8c863ceacae696aff37d1fd636121f1a512117652e5dfb86031c8d84836369",
- "sha256:5acea83b801e98541619af398cc0109ff48016955cc0818f478ee9ef1c5c3dcb",
- "sha256:642199e98af1bd2b6aeb8ecf726972d238c9877b0f6e8221ee5ab945ec8a2189",
- "sha256:64bd6e1762cd7f0986a740fee4dff927b9ec2c5e4d9a28d056eb17d332158014",
- "sha256:6d9fc9d812c81e6168b6d405bf00b8d6739a7f72ef22a9214c4241e0dc70b323",
- "sha256:7079129b64cb78bdc8d611d1fd7e8002c0a2565da6a47c4df8062349fee90e3e",
- "sha256:7dca87ca328f5ea7dafc907c5ec100d187911f94825f8700caac0b3f4c384b49",
- "sha256:860fd59990c37c3ef913c3ae390b3929d005243acca1a86facb0773e2d8d9e50",
- "sha256:8e6da5cffbbe571f93588f562ed130ea63ee206d12851b60819512dd3e1ba50d",
- "sha256:8ec0636d3f7d68520afc6ac2dc4b8341ddb725039de042faf0e311599f54eb37",
- "sha256:9491100aba630910489c1d0158034e1c9a6546f0b1340f716d522dc103788e39",
- "sha256:97b974d3ba0fb4612b77ed35d7627490e8e3dff56ab41454d9e8b23448940576",
- "sha256:995f9e8181723852ca458e22de5d9b7d3ba4da3f11cc1cb113f093b271d7965a",
- "sha256:9dd47ff0cb2a656ad69c38da850df3454da88ee9a6fde0ba79acceee0e79daba",
- "sha256:9fad446ad0bc886855ddf5909cbf8cb5d0faa637aaa6277fb4b19ade134ab3c7",
- "sha256:a972cec723e0563aa0823ee2ab1df0cb196ed0778f173b381c871a03719d4826",
- "sha256:ac9bea18d6d58a995fac1b2cb4488e17eceeac413af014b1dd26170b766d8467",
- "sha256:b0531f0b0e07643eb089df4c509d30d72c9ef40defa53e41363eca8a8cc61495",
- "sha256:b208cfd4f5fe34e1535c08983a1a6803fdbc7a1e86cf13dd0c61de0b51a0aadc",
- "sha256:b3482cb7b3325faa5f6bc179649406058253d91ceda359c104dac0ad320e1391",
- "sha256:b6fb9c32a91ec32a689ec6410def76443e3c750e7cfc3fb2206b985ffb2b85f0",
- "sha256:b78ea78450fd96a498f50ee096f69c75379af5138f7881a51355ab0e11286c97",
- "sha256:bd249bc894af67cbd8bad2c22e7cbcd46cf87ddfca1f1289d1e7e54868cc785c",
- "sha256:c7d1fd447e33ee20c1f33f2c8e6634211124a9aabde3c617687d8b739aa69eac",
- "sha256:d0bbe7dd86dca64854f4b6ce2ea5c60b51e36dfd597300057cf473d3615f2369",
- "sha256:d6d6a0910c3b4368d89dde073e630882cdb266755565155bc33520283b2d9df8",
- "sha256:da1eeb460ecce8d5b8608826595c777728cdf28ce7b5a5a8c8ac8d949beadcf2",
- "sha256:e0c8854b09bc4de7b041148d8550d3bd712b5c21ff6a8ed308085f190235d7ff",
- "sha256:e0d4142eb40ca6f94539e4db929410f2a46052a0fe7a2c1c59f6179c39938d2a",
- "sha256:e9e82dcb3f2ebbc8cb5ce1102d5f1c5ed236bf8a11730fb45ba82e2841ec21df",
- "sha256:ed6906f61834d687738d25988ae117683705636936cc605be0bb208b23df4d8f"
+ "sha256:0391ea3622f5c51a2e29708877d56e3d276827ac5447d7f45e9bc4ade8923c52",
+ "sha256:12c045f43b1d2915eca6b880a7f4a256f59d62df4f044788c8ba67709412128d",
+ "sha256:136553f123ee2951bfcfbc264acd34a2fc2f29d7cdf610ce7daf672b6fbaa693",
+ "sha256:1402da8e0f435991983d0a9708b779f95a8c98c6b18a171b9f1be09005e64d9d",
+ "sha256:16372619ee728ed67a2a606a614f56d3eabc5b86f8b615c79d01957062826ca8",
+ "sha256:1ad78ce7f18ce4e7df1b2ea4019b5817a2f6a8a16e34ff2775f646adce0a5027",
+ "sha256:1b416af7d0ed3271cad0f0a0d0bee0911ed7eba23e66f8424d9f3dfcdcae1304",
+ "sha256:1f45315b2dc58d8a3e7754fe4e38b6fce132dab284a92851e41b2b344f6441c5",
+ "sha256:2376e317111daa0a6739e50f7ee2a6353f768489102308b0d98fcf4a04f7f3b5",
+ "sha256:23c9f4edbf4c065fddb10a4f6e8b6a244342d95966a48820c614891e5059bb50",
+ "sha256:246535e2f7496b7ac85deffe932896a3577be7af8fb7eebe7146444680297e9a",
+ "sha256:2e8da03bd561504d9b20e7a12340870dfc206c64ea59b4cfee9fceb95070ee94",
+ "sha256:34c1b7e83f94f3b564b35f480f5652a47007dd91f7c839f404d03279cc8dd021",
+ "sha256:39261798d208c3095ae4f7bc8eaeb3481ea8c6e03dc48028057d3cbdbdb8937e",
+ "sha256:3b787adbf04b0db1967798dba8da1af07e387908ed1553a0d6e74c084d1ceafe",
+ "sha256:3c2ec8a0f51d60f1e9c0c5ab116b7fc104b165ada3f6c58abf881cb2eb16044d",
+ "sha256:435e7a933b9fda8126130b046975a968cc2d833b505475e588339e09f7672890",
+ "sha256:4d8335b5f1b6e2bce120d55fb17064b0262ff29b459e8493d1785c18ae2553b8",
+ "sha256:4d9828d25fb246bedd31e04c9e75714a4087211ac348cb39c8c5f99dbb6683fe",
+ "sha256:52659ad2534427dffcc36aac76bebdd02b67e3b7a619ac67543bc9bfe6b7cdb1",
+ "sha256:5266de33d4c3420973cf9ae3b98b54a2a6d53a559310e3236c4b2b06b9c07d4e",
+ "sha256:5521a06a3148686d9269c53b09f7d399a5725c47bbb5b35747e1cb76326b714b",
+ "sha256:596140185c7fa113563c67c2e894eabe0daea18cf8e33851738c19f70ce86aeb",
+ "sha256:5b732c8beef1d7bc2d9e476dbba20aaff6167bf205ad9aa8d30913859e82884b",
+ "sha256:5ebeb7ef54a7be11044c33a17b2624abe4307a75893c001a4800857956b41094",
+ "sha256:712a64103d97c404e87d4d7c47fb0c7ff9acccc625ca2002848e0d53288b90ea",
+ "sha256:7678556eeb0152cbd1522b684dcd215250885993dd00adb93679ec3c0e6e091c",
+ "sha256:77974aba6c1bc26e3c205c2214f0d5b4305bdc719268b93e768ddb17e3fdd636",
+ "sha256:783145835458e60fa97afac25d511d00a1eca94d4a8f3ace9fe2043003c678e4",
+ "sha256:7bfdb06b395385ea9b91bf55c1adf1b297c9fdb531552845ff1d3ea6e40d5aba",
+ "sha256:7c8dde0ca2f77828815fd1aedfdf52e59071a5bae30dac3b4da2a335c672149a",
+ "sha256:83807d445817326b4bcdaaaf8e8e9f1753da04341eceec705c001ff342002e5d",
+ "sha256:87eed225fd415bbae787f93a457af7f5990b92a334e346f72070bf569b9c9c95",
+ "sha256:8fb62fe3d206d72fe1cfe31c4a1106ad2b136fcc1606093aeab314f02930fdf2",
+ "sha256:95172a21038c9b423e68be78fd0be6e1b97674cde269b76fe269a5dfa6fadf0b",
+ "sha256:9f48ba6f6c13e5e49f3d3efb1b51c8193215c42ac82610a04624906a9270be6f",
+ "sha256:a0c03b6be48aaf92525cccf393265e02773be8fd9551a2f9adbe7db1fa2b60f1",
+ "sha256:a5ae282abe60a2db0fd407072aff4599c279bcd6e9a2475500fc35b00a57c532",
+ "sha256:aee2512827ceb6d7f517c8b85aa5d3923afe8fc7a57d028cffcd522f1c6fd082",
+ "sha256:c8b0451d2ec95010d1db8ca733afc41f659f425b7f608af569711097fd6014e2",
+ "sha256:c9aa4496fd0e17e3843399f533d62857cef5900facf93e735ef65aa4bbc90ef0",
+ "sha256:cbc6472e01952d3d1b2772b720428f8b90e2deea8344e854df22b0618e9cce71",
+ "sha256:cdfe0c22692a30cd830c0755746473ae66c4a8f2e7bd508b35fb3b6a0813d787",
+ "sha256:cf802eef1f0134afb81fef94020351be4fe1d6681aadf9c5e862af6602af64ef",
+ "sha256:d42f9c36d06440e34226e8bd65ff065ca0963aeecada587b937011efa02cdc9d",
+ "sha256:d5b47c440210c5d1d67e1cf434124e0b5c395eee1f5806fdd89b553ed1acd0a3",
+ "sha256:d9b4a8148c57ecac25a16b0e11798cbe88edf5237b0df99973687dd866f05e1b",
+ "sha256:daf43a3d1ea699402c5a850e5313680ac355b4adc9770cd5cfc2940e7861f1bf",
+ "sha256:dbdc15f0c81611925f382dfa97b3bd0bc2c1ce19d4fe50482cb0ddc12ba30020",
+ "sha256:deaa09cd492e24fd9b15296844c0ad1b3c976da7907e1c1ed3a0ad21dded6f76",
+ "sha256:e37242f5324ffd9f7ba5acf96d774f9276aa62a966c0bad8dae692deebec7716",
+ "sha256:ed2cf9ed4e8ebc3b754d398cba12f24359f018b416c380f577bbae112ca52fc9",
+ "sha256:f2712c5179f40af9ddc8f6727f2bd910ea0eb50206daea75f58ddd9fa3f715bb",
+ "sha256:f4ca91d61a4bf61b0f2228f24bbfa6a9facd5f8af03759fe2a655c50ae2c6610",
+ "sha256:f6b3dfc7661f8842babd8ea07e9897fe3d9b69a1d7e5fbb743e4160f9387833b"
],
- "markers": "python_version == '3.11'",
- "version": "==2.2.2"
+ "markers": "python_version >= '3.10'",
+ "version": "==2.2.3"
},
"opensearch-py": {
"hashes": [
@@ -1045,7 +1043,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -1231,6 +1229,185 @@
}
},
"develop": {
+ "certifi": {
+ "hashes": [
+ "sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651",
+ "sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe"
+ ],
+ "markers": "python_version >= '3.6'",
+ "version": "==2025.1.31"
+ },
+ "cffi": {
+ "hashes": [
+ "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8",
+ "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2",
+ "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1",
+ "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15",
+ "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36",
+ "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824",
+ "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8",
+ "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36",
+ "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17",
+ "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf",
+ "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc",
+ "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3",
+ "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed",
+ "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702",
+ "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1",
+ "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8",
+ "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903",
+ "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6",
+ "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d",
+ "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b",
+ "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e",
+ "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be",
+ "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c",
+ "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683",
+ "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9",
+ "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c",
+ "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8",
+ "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1",
+ "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4",
+ "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655",
+ "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67",
+ "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595",
+ "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0",
+ "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65",
+ "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41",
+ "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6",
+ "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401",
+ "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6",
+ "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3",
+ "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16",
+ "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93",
+ "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e",
+ "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4",
+ "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964",
+ "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c",
+ "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576",
+ "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0",
+ "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3",
+ "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662",
+ "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3",
+ "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff",
+ "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5",
+ "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd",
+ "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f",
+ "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5",
+ "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14",
+ "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d",
+ "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9",
+ "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7",
+ "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382",
+ "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a",
+ "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e",
+ "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a",
+ "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4",
+ "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99",
+ "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
+ "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==1.17.1"
+ },
+ "charset-normalizer": {
+ "hashes": [
+ "sha256:0167ddc8ab6508fe81860a57dd472b2ef4060e8d378f0cc555707126830f2537",
+ "sha256:01732659ba9b5b873fc117534143e4feefecf3b2078b0a6a2e925271bb6f4cfa",
+ "sha256:01ad647cdd609225c5350561d084b42ddf732f4eeefe6e678765636791e78b9a",
+ "sha256:04432ad9479fa40ec0f387795ddad4437a2b50417c69fa275e212933519ff294",
+ "sha256:0907f11d019260cdc3f94fbdb23ff9125f6b5d1039b76003b5b0ac9d6a6c9d5b",
+ "sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd",
+ "sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601",
+ "sha256:09b5e6733cbd160dcc09589227187e242a30a49ca5cefa5a7edd3f9d19ed53fd",
+ "sha256:0af291f4fe114be0280cdd29d533696a77b5b49cfde5467176ecab32353395c4",
+ "sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d",
+ "sha256:1a2bc9f351a75ef49d664206d51f8e5ede9da246602dc2d2726837620ea034b2",
+ "sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313",
+ "sha256:234ac59ea147c59ee4da87a0c0f098e9c8d169f4dc2a159ef720f1a61bbe27cd",
+ "sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa",
+ "sha256:237bdbe6159cff53b4f24f397d43c6336c6b0b42affbe857970cefbb620911c8",
+ "sha256:28bf57629c75e810b6ae989f03c0828d64d6b26a5e205535585f96093e405ed1",
+ "sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2",
+ "sha256:2a75d49014d118e4198bcee5ee0a6f25856b29b12dbf7cd012791f8a6cc5c496",
+ "sha256:2bdfe3ac2e1bbe5b59a1a63721eb3b95fc9b6817ae4a46debbb4e11f6232428d",
+ "sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b",
+ "sha256:2fb9bd477fdea8684f78791a6de97a953c51831ee2981f8e4f583ff3b9d9687e",
+ "sha256:311f30128d7d333eebd7896965bfcfbd0065f1716ec92bd5638d7748eb6f936a",
+ "sha256:329ce159e82018d646c7ac45b01a430369d526569ec08516081727a20e9e4af4",
+ "sha256:345b0426edd4e18138d6528aed636de7a9ed169b4aaf9d61a8c19e39d26838ca",
+ "sha256:363e2f92b0f0174b2f8238240a1a30142e3db7b957a5dd5689b0e75fb717cc78",
+ "sha256:3a3bd0dcd373514dcec91c411ddb9632c0d7d92aed7093b8c3bbb6d69ca74408",
+ "sha256:3bed14e9c89dcb10e8f3a29f9ccac4955aebe93c71ae803af79265c9ca5644c5",
+ "sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3",
+ "sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f",
+ "sha256:4532bff1b8421fd0a320463030c7520f56a79c9024a4e88f01c537316019005a",
+ "sha256:49402233c892a461407c512a19435d1ce275543138294f7ef013f0b63d5d3765",
+ "sha256:4c0907b1928a36d5a998d72d64d8eaa7244989f7aaaf947500d3a800c83a3fd6",
+ "sha256:4d86f7aff21ee58f26dcf5ae81a9addbd914115cdebcbb2217e4f0ed8982e146",
+ "sha256:5777ee0881f9499ed0f71cc82cf873d9a0ca8af166dfa0af8ec4e675b7df48e6",
+ "sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9",
+ "sha256:619a609aa74ae43d90ed2e89bdd784765de0a25ca761b93e196d938b8fd1dbbd",
+ "sha256:6e27f48bcd0957c6d4cb9d6fa6b61d192d0b13d5ef563e5f2ae35feafc0d179c",
+ "sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f",
+ "sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545",
+ "sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176",
+ "sha256:75832c08354f595c760a804588b9357d34ec00ba1c940c15e31e96d902093770",
+ "sha256:7709f51f5f7c853f0fb938bcd3bc59cdfdc5203635ffd18bf354f6967ea0f824",
+ "sha256:78baa6d91634dfb69ec52a463534bc0df05dbd546209b79a3880a34487f4b84f",
+ "sha256:7974a0b5ecd505609e3b19742b60cee7aa2aa2fb3151bc917e6e2646d7667dcf",
+ "sha256:7a4f97a081603d2050bfaffdefa5b02a9ec823f8348a572e39032caa8404a487",
+ "sha256:7b1bef6280950ee6c177b326508f86cad7ad4dff12454483b51d8b7d673a2c5d",
+ "sha256:7d053096f67cd1241601111b698f5cad775f97ab25d81567d3f59219b5f1adbd",
+ "sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b",
+ "sha256:807f52c1f798eef6cf26beb819eeb8819b1622ddfeef9d0977a8502d4db6d534",
+ "sha256:80ed5e856eb7f30115aaf94e4a08114ccc8813e6ed1b5efa74f9f82e8509858f",
+ "sha256:8417cb1f36cc0bc7eaba8ccb0e04d55f0ee52df06df3ad55259b9a323555fc8b",
+ "sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9",
+ "sha256:89149166622f4db9b4b6a449256291dc87a99ee53151c74cbd82a53c8c2f6ccd",
+ "sha256:8bfa33f4f2672964266e940dd22a195989ba31669bd84629f05fab3ef4e2d125",
+ "sha256:8c60ca7339acd497a55b0ea5d506b2a2612afb2826560416f6894e8b5770d4a9",
+ "sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de",
+ "sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11",
+ "sha256:97f68b8d6831127e4787ad15e6757232e14e12060bec17091b85eb1486b91d8d",
+ "sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35",
+ "sha256:9f0b8b1c6d84c8034a44893aba5e767bf9c7a211e313a9605d9c617d7083829f",
+ "sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda",
+ "sha256:ab36c8eb7e454e34e60eb55ca5d241a5d18b2c6244f6827a30e451c42410b5f7",
+ "sha256:b010a7a4fd316c3c484d482922d13044979e78d1861f0e0650423144c616a46a",
+ "sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971",
+ "sha256:b7b2d86dd06bfc2ade3312a83a5c364c7ec2e3498f8734282c6c3d4b07b346b8",
+ "sha256:b97e690a2118911e39b4042088092771b4ae3fc3aa86518f84b8cf6888dbdb41",
+ "sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d",
+ "sha256:c0429126cf75e16c4f0ad00ee0eae4242dc652290f940152ca8c75c3a4b6ee8f",
+ "sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757",
+ "sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a",
+ "sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886",
+ "sha256:c96836c97b1238e9c9e3fe90844c947d5afbf4f4c92762679acfe19927d81d77",
+ "sha256:d7f50a1f8c450f3925cb367d011448c39239bb3eb4117c36a6d354794de4ce76",
+ "sha256:d973f03c0cb71c5ed99037b870f2be986c3c05e63622c017ea9816881d2dd247",
+ "sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85",
+ "sha256:d9c3cdf5390dcd29aa8056d13e8e99526cda0305acc038b96b30352aff5ff2bb",
+ "sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7",
+ "sha256:dccbe65bd2f7f7ec22c4ff99ed56faa1e9f785482b9bbd7c717e26fd723a1d1e",
+ "sha256:dd78cfcda14a1ef52584dbb008f7ac81c1328c0f58184bf9a84c49c605002da6",
+ "sha256:e218488cd232553829be0664c2292d3af2eeeb94b32bea483cf79ac6a694e037",
+ "sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1",
+ "sha256:ea0d8d539afa5eb2728aa1932a988a9a7af94f18582ffae4bc10b3fbdad0626e",
+ "sha256:eab677309cdb30d047996b36d34caeda1dc91149e4fdca0b1a039b3f79d9a807",
+ "sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407",
+ "sha256:ecddf25bee22fe4fe3737a399d0d177d72bc22be6913acfab364b40bce1ba83c",
+ "sha256:eea6ee1db730b3483adf394ea72f808b6e18cf3cb6454b4d86e04fa8c4327a12",
+ "sha256:f08ff5e948271dc7e18a35641d2f11a4cd8dfd5634f55228b691e62b37125eb3",
+ "sha256:f30bf9fd9be89ecb2360c7d94a711f00c09b976258846efe40db3d05828e8089",
+ "sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd",
+ "sha256:fc54db6c8593ef7d4b2a331b58653356cf04f67c960f584edb7c3d8c97e8f39e",
+ "sha256:fd4ec41f914fa74ad1b8304bbc634b3de73d2a0889bd32076342a573e0779e00",
+ "sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616"
+ ],
+ "markers": "python_version >= '3.7'",
+ "version": "==3.4.1"
+ },
"coverage": {
"hashes": [
"sha256:00b2086892cf06c7c2d74983c9595dc511acca00665480b3ddff749ec4fb2a95",
@@ -1301,6 +1478,51 @@
"markers": "python_version >= '3.9'",
"version": "==7.6.12"
},
+ "cryptography": {
+ "hashes": [
+ "sha256:00918d859aa4e57db8299607086f793fa7813ae2ff5a4637e318a25ef82730f7",
+ "sha256:1e8d181e90a777b63f3f0caa836844a1182f1f265687fac2115fcf245f5fbec3",
+ "sha256:1f9a92144fa0c877117e9748c74501bea842f93d21ee00b0cf922846d9d0b183",
+ "sha256:21377472ca4ada2906bc313168c9dc7b1d7ca417b63c1c3011d0c74b7de9ae69",
+ "sha256:24979e9f2040c953a94bf3c6782e67795a4c260734e5264dceea65c8f4bae64a",
+ "sha256:2a46a89ad3e6176223b632056f321bc7de36b9f9b93b2cc1cccf935a3849dc62",
+ "sha256:322eb03ecc62784536bc173f1483e76747aafeb69c8728df48537eb431cd1911",
+ "sha256:436df4f203482f41aad60ed1813811ac4ab102765ecae7a2bbb1dbb66dcff5a7",
+ "sha256:4f422e8c6a28cf8b7f883eb790695d6d45b0c385a2583073f3cec434cc705e1a",
+ "sha256:53f23339864b617a3dfc2b0ac8d5c432625c80014c25caac9082314e9de56f41",
+ "sha256:5fed5cd6102bb4eb843e3315d2bf25fede494509bddadb81e03a859c1bc17b83",
+ "sha256:610a83540765a8d8ce0f351ce42e26e53e1f774a6efb71eb1b41eb01d01c3d12",
+ "sha256:6c8acf6f3d1f47acb2248ec3ea261171a671f3d9428e34ad0357148d492c7864",
+ "sha256:6f76fdd6fd048576a04c5210d53aa04ca34d2ed63336d4abd306d0cbe298fddf",
+ "sha256:72198e2b5925155497a5a3e8c216c7fb3e64c16ccee11f0e7da272fa93b35c4c",
+ "sha256:887143b9ff6bad2b7570da75a7fe8bbf5f65276365ac259a5d2d5147a73775f2",
+ "sha256:888fcc3fce0c888785a4876ca55f9f43787f4c5c1cc1e2e0da71ad481ff82c5b",
+ "sha256:8e6a85a93d0642bd774460a86513c5d9d80b5c002ca9693e63f6e540f1815ed0",
+ "sha256:94f99f2b943b354a5b6307d7e8d19f5c423a794462bde2bf310c770ba052b1c4",
+ "sha256:9b336599e2cb77b1008cb2ac264b290803ec5e8e89d618a5e978ff5eb6f715d9",
+ "sha256:a2d8a7045e1ab9b9f803f0d9531ead85f90c5f2859e653b61497228b18452008",
+ "sha256:b8272f257cf1cbd3f2e120f14c68bff2b6bdfcc157fafdee84a1b795efd72862",
+ "sha256:bf688f615c29bfe9dfc44312ca470989279f0e94bb9f631f85e3459af8efc009",
+ "sha256:d9c5b9f698a83c8bd71e0f4d3f9f839ef244798e5ffe96febfa9714717db7af7",
+ "sha256:dd7c7e2d71d908dc0f8d2027e1604102140d84b155e658c20e8ad1304317691f",
+ "sha256:df978682c1504fc93b3209de21aeabf2375cb1571d4e61907b3e7a2540e83026",
+ "sha256:e403f7f766ded778ecdb790da786b418a9f2394f36e8cc8b796cc056ab05f44f",
+ "sha256:eb3889330f2a4a148abead555399ec9a32b13b7c8ba969b72d8e500eb7ef84cd",
+ "sha256:f4daefc971c2d1f82f03097dc6f216744a6cd2ac0f04c68fb935ea2ba2a0d420",
+ "sha256:f51f5705ab27898afda1aaa430f34ad90dc117421057782022edf0600bec5f14",
+ "sha256:fd0ee90072861e276b0ff08bd627abec29e32a53b2be44e41dbcdf87cbee2b00"
+ ],
+ "markers": "python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'",
+ "version": "==44.0.1"
+ },
+ "idna": {
+ "hashes": [
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
+ ],
+ "markers": "python_version >= '3.6'",
+ "version": "==3.10"
+ },
"iniconfig": {
"hashes": [
"sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3",
@@ -1309,6 +1531,14 @@
"markers": "python_version >= '3.7'",
"version": "==2.0.0"
},
+ "jwt": {
+ "hashes": [
+ "sha256:61c9170f92e736b530655e75374681d4fcca9cfa8763ab42be57353b2b203494"
+ ],
+ "index": "pypi",
+ "markers": "python_version >= '3.6'",
+ "version": "==1.3.1"
+ },
"packaging": {
"hashes": [
"sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
@@ -1325,6 +1555,14 @@
"markers": "python_version >= '3.8'",
"version": "==1.5.0"
},
+ "pycparser": {
+ "hashes": [
+ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
+ "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.22"
+ },
"pytest": {
"hashes": [
"sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6",
@@ -1333,6 +1571,31 @@
"index": "pypi",
"markers": "python_version >= '3.8'",
"version": "==8.3.4"
+ },
+ "requests": {
+ "hashes": [
+ "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
+ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.32.3"
+ },
+ "requests-mock": {
+ "hashes": [
+ "sha256:b1e37054004cdd5e56c84454cc7df12b25f90f382159087f4b6915aaeef39563",
+ "sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"
+ ],
+ "index": "pypi",
+ "markers": "python_version >= '3.5'",
+ "version": "==1.12.1"
+ },
+ "urllib3": {
+ "hashes": [
+ "sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
+ "sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
+ ],
+ "markers": "python_version >= '3.9'",
+ "version": "==2.3.0"
}
}
}
diff --git a/dbrepo-search-service/init/clients/keycloak_client.py b/dbrepo-search-service/init/clients/keycloak_client.py
index 2e15d00a9b..e8c277601b 100644
--- a/dbrepo-search-service/init/clients/keycloak_client.py
+++ b/dbrepo-search-service/init/clients/keycloak_client.py
@@ -1,10 +1,10 @@
import logging
+import os
from dataclasses import dataclass
from typing import List
import requests
from dbrepo.api.dto import ApiError
-from flask import current_app
from jwt import jwk_from_pem, JWT
from jwt.exceptions import JWTDecodeError
@@ -20,13 +20,13 @@ class KeycloakClient:
def obtain_user_token(self, username: str, password: str) -> str:
response = requests.post(
- f"{current_app.config['AUTH_SERVICE_ENDPOINT']}/realms/dbrepo/protocol/openid-connect/token",
+ f"{os.getenv('AUTH_SERVICE_ENDPOINT', 'http://auth-service:8080')}/realms/dbrepo/protocol/openid-connect/token",
data={
"username": username,
"password": password,
"grant_type": "password",
- "client_id": current_app.config["AUTH_SERVICE_CLIENT"],
- "client_secret": current_app.config["AUTH_SERVICE_CLIENT_SECRET"]
+ "client_id": os.getenv("AUTH_SERVICE_CLIENT", "dbrepo-client"),
+ "client_secret": os.getenv("AUTH_SERVICE_CLIENT_SECRET", "MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG")
})
body = response.json()
if "access_token" not in body:
@@ -34,7 +34,9 @@ class KeycloakClient:
return response.json()["access_token"]
def verify_jwt(self, access_token: str) -> ApiError | User:
- public_key = jwk_from_pem(str(current_app.config["JWT_PUBKEY"]).encode('utf-8'))
+ public_key = jwk_from_pem(str('-----BEGIN PUBLIC KEY-----\n' + os.getenv("JWT_PUBKEY",
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB") + '\n-----END PUBLIC KEY-----').encode(
+ 'utf-8'))
payload = JWT().decode(message=access_token, key=public_key, do_time_check=True)
return User(id=payload.get('uid'), username=payload.get('client_id'),
roles=payload.get('realm_access')["roles"])
diff --git a/dbrepo-search-service/friendly_names_overrides.json b/dbrepo-search-service/init/friendly_names_overrides.json
similarity index 100%
rename from dbrepo-search-service/friendly_names_overrides.json
rename to dbrepo-search-service/init/friendly_names_overrides.json
diff --git a/dbrepo-search-service/test/rsa/rs256.key b/dbrepo-search-service/init/test/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/test/rsa/rs256.key
rename to dbrepo-search-service/init/test/rsa/rs256.key
diff --git a/dbrepo-search-service/init/test/rsa/rsa/rs256.key b/dbrepo-search-service/init/test/rsa/rsa/rs256.key
new file mode 100644
index 0000000000..86b3eaf5c6
--- /dev/null
+++ b/dbrepo-search-service/init/test/rsa/rsa/rs256.key
@@ -0,0 +1,3 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==
+-----END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/dbrepo-search-service/test/rsa/rsa256.pkey b/dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/test/rsa/rsa256.pkey
rename to dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey
diff --git a/dbrepo-search-service/init/test/rsa/rsa256.pkey b/dbrepo-search-service/init/test/rsa/rsa256.pkey
new file mode 100644
index 0000000000..857dfb22be
--- /dev/null
+++ b/dbrepo-search-service/init/test/rsa/rsa256.pkey
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/dbrepo-search-service/init/test/test_keycloak_client.py b/dbrepo-search-service/init/test/test_keycloak_client.py
new file mode 100644
index 0000000000..0c43da2301
--- /dev/null
+++ b/dbrepo-search-service/init/test/test_keycloak_client.py
@@ -0,0 +1,53 @@
+import time
+import unittest
+
+import jwt
+import requests_mock
+
+from clients.keycloak_client import KeycloakClient
+
+
+class JwtTest(unittest.TestCase):
+
+ def response(self, username) -> dict:
+ return dict({
+ "client_id": username,
+ "access_token": "eyEY1234"
+ })
+
+ def token(self, username: str, roles: [str], iat: int = int(time.time())) -> str:
+ claims = {
+ 'iat': iat,
+ 'client_id': username,
+ 'realm_access': {
+ 'roles': roles
+ }
+ }
+ with open('test/rsa/rs256.key', 'rb') as fh:
+ return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
+
+ def test_obtain_user_token_succeeds(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/realms/dbrepo/protocol/openid-connect/token',
+ json=self.response("username"))
+ # test
+ token = KeycloakClient().obtain_user_token("username", "password")
+ self.assertEqual("eyEY1234", token)
+
+ def test_obtain_user_token_malformed_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/realms/dbrepo/protocol/openid-connect/token',
+ json={"client_id": "username"})
+ # test
+ try:
+ KeycloakClient().obtain_user_token("username", "password")
+ self.fail()
+ except AssertionError:
+ pass
+
+ def test_verify_jwt_succeeds(self):
+ # test
+ user = KeycloakClient().verify_jwt(self.token("username", []))
+ self.assertEqual("username", user.username)
diff --git a/dbrepo-search-service/init/test/test_opensearch_client.py b/dbrepo-search-service/init/test/test_opensearch_client.py
new file mode 100644
index 0000000000..70328df638
--- /dev/null
+++ b/dbrepo-search-service/init/test/test_opensearch_client.py
@@ -0,0 +1,206 @@
+import unittest
+
+import opensearchpy
+import os
+from dbrepo.api.dto import Database, Table, Column, ColumnType, Constraints, PrimaryKey, \
+ ConceptBrief, UnitBrief, UserBrief, ContainerBrief, ImageBrief, TableBrief, ColumnBrief
+from opensearchpy import NotFoundError
+
+from clients.opensearch_client import OpenSearchClient
+
+req = Database(id=1,
+ name="Test",
+ internal_name="test_tuw1",
+ owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
+ contact=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
+ exchange_name="dbrepo",
+ is_public=True,
+ is_schema_public=True,
+ container=ContainerBrief(id=1,
+ name="MariaDB",
+ internal_name="mariadb",
+ host="data-db",
+ image=ImageBrief(id=1,
+ name="mariadb",
+ version="11.1.3",
+ jdbc_method="mariadb")),
+ tables=[Table(id=1,
+ database_id=1,
+ name="Data",
+ internal_name="data",
+ owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
+ constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
+ is_versioned=False,
+ queue_name="dbrepo",
+ routing_key="dbrepo.1.1",
+ is_public=True,
+ is_schema_public=True,
+ columns=[Column(id=1,
+ database_id=1,
+ table_id=1,
+ name="ID",
+ ord=0,
+ internal_name="id",
+ type=ColumnType.BIGINT,
+ is_null_allowed=False,
+ size=20,
+ d=0,
+ concept=ConceptBrief(id=1, uri="http://www.wikidata.org/entity/Q2221906"),
+ unit=UnitBrief(id=1,
+ uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"),
+ val_min=0,
+ val_max=10)]
+ )])
+
+
+class OpenSearchClientTest(unittest.TestCase):
+
+ def test_update_database_succeeds(self):
+ req.tables = [Table(id=1,
+ name="Test Table",
+ internal_name="test_table",
+ queue_name="dbrepo",
+ routing_key="dbrepo.test_tuw1.test_table",
+ is_public=True,
+ is_schema_public=True,
+ database_id=req.id,
+ constraints=Constraints(uniques=[], foreign_keys=[], checks=[],
+ primary_key=[PrimaryKey(id=1,
+ table=TableBrief(id=1,
+ database_id=req.id,
+ name="Test Table",
+ internal_name="test_table",
+ is_public=True,
+ is_schema_public=True,
+ is_versioned=True,
+ owned_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502"),
+ column=ColumnBrief(id=1,
+ name="ID",
+ database_id=req.id,
+ table_id=1,
+ internal_name="id",
+ type=ColumnType.BIGINT))]),
+ is_versioned=True,
+ owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
+ columns=[Column(id=1,
+ database_id=req.id,
+ table_id=1,
+ ord=0,
+ name="ID",
+ internal_name="id",
+ type=ColumnType.BIGINT,
+ is_null_allowed=False)])]
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
+ self.assertEqual(1, database.id)
+ self.assertEqual("Test", database.name)
+ self.assertEqual("test_tuw1", database.internal_name)
+ self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
+ self.assertEqual("foo", database.owner.username)
+ self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.contact.id)
+ self.assertEqual("foo", database.contact.username)
+ self.assertEqual("dbrepo", database.exchange_name)
+ self.assertEqual(True, database.is_public)
+ self.assertEqual(1, database.container.id)
+ # ...
+ self.assertEqual(1, database.container.image.id)
+ # ...
+ self.assertEqual(1, len(database.tables))
+ self.assertEqual(1, database.tables[0].id)
+ self.assertEqual("Test Table", database.tables[0].name)
+ self.assertEqual("test_table", database.tables[0].internal_name)
+ self.assertEqual("dbrepo", database.tables[0].queue_name)
+ self.assertEqual("dbrepo.test_tuw1.test_table", database.tables[0].routing_key)
+ self.assertEqual(True, database.tables[0].is_public)
+ self.assertEqual(1, database.tables[0].database_id)
+ self.assertEqual(True, database.tables[0].is_versioned)
+ self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.tables[0].owner.id)
+ self.assertEqual("foo", database.tables[0].owner.username)
+ self.assertEqual(1, len(database.tables[0].columns))
+ self.assertEqual(1, database.tables[0].columns[0].id)
+ self.assertEqual("ID", database.tables[0].columns[0].name)
+ self.assertEqual("id", database.tables[0].columns[0].internal_name)
+ self.assertEqual(ColumnType.BIGINT, database.tables[0].columns[0].type)
+ self.assertEqual(1, database.tables[0].columns[0].database_id)
+ self.assertEqual(1, database.tables[0].columns[0].table_id)
+ self.assertEqual(False, database.tables[0].columns[0].is_null_allowed)
+
+ def test_update_database_create_succeeds(self):
+ # test
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
+ self.assertEqual(1, database.id)
+ self.assertEqual("Test", database.name)
+ self.assertEqual("test_tuw1", database.internal_name)
+ self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
+ self.assertEqual("foo", database.owner.username)
+ self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.contact.id)
+ self.assertEqual("foo", database.contact.username)
+ self.assertEqual("dbrepo", database.exchange_name)
+ self.assertEqual(True, database.is_public)
+ self.assertEqual(1, database.container.id)
+ # ...
+ self.assertEqual(1, database.container.image.id)
+ # ...
+ self.assertEqual(1, len(database.tables))
+
+ def test_update_database_malformed_fails(self):
+ os.environ['OPENSEARCH_USERNAME'] = 'i_do_not_exist'
+
+ # test
+ try:
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
+ except opensearchpy.exceptions.TransportError:
+ pass
+
+ def test_delete_database_fails(self):
+
+ # test
+ try:
+ OpenSearchClient().delete_database(database_id=9999)
+ except opensearchpy.exceptions.NotFoundError:
+ pass
+
+ def test_delete_database_succeeds(self):
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ OpenSearchClient().delete_database(database_id=req.id)
+
+ def test_get_fields_for_index_database_succeeds(self):
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ response = OpenSearchClient().get_fields_for_index(field_type="database")
+ self.assertTrue(len(response) > 0)
+
+ def test_get_fields_for_index_user_succeeds(self):
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ response = OpenSearchClient().get_fields_for_index(field_type="user")
+ self.assertTrue(len(response) > 0)
+
+ def test_fuzzy_search_succeeds(self):
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ OpenSearchClient().fuzzy_search(search_term="test_tuw")
+
+ def test_unit_independent_search_fails(self):
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
+ try:
+ OpenSearchClient().unit_independent_search(0, 100, {
+ "unit.uri": "http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"})
+ self.fail()
+ except NotFoundError:
+ pass
diff --git a/dbrepo-search-service/test.sh b/dbrepo-search-service/test.sh
deleted file mode 100644
index 40328cd5dd..0000000000
--- a/dbrepo-search-service/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-PIPENV_PIPFILE=./dbrepo-search-service/Pipfile
-source ./dbrepo-search-service/venv/bin/activate
-pip install pipenv
-pipenv install gunicorn && pipenv install --dev --system --deploy
-cd ./dbrepo-search-service/ && coverage run -m pytest test/test_app.py test/test_jwt.py test/test_opensearch_client.py test/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
-cat ./coverage.txt | grep -o 'TOTAL[^%]*%'
\ No newline at end of file
diff --git a/dbrepo-search-service/test/test_jwt.py b/dbrepo-search-service/test/test_jwt.py
index 96ce8410da..1f23853a7c 100644
--- a/dbrepo-search-service/test/test_jwt.py
+++ b/dbrepo-search-service/test/test_jwt.py
@@ -84,7 +84,7 @@ class JwtTest(unittest.TestCase):
with app.app_context():
with requests_mock.Mocker() as mock:
# mock
- mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
+ mock.post('http://auth-service:8080/realms/dbrepo/protocol/openid-connect/token',
json=self.response([]))
# test
user = verify_password('username', 'password')
diff --git a/dbrepo-search-service/test/test_keycloak_client.py b/dbrepo-search-service/test/test_keycloak_client.py
deleted file mode 100644
index 453a9b802b..0000000000
--- a/dbrepo-search-service/test/test_keycloak_client.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import time
-import unittest
-
-import jwt
-import requests_mock
-
-from app import app
-from clients.keycloak_client import KeycloakClient
-
-
-class JwtTest(unittest.TestCase):
-
- def response(self, username) -> dict:
- return dict({
- "client_id": username,
- "access_token": "eyEY1234"
- })
-
- def token(self, username: str, roles: [str], iat: int = int(time.time())) -> str:
- claims = {
- 'iat': iat,
- 'client_id': username,
- 'realm_access': {
- 'roles': roles
- }
- }
- with open('test/rsa/rs256.key', 'rb') as fh:
- return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
-
- def test_obtain_user_token_succeeds(self):
- with app.app_context():
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
- json=self.response("username"))
- # test
- token = KeycloakClient().obtain_user_token("username", "password")
- self.assertEqual("eyEY1234", token)
-
- def test_obtain_user_token_malformed_fails(self):
- with app.app_context():
- with requests_mock.Mocker() as mock:
- # mock
- mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
- json={"client_id": "username"})
- # test
- try:
- KeycloakClient().obtain_user_token("username", "password")
- self.fail()
- except AssertionError:
- pass
-
- def test_verify_jwt_succeeds(self):
- with app.app_context():
- # test
- user = KeycloakClient().verify_jwt(self.token("username", []))
- self.assertEqual("username", user.username)
diff --git a/dbrepo-search-service/test/test_opensearch_client.py b/dbrepo-search-service/test/test_opensearch_client.py
deleted file mode 100644
index edbdff683d..0000000000
--- a/dbrepo-search-service/test/test_opensearch_client.py
+++ /dev/null
@@ -1,215 +0,0 @@
-import unittest
-
-import opensearchpy
-from dbrepo.api.dto import Database, Table, Column, ColumnType, Constraints, PrimaryKey, \
- ConceptBrief, UnitBrief, UserBrief, ContainerBrief, ImageBrief, TableBrief, ColumnBrief
-from opensearchpy import NotFoundError
-
-from app import app
-from init.clients.opensearch_client import OpenSearchClient
-
-req = Database(id=1,
- name="Test",
- internal_name="test_tuw1",
- owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
- contact=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
- exchange_name="dbrepo",
- is_public=True,
- is_schema_public=True,
- container=ContainerBrief(id=1,
- name="MariaDB",
- internal_name="mariadb",
- host="data-db",
- image=ImageBrief(id=1,
- name="mariadb",
- version="11.1.3",
- jdbc_method="mariadb")),
- tables=[Table(id=1,
- database_id=1,
- name="Data",
- internal_name="data",
- owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
- constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
- is_versioned=False,
- queue_name="dbrepo",
- routing_key="dbrepo.1.1",
- is_public=True,
- is_schema_public=True,
- columns=[Column(id=1,
- database_id=1,
- table_id=1,
- name="ID",
- ord=0,
- internal_name="id",
- type=ColumnType.BIGINT,
- is_null_allowed=False,
- size=20,
- d=0,
- concept=ConceptBrief(id=1, uri="http://www.wikidata.org/entity/Q2221906"),
- unit=UnitBrief(id=1,
- uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"),
- val_min=0,
- val_max=10)]
- )])
-
-
-class OpenSearchClientTest(unittest.TestCase):
-
- def test_update_database_succeeds(self):
- with app.app_context():
- req.tables = [Table(id=1,
- name="Test Table",
- internal_name="test_table",
- queue_name="dbrepo",
- routing_key="dbrepo.test_tuw1.test_table",
- is_public=True,
- is_schema_public=True,
- database_id=req.id,
- constraints=Constraints(uniques=[], foreign_keys=[], checks=[],
- primary_key=[PrimaryKey(id=1,
- table=TableBrief(id=1,
- database_id=req.id,
- name="Test Table",
- internal_name="test_table",
- is_public=True,
- is_schema_public=True,
- is_versioned=True,
- owned_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502"),
- column=ColumnBrief(id=1,
- name="ID",
- database_id=req.id,
- table_id=1,
- internal_name="id",
- type=ColumnType.BIGINT))]),
- is_versioned=True,
- owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
- columns=[Column(id=1,
- database_id=req.id,
- table_id=1,
- ord=0,
- name="ID",
- internal_name="id",
- type=ColumnType.BIGINT,
- is_null_allowed=False)])]
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- database = OpenSearchClient().update_database(database_id=req.id, data=req)
- self.assertEqual(1, database.id)
- self.assertEqual("Test", database.name)
- self.assertEqual("test_tuw1", database.internal_name)
- self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
- self.assertEqual("foo", database.owner.username)
- self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.contact.id)
- self.assertEqual("foo", database.contact.username)
- self.assertEqual("dbrepo", database.exchange_name)
- self.assertEqual(True, database.is_public)
- self.assertEqual(1, database.container.id)
- # ...
- self.assertEqual(1, database.container.image.id)
- # ...
- self.assertEqual(1, len(database.tables))
- self.assertEqual(1, database.tables[0].id)
- self.assertEqual("Test Table", database.tables[0].name)
- self.assertEqual("test_table", database.tables[0].internal_name)
- self.assertEqual("dbrepo", database.tables[0].queue_name)
- self.assertEqual("dbrepo.test_tuw1.test_table", database.tables[0].routing_key)
- self.assertEqual(True, database.tables[0].is_public)
- self.assertEqual(1, database.tables[0].database_id)
- self.assertEqual(True, database.tables[0].is_versioned)
- self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.tables[0].owner.id)
- self.assertEqual("foo", database.tables[0].owner.username)
- self.assertEqual(1, len(database.tables[0].columns))
- self.assertEqual(1, database.tables[0].columns[0].id)
- self.assertEqual("ID", database.tables[0].columns[0].name)
- self.assertEqual("id", database.tables[0].columns[0].internal_name)
- self.assertEqual(ColumnType.BIGINT, database.tables[0].columns[0].type)
- self.assertEqual(1, database.tables[0].columns[0].database_id)
- self.assertEqual(1, database.tables[0].columns[0].table_id)
- self.assertEqual(False, database.tables[0].columns[0].is_null_allowed)
-
- def test_update_database_create_succeeds(self):
- with app.app_context():
- # test
- database = OpenSearchClient().update_database(database_id=req.id, data=req)
- self.assertEqual(1, database.id)
- self.assertEqual("Test", database.name)
- self.assertEqual("test_tuw1", database.internal_name)
- self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
- self.assertEqual("foo", database.owner.username)
- self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.contact.id)
- self.assertEqual("foo", database.contact.username)
- self.assertEqual("dbrepo", database.exchange_name)
- self.assertEqual(True, database.is_public)
- self.assertEqual(1, database.container.id)
- # ...
- self.assertEqual(1, database.container.image.id)
- # ...
- self.assertEqual(1, len(database.tables))
-
- def test_update_database_malformed_fails(self):
- with app.app_context():
- app.config['OPENSEARCH_USERNAME'] = 'i_do_not_exist'
-
- # test
- try:
- database = OpenSearchClient().update_database(database_id=req.id, data=req)
- except opensearchpy.exceptions.TransportError:
- pass
-
- def test_delete_database_fails(self):
- with app.app_context():
-
- # test
- try:
- OpenSearchClient().delete_database(database_id=9999)
- except opensearchpy.exceptions.NotFoundError:
- pass
-
- def test_delete_database_succeeds(self):
- with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- OpenSearchClient().delete_database(database_id=req.id)
-
- def test_get_fields_for_index_database_succeeds(self):
- with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- response = OpenSearchClient().get_fields_for_index(field_type="database")
- self.assertTrue(len(response) > 0)
-
- def test_get_fields_for_index_user_succeeds(self):
- with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- response = OpenSearchClient().get_fields_for_index(field_type="user")
- self.assertTrue(len(response) > 0)
-
- def test_fuzzy_search_succeeds(self):
- with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- OpenSearchClient().fuzzy_search(search_term="test_tuw")
-
- def test_unit_independent_search_fails(self):
- with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
- try:
- OpenSearchClient().unit_independent_search(0, 100, {
- "unit.uri": "http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"})
- self.fail()
- except NotFoundError:
- pass
diff --git a/dbrepo-ui/components/user/UserToolbar.vue b/dbrepo-ui/components/user/UserToolbar.vue
index 54210130d3..59c0f53221 100644
--- a/dbrepo-ui/components/user/UserToolbar.vue
+++ b/dbrepo-ui/components/user/UserToolbar.vue
@@ -11,9 +11,6 @@
<v-tab
:text="$t('toolbars.user.info')"
to="/user/info" />
- <v-tab
- :text="$t('toolbars.user.authentication')"
- to="/user/authentication" />
</v-tabs>
</template>
</v-toolbar>
diff --git a/dbrepo-ui/pages/user/authentication.vue b/dbrepo-ui/pages/user/authentication.vue
deleted file mode 100644
index 912c1878c4..0000000000
--- a/dbrepo-ui/pages/user/authentication.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
- <div
- v-if="loggedIn">
- <UserToolbar />
- <v-window v-model="tab">
- <v-window-item>
- <v-card
- :title="$t('pages.settings.subpages.authentication.title')"
- :subtitle="$t('pages.settings.subpages.authentication.subtitle')"
- variant="flat"
- rounded="0">
- <v-card-text>
- <v-form
- v-model="valid2">
- <v-row dense>
- <v-col md="6">
- <v-text-field
- v-model="password"
- type="password"
- :rules="[v => !!v || $t('validation.required')]"
- required
- :variant="inputVariant"
- persistent-hint
- :label="$t('pages.settings.subpages.authentication.password.label')"
- :hint="$t('pages.settings.subpages.authentication.password.hint')" />
- </v-col>
- </v-row>
- <v-row dense>
- <v-col md="6">
- <v-text-field
- v-model="password2"
- type="password"
- :rules="[v => !!v || $t('validation.required'), v => (!!v && v) === password || $t('Not matching!')]"
- required
- :variant="inputVariant"
- persistent-hint
- :label="$t('pages.settings.subpages.authentication.confirm.label')"
- :hint="$t('pages.settings.subpages.authentication.confirm.hint')" />
- </v-col>
- </v-row>
- <v-row>
- <v-col md="6">
- <v-btn
- size="small"
- color="secondary"
- :loading="loadingUpdate"
- :disabled="!valid2"
- variant="flat"
- type="submit"
- :text="$t('pages.settings.subpages.authentication.submit.text')"
- @click="changePassword" />
- </v-col>
- </v-row>
- </v-form>
- </v-card-text>
- </v-card>
- </v-window-item>
- </v-window>
- <v-breadcrumbs :items="items" class="pa-0 mt-2" />
- </div>
-</template>
-
-<script setup>
-const { loggedIn, user } = useOidcAuth()
-</script>
-<script>
-import UserToolbar from '@/components/user/UserToolbar.vue'
-import { useCacheStore } from '@/stores/cache.js'
-
-export default {
- components: {
- UserToolbar
- },
- data () {
- return {
- tab: 0,
- valid1: false,
- valid2: false,
- loadingUpdate: false,
- items: [
- {
- title: this.$t('navigation.user'),
- to: '/user'
- },
- {
- title: this.$t('toolbars.user.authentication'),
- to: `/user/authentication`,
- disabled: true
- }
- ],
- email: null,
- password: null,
- password2: null,
- cacheStore: useCacheStore()
- }
- },
- computed: {
- cacheUser () {
- return this.cacheStore.getUser
- },
- inputVariant () {
- const runtimeConfig = useRuntimeConfig()
- return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.input.contrast : runtimeConfig.public.variant.input.normal
- },
- buttonVariant () {
- const runtimeConfig = useRuntimeConfig()
- return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.button.contrast : runtimeConfig.public.variant.button.normal
- }
- },
- methods: {
- changePassword () {
- this.loadingUpdate = true
- const userService = useUserService()
- userService.updatePassword(this.cacheUser.uid, {'password': this.password})
- .then(() => {
- const user = Object.assign({}, this.cacheUser)
- user.setup_finished = true
- this.cacheStore.setUser(user)
- // fixme [mweise]: currently nuxt-oidc-auth cannot refresh the session correctly
- const toast = useToastInstance()
- toast.success(this.$t('success.user.password'))
- this.loadingUpdate = false
- })
- .catch(({code, message}) => {
- const toast = useToastInstance()
- if (typeof code !== 'string') {
- return
- }
- toast.error(message)
- this.loadingUpdate = false
- })
- .finally(() => {
- this.loadingUpdate = false
- })
- }
- }
-}
-</script>
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index 7b332886dd5aca385115460c47692fdef8522e0b..f370c8825750a431296ef68c3d482a2e4eee9389 100644
GIT binary patch
delta 972
zcmZ4FztCSgz?+#xgn@yBgQ45oFKYecl+T5X3=C(O7#Kt*KU5O0?+rSgcUVDSPxL4I
z56lj)Ec#wWUzWSIf?u=tj(CK*hFM?2Ta)_uM_blOh34`fIK*dtSf~6!PHW>2?q3Pf
z;hT&NJtuqjJ7oMwir-}Y;^Ic`_1Cw#pI@eAuOK#eEpPlR-ugR>`mR6AEb7QfH4RvE
zWWLVT2&2U|dC`2bYbzb@N7wf*KQYl-+H1br+|1gO)4I)AmVL`<ZHr}IdeV3E+KrCx
z^`GZD>=*31$^Wyy$Zma}_cpa#Z9%8*=Bek1vXokP`!$F;T-tTYS>b->D;u`TDe9M1
zq+*Yxa@zLPgs;%q@$tiE<%_r45Ae%sNSZ7=(f-%g<m1lm*Glsb*Bud8`ZgiGzW85b
z?G@hrIdh$To$X#MtJ!M8qxpExyD1lPmCbitFXf(XC}61h^@F&@x4_~Wi}kq*B`^A0
z!*ASHUaOgAag=GbWY|tS^BF5|ssv}vOJ8s$g{yMesz-m`RJ^}=J^tL^WsZ~Fr}%ym
z_&a@?qld_sg{o3B)!u`mgo}ZJgMp#jo6&FbMn)CpE^oidHyCx9yS@D;b1=z)X-y_o
zFdfLG1*YqmOu+P3CNHphCg!tX`Vw<DNPKew%N!;!<3AfWCz!!2&?E?AOrE4T3ry=P
zP3D9rgUP3rEUiF11|+}<XA3aAbzIEIz~Ji|;;8HC=cXUv&B!Fe3~@Nfy>`mdOs5zp
zKV%k}oUhCSHos0;TI?4i14Cj7ifWLr)+<XhN>4tmEE$7tB|nOl&P+&F<|dY<=Aj!E
z1y|3&z#s|dfZSU!*+E4E?2>F1X{O~&lNTx)PTr})qtNB;7xiaen^PA91H%Uf1_lkd
zHU@?zjbE513o>g>=2ztb2dJE?G}960$q$)bCfBP%Jl3Zw%@o8kIiJO3@_ne#J5_0>
zk8G3q*d=rzA%n<ePF9AlQM?QcDsl`A+9)>t=b!Aa7S6OtcJe|+)5&+$_`!~SuO`jZ
eqBwb>qWxrVb%=#g>e7sglgrfA*tRNxOaK6RmP7mi
delta 980
zcmZ4JzsO%Yz?+#xgn@yBgQ23tH)_*<rs5(-28J_C3=ATZA1H~}_Xha}A65|9o38f1
z(VpST617>guQr$cnX&TPZ#J`OnNC(4Jm2o0zRa{w*4>tY`}d9S6{ndaf)}d)>pD04
zn%Em3pGPllDGFrS-4=brSheNNsg+Y-UfdYs^SvW7J?rfAs<ZRWR~*`E)Aw!S${r@J
zsXw|GN^vjqZl68P*<JhH#jkGl4>gOP__bYH?zuWTe8bN*U*}D=-sW&Nukq1~bvLiv
zSg>^ePrn8CIgbA1|5;z8C;pu^S}?ap@oCv^(Pf{ScCB^PcHmUV%z1iX@@tV&zP&al
zCKrnIoI7OHF6XvST8H<>#}Av858hHg|6Nu?!o+Ge-*5MfL&fiV-`;Eg+i~9Ig`$6b
zQQZ-{)ot<HuPs`n_&zjvkEB%Fl*G8wr2)Ch*LMV$a=$hdP}IEoLEPe-V{wJW`d;-d
zFZf!;Z_HjieR|}q<)M=v9CZnQZZVfhEp^&l$EiM_bgpJjogSsyUhN%TZ~1*Tn<rnO
z*+J)$_$W3-#|wep21b2$44^pSVqoB4V5nd!@twSZQH8m@#CP&_MqMz?&Ljt>HJDVH
zD@uGP2QX=Y=~^ZeFujGz3oOsbd=^Y!WbOvho8wvLFo7BW*tj{t3?6|dL9mvIinGA9
zp3-DacsiJTO3Bg+#A84LoN%@P!&}ECj0_CEt|5-Po_=on0p5&EBFqqngWPMYEX{P9
zaq<IZk;!?=JRl1v*D6bk{bpofNG!ony-r!WUWN%QRZ?1>nVN^90^J$>D9&(ULUKlK
zVi^I=k|>%B;hHCVsK|qZAxlM?X$8~d1&W4~cc}0vl$ZEM{h8P1)WyKS@PUDWK?AOz
zfniDGSEk7V%vzKAR3ToJRh4Es$~^f2v&-Z<s8Fw}G*d9k<UAIW$@ic_Z&jt4KCw;a
zWtZTG1REp|f`ZLZO`3^8V6vZDIMZU;$qN)sC*M)y2RrMXnlw|Z;^YO2_LIHTdB8%E
S>e7r#lS|dr*tRKwTm=9Sl1q62
diff --git a/make/build.mk b/make/build.mk
index 270b2cee6f..61f2f7448f 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -17,6 +17,7 @@ build-metadata-service: ## Build the Metadata Service.
.PHONY: build-auth-event-listener
build-auth-event-listener: ## Build the Auth Service Event Listener.
mvn -f ./dbrepo-auth-service/listeners/pom.xml clean package -DskipTests
+ cp ./dbrepo-auth-service/listeners/target/create-event-listener.jar ./helm/dbrepo/files/create-event-listener.jar
.PHONY: build-ui
build-ui: ## Build the UI.
--
GitLab