diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 3dacfc7e94d4107d24133eb08a022d859edd1bd8..df4596e8eadbfc3c5126bff315bd2aa5e5c3998d 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -52,7 +52,6 @@
<apache-jena.version>4.10.0</apache-jena.version>
<opencsv.version>5.7.1</opencsv.version>
<super-csv.version>2.4.0</super-csv.version>
- <keycloak.version>26.0.4</keycloak.version>
<testcontainers.version>1.19.1</testcontainers.version>
<jackson.version>2.15.2</jackson.version>
<keycloak-testcontainer.version>3.2.0</keycloak-testcontainer.version>
@@ -132,16 +131,6 @@
<version>${commons-validator.version}</version>
</dependency>
<!-- Authentication -->
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-common</artifactId>
- <version>${keycloak.version}</version>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak.version}</version>
- </dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
index b8deb55db028780ef1a9bcbdcd6f22b94432fe62..877488867683c774ca1671c7402df91f6f746d26 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.Database;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.DatabaseAccess;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.AccessService;
import at.ac.tuwien.ifs.dbrepo.service.DashboardService;
import at.ac.tuwien.ifs.dbrepo.service.DatabaseService;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ConceptEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ConceptEndpoint.java
index a25f267df8715549f7cf0949f8f8a3057aec5f8a..80dc3a8f623ad9e71935b52747fa7f79079e2092 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ConceptEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ConceptEndpoint.java
@@ -1,7 +1,6 @@
package at.ac.tuwien.ifs.dbrepo.endpoints;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.ConceptDto;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.ConceptService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ContainerEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ContainerEndpoint.java
index ab5301c87ece25c79aab200ceadede6e0f79c850..84ce254ab4f9cbb4f4afb7f7d1da4526e9eefdda 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ContainerEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ContainerEndpoint.java
@@ -8,7 +8,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.container.Container;
import at.ac.tuwien.ifs.dbrepo.core.exception.ContainerAlreadyExistsException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ContainerNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.ContainerService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
index 242422496a61d9f99f651409eed67a8f04634fc5..7a7544ea1f4c617132c6ead93cf785cf765c2ec7 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.container.Container;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.Database;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.*;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/IdentifierEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/IdentifierEndpoint.java
index d6a4c7a7d5c039283a2ff81536164268973e9629..1b9f524a86a508de1922ced9ce51e6e27be6e3d7 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/IdentifierEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/IdentifierEndpoint.java
@@ -11,7 +11,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.Identifier;
import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.IdentifierStatusType;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.*;
import at.ac.tuwien.ifs.dbrepo.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ImageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ImageEndpoint.java
index 8d51d99bd1e8c36913ad39e0b6dee1fb16af3940..bf1e09f5d45158084bf364b386643584ca415728 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ImageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ImageEndpoint.java
@@ -9,7 +9,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.ContainerImage;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageAlreadyExistsException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageInvalidException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.ImageService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/LicenseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/LicenseEndpoint.java
index 125a030acae099f788f8459b100fb72773dc7098..8588942a402ae7916bfe5afe34eff1badc4115be 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/LicenseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/LicenseEndpoint.java
@@ -1,7 +1,6 @@
package at.ac.tuwien.ifs.dbrepo.endpoints;
import at.ac.tuwien.ifs.dbrepo.core.api.database.LicenseDto;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.LicenseService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/MessageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/MessageEndpoint.java
index 6fed77bd5c41a141a6098b4c66a6d296dabf4c29..da1f5b8b254dc19e41a23ab33f1b6a6362668d50 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/MessageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/MessageEndpoint.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageUpdateDto;
import at.ac.tuwien.ifs.dbrepo.core.entity.maintenance.BannerMessage;
import at.ac.tuwien.ifs.dbrepo.core.exception.MessageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.BannerMessageService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/OntologyEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/OntologyEndpoint.java
index 8e2b5381df9af1a506a9d7b7fb2158e08e1122e1..a64f4301fd2310bf7363aa95fac9fd7e63397cb9 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/OntologyEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/OntologyEndpoint.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.exception.FilterBadRequestException;
import at.ac.tuwien.ifs.dbrepo.core.exception.MalformedException;
import at.ac.tuwien.ifs.dbrepo.core.exception.OntologyNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.UriMalformedException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.EntityService;
import at.ac.tuwien.ifs.dbrepo.service.OntologyService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/TableEndpoint.java
index 880bf62fb791ff4f684caddb78a44f83a926107c..4868ab072af5802f28e8985337f58dabc0233be8 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/TableEndpoint.java
@@ -13,7 +13,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.Database;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.DatabaseAccess;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.table.Table;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.*;
import at.ac.tuwien.ifs.dbrepo.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UnitEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UnitEndpoint.java
index 90b9cacf47e177374f0c43cbdb9ab70b2c888090..dc46567736e779a9611eecdeca9068240100f24c 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UnitEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UnitEndpoint.java
@@ -1,7 +1,6 @@
package at.ac.tuwien.ifs.dbrepo.endpoints;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.UnitDto;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.UnitService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UserEndpoint.java
index 4bf7f2d976211cdeca66992536f67c6ea40026b6..fba4c4e24ed6640ac284421e41b6705db3e552ba 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/UserEndpoint.java
@@ -9,7 +9,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.AuthServiceException;
import at.ac.tuwien.ifs.dbrepo.core.exception.NotAllowedException;
import at.ac.tuwien.ifs.dbrepo.core.exception.UserNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.UserService;
import io.micrometer.observation.annotation.Observed;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
index bc5033821e37ec205985b8e3eaf9dd40f1f5109b..aef7a76b864f932e1443a03396bc5fb41d19c116 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
@@ -9,7 +9,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.Database;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.DatabaseAccess;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.View;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.DashboardService;
import at.ac.tuwien.ifs.dbrepo.service.DatabaseService;
import at.ac.tuwien.ifs.dbrepo.service.UserService;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpointUnitTest.java
index 357aa6daa50da9cd34e1b99f26683760fe0d7db5..9a37afb0b3f7288f470e8d5812417caee7faef00 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpointUnitTest.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.DatabaseAccess;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.AccessService;
import at.ac.tuwien.ifs.dbrepo.service.DashboardService;
import at.ac.tuwien.ifs.dbrepo.service.DatabaseService;
@@ -26,7 +25,6 @@ import org.springframework.security.test.context.support.WithAnonymousUser;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import java.io.IOException;
import java.security.Principal;
import java.util.List;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/utils/KeycloakUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/utils/KeycloakUtils.java
index f1f4f85f70e63482c6038e18f62c2fe2268b208f..11af3169edf45a01dd9851348618bd9db77b9260 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/utils/KeycloakUtils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/utils/KeycloakUtils.java
@@ -3,7 +3,6 @@ package at.ac.tuwien.ifs.dbrepo.utils;
import at.ac.tuwien.ifs.dbrepo.core.api.keycloak.UserCreateDto;
import at.ac.tuwien.ifs.dbrepo.config.KeycloakConfig;
import at.ac.tuwien.ifs.dbrepo.core.exception.UserNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import jakarta.ws.rs.core.Response;
import lombok.extern.log4j.Log4j2;
import org.keycloak.admin.client.Keycloak;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/JacksonConfig.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/JacksonConfig.java
index 8df011ab76a2b2471f94086143d8db8e3c4a916f..8ff2d5434e15532168491e1f5f466b041d475c9d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/JacksonConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/JacksonConfig.java
@@ -1,6 +1,5 @@
package at.ac.tuwien.ifs.dbrepo.config;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
@@ -10,7 +9,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import java.util.Date;
import java.util.TimeZone;
@Slf4j
@@ -18,7 +16,7 @@ import java.util.TimeZone;
public class JacksonConfig {
@Bean
- public ObjectMapper objectMapper() throws JsonProcessingException {
+ public ObjectMapper objectMapper() {
final ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new Jdk8Module());
objectMapper.registerModule(new JavaTimeModule());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/KeycloakGatewayImpl.java
index 1095f9acaa4909b1e54b1fff014485eafd9f18d3..1a5e226260d18650b3d763c793f63a6e859ab253 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/KeycloakGatewayImpl.java
@@ -6,7 +6,6 @@ import at.ac.tuwien.ifs.dbrepo.config.KeycloakConfig;
import at.ac.tuwien.ifs.dbrepo.core.exception.AuthServiceException;
import at.ac.tuwien.ifs.dbrepo.core.exception.UserNotFoundException;
import at.ac.tuwien.ifs.dbrepo.gateway.KeycloakGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import jakarta.ws.rs.ForbiddenException;
import jakarta.ws.rs.NotAuthorizedException;
import jakarta.ws.rs.NotFoundException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/SearchServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/SearchServiceGatewayImpl.java
index c7d659380e491e7d0716dd425c24429c806a7872..16e981cf12c3d0f4edd971368ee4cf6bff4ed717 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/SearchServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/SearchServiceGatewayImpl.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.exception.DatabaseNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.SearchServiceConnectionException;
import at.ac.tuwien.ifs.dbrepo.core.exception.SearchServiceException;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
index c1cceea979af815311076b4cb9b2305990c25e82..663d51f87a66b1b43a8c473ec39b0bf335222d1f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.DataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import at.ac.tuwien.ifs.dbrepo.service.AccessService;
import at.ac.tuwien.ifs.dbrepo.service.DatabaseService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/BannerMessageServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/BannerMessageServiceImpl.java
index ed64c37a7e814d86bd71ba15ea56861b76b26d36..f1406daaeef68e0e3560a18a6eec58e880330e73 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/BannerMessageServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/BannerMessageServiceImpl.java
@@ -4,7 +4,6 @@ import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageCreateDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageUpdateDto;
import at.ac.tuwien.ifs.dbrepo.core.entity.maintenance.BannerMessage;
import at.ac.tuwien.ifs.dbrepo.core.exception.MessageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.BannerMessageRepository;
import at.ac.tuwien.ifs.dbrepo.service.BannerMessageService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ContainerServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ContainerServiceImpl.java
index 1a62466996ed8bec94d14ae69c30c5de4991f6fd..b0dee96e59eb15fa3abbc1048f731d7ac14b887a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ContainerServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ContainerServiceImpl.java
@@ -6,7 +6,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.ContainerImage;
import at.ac.tuwien.ifs.dbrepo.core.exception.ContainerAlreadyExistsException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ContainerNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.ContainerRepository;
import at.ac.tuwien.ifs.dbrepo.repository.ImageRepository;
import at.ac.tuwien.ifs.dbrepo.service.ContainerService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DashboardServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DashboardServiceImpl.java
index 2b0c50ef3273604a05cdb141a1de2702f65e7314..f93f6064eee5d4c595befcf3afb3a9872fb07c06 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DashboardServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DashboardServiceImpl.java
@@ -7,7 +7,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.DashboardServiceConnectionException;
import at.ac.tuwien.ifs.dbrepo.core.exception.DashboardServiceException;
import at.ac.tuwien.ifs.dbrepo.gateway.DashboardServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.service.DashboardService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DataCiteIdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DataCiteIdentifierServiceImpl.java
index 0a20ac72675e046ac651834294301ee5608047ed..a4d0a3e12199c87589936921682fd6959e8a971d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DataCiteIdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DataCiteIdentifierServiceImpl.java
@@ -16,7 +16,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.Identifier;
import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.IdentifierStatusType;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.IdentifierRepository;
import at.ac.tuwien.ifs.dbrepo.service.IdentifierService;
import lombok.extern.slf4j.Slf4j;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DatabaseServiceImpl.java
index 7fa1d8063c996242750eaff5d62ddca4fb952ef9..4e649f4b036c1d9e2afd72392c1a822bc1cc88b5 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/DatabaseServiceImpl.java
@@ -20,7 +20,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.DataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import at.ac.tuwien.ifs.dbrepo.service.DatabaseService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
index eb600fd0a35c1a4e35270eb40b5948dc8a1be17b..71f03d977187f96d8dc86d173878406ba85ff6ac 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
@@ -16,7 +16,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.DataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.IdentifierRepository;
import at.ac.tuwien.ifs.dbrepo.service.IdentifierService;
import at.ac.tuwien.ifs.dbrepo.service.ViewService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ImageServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ImageServiceImpl.java
index 5e497b4b6f7146156a97bce42b3afb201550ef82..47db23d6c2682f5e3680af5af301fd8d94c6ce72 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ImageServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ImageServiceImpl.java
@@ -6,7 +6,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.ContainerImage;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageAlreadyExistsException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageInvalidException;
import at.ac.tuwien.ifs.dbrepo.core.exception.ImageNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.ImageRepository;
import at.ac.tuwien.ifs.dbrepo.service.ImageService;
import jakarta.validation.ConstraintViolationException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/MetadataServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/MetadataServiceImpl.java
index cc81f80fc336805ec634369bc8bf63064c72c9ab..217cd1f341b583da827ef4ced8cf67b41c02dbbc 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/MetadataServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/MetadataServiceImpl.java
@@ -10,7 +10,6 @@ import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.CrossrefGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.OrcidGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.RorGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.oaipmh.OaiErrorType;
import at.ac.tuwien.ifs.dbrepo.oaipmh.OaiListIdentifiersParameters;
import at.ac.tuwien.ifs.dbrepo.oaipmh.OaiRecordParameters;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/OntologyServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/OntologyServiceImpl.java
index f779734326d8ab97aaa76a961f872293973d500a..0e7bc26e517e094c9ab6a579c49052e4ef160a1a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/OntologyServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/OntologyServiceImpl.java
@@ -4,7 +4,6 @@ import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyCreateDto;
import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyModifyDto;
import at.ac.tuwien.ifs.dbrepo.core.entity.semantics.Ontology;
import at.ac.tuwien.ifs.dbrepo.core.exception.OntologyNotFoundException;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.OntologyRepository;
import at.ac.tuwien.ifs.dbrepo.service.OntologyService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/TableServiceImpl.java
index d91ce20cb78465335084db8b58fe789b0e65cab7..31c0171d096ef0eaf2328c25577113a1df19ae76 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/TableServiceImpl.java
@@ -14,7 +14,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.DataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import at.ac.tuwien.ifs.dbrepo.service.*;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
index 1a243b91d07370d8e567ad56d6d97cab91c04d16..60de7a0955d81fdab04bd1e3b3bb23dcd6b1afd1 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
@@ -9,7 +9,6 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
import at.ac.tuwien.ifs.dbrepo.gateway.DataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.gateway.SearchServiceGateway;
-import at.ac.tuwien.ifs.dbrepo.mapper.MetadataMapper;
import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import at.ac.tuwien.ifs.dbrepo.service.ViewService;
import com.google.common.hash.Hashing;
diff --git a/lib/java/dbrepo-core/pom.xml b/lib/java/dbrepo-core/pom.xml
index a6394c9187c7b9d79c11266d7b6f723439d6da54..87dd20ddc7c0842759a29bb022a2c4b3c24bc1d3 100644
--- a/lib/java/dbrepo-core/pom.xml
+++ b/lib/java/dbrepo-core/pom.xml
@@ -36,6 +36,7 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lombok.version>1.18.36</lombok.version>
+ <keycloak.version>26.0.4</keycloak.version>
<mapstruct.version>1.6.3</mapstruct.version>
<spring-cloud.version>4.1.4</spring-cloud.version>
<jackson-datatype.version>2.15.0</jackson-datatype.version>
@@ -77,6 +78,16 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- Mapping -->
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-admin-client</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/Serialize.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/Serialize.java
new file mode 100644
index 0000000000000000000000000000000000000000..073a7c669901c33384a9b402b2c247cb50993694
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/Serialize.java
@@ -0,0 +1,32 @@
+package at.ac.tuwien.ifs.dbrepo.core;
+
+import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.io.IOException;
+import java.util.TimeZone;
+
+public class Serialize extends BaseTest {
+
+ public static ObjectMapper objectMapper() {
+ final ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.registerModule(new Jdk8Module());
+ objectMapper.registerModule(new JavaTimeModule());
+ objectMapper.registerModule(new Hibernate6Module()); /* lazy load mapping on REST endpoints */
+ objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ objectMapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+ objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
+ return objectMapper;
+ }
+
+ public static void main(String[] args) throws IOException {
+// objectMapper().writeValue(new File("./src/main/resources/database-1.json"), IDENTIFIER_1);
+ }
+
+}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MetadataMapper.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/mapper/MetadataMapper.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MetadataMapper.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/mapper/MetadataMapper.java
index 324868bed11f7a6bfeceb867b987f674fc8c1fa6..249a9842f23d34494d58631ab40e8c325820fc46 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MetadataMapper.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/mapper/MetadataMapper.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.ifs.dbrepo.mapper;
+package at.ac.tuwien.ifs.dbrepo.core.mapper;
import at.ac.tuwien.ifs.dbrepo.core.api.container.ContainerBriefDto;
import at.ac.tuwien.ifs.dbrepo.core.api.container.ContainerDto;
@@ -14,10 +14,7 @@ import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TableDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.ColumnBriefDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.ColumnDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.CreateTableColumnDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.ConceptDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.ConceptSaveDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.UnitDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.UnitSaveDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.*;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.ConstraintsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.CreateTableConstraintsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.foreign.ForeignKeyBriefDto;
@@ -39,10 +36,17 @@ import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageCreateDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageTypeDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.OrcidActivitiesSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.OrcidEmploymentsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedSourceTypeDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.OrcidPersonDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidNameDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidValueDto;
import at.ac.tuwien.ifs.dbrepo.core.api.ror.RorDto;
import at.ac.tuwien.ifs.dbrepo.core.api.semantics.EntityDto;
import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyBriefDto;
@@ -277,6 +281,38 @@ public interface MetadataMapper {
})
ExternalMetadataDto orcidDtoToExternalMetadataDto(OrcidDto data);
+ default OrcidDto userToOrcidDto(User data) {
+ return OrcidDto.builder()
+ .person(OrcidPersonDto.builder()
+ .name(OrcidNameDto.builder()
+ .givenNames(OrcidValueDto.builder()
+ .value(data.getFirstname())
+ .build())
+ .familyName(OrcidValueDto.builder()
+ .value(data.getLastname())
+ .build())
+ .build())
+ .build())
+ .activitiesSummary(OrcidActivitiesSummaryDto.builder()
+ .employments(OrcidEmploymentsDto.builder()
+ .affiliationGroup(new OrcidAffiliationGroupDto[]{
+ OrcidAffiliationGroupDto.builder()
+ .summaries(new OrcidEmploymentSummaryDto[]{
+ OrcidEmploymentSummaryDto.builder()
+ .employmentSummary(OrcidSummaryDto.builder()
+ .organization(OrcidOrganizationDto.builder()
+ .name(data.getAffiliation())
+ .build())
+ .build())
+ .build()
+ })
+ .build()
+ })
+ .build())
+ .build())
+ .build();
+ }
+
@Mappings({
@Mapping(target = "organizationName", source = "employmentSummary.organization.name"),
@Mapping(target = "ringgoldId", expression = "java(disambiguatedOrganizationToRinggoldId(data.getEmploymentSummary().getOrganization().getDisambiguatedOrganization()))"),
@@ -535,8 +571,12 @@ public interface MetadataMapper {
ConceptDto tableColumnConceptToConceptDto(TableColumnConcept data);
+ ConceptBriefDto tableColumnConceptToConceptBriefDto(TableColumnConcept data);
+
UnitDto tableColumnUnitToUnitDto(TableColumnUnit data);
+ UnitBriefDto tableColumnUnitToUnitBriefDto(TableColumnUnit data);
+
TableColumnUnit unitSaveDtoToTableColumnUnit(UnitSaveDto data);
TableColumnUnit entityDtoToTableColumnUnit(EntityDto data);
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
index 1510a66e2de6d3e3e49150f02abb0c9be26b9730..a45ead5f7bdbced79d6d43b5a613c9c23db754ca 100644
--- a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
@@ -5,45 +5,37 @@ import at.ac.tuwien.ifs.dbrepo.core.api.amqp.CreateVirtualHostDto;
import at.ac.tuwien.ifs.dbrepo.core.api.amqp.ExchangeDto;
import at.ac.tuwien.ifs.dbrepo.core.api.amqp.GrantVirtualHostPermissionsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.amqp.QueueDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.auth.CreateUserDto;
import at.ac.tuwien.ifs.dbrepo.core.api.container.ContainerBriefDto;
import at.ac.tuwien.ifs.dbrepo.core.api.container.ContainerDto;
import at.ac.tuwien.ifs.dbrepo.core.api.container.image.*;
import at.ac.tuwien.ifs.dbrepo.core.api.database.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.*;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.FilterDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.FilterTypeDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.SubsetDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.*;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.*;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.ConceptBriefDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.ConceptDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.UnitBriefDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.columns.concepts.UnitDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.ConstraintsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.CreateTableConstraintsDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.foreign.*;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.foreign.CreateForeignKeyDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.unique.UniqueDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.datacite.DataCiteBody;
-import at.ac.tuwien.ifs.dbrepo.core.api.datacite.DataCiteData;
-import at.ac.tuwien.ifs.dbrepo.core.api.datacite.doi.DataCiteDoi;
import at.ac.tuwien.ifs.dbrepo.core.api.grafana.CreateDashboardDto;
import at.ac.tuwien.ifs.dbrepo.core.api.grafana.CreateDashboardResponseDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierFunderTypeDto;
import at.ac.tuwien.ifs.dbrepo.core.api.keycloak.*;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageCreateDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageTypeDto;
import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageUpdateDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.OrcidDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.OrcidActivitiesSummaryDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.OrcidEmploymentsDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.OrcidPersonDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidNameDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidValueDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.semantics.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.user.UserAttributesDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyBriefDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyCreateDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.semantics.OntologyModifyDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.user.internal.UpdateUserPasswordDto;
import at.ac.tuwien.ifs.dbrepo.core.entity.container.Container;
import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.ContainerImage;
import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.Operator;
@@ -59,13 +51,21 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.table.constraints.foreignKey
import at.ac.tuwien.ifs.dbrepo.core.entity.database.table.constraints.foreignKey.ReferenceType;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.table.constraints.primaryKey.PrimaryKey;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.table.constraints.unique.Unique;
-import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.IdentifierFunderType;
import at.ac.tuwien.ifs.dbrepo.core.entity.maintenance.BannerMessage;
import at.ac.tuwien.ifs.dbrepo.core.entity.maintenance.BannerMessageType;
import at.ac.tuwien.ifs.dbrepo.core.entity.semantics.Ontology;
import at.ac.tuwien.ifs.dbrepo.core.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.core.mapper.MetadataMapper;
+import at.ac.tuwien.ifs.dbrepo.core.mapper.MetadataMapperImpl;
import at.ac.tuwien.ifs.dbrepo.core.test.utils.ArrayUtils;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.core.io.InputStreamResource;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
@@ -143,7 +143,19 @@ import static java.time.temporal.ChronoUnit.MINUTES;
@TestPropertySource(locations = "classpath:application.properties")
public class BaseTest {
- private static final ObjectMapper objectMapper = new ObjectMapper();
+ private static ObjectMapper objectMapper() {
+ final ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.registerModule(new Jdk8Module());
+ objectMapper.registerModule(new JavaTimeModule());
+ objectMapper.registerModule(new Hibernate6Module()); /* lazy load mapping on REST endpoints */
+ objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ objectMapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+ objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
+ return objectMapper;
+ }
+
+ private static final MetadataMapper metadataMapper = new MetadataMapperImpl();
private static final String resourcesPath = "./src/main/resources";
@@ -164,18 +176,100 @@ public class BaseTest {
public static final QueryDto QUERY_7_DTO;
public static final QueryDto QUERY_8_DTO;
public static final QueryDto QUERY_9_DTO;
+ public static final TableColumnConcept CONCEPT_1;
+ public static final ConceptDto CONCEPT_1_DTO;
+ public static final ConceptBriefDto CONCEPT_1_BRIEF_DTO;
+ public static final TableColumnConcept CONCEPT_2;
+ public static final ConceptDto CONCEPT_2_DTO;
+ public static final ConceptBriefDto CONCEPT_2_BRIEF_DTO;
+ public static final TableColumnUnit UNIT_1;
+ public static final UnitDto UNIT_1_DTO;
+ public static final UnitBriefDto UNIT_1_BRIEF_DTO;
+ public static final TableColumnUnit UNIT_2;
+ public static final UnitDto UNIT_2_DTO;
+ public static final UnitBriefDto UNIT_2_BRIEF_DTO;
+ public static final User USER_1;
+ public static final UserDto USER_1_DTO;
+ public static final UserBriefDto USER_1_BRIEF_DTO;
+ public static final User USER_2;
+ public static final UserDto USER_2_DTO;
+ public static final UserBriefDto USER_2_BRIEF_DTO;
+ public static final User USER_3;
+ public static final UserDto USER_3_DTO;
+ public static final UserBriefDto USER_3_BRIEF_DTO;
+ public static final User USER_4;
+ public static final UserDto USER_4_DTO;
+ public static final UserBriefDto USER_4_BRIEF_DTO;
+ public static final User USER_5;
+ public static final UserDto USER_5_DTO;
+ public static final UserBriefDto USER_5_BRIEF_DTO;
+// public static final Identifier IDENTIFIER_1;
+// public static final Identifier IDENTIFIER_2;
+// public static final Identifier IDENTIFIER_3;
+// public static final Identifier IDENTIFIER_4;
+// public static final Identifier IDENTIFIER_5;
+// public static final Identifier IDENTIFIER_6;
+// public static final Identifier IDENTIFIER_7;
static {
try {
- QUERY_1_DTO = objectMapper.readValue(new File(resourcesPath + "/query-1.json"), QueryDto.class);
- QUERY_2_DTO = objectMapper.readValue(new File(resourcesPath + "/query-2.json"), QueryDto.class);
- QUERY_3_DTO = objectMapper.readValue(new File(resourcesPath + "/query-3.json"), QueryDto.class);
- QUERY_4_DTO = objectMapper.readValue(new File(resourcesPath + "/query-4.json"), QueryDto.class);
- QUERY_5_DTO = objectMapper.readValue(new File(resourcesPath + "/query-5.json"), QueryDto.class);
- QUERY_6_DTO = objectMapper.readValue(new File(resourcesPath + "/query-6.json"), QueryDto.class);
- QUERY_7_DTO = objectMapper.readValue(new File(resourcesPath + "/query-7.json"), QueryDto.class);
- QUERY_8_DTO = objectMapper.readValue(new File(resourcesPath + "/query-8.json"), QueryDto.class);
- QUERY_9_DTO = objectMapper.readValue(new File(resourcesPath + "/query-9.json"), QueryDto.class);
+ QUERY_1_DTO = objectMapper().readValue(new File(resourcesPath + "/query-1.json"), QueryDto.class);
+ QUERY_2_DTO = objectMapper().readValue(new File(resourcesPath + "/query-2.json"), QueryDto.class);
+ QUERY_3_DTO = objectMapper().readValue(new File(resourcesPath + "/query-3.json"), QueryDto.class);
+ QUERY_4_DTO = objectMapper().readValue(new File(resourcesPath + "/query-4.json"), QueryDto.class);
+ QUERY_5_DTO = objectMapper().readValue(new File(resourcesPath + "/query-5.json"), QueryDto.class);
+ QUERY_6_DTO = objectMapper().readValue(new File(resourcesPath + "/query-6.json"), QueryDto.class);
+ QUERY_7_DTO = objectMapper().readValue(new File(resourcesPath + "/query-7.json"), QueryDto.class);
+ QUERY_8_DTO = objectMapper().readValue(new File(resourcesPath + "/query-8.json"), QueryDto.class);
+ QUERY_9_DTO = objectMapper().readValue(new File(resourcesPath + "/query-9.json"), QueryDto.class);
+ CONCEPT_1 = objectMapper().readValue(new File(resourcesPath + "/concept-1.json"), TableColumnConcept.class);
+ CONCEPT_1_DTO = metadataMapper.tableColumnConceptToConceptDto(CONCEPT_1);
+ CONCEPT_1_BRIEF_DTO = metadataMapper.tableColumnConceptToConceptBriefDto(CONCEPT_1);
+ CONCEPT_2 = objectMapper().readValue(new File(resourcesPath + "/concept-2.json"), TableColumnConcept.class);
+ CONCEPT_2_DTO = metadataMapper.tableColumnConceptToConceptDto(CONCEPT_2);
+ CONCEPT_2_BRIEF_DTO = metadataMapper.tableColumnConceptToConceptBriefDto(CONCEPT_2);
+ UNIT_1 = objectMapper().readValue(new File(resourcesPath + "/unit-1.json"), TableColumnUnit.class);
+ UNIT_1_DTO = metadataMapper.tableColumnUnitToUnitDto(UNIT_1);
+ UNIT_1_BRIEF_DTO = metadataMapper.tableColumnUnitToUnitBriefDto(UNIT_1);
+ UNIT_2 = objectMapper().readValue(new File(resourcesPath + "/unit-2.json"), TableColumnUnit.class);
+ UNIT_2_DTO = metadataMapper.tableColumnUnitToUnitDto(UNIT_2);
+ UNIT_2_BRIEF_DTO = metadataMapper.tableColumnUnitToUnitBriefDto(UNIT_2);
+ USER_1 = objectMapper().readValue(new File(resourcesPath + "/user-1.json"), User.class);
+ USER_1_DTO = metadataMapper.userToUserDto(USER_1);
+ USER_1_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
+ USER_2 = objectMapper().readValue(new File(resourcesPath + "/user-2.json"), User.class);
+ USER_2_DTO = metadataMapper.userToUserDto(USER_1);
+ USER_2_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
+ USER_3 = objectMapper().readValue(new File(resourcesPath + "/user-3.json"), User.class);
+ USER_3_DTO = metadataMapper.userToUserDto(USER_1);
+ USER_3_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
+ USER_4 = objectMapper().readValue(new File(resourcesPath + "/user-4.json"), User.class);
+ USER_4_DTO = metadataMapper.userToUserDto(USER_1);
+ USER_4_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
+ USER_5 = objectMapper().readValue(new File(resourcesPath + "/user-5.json"), User.class);
+ USER_5_DTO = metadataMapper.userToUserDto(USER_1);
+ USER_5_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
+// IDENTIFIER_1 = objectMapper().readValue(new File(resourcesPath + "/identifier-1.json"), Identifier.class);
+// IDENTIFIER_1_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_1);
+// IDENTIFIER_1_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_1);
+// IDENTIFIER_2 = objectMapper().readValue(new File(resourcesPath + "/identifier-2.json"), Identifier.class);
+// IDENTIFIER_2_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_2);
+// IDENTIFIER_2_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_2);
+// IDENTIFIER_3 = objectMapper().readValue(new File(resourcesPath + "/identifier-3.json"), Identifier.class);
+// IDENTIFIER_3_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_3);
+// IDENTIFIER_3_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_3);
+// IDENTIFIER_4 = objectMapper().readValue(new File(resourcesPath + "/identifier-4.json"), Identifier.class);
+// IDENTIFIER_4_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_4);
+// IDENTIFIER_4_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_4);
+// IDENTIFIER_5 = objectMapper().readValue(new File(resourcesPath + "/identifier-5.json"), Identifier.class);
+// IDENTIFIER_5_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_5);
+// IDENTIFIER_5_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_5);
+// IDENTIFIER_6 = objectMapper().readValue(new File(resourcesPath + "/identifier-6.json"), Identifier.class);
+// IDENTIFIER_6_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_6);
+// IDENTIFIER_6_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_6);
+// IDENTIFIER_7 = objectMapper().readValue(new File(resourcesPath + "/identifier-7.json"), Identifier.class);
+// IDENTIFIER_7_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_7);
+// IDENTIFIER_7_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_7);
} catch (IOException e) {
throw new RuntimeException("Failed to initialize core test library", e);
}
@@ -309,154 +403,6 @@ public class BaseTest {
.scope(TOKEN_ACCESS_SCOPE)
.build();
- public static final UUID CONCEPT_1_ID = UUID.fromString("8cabc011-4bdf-44d4-9d33-b2648e2ddbf1");
- 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 static final ConceptSaveDto CONCEPT_1_SAVE_DTO = ConceptSaveDto.builder()
- .uri(CONCEPT_1_URI)
- .name(CONCEPT_1_NAME)
- .description(CONCEPT_1_DESCRIPTION)
- .build();
-
- 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 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 static final TableColumnConcept CONCEPT_1 = TableColumnConcept.builder()
- .id(CONCEPT_1_ID)
- .uri(CONCEPT_1_URI)
- .name(CONCEPT_1_NAME)
- .description(CONCEPT_1_DESCRIPTION)
- .created(CONCEPT_1_CREATED)
- .build();
-
- public static final EntityDto CONCEPT_1_ENTITY_DTO = EntityDto.builder()
- .uri(CONCEPT_1_URI)
- .description(CONCEPT_1_DESCRIPTION)
- .label(CONCEPT_1_NAME)
- .build();
-
- public static final UUID CONCEPT_2_ID = UUID.fromString("c5cf9914-15c1-4813-af11-eb2a070d59a9");
- 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 static final ConceptSaveDto CONCEPT_2_SAVE_DTO = ConceptSaveDto.builder()
- .uri(CONCEPT_2_URI)
- .name(CONCEPT_2_NAME)
- .description(CONCEPT_2_DESCRIPTION)
- .build();
-
- 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 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 static final TableColumnConcept CONCEPT_2 = TableColumnConcept.builder()
- .id(CONCEPT_2_ID)
- .uri(CONCEPT_2_URI)
- .name(CONCEPT_2_NAME)
- .description(CONCEPT_2_DESCRIPTION)
- .created(CONCEPT_2_CREATED)
- .build();
-
- public static final UUID UNIT_1_ID = UUID.fromString("1fee60e4-42f8-4883-85a8-e282fddf6a62");
- 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 static final UnitSaveDto UNIT_1_SAVE_DTO = UnitSaveDto.builder()
- .uri(UNIT_1_URI)
- .name(UNIT_1_NAME)
- .description(UNIT_1_DESCRIPTION)
- .build();
-
- 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 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 static final TableColumnUnit UNIT_1 = TableColumnUnit.builder()
- .id(UNIT_1_ID)
- .uri(UNIT_1_URI)
- .name(UNIT_1_NAME)
- .description(UNIT_1_DESCRIPTION)
- .created(UNIT_1_CREATED)
- .build();
-
- public static final EntityDto UNIT_1_ENTITY_DTO = EntityDto.builder()
- .uri(UNIT_1_URI)
- .description(UNIT_1_DESCRIPTION)
- .label(UNIT_1_NAME)
- .build();
-
- public static final UUID UNIT_2_ID = UUID.fromString("d88591a9-5171-4b12-8381-bcff1cfe7442");
- 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 static final UnitSaveDto UNIT_2_SAVE_DTO = UnitSaveDto.builder()
- .uri(UNIT_2_URI)
- .name(UNIT_2_NAME)
- .description(UNIT_2_DESCRIPTION)
- .build();
-
- 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 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 static final TableColumnUnit UNIT_2 = TableColumnUnit.builder()
- .id(UNIT_2_ID)
- .uri(UNIT_2_URI)
- .name(UNIT_2_NAME)
- .description(UNIT_2_DESCRIPTION)
- .created(UNIT_2_CREATED)
- .build();
-
public static final String USER_BROKER_USERNAME = "guest";
@SuppressWarnings("java:S2068")
public static final String USER_BROKER_PASSWORD = "guest";
@@ -491,37 +437,8 @@ public class BaseTest {
public static final Principal USER_LOCAL_ADMIN_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_LOCAL_ADMIN_DETAILS,
USER_LOCAL_ADMIN_PASSWORD, USER_LOCAL_ADMIN_DETAILS.getAuthorities());
- 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 static final String USER_1_PASSWORD = "junit1";
- @SuppressWarnings("java:S2068")
- 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 static final UserAttributesDto USER_1_ATTRIBUTES_DTO = UserAttributesDto.builder()
- .theme(USER_1_THEME)
- .orcid(USER_1_ORCID_URL)
- .affiliation(USER_1_AFFILIATION)
- .mariadbPassword(USER_1_DATABASE_PASSWORD)
- .language(USER_1_LANGUAGE)
- .build();
public static final CredentialDto USER_1_KEYCLOAK_CREDENTIAL_1 = CredentialDto.builder()
.type(CredentialTypeDto.PASSWORD)
@@ -535,15 +452,6 @@ public class BaseTest {
.value(USER_LOCAL_ADMIN_PASSWORD)
.build();
- 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)))
- .attributes(UserCreateAttributesDto.builder()
- .ldapId(String.valueOf(USER_1_ID))
- .build())
- .build();
-
public static final UserCreateDto USER_LOCAL_KEYCLOAK_SIGNUP_REQUEST = UserCreateDto.builder()
.username(USER_LOCAL_ADMIN_USERNAME)
.enabled(USER_LOCAL_ADMIN_ENABLED)
@@ -554,64 +462,9 @@ public class BaseTest {
.build())
.build();
- public static final User USER_1 = User.builder()
- .id(USER_1_ID)
- .keycloakId(USER_1_KEYCLOAK_ID)
- .username(USER_1_USERNAME)
- .firstname(USER_1_FIRSTNAME)
- .lastname(USER_1_LASTNAME)
- .affiliation(USER_1_AFFILIATION)
- .orcid(USER_1_ORCID_URL)
- .theme(USER_1_THEME)
- .mariadbPassword(USER_1_DATABASE_PASSWORD)
- .language(USER_1_LANGUAGE)
- .isInternal(USER_1_IS_INTERNAL)
- .build();
-
- public static final UserDto USER_1_DTO = UserDto.builder()
- .id(USER_1_ID)
- .username(USER_1_USERNAME)
- .firstname(USER_1_FIRSTNAME)
- .lastname(USER_1_LASTNAME)
- .attributes(USER_1_ATTRIBUTES_DTO)
- .name(USER_1_NAME)
- .qualifiedName(USER_1_QUALIFIED_NAME)
- .build();
-
- public static final 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 static final UserUpdateDto USER_1_UPDATE_DTO = UserUpdateDto.builder()
- .firstname(USER_1_FIRSTNAME)
- .lastname(USER_1_LASTNAME)
- .affiliation(USER_1_AFFILIATION)
- .orcid(USER_1_ORCID_URL)
- .theme(USER_1_THEME)
- .language(USER_1_LANGUAGE)
- .build();
-
- public static final UserPasswordDto USER_1_PASSWORD_DTO = UserPasswordDto.builder()
- .password(USER_1_PASSWORD)
- .build();
-
- public static final UserBriefDto USER_1_BRIEF_DTO = UserBriefDto.builder()
- .id(USER_1_ID)
- .username(USER_1_USERNAME)
- .firstname(USER_1_FIRSTNAME)
- .lastname(USER_1_LASTNAME)
- .name(USER_1_NAME)
- .qualifiedName(USER_1_QUALIFIED_NAME)
- .orcid(USER_1_ORCID_URL)
- .build();
-
public static final UserDetails USER_1_DETAILS = UserDetailsDto.builder()
- .id(USER_1_ID.toString())
- .username(USER_1_USERNAME)
+ .id(USER_1.getId().toString())
+ .username(USER_1.getUsername())
.password(USER_1_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
@@ -619,139 +472,30 @@ public class BaseTest {
public static final Principal USER_1_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_1_DETAILS,
USER_1_PASSWORD, USER_1_DETAILS.getAuthorities());
- 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 static final String USER_2_PASSWORD = "junit2";
- @SuppressWarnings("java:S2068")
- 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 static final UserAttributesDto USER_2_ATTRIBUTES_DTO = UserAttributesDto.builder()
- .theme(USER_2_THEME)
- .orcid(USER_2_ORCID_URL)
- .affiliation(USER_2_AFFILIATION)
- .mariadbPassword(USER_2_DATABASE_PASSWORD)
- .language(USER_2_LANGUAGE)
- .build();
-
- public static final User USER_2 = User.builder()
- .id(USER_2_ID)
- .keycloakId(USER_2_KEYCLOAK_ID)
- .username(USER_2_USERNAME)
- .firstname(USER_2_FIRSTNAME)
- .lastname(USER_2_LASTNAME)
- .affiliation(USER_2_AFFILIATION)
- .orcid(USER_2_ORCID_URL)
- .theme(USER_2_THEME)
- .mariadbPassword(USER_2_DATABASE_PASSWORD)
- .language(USER_2_LANGUAGE)
- .isInternal(USER_2_IS_INTERNAL)
- .build();
-
- public static final UserDto USER_2_DTO = UserDto.builder()
- .id(USER_2_ID)
- .username(USER_2_USERNAME)
- .firstname(USER_2_FIRSTNAME)
- .lastname(USER_2_LASTNAME)
- .name(USER_2_NAME)
- .qualifiedName(USER_2_QUALIFIED_NAME)
- .attributes(USER_2_ATTRIBUTES_DTO)
- .build();
-
- public static final UserBriefDto USER_2_BRIEF_DTO = UserBriefDto.builder()
- .id(USER_2_ID)
- .username(USER_2_USERNAME)
- .firstname(USER_2_FIRSTNAME)
- .lastname(USER_2_LASTNAME)
- .name(USER_2_NAME)
- .orcid(USER_2_ORCID_URL)
- .qualifiedName(USER_2_QUALIFIED_NAME)
- .build();
public static final UserDetails USER_2_DETAILS = UserDetailsDto.builder()
- .id(USER_2_ID.toString())
- .username(USER_2_USERNAME)
+ .id(USER_2.getId().toString())
+ .username(USER_2.getUsername())
.password(USER_2_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
public static final at.ac.tuwien.ifs.dbrepo.core.api.amqp.UserDetailsDto USER_2_DETAILS_DTO = at.ac.tuwien.ifs.dbrepo.core.api.amqp.UserDetailsDto.builder()
- .name(USER_2_USERNAME)
+ .name(USER_2.getUsername())
.tags(new String[]{})
.build();
public static final Principal USER_2_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_2_DETAILS,
USER_2_PASSWORD, USER_2_DETAILS.getAuthorities());
- 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 static final String USER_3_PASSWORD = "password";
- @SuppressWarnings("java:S2068")
- 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 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 static final User USER_3 = User.builder()
- .id(USER_3_ID)
- .keycloakId(USER_3_KEYCLOAK_ID)
- .username(USER_3_USERNAME)
- .firstname(USER_3_FIRSTNAME)
- .lastname(USER_3_LASTNAME)
- .affiliation(USER_3_AFFILIATION)
- .orcid(USER_3_ORCID_URL)
- .theme(USER_3_THEME)
- .mariadbPassword(USER_3_DATABASE_PASSWORD)
- .isInternal(USER_3_IS_INTERNAL)
- .build();
-
- public static final UserDto USER_3_DTO = UserDto.builder()
- .id(USER_3_ID)
- .username(USER_3_USERNAME)
- .firstname(USER_3_FIRSTNAME)
- .lastname(USER_3_LASTNAME)
- .name(USER_3_NAME)
- .qualifiedName(USER_3_QUALIFIED_NAME)
- .attributes(USER_3_ATTRIBUTES_DTO)
- .build();
-
- public static final UserBriefDto USER_3_BRIEF_DTO = UserBriefDto.builder()
- .id(USER_3_ID)
- .username(USER_3_USERNAME)
- .firstname(USER_3_FIRSTNAME)
- .lastname(USER_3_LASTNAME)
- .name(USER_3_NAME)
- .qualifiedName(USER_3_QUALIFIED_NAME)
- .build();
public static final UserDetails USER_3_DETAILS = UserDetailsDto.builder()
- .id(USER_3_ID.toString())
- .username(USER_3_USERNAME)
+ .id(USER_3.getId().toString())
+ .username(USER_3.getUsername())
.password(USER_3_PASSWORD)
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
@@ -760,68 +504,16 @@ public class BaseTest {
USER_3_PASSWORD, USER_3_DETAILS.getAuthorities());
public static final at.ac.tuwien.ifs.dbrepo.core.api.amqp.UserDetailsDto USER_3_DETAILS_DTO = at.ac.tuwien.ifs.dbrepo.core.api.amqp.UserDetailsDto.builder()
- .name(USER_3_USERNAME)
+ .name(USER_3.getUsername())
.tags(new String[]{})
.build();
- 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 static final String USER_4_PASSWORD = "junit4";
- @SuppressWarnings("java:S2068")
- 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 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 static final User USER_4 = User.builder()
- .id(USER_4_ID)
- .keycloakId(USER_4_KEYCLOAK_ID)
- .username(USER_4_USERNAME)
- .firstname(USER_4_FIRSTNAME)
- .lastname(USER_4_LASTNAME)
- .affiliation(USER_4_AFFILIATION)
- .orcid(USER_4_ORCID_URL)
- .theme(USER_4_THEME)
- .mariadbPassword(USER_4_DATABASE_PASSWORD)
- .isInternal(USER_4_IS_INTERNAL)
- .build();
-
- public static final UserDto USER_4_DTO = UserDto.builder()
- .id(USER_4_ID)
- .username(USER_4_USERNAME)
- .firstname(USER_4_FIRSTNAME)
- .lastname(USER_4_LASTNAME)
- .name(USER_4_NAME)
- .attributes(USER_4_ATTRIBUTES_DTO)
- .qualifiedName(USER_4_QUALIFIED_NAME)
- .build();
-
- public static final UserBriefDto USER_4_BRIEF_DTO = UserBriefDto.builder()
- .id(USER_4_ID)
- .username(USER_4_USERNAME)
- .firstname(USER_4_FIRSTNAME)
- .lastname(USER_4_LASTNAME)
- .name(USER_4_NAME)
- .qualifiedName(USER_4_QUALIFIED_NAME)
- .build();
public static final UserDetails USER_4_DETAILS = UserDetailsDto.builder()
- .id(USER_4_ID.toString())
- .username(USER_4_USERNAME)
+ .id(USER_4.getId().toString())
+ .username(USER_4.getUsername())
.password(USER_4_PASSWORD)
.authorities(new LinkedList<>())
.build();
@@ -829,48 +521,12 @@ public class BaseTest {
public static final Principal USER_4_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_4_DETAILS,
USER_4_PASSWORD, USER_4_DETAILS.getAuthorities());
- 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 static final String USER_5_PASSWORD = "junit5";
- @SuppressWarnings("java:S2068")
- 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 static final UserAttributesDto USER_5_ATTRIBUTES_DTO = UserAttributesDto.builder()
- .theme(USER_5_THEME)
- .affiliation(USER_5_AFFILIATION)
- .mariadbPassword(USER_5_DATABASE_PASSWORD)
- .build();
-
- public static final UserDto USER_5_DTO = UserDto.builder()
- .id(USER_5_ID)
- .username(USER_5_USERNAME)
- .firstname(USER_5_FIRSTNAME)
- .lastname(USER_5_LASTNAME)
- .name(USER_5_NAME)
- .qualifiedName(USER_5_QUALIFIED_NAME)
- .attributes(USER_5_ATTRIBUTES_DTO)
- .build();
-
- public static final UserBriefDto USER_5_BRIEF_DTO = UserBriefDto.builder()
- .id(USER_5_ID)
- .username(USER_5_USERNAME)
- .firstname(USER_5_FIRSTNAME)
- .lastname(USER_5_LASTNAME)
- .qualifiedName(USER_5_QUALIFIED_NAME)
- .build();
public static final UserDetails USER_5_DETAILS = UserDetailsDto.builder()
- .id(USER_5_ID.toString())
- .username(USER_5_USERNAME)
+ .id(USER_5.getId().toString())
+ .username(USER_5.getUsername())
.password(USER_5_PASSWORD)
.authorities(AUTHORITY_DEFAULT_DEVELOPER_AUTHORITIES)
.build();
@@ -878,53 +534,6 @@ public class BaseTest {
public static final Principal USER_5_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_5_DETAILS,
USER_5_PASSWORD, USER_5_DETAILS.getAuthorities());
- public static final User USER_5 = User.builder()
- .id(USER_5_ID)
- .keycloakId(USER_5_KEYCLOAK_ID)
- .username(USER_5_USERNAME)
- .firstname(USER_5_FIRSTNAME)
- .lastname(USER_5_LASTNAME)
- .affiliation(USER_5_AFFILIATION)
- .theme(USER_5_THEME)
- .mariadbPassword(USER_5_DATABASE_PASSWORD)
- .isInternal(USER_5_IS_INTERNAL)
- .build();
-
- 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 static final String USER_6_PASSWORD = "junit5";
- @SuppressWarnings("java:S2068")
- 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 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 static final Principal USER_6_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_6_DETAILS,
- USER_6_PASSWORD, USER_6_DETAILS.getAuthorities());
-
public static final UUID IMAGE_1_ID = UUID.fromString("e5449ade-acc1-4ba4-8858-e3496cdecd9c");
public static final String IMAGE_1_REGISTRY = "docker.io";
public static final String IMAGE_1_NAME = "mariadb";
@@ -1219,7 +828,6 @@ public class BaseTest {
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 static final CreateDatabaseDto DATABASE_1_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_1_NAME)
@@ -1230,9 +838,9 @@ public class BaseTest {
public static final at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto.builder()
.internalName(DATABASE_1_INTERNALNAME)
.containerId(CONTAINER_1_ID)
- .username(USER_1_USERNAME)
+ .username(USER_1.getUsername())
.password(USER_1_PASSWORD)
- .userId(USER_1_ID)
+ .userId(USER_1.getId())
.privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
@@ -1248,8 +856,6 @@ public class BaseTest {
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 static final CreateDatabaseDto DATABASE_2_CREATE = CreateDatabaseDto.builder()
.name(DATABASE_2_NAME)
@@ -1268,7 +874,6 @@ public class BaseTest {
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 static final DatabaseDto DATABASE_3_DTO = DatabaseDto.builder()
.id(DATABASE_3_ID)
@@ -1307,7 +912,7 @@ public class BaseTest {
.isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
.name(DATABASE_3_NAME)
.internalName(DATABASE_3_INTERNALNAME)
- .ownerId(USER_3_ID)
+ .ownerId(USER_3.getId())
.identifiers(new LinkedList<>()) /* IDENTIFIER_6_DTO */
.build();
@@ -1317,7 +922,7 @@ public class BaseTest {
.isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
.name(DATABASE_3_NAME)
.internalName(DATABASE_3_INTERNALNAME)
- .ownerId(USER_3_ID)
+ .ownerId(USER_3.getId())
.identifiers(new LinkedList<>())
.build();
@@ -1338,8 +943,6 @@ public class BaseTest {
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 static final DatabaseBriefDto DATABASE_4_BRIEF_DTO = DatabaseBriefDto.builder()
.id(DATABASE_4_ID)
@@ -1348,7 +951,7 @@ public class BaseTest {
.name(DATABASE_4_NAME)
.description(DATABASE_4_DESCRIPTION)
.internalName(DATABASE_4_INTERNALNAME)
- .ownerId(USER_4_ID)
+ .ownerId(USER_4.getId())
.identifiers(new LinkedList<>())
.build();
@@ -1586,7 +1189,7 @@ public class BaseTest {
.identifiers(new LinkedList<>())
.columns(new LinkedList<>() /* TABLE_1_COLUMNS */)
.constraints(null) /* TABLE_1_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.lastModified(TABLE_1_LAST_MODIFIED)
.avgRowLength(TABLE_1_AVG_ROW_LENGTH)
@@ -1703,7 +1306,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_1_SCHEMA_PUBLIC)
.description(TABLE_1_DESCRIPTION)
.name(TABLE_1_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final Long TABLE_1_DATA_COUNT = 3L;
@@ -1765,7 +1368,7 @@ public class BaseTest {
.columns(new LinkedList<>() /* TABLE_2_COLUMNS */)
.constraints(null) /* TABLE_2_CONSTRAINTS */
.owner(USER_2)
- .ownedBy(USER_2_ID)
+ .ownedBy(USER_2.getId())
.avgRowLength(TABLE_2_AVG_ROW_LENGTH)
.numRows(TABLE_2_NUM_ROWS)
.dataLength(TABLE_2_DATA_LENGTH)
@@ -1801,7 +1404,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_2_SCHEMA_PUBLIC)
.description(TABLE_2_DESCRIPTION)
.name(TABLE_2_NAME)
- .ownedBy(USER_2_ID)
+ .ownedBy(USER_2.getId())
.build();
public static final UUID TABLE_3_ID = UUID.fromString("a94ee518-c235-496b-8613-b0c643bc1b11");
@@ -1837,7 +1440,7 @@ public class BaseTest {
.columns(new LinkedList<>() /* TABLE_3_COLUMNS */)
.constraints(null) /* TABLE_3_CONSTRAINTS */
.owner(USER_3)
- .ownedBy(USER_3_ID)
+ .ownedBy(USER_3.getId())
.avgRowLength(TABLE_3_AVG_ROW_LENGTH)
.numRows(TABLE_3_NUM_ROWS)
.dataLength(TABLE_3_DATA_LENGTH)
@@ -1873,7 +1476,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_3_SCHEMA_PUBLIC)
.description(TABLE_3_DESCRIPTION)
.name(TABLE_3_NAME)
- .ownedBy(USER_3_ID)
+ .ownedBy(USER_3.getId())
.build();
public static final CreateTableConstraintsDto TABLE_3_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
@@ -1939,7 +1542,7 @@ public class BaseTest {
.queueName(TABLE_5_QUEUE_NAME)
.columns(new LinkedList<>()) /* TABLE_5_COLUMNS */
.constraints(null) /* TABLE_5_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.build();
@@ -1968,7 +1571,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_5_SCHEMA_PUBLIC)
.description(TABLE_5_DESCRIPTION)
.name(TABLE_5_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID TABLE_6_ID = UUID.fromString("ae84d169-d36c-4f5a-a390-153d090f9574");
@@ -1998,7 +1601,7 @@ public class BaseTest {
.queueName(TABLE_6_QUEUE_NAME)
.columns(new LinkedList<>()) /* TABLE_6_COLUMNS */
.constraints(null) /* TABLE_6_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.created(TABLE_6_CREATED)
.build();
@@ -2028,7 +1631,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_6_SCHEMA_PUBLIC)
.description(TABLE_6_DESCRIPTION)
.name(TABLE_6_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID TABLE_7_ID = UUID.fromString("e5d10200-3e4f-45f4-9f36-ff3ca39c6c29");
@@ -2058,7 +1661,7 @@ public class BaseTest {
.queueName(TABLE_7_QUEUE_NAME)
.columns(new LinkedList<>()) /* TABLE_7_COLUMNS */
.constraints(null) /* TABLE_7_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.created(TABLE_7_CREATED)
.build();
@@ -2088,7 +1691,7 @@ public class BaseTest {
.isSchemaPublic(TABLE_7_SCHEMA_PUBLIC)
.description(TABLE_7_DESCRIPTION)
.name(TABLE_7_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID TABLE_4_ID = UUID.fromString("6c87cbcf-5043-404f-9bf1-b09ddbac25a2");
@@ -2121,7 +1724,7 @@ public class BaseTest {
.isPublic(TABLE_4_IS_PUBLIC)
.isSchemaPublic(TABLE_4_SCHEMA_PUBLIC)
.owner(USER_1)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.created(TABLE_4_CREATED)
.lastModified(TABLE_4_LAST_MODIFIED)
.avgRowLength(TABLE_4_AVG_ROW_LENGTH)
@@ -2159,7 +1762,7 @@ public class BaseTest {
.isVersioned(TABLE_4_VERSIONED)
.isPublic(TABLE_4_IS_PUBLIC)
.isSchemaPublic(TABLE_4_SCHEMA_PUBLIC)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final ColumnBriefDto TABLE_4_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
@@ -2270,7 +1873,7 @@ public class BaseTest {
.queueName(TABLE_8_QUEUE_NAME)
.columns(new LinkedList<>()) /* TABLE_8_COLUMNS */
.constraints(null) /* TABLE_8_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.created(TABLE_8_CREATED)
.lastModified(TABLE_8_LAST_MODIFIED)
@@ -2306,7 +1909,7 @@ public class BaseTest {
.isPublic(TABLE_8_IS_PUBLIC)
.isSchemaPublic(TABLE_8_SCHEMA_PUBLIC)
.name(TABLE_8_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID TABLE_9_ID = UUID.fromString("9314294f-04fc-4354-8b1f-2a8aeb566453");
@@ -2335,7 +1938,7 @@ public class BaseTest {
.queueName(TABLE_9_QUEUE_NAME)
.columns(new LinkedList<>()) /* TABLE_9_COLUMNS */
.constraints(null) /* TABLE_9_CONSTRAINTS */
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.created(TABLE_9_CREATED)
.lastModified(TABLE_9_LAST_MODIFIED)
@@ -2365,7 +1968,7 @@ public class BaseTest {
.isPublic(TABLE_9_IS_PUBLIC)
.isSchemaPublic(TABLE_9_SCHEMA_PUBLIC)
.name(TABLE_9_NAME)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID COLUMN_9_1_ID = UUID.fromString("e03c7578-2d1a-4599-9b11-7174f40efc0a");
@@ -2540,7 +2143,7 @@ public class BaseTest {
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 static final UUID ONTOLOGY_1_CREATED_BY = USER_1.getId();
public static final Ontology ONTOLOGY_1 = Ontology.builder()
.id(ONTOLOGY_1_ID)
@@ -2587,7 +2190,7 @@ public class BaseTest {
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 static final UUID ONTOLOGY_2_CREATED_BY = USER_1.getId();
public static final Ontology ONTOLOGY_2 = Ontology.builder()
.id(ONTOLOGY_2_ID)
@@ -2606,7 +2209,7 @@ public class BaseTest {
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 static final UUID ONTOLOGY_3_CREATED_BY = USER_1.getId();
public static final Ontology ONTOLOGY_3 = Ontology.builder()
.id(ONTOLOGY_3_ID)
@@ -2625,7 +2228,7 @@ public class BaseTest {
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 static final UUID ONTOLOGY_4_CREATED_BY = USER_1.getId();
public static final Ontology ONTOLOGY_4 = Ontology.builder()
.id(ONTOLOGY_4_ID)
@@ -2644,7 +2247,7 @@ public class BaseTest {
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 static final UUID ONTOLOGY_5_CREATED_BY = USER_1.getId();
public static final Ontology ONTOLOGY_5 = Ontology.builder()
.id(ONTOLOGY_5_ID)
@@ -2797,28 +2400,9 @@ public class BaseTest {
.build())))
.build();
- public static final UUID QUERY_1_ID = UUID.fromString("60494137-f000-459e-acd3-4fcadbdf14ca");
- 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_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 static final SubsetDto QUERY_1_SUBSET_DTO = SubsetDto.builder()
- .tableId(TABLE_1_ID)
- .columns(new LinkedList<UUID>(List.of(COLUMN_1_1_ID, COLUMN_1_2_ID, COLUMN_1_3_ID, COLUMN_1_4_ID, COLUMN_1_5_ID)))
- .order(new LinkedList<OrderDto>(List.of(OrderDto.builder()
- .columnId(COLUMN_1_1_ID)
- .direction(OrderTypeDto.ASC)
- .build())))
- .build();
-
public static final ViewDto QUERY_1_VIEW_DTO = ViewDto.builder()
- .query(QUERY_1_STATEMENT)
- .queryHash(QUERY_1_QUERY_HASH)
+ .query(QUERY_1_DTO.getQuery())
+ .queryHash(QUERY_1_DTO.getQueryHash())
.owner(USER_1_BRIEF_DTO)
.columns(new LinkedList<>(List.of(ViewColumnDto.builder()
.name("id")
@@ -2842,60 +2426,6 @@ public class BaseTest {
.build())))
.build();
- public static final QueryBriefDto QUERY_1_BRIEF_DTO = QueryBriefDto.builder()
- .id(QUERY_1_ID)
- .databaseId(DATABASE_1_ID)
- .query(QUERY_1_STATEMENT)
- .queryHash(QUERY_1_QUERY_HASH)
- .resultHash(QUERY_1_RESULT_HASH)
- .execution(QUERY_1_EXECUTION)
- .owner(USER_1_BRIEF_DTO)
- .isPersisted(QUERY_1_PERSISTED)
- .resultNumber(3L)
- .build();
-
- public static final UUID QUERY_2_ID = UUID.fromString("4e0ac92a-7cb3-4222-9b85-0498c73e0afd");
- 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 static final UUID QUERY_3_ID = UUID.fromString("a9849020-45a7-40a8-9a19-d4ae2b28dd46");
- 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 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 static final UUID QUERY_7_ID = UUID.fromString("fe73a325-30a0-444c-b74f-23ce1533e55f");
- 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 static final UUID QUERY_4_ID = UUID.fromString("18a98197-51ff-4011-9f40-914a11675a6d");
- public static final String QUERY_4_STATEMENT = "SELECT `id`, `value` FROM `mfcc`";
- public static final String QUERY_4_QUERY_HASH = "df7da3801dfb5c191ff6711d79ce6455f3c09ec8323ce1ff7208ab85387263f5";
- 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 List<Map<String, Object>> QUERY_4_RESULT_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("id", BigInteger.valueOf(1L));
@@ -2917,16 +2447,6 @@ public class BaseTest {
put("value", 23.1);
}}));
- public static final UUID QUERY_5_ID = UUID.fromString("1a39f775-e3d5-4865-b4f5-dbbb5693b637");
- 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 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 static final SubsetDto QUERY_5_SUBSET_DTO = SubsetDto.builder()
.tableId(TABLE_8_ID)
.columns(new LinkedList<>(List.of(COLUMN_8_1_ID, COLUMN_8_2_ID)))
@@ -2939,8 +2459,8 @@ public class BaseTest {
.build();
public static final ViewDto QUERY_5_VIEW_DTO = ViewDto.builder()
- .query(QUERY_5_STATEMENT)
- .queryHash(QUERY_5_QUERY_HASH)
+ .query(QUERY_5_DTO.getQuery())
+ .queryHash(QUERY_5_DTO.getQueryHash())
.owner(USER_1_BRIEF_DTO)
.columns(new LinkedList<>(List.of(ViewColumnDto.builder()
.name("id")
@@ -2961,16 +2481,6 @@ public class BaseTest {
Map.of("id", BigInteger.valueOf(6L), "value", 23.1)
));
- public static final UUID QUERY_6_ID = UUID.fromString("7463412a-20c4-4fc1-8a33-948aea026f49");
- 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 List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
.id(COLUMN_1_1_ID)
.ordinalPosition(0)
@@ -3062,8 +2572,8 @@ public class BaseTest {
.size(10L)
.d(0L)
.nullAllowed(true)
- .conceptUri(CONCEPT_1_URI)
- .unitUri(UNIT_1_URI)
+ .conceptUri(CONCEPT_1.getUri())
+ .unitUri(UNIT_1.getUri())
.build());
public static final CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
@@ -4955,7 +4465,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
.query(VIEW_1_QUERY)
.queryHash(VIEW_1_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.identifiers(new LinkedList<>()) /* IDENTIFIER_3 */
.columns(null) /* VIEW_1_COLUMNS */
@@ -5039,7 +4549,7 @@ public class BaseTest {
.vdbid(DATABASE_1_ID)
.isPublic(VIEW_1_PUBLIC)
.isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.query(VIEW_1_QUERY)
.queryHash(VIEW_1_QUERY_HASH)
.build();
@@ -5121,7 +4631,7 @@ public class BaseTest {
.columns(null) /* VIEW_2_COLUMNS */
.query(VIEW_2_QUERY)
.queryHash(VIEW_2_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.database(null) /* DATABASE_1 */
.build();
@@ -5194,7 +4704,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_2_SCHEMA_PUBLIC)
.query(VIEW_2_QUERY)
.queryHash(VIEW_2_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID VIEW_3_ID = UUID.fromString("88940939-d456-4aae-88a6-f2b6b343c614");
@@ -5270,7 +4780,7 @@ public class BaseTest {
.columns(null) /* VIEW_3_COLUMNS */
.query(VIEW_3_QUERY)
.queryHash(VIEW_3_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.database(null) /* DATABASE_1 */
.build();
@@ -5343,7 +4853,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_3_SCHEMA_PUBLIC)
.query(VIEW_3_QUERY)
.queryHash(VIEW_3_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final UUID VIEW_4_ID = UUID.fromString("13b36fa0-a65a-4ccf-80b1-5b3a2444a41a");
@@ -5520,7 +5030,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
.query(VIEW_4_QUERY)
.queryHash(VIEW_4_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.columns(null) /* VIEW_4_COLUMNS */
.build();
@@ -5549,7 +5059,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
.query(VIEW_4_QUERY)
.queryHash(VIEW_4_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.build();
public static final List<ViewColumn> VIEW_4_COLUMNS = List.of(
@@ -5725,7 +5235,7 @@ public class BaseTest {
.isSchemaPublic(VIEW_5_SCHEMA_PUBLIC)
.query(VIEW_5_QUERY)
.queryHash(VIEW_5_QUERY_HASH)
- .ownedBy(USER_1_ID)
+ .ownedBy(USER_1.getId())
.owner(USER_1)
.columns(null)
.build();
@@ -5849,273 +5359,6 @@ public class BaseTest {
.uri(LICENSE_1_URI)
.build();
- public static final UUID CREATOR_1_ID = UUID.fromString("a0417f34-80ff-419f-821d-ce179021484a");
- 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()
- .value(USER_1_FIRSTNAME)
- .build())
- .familyName(OrcidValueDto.builder()
- .value(USER_1_LASTNAME)
- .build())
- .build())
- .build())
- .activitiesSummary(OrcidActivitiesSummaryDto.builder()
- .employments(OrcidEmploymentsDto.builder()
- .affiliationGroup(new OrcidAffiliationGroupDto[]{
- OrcidAffiliationGroupDto.builder()
- .summaries(new OrcidEmploymentSummaryDto[]{
- OrcidEmploymentSummaryDto.builder()
- .employmentSummary(OrcidSummaryDto.builder()
- .organization(OrcidOrganizationDto.builder()
- .name(USER_1_AFFILIATION)
- .build())
- .build())
- .build()
- })
- .build()
- })
- .build())
- .build())
- .build();
-
- public static final UUID CREATOR_2_ID = UUID.fromString("56b70dae-17a7-4f76-9c1e-a493762ba760");
- 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 UUID CREATOR_3_ID = UUID.fromString("a2dfea46-7d88-4069-9b93-2417e1fb578b");
- 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 UUID CREATOR_4_ID = UUID.fromString("473489fa-ad02-4e48-856f-5a3f83ff541d");
- 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 UUID IDENTIFIER_1_ID = UUID.fromString("679a83f2-ef23-4b4b-98f7-ad77b9d68733");
- 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_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 UUID IDENTIFIER_1_TITLE_1_ID = UUID.fromString("3df6b286-9bd2-4ae3-b8f4-29c217544bef");
- 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 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 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 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 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 static final UUID IDENTIFIER_1_TITLE_2_ID = UUID.fromString("903a7e5b-8014-4b8a-b8fd-44f477880905");
- 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 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 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 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 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 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 static final UUID IDENTIFIER_1_DESCRIPTION_1_ID = UUID.fromString("1c438756-93f0-4797-983c-175a17e18c2c");
- 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 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 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 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 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 static final UUID IDENTIFIER_1_CREATOR_1_ID = UUID.fromString("667cd1d6-4f94-4808-b5cb-12e5ec0788d8");
- 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)
- .creatorName(IDENTIFIER_1_CREATOR_1_NAME)
- .nameType(NameType.PERSONAL)
- .nameIdentifier(IDENTIFIER_1_CREATOR_1_ORCID)
- .nameIdentifierScheme(IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE)
- .affiliation(IDENTIFIER_1_CREATOR_1_AFFILIATION)
- .affiliationIdentifier(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER)
- .affiliationIdentifierScheme(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME)
- .affiliationIdentifierSchemeUri(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI)
- .build();
-
- 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)
- .creatorName(IDENTIFIER_1_CREATOR_1_NAME)
- .nameType(NameTypeDto.PERSONAL)
- .nameIdentifier(IDENTIFIER_1_CREATOR_1_ORCID)
- .nameIdentifierScheme(IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE_DTO)
- .affiliation(IDENTIFIER_1_CREATOR_1_AFFILIATION)
- .affiliationIdentifier(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER)
- .affiliationIdentifierScheme(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_DTO)
- .affiliationIdentifierSchemeUri(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_URI)
- .build();
-
- 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)
- .creatorName(IDENTIFIER_1_CREATOR_1_NAME)
- .nameType(NameTypeDto.PERSONAL)
- .nameIdentifier(IDENTIFIER_1_CREATOR_1_ORCID)
- .nameIdentifierScheme(IDENTIFIER_1_CREATOR_1_IDENTIFIER_SCHEME_TYPE_DTO)
- .affiliation(IDENTIFIER_1_CREATOR_1_AFFILIATION)
- .affiliationIdentifier(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER)
- .affiliationIdentifierScheme(IDENTIFIER_1_CREATOR_1_AFFILIATION_IDENTIFIER_SCHEME_DTO)
- .build();
-
public static final UUID FUNDER_1_ID = UUID.fromString("8deb273d-6dd6-407d-970a-01534035ac01");
public static final String FUNDER_1_NAME = "European Commission";
public static final String FUNDER_1_IDENTIFIER = "https://doi.org/10.13039/501100000780";
@@ -6124,1164 +5367,6 @@ public class BaseTest {
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 static final IdentifierFunder IDENTIFIER_1_FUNDER_1 = IdentifierFunder.builder()
- .id(FUNDER_1_ID)
- .funderName(FUNDER_1_NAME)
- .funderIdentifier(FUNDER_1_IDENTIFIER)
- .funderIdentifierType(FUNDER_1_IDENTIFIER_TYPE)
- .awardTitle(FUNDER_1_AWARD_TITLE)
- .build();
-
- public static final IdentifierFunderDto IDENTIFIER_1_FUNDER_1_DTO = IdentifierFunderDto.builder()
- .id(FUNDER_1_ID)
- .funderName(FUNDER_1_NAME)
- .funderIdentifier(FUNDER_1_IDENTIFIER)
- .funderIdentifierType(FUNDER_1_IDENTIFIER_TYPE_DTO)
- .awardTitle(FUNDER_1_AWARD_TITLE)
- .build();
-
- 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 static final DataCiteBody<DataCiteDoi> IDENTIFIER_1_DATA_CITE = DataCiteBody.<DataCiteDoi>builder()
- .data(DataCiteData.<DataCiteDoi>builder()
- .type("dois")
- .attributes(DataCiteDoi.builder()
- .doi(IDENTIFIER_1_DOI)
- .build())
- .build())
- .build();
-
- public static final Identifier IDENTIFIER_1 = Identifier.builder()
- .id(IDENTIFIER_1_ID)
- .queryId(QUERY_1_ID)
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1, IDENTIFIER_1_TITLE_2)))
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1)))
- .doi(IDENTIFIER_1_DOI)
- .database(null /* DATABASE_1 */)
- .created(IDENTIFIER_1_CREATED)
- .lastModified(IDENTIFIER_1_MODIFIED)
- .execution(IDENTIFIER_1_EXECUTION)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .queryHash(QUERY_1_QUERY_HASH)
- .resultHash(QUERY_1_RESULT_HASH)
- .query(QUERY_1_STATEMENT)
- .queryNormalized(QUERY_1_STATEMENT)
- .resultNumber(QUERY_1_RESULT_NUMBER)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE)
- .owner(USER_1)
- .ownedBy(USER_1_ID)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1)))
- .status(IDENTIFIER_1_STATUS_TYPE)
- .build();
-
- public static final Identifier IDENTIFIER_1_WITH_DOI = Identifier.builder()
- .id(IDENTIFIER_1_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1, IDENTIFIER_1_TITLE_2)))
- .doi(IDENTIFIER_1_DOI)
- .database(null /* for jpa */)
- .created(IDENTIFIER_1_CREATED)
- .lastModified(IDENTIFIER_1_MODIFIED)
- .execution(IDENTIFIER_1_EXECUTION)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .queryHash(QUERY_1_QUERY_HASH)
- .resultHash(QUERY_1_RESULT_HASH)
- .query(QUERY_1_STATEMENT)
- .queryNormalized(QUERY_1_STATEMENT)
- .resultNumber(QUERY_1_RESULT_NUMBER)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE)
- .owner(USER_1)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1)))
- .status(IDENTIFIER_1_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_1_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_1_ID)
- .databaseId(DATABASE_1_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_1_ID)
- .selfHtml("/pid/" + IDENTIFIER_1_ID)
- .dashboardHtml(null)
- .build())
- .queryId(QUERY_1_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_DTO, IDENTIFIER_1_TITLE_2_DTO)))
- .doi(IDENTIFIER_1_DOI)
- .execution(IDENTIFIER_1_EXECUTION)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .queryHash(QUERY_1_QUERY_HASH)
- .resultHash(QUERY_1_RESULT_HASH)
- .query(QUERY_1_STATEMENT)
- .queryNormalized(QUERY_1_STATEMENT)
- .resultNumber(QUERY_1_RESULT_NUMBER)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .owner(USER_1_BRIEF_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1_DTO)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_DTO)))
- .status(IDENTIFIER_1_STATUS_TYPE_DTO)
- .build();
-
- public static final IdentifierBriefDto IDENTIFIER_1_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_1_ID)
- .databaseId(DATABASE_1_ID)
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_DTO, IDENTIFIER_1_TITLE_2_DTO)))
- .doi(IDENTIFIER_1_DOI)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .status(IDENTIFIER_1_STATUS_TYPE_DTO)
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_1_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_1_ID)
- .type(IDENTIFIER_1_TYPE_DTO)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_CREATE_DTO, IDENTIFIER_1_TITLE_2_CREATE_DTO)))
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .doi(IDENTIFIER_1_DOI)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1_CREATE_DTO)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_1_CREATE_WITH_DOI_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_1_ID)
- .type(IDENTIFIER_1_TYPE_DTO)
- .doi(IDENTIFIER_1_DOI)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_CREATE_DTO, IDENTIFIER_1_TITLE_2_CREATE_DTO)))
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1_CREATE_DTO)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_1_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_1_ID)
- .databaseId(DATABASE_1_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_1_DESCRIPTION_1_CREATE_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_CREATE_DTO, IDENTIFIER_1_TITLE_2_CREATE_DTO)))
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .creators(new LinkedList<>(List.of(IDENTIFIER_1_CREATOR_1_CREATE_DTO)))
- .funders(new LinkedList<>(List.of(IDENTIFIER_1_FUNDER_1_CREATE_DTO)))
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_1_SAVE_MODIFY_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_1_ID)
- .databaseId(DATABASE_1_ID)
- .descriptions(new LinkedList<>(List.of())) // <<<
- .titles(new LinkedList<>(List.of(IDENTIFIER_1_TITLE_1_CREATE_DTO))) // <<<
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_1_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_1_PUBLICATION_YEAR)
- .creators(new LinkedList<>(List.of())) // <<<
- .funders(new LinkedList<>(List.of())) // <<<
- .publisher(IDENTIFIER_1_PUBLISHER)
- .type(IDENTIFIER_1_TYPE_DTO)
- .licenses(new LinkedList<>(List.of())) // <<<
- .build();
-
- public static final UUID IDENTIFIER_5_ID = UUID.fromString("e05bb4c9-ed26-48c9-bd91-5c48a93a04bd");
- 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 UUID IDENTIFIER_5_TITLE_1_ID = UUID.fromString("1a0ae9c2-61c6-44f8-b886-26a4f4dabc52");
- 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 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 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 static final UUID IDENTIFIER_5_DESCRIPTION_1_ID = UUID.fromString("ab49bdca-f373-4823-9947-2a0cbfa88350");
- 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 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 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 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 static final UUID IDENTIFIER_5_CREATOR_1_ID = UUID.fromString("6844b684-93e4-47d2-a615-5939127fdafe");
-
- public static final Creator IDENTIFIER_5_CREATOR_1 = Creator.builder()
- .id(IDENTIFIER_5_CREATOR_1_ID)
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- 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)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(null) /* <<<< */
- .nameIdentifierScheme(null) /* <<<< */
- .affiliation(CREATOR_1_AFFIL)
- .build();
-
- public static final UUID IDENTIFIER_5_CREATOR_2_ID = UUID.fromString("14943ad6-a935-49f5-b07e-f9eb789b8604");
-
- public static final Creator IDENTIFIER_5_CREATOR_2 = Creator.builder()
- .id(IDENTIFIER_5_CREATOR_2_ID)
- .firstname(CREATOR_2_FIRSTNAME)
- .lastname(CREATOR_2_LASTNAME)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(CREATOR_2_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- 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)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(CREATOR_2_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_CREATE_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_2_FIRSTNAME)
- .lastname(CREATOR_2_LASTNAME)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(CREATOR_2_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_5_CREATOR_2_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_2_FIRSTNAME)
- .lastname(CREATOR_2_LASTNAME)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(null) /* <<<< */
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- public static final Identifier IDENTIFIER_5 = Identifier.builder()
- .id(IDENTIFIER_5_ID)
- .queryId(QUERY_2_ID)
- .database(null) /* DATABASE_2 */
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_5_DESCRIPTION_1)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_5_TITLE_1)))
- .doi(IDENTIFIER_5_DOI)
- .created(IDENTIFIER_5_CREATED)
- .lastModified(IDENTIFIER_5_MODIFIED)
- .execution(IDENTIFIER_5_EXECUTION)
- .publicationDay(IDENTIFIER_5_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_5_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_5_QUERY_HASH)
- .resultHash(IDENTIFIER_5_RESULT_HASH)
- .query(IDENTIFIER_5_QUERY)
- .queryNormalized(IDENTIFIER_5_NORMALIZED)
- .resultNumber(IDENTIFIER_5_RESULT_NUMBER)
- .publisher(IDENTIFIER_5_PUBLISHER)
- .type(IDENTIFIER_5_TYPE)
- .owner(USER_2)
- .ownedBy(USER_2_ID)
- .creators(new LinkedList<>(List.of(IDENTIFIER_5_CREATOR_1, IDENTIFIER_5_CREATOR_2)))
- .status(IDENTIFIER_5_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_5_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_5_ID)
- .databaseId(DATABASE_2_ID)
- .queryId(QUERY_2_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_5_ID)
- .selfHtml("/pid/" + IDENTIFIER_5_ID)
- .data("/api/database/" + DATABASE_2_ID + "/subset/" + QUERY_2_ID + "/data")
- .dashboardHtml("/d/" + DATABASE_2_DASHBOARD_UID)
- .build())
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_5_DESCRIPTION_1_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_5_TITLE_1_DTO)))
- .doi(IDENTIFIER_5_DOI)
- .execution(IDENTIFIER_5_EXECUTION)
- .publicationDay(IDENTIFIER_5_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_5_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_5_QUERY_HASH)
- .resultHash(IDENTIFIER_5_RESULT_HASH)
- .query(IDENTIFIER_5_QUERY)
- .queryNormalized(IDENTIFIER_5_NORMALIZED)
- .resultNumber(IDENTIFIER_5_RESULT_NUMBER)
- .publisher(IDENTIFIER_5_PUBLISHER)
- .type(IDENTIFIER_5_TYPE_DTO)
- .owner(USER_2_BRIEF_DTO)
- .status(IDENTIFIER_5_STATUS_TYPE_DTO)
- .creators(new LinkedList<>(List.of(IDENTIFIER_5_CREATOR_1_DTO, IDENTIFIER_5_CREATOR_2_DTO)))
- .build();
-
- public static final IdentifierBriefDto IDENTIFIER_5_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_5_ID)
- .databaseId(DATABASE_2_ID)
- .queryId(QUERY_2_ID)
- .titles(new LinkedList<>(List.of(IDENTIFIER_5_TITLE_1_DTO)))
- .doi(IDENTIFIER_5_DOI)
- .publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_5_PUBLISHER)
- .type(IDENTIFIER_5_TYPE_DTO)
- .build();
-
- public static final UUID RELATED_IDENTIFIER_5_ID = UUID.fromString("26545877-574d-44fa-819d-d9d9a9750b38");
- 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 static final RelatedIdentifier IDENTIFIER_1_RELATED_IDENTIFIER_1 = RelatedIdentifier.builder()
- .id(RELATED_IDENTIFIER_5_ID)
- .identifier(IDENTIFIER_5)
- .type(RELATED_IDENTIFIER_5_TYPE)
- .relation(RELATED_IDENTIFIER_5_RELATION_TYPE)
- .value(RELATED_IDENTIFIER_5_VALUE)
- .build();
-
- 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 static final CreateIdentifierDto IDENTIFIER_5_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_2_ID)
- .publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_5_PUBLISHER)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_5_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_5_ID)
- .queryId(QUERY_2_ID)
- .databaseId(DATABASE_2_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_5_DESCRIPTION_1_CREATE_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_5_TITLE_1_CREATE_DTO)))
- .relatedIdentifiers(new LinkedList<>(List.of(IDENTIFIER_1_RELATED_IDENTIFIER_5_CREATE_DTO)))
- .publicationDay(IDENTIFIER_5_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_5_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_5_PUBLICATION_YEAR)
- .creators(new LinkedList<>(List.of(IDENTIFIER_5_CREATOR_1_CREATE_DTO, IDENTIFIER_5_CREATOR_2_CREATE_DTO)))
- .publisher(IDENTIFIER_5_PUBLISHER)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .type(IDENTIFIER_5_TYPE_DTO)
- .build();
-
- public static final UUID IDENTIFIER_6_ID = UUID.fromString("a244204d-9671-42a0-be07-9b14402238fd");
- 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 UUID IDENTIFIER_6_TITLE_1_ID = UUID.fromString("0449011c-1490-4c8e-b46c-c1f862126aea");
- 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 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 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 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 static final UUID IDENTIFIER_6_DESCRIPTION_1_ID = UUID.fromString("aac03bbd-27e6-419d-8118-f996d594f00f");
- 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 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 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 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 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)
- .build();
-
- private final static UUID IDENTIFIER_6_CREATOR_1_ID = UUID.fromString("f8a52dca-8aec-46c1-b0e1-603dbe6a1a65");
-
- public static final Creator IDENTIFIER_6_CREATOR_1 = Creator.builder()
- .id(IDENTIFIER_6_CREATOR_1_ID)
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- 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)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_6_CREATOR_1_MODIFY_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(null) /* <<<< */
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ISNI) /* <<<< */
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
- .build();
-
- private final static UUID IDENTIFIER_6_CREATOR_2_ID = UUID.fromString("eeae78cb-75a1-42e2-b608-7082e5fbecc6");
-
- public static final Creator IDENTIFIER_6_CREATOR_2 = Creator.builder()
- .id(IDENTIFIER_6_CREATOR_2_ID)
- .firstname(CREATOR_2_FIRSTNAME)
- .lastname(CREATOR_2_LASTNAME)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(CREATOR_2_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- 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)
- .creatorName(CREATOR_2_NAME)
- .nameIdentifier(CREATOR_2_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_2_AFFIL)
- .build();
-
- private final static UUID IDENTIFIER_6_CREATOR_3_ID = UUID.fromString("700058f1-6314-4cd1-9c0c-62e75c8f422b");
-
- public static final Creator IDENTIFIER_6_CREATOR_3 = Creator.builder()
- .id(IDENTIFIER_6_CREATOR_3_ID)
- .firstname(CREATOR_3_FIRSTNAME)
- .lastname(CREATOR_3_LASTNAME)
- .creatorName(CREATOR_3_NAME)
- .nameIdentifier(CREATOR_3_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_3_AFFIL)
- .affiliationIdentifier(CREATOR_3_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_3_AFFIL_SCHEME_TYPE)
- .affiliationIdentifierSchemeUri(CREATOR_3_AFFIL_URI)
- .build();
-
- 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)
- .creatorName(CREATOR_3_NAME)
- .nameIdentifier(CREATOR_3_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_3_AFFIL)
- .affiliationIdentifier(CREATOR_3_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_3_AFFIL_SCHEME_TYPE_DTO)
- .affiliationIdentifierSchemeUri(CREATOR_3_AFFIL_URI)
- .build();
-
- public static final Identifier IDENTIFIER_6 = Identifier.builder()
- .id(IDENTIFIER_6_ID)
- .queryId(QUERY_3_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_6_DESCRIPTION_1)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_6_TITLE_1)))
- .doi(IDENTIFIER_6_DOI)
- .created(IDENTIFIER_6_CREATED)
- .lastModified(IDENTIFIER_6_MODIFIED)
- .execution(IDENTIFIER_6_EXECUTION)
- .publicationDay(IDENTIFIER_6_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_6_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_6_QUERY_HASH)
- .resultHash(IDENTIFIER_6_RESULT_HASH)
- .query(IDENTIFIER_6_QUERY)
- .queryNormalized(IDENTIFIER_6_NORMALIZED)
- .resultNumber(IDENTIFIER_6_RESULT_NUMBER)
- .publisher(IDENTIFIER_6_PUBLISHER)
- .type(IDENTIFIER_6_TYPE)
- .owner(USER_3)
- .ownedBy(USER_3_ID)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_6_CREATOR_1, IDENTIFIER_6_CREATOR_2, IDENTIFIER_6_CREATOR_3)))
- .status(IDENTIFIER_6_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_6_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_6_ID)
- .databaseId(DATABASE_3_ID)
- .queryId(QUERY_3_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_6_ID)
- .selfHtml("/pid/" + IDENTIFIER_6_ID)
- .data("/api/database/" + DATABASE_3_ID + "/subset/" + QUERY_3_ID + "/data")
- .dashboardHtml("/d/" + DATABASE_3_DASHBOARD_UID)
- .build())
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_6_DESCRIPTION_1_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_6_TITLE_1_DTO)))
- .doi(IDENTIFIER_6_DOI)
- .execution(IDENTIFIER_6_EXECUTION)
- .publicationDay(IDENTIFIER_6_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_6_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_6_QUERY_HASH)
- .resultHash(IDENTIFIER_6_RESULT_HASH)
- .query(IDENTIFIER_6_QUERY)
- .queryNormalized(IDENTIFIER_6_NORMALIZED)
- .resultNumber(IDENTIFIER_6_RESULT_NUMBER)
- .publisher(IDENTIFIER_6_PUBLISHER)
- .type(IDENTIFIER_6_TYPE_DTO)
- .owner(USER_3_BRIEF_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>(List.of(IDENTIFIER_6_CREATOR_1_DTO, IDENTIFIER_6_CREATOR_2_DTO, IDENTIFIER_6_CREATOR_3_DTO)))
- .status(IDENTIFIER_6_STATUS_TYPE_DTO)
- .build();
-
-
- public static final IdentifierBriefDto IDENTIFIER_6_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_6_ID)
- .databaseId(DATABASE_3_ID)
- .queryId(QUERY_3_ID)
- .titles(new LinkedList<>(List.of(IDENTIFIER_6_TITLE_1_DTO)))
- .doi(IDENTIFIER_6_DOI)
- .publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_6_PUBLISHER)
- .type(IDENTIFIER_6_TYPE_DTO)
- .status(IDENTIFIER_6_STATUS_TYPE_DTO)
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_6_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_3_ID)
- .publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_6_PUBLISHER)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_6_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_6_ID)
- .databaseId(DATABASE_3_ID)
- .queryId(QUERY_3_ID)
- .descriptions(new LinkedList<>(List.of(IDENTIFIER_6_DESCRIPTION_1_CREATE_DTO)))
- .titles(new LinkedList<>(List.of(IDENTIFIER_6_TITLE_1_CREATE_DTO)))
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_6_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_6_PUBLICATION_YEAR)
- .creators(new LinkedList<>(List.of(IDENTIFIER_6_CREATOR_1_CREATE_DTO)))
- .publisher(IDENTIFIER_6_PUBLISHER)
- .type(IDENTIFIER_6_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .build();
-
- public static final UUID IDENTIFIER_7_ID = UUID.fromString("b216ae00-a31d-4ecb-95fb-37eb4da3946f");
- 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()
- .doi(IDENTIFIER_7_DOI)
- .build())
- .build())
- .build();
-
- private final static UUID IDENTIFIER_7_CREATOR_1_ID = UUID.fromString("b899c367-06c7-4f47-8aea-5f15061ee3ee");
-
- public static final Creator IDENTIFIER_7_CREATOR_1 = Creator.builder()
- .id(IDENTIFIER_7_CREATOR_1_ID)
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeType.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- 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)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .affiliationIdentifierScheme(CREATOR_1_AFFIL_TYPE_DTO)
- .affiliationIdentifierSchemeUri(CREATOR_1_AFFIL_URI)
- .build();
-
- public static final IdentifierDto IDENTIFIER_7_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_7_ID)
- .databaseId(DATABASE_4_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_7_ID)
- .selfHtml("/pid/" + IDENTIFIER_7_ID)
- .dashboardHtml("/d/" + DATABASE_4_DASHBOARD_UID)
- .build())
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_7_DOI)
- .execution(IDENTIFIER_7_EXECUTION)
- .publicationDay(IDENTIFIER_7_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_7_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
- .resultNumber(IDENTIFIER_7_RESULT_NUMBER)
- .publisher(IDENTIFIER_7_PUBLISHER)
- .type(IDENTIFIER_7_TYPE_DTO)
- .owner(USER_4_BRIEF_DTO)
- .relatedIdentifiers(new LinkedList<>())
- .licenses(new LinkedList<>())
- .funders(new LinkedList<>())
- .creators(new LinkedList<>(List.of(IDENTIFIER_7_CREATOR_1_DTO)))
- .status(IDENTIFIER_7_STATUS_TYPE_DTO)
- .build();
-
- public static final SaveIdentifierCreatorDto IDENTIFIER_7_CREATOR_1_CREATE_DTO = SaveIdentifierCreatorDto.builder()
- .firstname(CREATOR_1_FIRSTNAME)
- .lastname(CREATOR_1_LASTNAME)
- .creatorName(CREATOR_1_NAME)
- .nameIdentifier(CREATOR_1_ORCID)
- .nameIdentifierScheme(NameIdentifierSchemeTypeDto.ORCID)
- .affiliation(CREATOR_1_AFFIL)
- .affiliationIdentifier(CREATOR_1_AFFIL_ROR)
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_7_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_4_ID)
- .publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_7_PUBLISHER)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_7_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_7_ID)
- .databaseId(DATABASE_4_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_7_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
- .creators(new LinkedList<>(List.of(IDENTIFIER_7_CREATOR_1_CREATE_DTO)))
- .funders(new LinkedList<>())
- .licenses(new LinkedList<>())
- .publisher(IDENTIFIER_7_PUBLISHER)
- .type(IDENTIFIER_7_TYPE_DTO)
- .build();
-
- public static final UUID IDENTIFIER_2_ID = UUID.fromString("fdb95f60-48e7-4e74-8122-d3c8d079c889");
- 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 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(DATABASE_1_ID)
- .queryId(QUERY_1_ID)
- .type(IDENTIFIER_2_TYPE_DTO)
- .publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_2_PUBLISHER)
- .build();
-
- public static final Identifier IDENTIFIER_2 = Identifier.builder()
- .id(IDENTIFIER_2_ID)
- .queryId(QUERY_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_2_DOI)
- .database(null /* DATABASE_1 */)
- .created(IDENTIFIER_2_CREATED)
- .lastModified(IDENTIFIER_2_MODIFIED)
- .execution(IDENTIFIER_2_EXECUTION)
- .publicationDay(IDENTIFIER_2_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_2_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_2_QUERY_HASH)
- .resultHash(IDENTIFIER_2_RESULT_HASH)
- .query(IDENTIFIER_2_QUERY)
- .queryNormalized(IDENTIFIER_2_NORMALIZED)
- .resultNumber(IDENTIFIER_2_RESULT_NUMBER)
- .publisher(IDENTIFIER_2_PUBLISHER)
- .type(IDENTIFIER_2_TYPE)
- .owner(USER_1)
- .ownedBy(USER_1_ID)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_2_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_2_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_2_ID)
- .queryId(QUERY_1_ID)
- .databaseId(DATABASE_1_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_2_ID)
- .selfHtml("/pid/" + IDENTIFIER_2_ID)
- .data("/api/database/" + DATABASE_1_ID + "/subset/" + QUERY_1_ID + "/data")
- .build())
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_2_DOI)
- .execution(IDENTIFIER_2_EXECUTION)
- .publicationDay(IDENTIFIER_2_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_2_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_2_QUERY_HASH)
- .resultHash(IDENTIFIER_2_RESULT_HASH)
- .query(IDENTIFIER_2_QUERY)
- .queryNormalized(IDENTIFIER_2_NORMALIZED)
- .resultNumber(IDENTIFIER_2_RESULT_NUMBER)
- .publisher(IDENTIFIER_2_PUBLISHER)
- .type(IDENTIFIER_2_TYPE_DTO)
- .owner(USER_1_BRIEF_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_2_STATUS_TYPE_DTO)
- .build();
-
- public static final IdentifierBriefDto IDENTIFIER_2_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_2_ID)
- .queryId(QUERY_1_ID)
- .databaseId(DATABASE_1_ID)
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_2_DOI)
- .publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_2_PUBLISHER)
- .type(IDENTIFIER_2_TYPE_DTO)
- .status(IDENTIFIER_2_STATUS_TYPE_DTO)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_2_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_2_ID)
- .databaseId(DATABASE_1_ID)
- .queryId(QUERY_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_2_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_2_PUBLICATION_YEAR)
- .creators(new LinkedList<>())
- .publisher(IDENTIFIER_2_PUBLISHER)
- .type(IDENTIFIER_2_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .queryId(QUERY_1_ID)
- .build();
-
- public static final UUID IDENTIFIER_3_ID = UUID.fromString("e2d831c2-3694-4fdc-8c48-7a7e94b73c43");
- 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(VIEW_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_3_DOI)
- .database(null /* DATABASE_1 */)
- .created(IDENTIFIER_3_CREATED)
- .lastModified(IDENTIFIER_3_MODIFIED)
- .execution(IDENTIFIER_3_EXECUTION)
- .publicationDay(IDENTIFIER_3_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_3_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_3_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_3_QUERY_HASH)
- .resultHash(IDENTIFIER_3_RESULT_HASH)
- .query(IDENTIFIER_3_QUERY)
- .queryNormalized(IDENTIFIER_3_NORMALIZED)
- .resultNumber(IDENTIFIER_3_RESULT_NUMBER)
- .publisher(IDENTIFIER_3_PUBLISHER)
- .type(IDENTIFIER_3_TYPE)
- .owner(USER_1)
- .ownedBy(USER_1_ID)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_3_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_3_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_3_ID)
- .databaseId(DATABASE_1_ID)
- .viewId(VIEW_1_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_3_ID)
- .selfHtml("/pid/" + IDENTIFIER_3_ID)
- .data("/api/database/" + DATABASE_1_ID + "/view/" + VIEW_1_ID + "/data")
- .build())
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_3_DOI)
- .execution(IDENTIFIER_3_EXECUTION)
- .publicationDay(IDENTIFIER_3_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_3_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_3_PUBLICATION_YEAR)
- .queryHash(IDENTIFIER_3_QUERY_HASH)
- .resultHash(IDENTIFIER_3_RESULT_HASH)
- .query(IDENTIFIER_3_QUERY)
- .queryNormalized(IDENTIFIER_3_NORMALIZED)
- .resultNumber(IDENTIFIER_3_RESULT_NUMBER)
- .publisher(IDENTIFIER_3_PUBLISHER)
- .type(IDENTIFIER_3_TYPE_DTO)
- .owner(USER_1_BRIEF_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_3_STATUS_TYPE_DTO)
- .build();
-
- public static final IdentifierBriefDto IDENTIFIER_3_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_3_ID)
- .databaseId(DATABASE_1_ID)
- .viewId(VIEW_1_ID)
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_3_DOI)
- .publicationYear(IDENTIFIER_3_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_3_PUBLISHER)
- .type(IDENTIFIER_3_TYPE_DTO)
- .status(IDENTIFIER_3_STATUS_TYPE_DTO)
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_3_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_1_ID)
- .viewId(VIEW_1_ID)
- .type(IDENTIFIER_3_TYPE_DTO)
- .publicationYear(IDENTIFIER_3_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_3_PUBLISHER)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_3_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_3_ID)
- .databaseId(DATABASE_1_ID)
- .viewId(VIEW_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_3_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_3_PUBLICATION_YEAR)
- .creators(new LinkedList<>())
- .publisher(IDENTIFIER_3_PUBLISHER)
- .type(IDENTIFIER_3_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .build();
-
- public static final UUID IDENTIFIER_4_ID = UUID.fromString("3bd69bb8-f7e3-48e4-9717-823787e7ba23");
- 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(TABLE_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_4_DOI)
- .database(null /* DATABASE_1 */)
- .created(IDENTIFIER_4_CREATED)
- .lastModified(IDENTIFIER_4_MODIFIED)
- .execution(IDENTIFIER_4_EXECUTION)
- .publicationDay(IDENTIFIER_4_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_4_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
- .resultHash(IDENTIFIER_4_RESULT_HASH)
- .resultNumber(IDENTIFIER_4_RESULT_NUMBER)
- .publisher(IDENTIFIER_4_PUBLISHER)
- .type(IDENTIFIER_4_TYPE)
- .owner(USER_1)
- .ownedBy(USER_1_ID)
- .licenses(new LinkedList<>(List.of(LICENSE_1)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_4_STATUS_TYPE)
- .build();
-
- public static final IdentifierDto IDENTIFIER_4_DTO = IdentifierDto.builder()
- .id(IDENTIFIER_4_ID)
- .databaseId(DATABASE_1_ID)
- .tableId(TABLE_1_ID)
- .links(LinksDto.builder()
- .self("/api/identifier/" + IDENTIFIER_4_ID)
- .selfHtml("/pid/" + IDENTIFIER_4_ID)
- .data("/api/database/" + DATABASE_1_ID + "/table/" + TABLE_1_ID + "/data")
- .build())
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_4_DOI)
- .execution(IDENTIFIER_4_EXECUTION)
- .publicationDay(IDENTIFIER_4_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_4_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
- .resultHash(IDENTIFIER_4_RESULT_HASH)
- .resultNumber(IDENTIFIER_4_RESULT_NUMBER)
- .publisher(IDENTIFIER_4_PUBLISHER)
- .type(IDENTIFIER_4_TYPE_DTO)
- .owner(USER_1_BRIEF_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .creators(new LinkedList<>())
- .status(IDENTIFIER_4_STATUS_TYPE_DTO)
- .build();
-
- public static final IdentifierBriefDto IDENTIFIER_4_BRIEF_DTO = IdentifierBriefDto.builder()
- .id(IDENTIFIER_4_ID)
- .databaseId(DATABASE_1_ID)
- .tableId(TABLE_1_ID)
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_4_DOI)
- .publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_4_PUBLISHER)
- .type(IDENTIFIER_4_TYPE_DTO)
- .status(IDENTIFIER_4_STATUS_TYPE_DTO)
- .build();
-
- public static final CreateIdentifierDto IDENTIFIER_4_CREATE_DTO = CreateIdentifierDto.builder()
- .databaseId(DATABASE_1_ID)
- .publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
- .publisher(IDENTIFIER_4_PUBLISHER)
- .build();
-
- public static final IdentifierSaveDto IDENTIFIER_4_SAVE_DTO = IdentifierSaveDto.builder()
- .id(IDENTIFIER_4_ID)
- .databaseId(DATABASE_1_ID)
- .tableId(TABLE_1_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .relatedIdentifiers(new LinkedList<>())
- .publicationMonth(IDENTIFIER_4_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_4_PUBLICATION_YEAR)
- .creators(new LinkedList<>())
- .publisher(IDENTIFIER_4_PUBLISHER)
- .type(IDENTIFIER_4_TYPE_DTO)
- .licenses(new LinkedList<>(List.of(LICENSE_1_DTO)))
- .build();
-
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 = "";
@@ -7363,945 +5448,50 @@ public class BaseTest {
.displayEnd(BANNER_MESSAGE_2_END)
.build();
- public static final Database DATABASE_1 = Database.builder()
- .id(DATABASE_1_ID)
- .created(Instant.now().minus(1, HOURS))
- .lastModified(Instant.now())
- .isPublic(DATABASE_1_PUBLIC)
- .isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
- .isDashboardEnabled(DATABASE_1_DASHBOARD_ENABLED)
- .name(DATABASE_1_NAME)
- .description(DATABASE_1_DESCRIPTION)
- .dashboardUid(DATABASE_1_DASHBOARD_UID)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_1, IDENTIFIER_2, IDENTIFIER_3, IDENTIFIER_4)))
- .cid(CONTAINER_1_ID)
- .container(CONTAINER_1)
- .internalName(DATABASE_1_INTERNALNAME)
- .exchangeName(DATABASE_1_EXCHANGE)
- .created(DATABASE_1_CREATED)
- .lastModified(DATABASE_1_LAST_MODIFIED)
- .ownedBy(DATABASE_1_CREATED_BY)
- .owner(USER_1)
- .ownedBy(USER_1_ID)
- .owner(USER_1)
- .image(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
- .contactPerson(USER_1_ID)
- .contact(USER_1)
- .subsets(new LinkedList<>())
- .tables(new LinkedList<>())
- .views(new LinkedList<>())
- .accesses(new LinkedList<>())
- .identifiers(new LinkedList<>())
- .build();
-
public static final CreateDashboardDto DATABASE_1_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
.databaseName(DATABASE_1_INTERNALNAME)
.isPublic(DATABASE_1_PUBLIC)
.isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
- .ownerUsername(USER_1_USERNAME)
+ .ownerUsername(USER_1.getUsername())
.build();
public static final CreateDashboardResponseDto DATABASE_1_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
.uid(DATABASE_1_DASHBOARD_UID)
.build();
- public static final DatabaseDto DATABASE_1_DTO = DatabaseDto.builder()
- .id(DATABASE_1_ID)
- .isPublic(DATABASE_1_PUBLIC)
- .isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
- .name(DATABASE_1_NAME)
- .description(DATABASE_1_DESCRIPTION)
- .dashboardUid(DATABASE_1_DASHBOARD_UID)
- .container(CONTAINER_1_DTO)
- .internalName(DATABASE_1_INTERNALNAME)
- .exchangeName(DATABASE_1_EXCHANGE)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_1_DTO, IDENTIFIER_2_DTO, IDENTIFIER_3_DTO, IDENTIFIER_4_DTO)))
- .tables(new LinkedList<>(List.of(TABLE_1_DTO, TABLE_2_DTO, TABLE_3_DTO, TABLE_4_DTO)))
- .views(new LinkedList<>(List.of(VIEW_1_DTO, VIEW_2_DTO, VIEW_3_DTO)))
- .owner(USER_1_BRIEF_DTO)
- .build();
-
- public static final DatabaseDto DATABASE_1_PRIVILEGED_DTO = DatabaseDto.builder()
- .id(DATABASE_1_ID)
- .isPublic(DATABASE_1_PUBLIC)
- .isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
- .name(DATABASE_1_NAME)
- .container(CONTAINER_1_PRIVILEGED_DTO)
- .internalName(DATABASE_1_INTERNALNAME)
- .exchangeName(DATABASE_1_EXCHANGE)
- .accesses(new LinkedList<>(List.of())) /* DATABASE_1_USER_1_READ_ACCESS_DTO */
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_1_DTO, IDENTIFIER_2_DTO, IDENTIFIER_3_DTO, IDENTIFIER_4_DTO)))
- .tables(new LinkedList<>(List.of(TABLE_1_DTO, TABLE_2_DTO, TABLE_3_DTO, TABLE_4_DTO)))
- .views(new LinkedList<>(List.of(VIEW_1_DTO, VIEW_2_DTO, VIEW_3_DTO)))
- .owner(USER_1_BRIEF_DTO)
- .lastRetrieved(Instant.now())
+ public static final CreateDashboardDto DATABASE_2_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
+ .databaseName(DATABASE_2_INTERNALNAME)
+ .isPublic(DATABASE_2_PUBLIC)
+ .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
+ .ownerUsername(USER_2.getUsername())
.build();
- public static final DatabaseBriefDto DATABASE_1_BRIEF_DTO = DatabaseBriefDto.builder()
- .id(DATABASE_1_ID)
- .isPublic(DATABASE_1_PUBLIC)
- .isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
- .name(DATABASE_1_NAME)
- .internalName(DATABASE_1_INTERNALNAME)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_1_BRIEF_DTO, IDENTIFIER_2_BRIEF_DTO, IDENTIFIER_3_BRIEF_DTO, IDENTIFIER_4_BRIEF_DTO)))
+ public static final CreateDashboardResponseDto DATABASE_2_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
+ .uid(DATABASE_2_DASHBOARD_UID)
.build();
- public static final DatabaseAccess DATABASE_1_USER_1_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_1_ID)
- .user(USER_1)
+ public static final CreateDashboardDto DATABASE_3_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
+ .databaseName(DATABASE_3_INTERNALNAME)
+ .isPublic(DATABASE_3_PUBLIC)
+ .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
+ .ownerUsername(USER_3.getUsername())
.build();
- 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 static final DatabaseAccess DATABASE_1_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- public static final DatabaseAccess DATABASE_1_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- public static final DatabaseAccess DATABASE_1_USER_2_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- 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 static final DatabaseAccess DATABASE_1_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- 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 static final DatabaseAccess DATABASE_1_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- 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 static final DatabaseAccess DATABASE_1_USER_3_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- public static final DatabaseAccess DATABASE_1_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- public static final DatabaseAccess DATABASE_1_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_1_ID)
- .database(DATABASE_1)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- 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 static final 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 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 static final Database DATABASE_2 = Database.builder()
- .id(DATABASE_2_ID)
- .created(DATABASE_2_CREATED)
- .lastModified(Instant.now())
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .isDashboardEnabled(DATABASE_2_DASHBOARD_ENABLED)
- .name(DATABASE_2_NAME)
- .description(DATABASE_2_DESCRIPTION)
- .dashboardUid(DATABASE_2_DASHBOARD_UID)
- .cid(CONTAINER_1_ID)
- .container(CONTAINER_1)
- .internalName(DATABASE_2_INTERNALNAME)
- .exchangeName(DATABASE_2_EXCHANGE)
- .created(DATABASE_2_CREATED)
- .lastModified(DATABASE_2_LAST_MODIFIED)
- .ownedBy(DATABASE_2_OWNER)
- .owner(USER_2)
- .contactPerson(USER_2_ID)
- .contact(USER_2)
- .tables(new LinkedList<>())
- .views(new LinkedList<>())
- .accesses(new LinkedList<>())
- .identifiers(new LinkedList<>())
- .build();
-
- public static final CreateDashboardDto DATABASE_2_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
- .databaseName(DATABASE_2_INTERNALNAME)
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .ownerUsername(USER_2_USERNAME)
- .build();
-
- public static final CreateDashboardResponseDto DATABASE_2_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
- .uid(DATABASE_2_DASHBOARD_UID)
- .build();
-
- public static final DatabaseDto DATABASE_2_DTO = DatabaseDto.builder()
- .id(DATABASE_2_ID)
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .name(DATABASE_2_NAME)
- .description(DATABASE_2_DESCRIPTION)
- .dashboardUid(DATABASE_2_DASHBOARD_UID)
- .container(CONTAINER_1_DTO)
- .internalName(DATABASE_2_INTERNALNAME)
- .exchangeName(DATABASE_2_EXCHANGE)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_5_DTO)))
- .tables(new LinkedList<>(List.of(TABLE_5_DTO, TABLE_6_DTO, TABLE_7_DTO)))
- .views(new LinkedList<>(List.of(VIEW_4_DTO)))
- .owner(USER_2_BRIEF_DTO)
- .lastRetrieved(Instant.now())
- .build();
-
- public static final DatabaseDto DATABASE_2_PRIVILEGED_DTO = DatabaseDto.builder()
- .id(DATABASE_2_ID)
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .name(DATABASE_2_NAME)
- .container(CONTAINER_1_PRIVILEGED_DTO)
- .internalName(DATABASE_2_INTERNALNAME)
- .exchangeName(DATABASE_2_EXCHANGE)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_5_DTO)))
- .tables(new LinkedList<>(List.of(TABLE_5_DTO, TABLE_6_DTO, TABLE_7_DTO)))
- .views(new LinkedList<>(List.of(VIEW_4_DTO)))
- .owner(USER_2_BRIEF_DTO)
- .lastRetrieved(Instant.now())
- .build();
-
- public static final DatabaseBriefDto DATABASE_2_PRIVILEGED_BRIEF_DTO = DatabaseBriefDto.builder()
- .id(DATABASE_2_ID)
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .name(DATABASE_2_NAME)
- .internalName(DATABASE_2_INTERNALNAME)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_5_BRIEF_DTO)))
- .ownerId(USER_2_ID)
- .build();
-
- public static final DatabaseBriefDto DATABASE_2_BRIEF_DTO = DatabaseBriefDto.builder()
- .id(DATABASE_2_ID)
- .isPublic(DATABASE_2_PUBLIC)
- .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
- .name(DATABASE_2_NAME)
- .internalName(DATABASE_2_INTERNALNAME)
- .identifiers(new LinkedList<>(List.of(IDENTIFIER_5_BRIEF_DTO)))
- .ownerId(USER_2_ID)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_1_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_2_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- 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 static final DatabaseAccess DATABASE_2_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- 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 static final DatabaseAccess DATABASE_2_USER_3_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- 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 static final DatabaseAccess DATABASE_2_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- public static final DatabaseAccess DATABASE_2_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_2_ID)
- .database(DATABASE_2)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- public static final Database DATABASE_3 = Database.builder()
- .id(DATABASE_3_ID)
- .created(Instant.now().minus(1, HOURS))
- .lastModified(Instant.now())
- .isPublic(DATABASE_3_PUBLIC)
- .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
- .isDashboardEnabled(DATABASE_3_DASHBOARD_ENABLED)
- .name(DATABASE_3_NAME)
- .description(DATABASE_3_DESCRIPTION)
- .dashboardUid(DATABASE_3_DASHBOARD_UID)
- .cid(CONTAINER_1_ID)
- .container(CONTAINER_1)
- .internalName(DATABASE_3_INTERNALNAME)
- .exchangeName(DATABASE_3_EXCHANGE)
- .created(DATABASE_3_CREATED)
- .lastModified(DATABASE_3_LAST_MODIFIED)
- .ownedBy(DATABASE_3_OWNER)
- .owner(USER_3)
- .contactPerson(USER_3_ID)
- .contact(USER_3)
- .tables(new LinkedList<>())
- .views(new LinkedList<>())
- .accesses(new LinkedList<>()) /* DATABASE_3_USER_1_WRITE_ALL_ACCESS */
- .identifiers(new LinkedList<>()) /* IDENTIFIER_6 */
- .build();
-
- public static final CreateDashboardDto DATABASE_3_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
- .databaseName(DATABASE_3_INTERNALNAME)
- .isPublic(DATABASE_3_PUBLIC)
- .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
- .ownerUsername(USER_3_USERNAME)
- .build();
-
- public static final CreateDashboardResponseDto DATABASE_3_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
- .uid(DATABASE_3_DASHBOARD_UID)
- .build();
-
- public static final DatabaseAccess DATABASE_3_USER_1_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- 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 static final DatabaseAccess DATABASE_3_USER_1_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- 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 static final DatabaseAccess DATABASE_3_USER_1_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_1_ID)
- .user(USER_1)
- .build();
-
- 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 static final DatabaseAccess DATABASE_3_USER_2_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- public static final DatabaseAccess DATABASE_3_USER_2_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- public static final DatabaseAccess DATABASE_3_USER_2_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_2_ID)
- .user(USER_2)
- .build();
-
- public static final DatabaseAccess DATABASE_3_USER_3_READ_ACCESS = DatabaseAccess.builder()
- .type(AccessType.READ)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- 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 static final DatabaseAccess DATABASE_3_USER_3_WRITE_OWN_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_OWN)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- 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 static final DatabaseAccess DATABASE_3_USER_3_WRITE_ALL_ACCESS = DatabaseAccess.builder()
- .type(AccessType.WRITE_ALL)
- .hdbid(DATABASE_3_ID)
- .database(DATABASE_3)
- .huserid(USER_3_ID)
- .user(USER_3)
- .build();
-
- 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 static final Identifier IDENTIFIER_7 = Identifier.builder()
- .id(IDENTIFIER_7_ID)
- .descriptions(new LinkedList<>())
- .titles(new LinkedList<>())
- .doi(IDENTIFIER_7_DOI)
- .created(IDENTIFIER_7_CREATED)
- .lastModified(IDENTIFIER_7_MODIFIED)
- .execution(IDENTIFIER_7_EXECUTION)
- .publicationDay(IDENTIFIER_7_PUBLICATION_DAY)
- .publicationMonth(IDENTIFIER_7_PUBLICATION_MONTH)
- .publicationYear(IDENTIFIER_7_PUBLICATION_YEAR)
- .resultNumber(IDENTIFIER_7_RESULT_NUMBER)
- .publisher(IDENTIFIER_7_PUBLISHER)
- .type(IDENTIFIER_7_TYPE)
- .owner(USER_4)
- .ownedBy(USER_4_ID)
- .licenses(new LinkedList<>())
- .creators(new LinkedList<>(List.of(IDENTIFIER_7_CREATOR_1)))
- .relatedIdentifiers(new LinkedList<>())
- .funders(new LinkedList<>())
- .status(IDENTIFIER_7_STATUS_TYPE)
- .build();
-
- public static final Database DATABASE_4 = Database.builder()
- .id(DATABASE_4_ID)
- .created(Instant.now().minus(4, HOURS))
- .lastModified(Instant.now())
- .isPublic(DATABASE_4_PUBLIC)
- .isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
- .isDashboardEnabled(DATABASE_4_DASHBOARD_ENABLED)
- .name(DATABASE_4_NAME)
- .description(DATABASE_4_DESCRIPTION)
- .dashboardUid(DATABASE_4_DASHBOARD_UID)
- .cid(CONTAINER_4_ID)
- .container(CONTAINER_4)
- .internalName(DATABASE_4_INTERNALNAME)
- .exchangeName(DATABASE_4_EXCHANGE)
- .created(DATABASE_4_CREATED)
- .lastModified(DATABASE_4_LAST_MODIFIED)
- .ownedBy(DATABASE_4_OWNER)
- .owner(USER_4)
- .contactPerson(USER_4_ID)
- .contact(USER_4)
- .tables(new LinkedList<>())
- .views(new LinkedList<>())
- .identifiers(new LinkedList<>())
+ public static final CreateDashboardResponseDto DATABASE_3_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
+ .uid(DATABASE_3_DASHBOARD_UID)
.build();
public static final CreateDashboardDto DATABASE_4_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
.databaseName(DATABASE_4_INTERNALNAME)
.isPublic(DATABASE_4_PUBLIC)
.isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
- .ownerUsername(USER_4_USERNAME)
+ .ownerUsername(USER_4.getUsername())
.build();
public static final CreateDashboardResponseDto DATABASE_4_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
.uid(DATABASE_4_DASHBOARD_UID)
.build();
- 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 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 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 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 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 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 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 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 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 static final List<IdentifierDto> VIEW_1_DTO_IDENTIFIERS = List.of(IDENTIFIER_3_DTO);
-
- public static final Constraints TABLE_1_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_1)
- .column(TABLE_1_COLUMNS.get(0))
- .id(COLUMN_1_1_ID)
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_1_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .id(UUID.fromString("b3f40a88-4f21-4de0-a595-3d15e63943aa"))
- .table(TABLE_1_BRIEF_DTO)
- .column(TABLE_1_COLUMNS_BRIEF_0_DTO)
- .build())))
- .build();
-
- public static final Constraints TABLE_2_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>(List.of("`mintemp` > 0")))
- .foreignKeys(new LinkedList<>(List.of(ForeignKey.builder()
- .id(UUID.fromString("d79f0fb1-05d6-4f3e-a5e2-8559982b8516"))
- .name("fk_location")
- .onDelete(ReferenceType.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReference.builder()
- .id(UUID.fromString("a4da8f2f-2999-4621-8066-801a2fb73c8d"))
- .column(TABLE_2_COLUMNS.get(2))
- .referencedColumn(TABLE_1_COLUMNS.get(0))
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_2)
- .referencedTable(TABLE_1)
- .onUpdate(ReferenceType.NO_ACTION)
- .build())))
- .uniques(new LinkedList<>(List.of(Unique.builder()
- .id(UUID.fromString("408e398f-d157-49a1-8b45-87a070f3b4de"))
- .table(TABLE_2)
- .name("uk_1")
- .columns(new LinkedList<>(List.of(TABLE_2_COLUMNS.get(1))))
- .build())))
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_2)
- .column(TABLE_2_COLUMNS.get(0))
- .id(COLUMN_2_1_ID)
- .build())))
- .build();
-
- 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(UUID.fromString("ca833111-1e9a-48a3-bb16-ad6f90196f96"))
- .name("fk_location")
- .onDelete(ReferenceTypeDto.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReferenceDto.builder()
- .id(UUID.fromString("8552f282-0403-424d-b2ba-4ed0f760197c"))
- .column(TABLE_2_COLUMNS_BRIEF_2_DTO)
- .referencedColumn(TABLE_1_COLUMNS_BRIEF_0_DTO)
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_1_BRIEF_DTO)
- .referencedTable(TABLE_2_BRIEF_DTO)
- .onUpdate(ReferenceTypeDto.NO_ACTION)
- .build())))
- .uniques(new LinkedList<>(List.of(UniqueDto.builder()
- .id(UUID.fromString("b9aba807-dd9c-43a3-9614-2493cb4b26bd"))
- .table(TABLE_2_BRIEF_DTO)
- .name("uk_1")
- .columns(new LinkedList<>(List.of(TABLE_2_COLUMNS_BRIEF_DTO.get(1))))
- .build())))
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_2_BRIEF_DTO)
- .column(TABLE_2_COLUMNS_BRIEF_0_DTO)
- .id(COLUMN_2_1_ID)
- .build())))
- .build();
-
- public static final Constraints TABLE_3_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_3)
- .column(TABLE_3_COLUMNS.get(0))
- .id(COLUMN_3_1_ID)
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_3_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_3_BRIEF_DTO)
- .column(TABLE_3_COLUMNS_BRIEF_0_DTO)
- .id(COLUMN_3_1_ID)
- .build())))
- .build();
-
- public static final Constraints TABLE_4_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_4)
- .column(TABLE_4_COLUMNS.get(0))
- .id(COLUMN_4_1_ID)
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_4_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_4_BRIEF_DTO)
- .column(TABLE_4_COLUMNS_BRIEF_0_DTO)
- .id(COLUMN_4_1_ID)
- .build())))
- .build();
-
- public static final Constraints TABLE_5_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_5)
- .column(TABLE_5_COLUMNS.get(0))
- .id(COLUMN_5_1_ID)
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_5_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_5_BRIEF_DTO)
- .column(TABLE_5_COLUMNS_BRIEF_0_DTO)
- .id(COLUMN_5_1_ID)
- .build())))
- .build();
-
- public static final Constraints TABLE_6_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>(List.of()))
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_6)
- .column(TABLE_6_COLUMNS.get(0))
- .id(COLUMN_6_1_ID)
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_6_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_6_BRIEF_DTO)
- .column(TABLE_6_COLUMNS_BRIEF_0_DTO)
- .id(COLUMN_6_1_ID)
- .build())))
- .build();
-
- public static final Constraints TABLE_7_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>(List.of(ForeignKey.builder()
- .id(UUID.fromString("421c3dd8-ae09-4c72-a6ca-09de009e755f"))
- .name("fk_name_id")
- .onDelete(ReferenceType.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReference.builder()
- .id(UUID.fromString("7c0e4a3c-88b8-4276-8924-403fd122fbf1"))
- .column(TABLE_6_COLUMNS.get(0))
- .referencedColumn(TABLE_7_COLUMNS.get(0))
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_7)
- .referencedTable(TABLE_6)
- .onUpdate(ReferenceType.NO_ACTION)
- .build(),
- ForeignKey.builder()
- .id(UUID.fromString("fce75207-6009-49ff-a646-d3e18aed787a"))
- .name("fk_zoo_id")
- .onDelete(ReferenceType.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReference.builder()
- .id(UUID.fromString("e6cb1daa-a210-41c4-bb79-2c98ef25a02c"))
- .column(TABLE_5_COLUMNS.get(0))
- .referencedColumn(TABLE_7_COLUMNS.get(1))
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_7)
- .referencedTable(TABLE_5)
- .onUpdate(ReferenceType.NO_ACTION)
- .build())))
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_7)
- .column(TABLE_7_COLUMNS.get(0))
- .id(COLUMN_7_1_ID)
- .build())))
- .build();
-
- public static final ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_0_DTO = ForeignKeyDto.builder()
- .id(UUID.fromString("561b4933-54e5-4dad-a536-39836da87fe3"))
- .name("fk_name_id")
- .onDelete(ReferenceTypeDto.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReferenceDto.builder()
- .id(UUID.fromString("0f4b00c0-f2a8-4929-8619-bdc941b5dc8c"))
- .column(TABLE_6_COLUMNS_BRIEF_0_DTO)
- .referencedColumn(TABLE_7_COLUMNS_BRIEF_0_DTO)
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_7_BRIEF_DTO)
- .referencedTable(TABLE_6_BRIEF_DTO)
- .onUpdate(ReferenceTypeDto.NO_ACTION)
- .build();
-
- public static final ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_0_DTO = ForeignKeyBriefDto.builder()
- .id(UUID.fromString("a92f09c5-9bce-4f77-8f7b-a9afc1d30ec2"))
- .build();
-
- public static final ForeignKeyDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_1_DTO = ForeignKeyDto.builder()
- .id(UUID.fromString("f2e82566-ddc3-4b76-8d27-adc3c51780a9"))
- .name("fk_zoo_id")
- .onDelete(ReferenceTypeDto.NO_ACTION)
- .references(new LinkedList<>(List.of(ForeignKeyReferenceDto.builder()
- .id(UUID.fromString("7a393166-25d2-4b8c-a5e7-7d1b3b33b823"))
- .column(TABLE_5_COLUMNS_BRIEF_0_DTO)
- .referencedColumn(TABLE_7_COLUMNS_BRIEF_1_DTO)
- .foreignKey(null) // set later
- .build())))
- .table(TABLE_7_BRIEF_DTO)
- .referencedTable(TABLE_5_BRIEF_DTO)
- .onUpdate(ReferenceTypeDto.NO_ACTION)
- .build();
-
- public static final ForeignKeyBriefDto TABLE_7_CONSTRAINTS_FOREIGN_KEY_BRIEF_1_DTO = ForeignKeyBriefDto.builder()
- .id(UUID.fromString("6ce1f707-0bdf-4930-be77-157801d2735a"))
- .build();
-
- 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)))
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_7_BRIEF_DTO)
- .column(TABLE_7_COLUMNS_BRIEF_0_DTO)
- .id(UUID.fromString("9969e13f-2a2f-45c7-bccf-a7df0ac813a8"))
- .build())))
- .build();
-
- public static final Constraints TABLE_8_CONSTRAINTS = Constraints.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
- .table(TABLE_8)
- .column(TABLE_8_COLUMNS.get(0))
- .id(UUID.fromString("cd23b601-966c-4aa7-9722-6bcb009200cc"))
- .build())))
- .build();
-
- public static final ConstraintsDto TABLE_8_CONSTRAINTS_DTO = ConstraintsDto.builder()
- .checks(new LinkedHashSet<>())
- .foreignKeys(new LinkedList<>())
- .uniques(new LinkedList<>())
- .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
- .table(TABLE_8_BRIEF_DTO)
- .column(TABLE_8_COLUMNS_BRIEF_0_DTO)
- .id(UUID.fromString("c61196d1-a902-405c-a825-0781c0c94df1"))
- .build())))
- .build();
-
public static final ExportResourceDto EXPORT_RESOURCE_DTO = ExportResourceDto.builder()
.filename("68b329da9893e34099c7d8ad5cb9c940")
.resource(new InputStreamResource(InputStream.nullInputStream()))
diff --git a/lib/java/dbrepo-core/src/main/resources/container-1.json b/lib/java/dbrepo-core/src/main/resources/container-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4879536b5443ba147fe57006f1f0f1d431268f2
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/container-1.json
@@ -0,0 +1,26 @@
+{
+ "id" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "name" : "u01",
+ "internalName" : "dbrepo-userdb-u01",
+ "host" : "localhost",
+ "port" : 3308,
+ "uiHost" : "localhost",
+ "uiPort" : 3306,
+ "quota" : 4,
+ "uiAdditionalFlags" : "?sslMode=disable",
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:20:29.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/container-2.json b/lib/java/dbrepo-core/src/main/resources/container-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8627c7605802af53f0a0716902fe35ab41af71f
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/container-2.json
@@ -0,0 +1,24 @@
+{
+ "id" : "1731c7d2-8bd1-4392-85bc-18a3be99e01d",
+ "name" : "u03",
+ "internalName" : "dbrepo-userdb-u03",
+ "host" : "localhost",
+ "port" : 3310,
+ "quota" : 20,
+ "databases" : [ ],
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:21:12.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/container-3.json b/lib/java/dbrepo-core/src/main/resources/container-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..7a29b8b41cfb18820b2da8b384420fe0e3602332
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/container-3.json
@@ -0,0 +1,23 @@
+{
+ "id" : "67aee75c-791c-410b-abbb-175c11ddd252",
+ "name" : "u04",
+ "internalName" : "dbrepo-userdb-u04",
+ "host" : "localhost",
+ "port" : 3311,
+ "quota" : 0,
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:21:28.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/container-4.json b/lib/java/dbrepo-core/src/main/resources/container-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..7a29b8b41cfb18820b2da8b384420fe0e3602332
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/container-4.json
@@ -0,0 +1,23 @@
+{
+ "id" : "67aee75c-791c-410b-abbb-175c11ddd252",
+ "name" : "u04",
+ "internalName" : "dbrepo-userdb-u04",
+ "host" : "localhost",
+ "port" : 3311,
+ "quota" : 0,
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:21:28.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/database-1.json b/lib/java/dbrepo-core/src/main/resources/database-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..668c73ae0eb2478d89ff1617ee40d6f867436d02
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/database-1.json
@@ -0,0 +1,68 @@
+{
+ "id" : "b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425",
+ "dashboardUid" : "2c7b6aeae843e41cf75b",
+ "ownedBy" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+ "owner" : {
+ "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+ "username" : "junit1",
+ "firstname" : "John",
+ "lastname" : "Doe",
+ "orcid" : "https://orcid.org/0000-0003-4216-302X",
+ "affiliation" : "TU Graz",
+ "language" : "en",
+ "theme" : "light"
+ },
+ "cid" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "container" : {
+ "id" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "name" : "u01",
+ "internalName" : "dbrepo-userdb-u01",
+ "host" : "localhost",
+ "port" : 3308,
+ "uiHost" : "localhost",
+ "uiPort" : 3306,
+ "quota" : 4,
+ "uiAdditionalFlags" : "?sslMode=disable",
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:20:29.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+ },
+ "name" : "Weather",
+ "internalName" : "weather",
+ "exchangeName" : "dbrepo",
+ "description" : "Weather in Australia",
+ "contactPerson" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+ "contact" : {
+ "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+ "username" : "junit1",
+ "firstname" : "John",
+ "lastname" : "Doe",
+ "orcid" : "https://orcid.org/0000-0003-4216-302X",
+ "affiliation" : "TU Graz",
+ "language" : "en",
+ "theme" : "light"
+ },
+ "identifiers" : [ ],
+ "subsets" : [ ],
+ "tables" : [ ],
+ "views" : [ ],
+ "accesses" : [ ],
+ "isPublic" : false,
+ "isSchemaPublic" : false,
+ "isDashboardEnabled" : false,
+ "image" : "AQIDBAUGBwgJCg==",
+ "created" : "2023-02-26T08:22:21.000Z",
+ "lastModified" : "2023-02-26T08:22:21Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/database-2.json b/lib/java/dbrepo-core/src/main/resources/database-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..d6d5799dcc9d2064709e8ef530776ac285653e0e
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/database-2.json
@@ -0,0 +1,66 @@
+{
+ "id" : "dd9dfee2-9fbd-46b0-92d5-98f0f8866ffe",
+ "dashboardUid" : "7779bc9207daeae7e5a7",
+ "ownedBy" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+ "owner" : {
+ "id" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+ "username" : "junit2",
+ "firstname" : "Jane",
+ "lastname" : "Doe",
+ "orcid" : "https://orcid.org/0000-0002-9272-6225",
+ "affiliation" : "TU Wien",
+ "language" : "de",
+ "theme" : "light"
+ },
+ "cid" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "container" : {
+ "id" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "name" : "u01",
+ "internalName" : "dbrepo-userdb-u01",
+ "host" : "localhost",
+ "port" : 3308,
+ "uiHost" : "localhost",
+ "uiPort" : 3306,
+ "quota" : 4,
+ "uiAdditionalFlags" : "?sslMode=disable",
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:20:29.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+ },
+ "name" : "Zoo",
+ "internalName" : "zoo",
+ "exchangeName" : "dbrepo",
+ "description" : "Zoo data",
+ "contactPerson" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+ "contact" : {
+ "id" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+ "username" : "junit2",
+ "firstname" : "Jane",
+ "lastname" : "Doe",
+ "orcid" : "https://orcid.org/0000-0002-9272-6225",
+ "affiliation" : "TU Wien",
+ "language" : "de",
+ "theme" : "light"
+ },
+ "identifiers" : [ ],
+ "tables" : [ ],
+ "views" : [ ],
+ "accesses" : [ ],
+ "isPublic" : false,
+ "isSchemaPublic" : true,
+ "isDashboardEnabled" : true,
+ "created" : "2023-02-26T08:22:52.000Z",
+ "lastModified" : "2023-02-26T08:22:52Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/database-3.json b/lib/java/dbrepo-core/src/main/resources/database-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..8734403ca844830adf2180e0248e120fec43c078
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/database-3.json
@@ -0,0 +1,62 @@
+{
+ "id" : "9d8cb9a9-9468-4801-a2e0-2dac8bc67c31",
+ "dashboardUid" : "18d25f581fb272ac260b",
+ "ownedBy" : "7b080e33-d8db-4276-9d53-47208e657006",
+ "owner" : {
+ "id" : "7b080e33-d8db-4276-9d53-47208e657006",
+ "username" : "junit3",
+ "firstname" : "System",
+ "lastname" : "System",
+ "affiliation" : "TU Wien",
+ "theme" : "light"
+ },
+ "cid" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "container" : {
+ "id" : "7ddb7e87-b965-43a2-9a24-4fa406d998f4",
+ "name" : "u01",
+ "internalName" : "dbrepo-userdb-u01",
+ "host" : "localhost",
+ "port" : 3308,
+ "uiHost" : "localhost",
+ "uiPort" : 3306,
+ "quota" : 4,
+ "uiAdditionalFlags" : "?sslMode=disable",
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:20:29.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+ },
+ "name" : "Musicology",
+ "internalName" : "musicology",
+ "exchangeName" : "dbrepo",
+ "description" : "Musicology data",
+ "contactPerson" : "7b080e33-d8db-4276-9d53-47208e657006",
+ "contact" : {
+ "id" : "7b080e33-d8db-4276-9d53-47208e657006",
+ "username" : "junit3",
+ "firstname" : "System",
+ "lastname" : "System",
+ "affiliation" : "TU Wien",
+ "theme" : "light"
+ },
+ "identifiers" : [ ],
+ "tables" : [ ],
+ "views" : [ ],
+ "accesses" : [ ],
+ "isPublic" : true,
+ "isSchemaPublic" : false,
+ "isDashboardEnabled" : true,
+ "created" : "2023-02-26T08:23:12.000Z",
+ "lastModified" : "2023-02-26T08:23:12Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/database-4.json b/lib/java/dbrepo-core/src/main/resources/database-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..d04ab0a5e79371f190364cb3fd3783b05bcde043
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/database-4.json
@@ -0,0 +1,58 @@
+{
+ "id" : "c503d7f3-5952-4d97-b26a-da86bea4c20d",
+ "dashboardUid" : "456a3760f69821a0f944",
+ "ownedBy" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+ "owner" : {
+ "id" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+ "username" : "junit4",
+ "firstname" : "JUnit",
+ "lastname" : "4",
+ "affiliation" : "TU Wien",
+ "theme" : "light"
+ },
+ "cid" : "67aee75c-791c-410b-abbb-175c11ddd252",
+ "container" : {
+ "id" : "67aee75c-791c-410b-abbb-175c11ddd252",
+ "name" : "u04",
+ "internalName" : "dbrepo-userdb-u04",
+ "host" : "localhost",
+ "port" : 3311,
+ "quota" : 0,
+ "image" : {
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+ },
+ "created" : "2023-02-26T08:21:28.000Z",
+ "privilegedUsername" : "root",
+ "privilegedPassword" : "dbrepo"
+ },
+ "name" : "Weather AT",
+ "internalName" : "weather_at",
+ "exchangeName" : "dbrepo",
+ "description" : "Weather data",
+ "contactPerson" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+ "contact" : {
+ "id" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+ "username" : "junit4",
+ "firstname" : "JUnit",
+ "lastname" : "4",
+ "affiliation" : "TU Wien",
+ "theme" : "light"
+ },
+ "identifiers" : [ ],
+ "tables" : [ ],
+ "views" : [ ],
+ "isPublic" : true,
+ "isSchemaPublic" : true,
+ "isDashboardEnabled" : true,
+ "created" : "2023-02-26T08:23:33.000Z",
+ "lastModified" : "2023-02-26T08:23:33Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-1.json b/lib/java/dbrepo-core/src/main/resources/identifier-1.json
deleted file mode 100644
index 8fc668dc102649d13d2d9b947156bded9670c0fe..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-1.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "id" : "679a83f2-ef23-4b4b-98f7-ad77b9d68733",
- "links" : {
- "self" : "/api/identifier/679a83f2-ef23-4b4b-98f7-ad77b9d68733",
- "self_html" : "/pid/679a83f2-ef23-4b4b-98f7-ad77b9d68733"
- },
- "type" : "database",
- "titles" : [ {
- "id" : "3df6b286-9bd2-4ae3-b8f4-29c217544bef",
- "title" : "Austrian weather data",
- "language" : "en"
- }, {
- "id" : "903a7e5b-8014-4b8a-b8fd-44f477880905",
- "title" : "Österreichische Wetterdaten",
- "language" : "en",
- "type" : "TranslatedTitle"
- } ],
- "descriptions" : [ {
- "id" : "1c438756-93f0-4797-983c-175a17e18c2c",
- "description" : "Selecting all from the weather Austrian table",
- "language" : "en"
- } ],
- "funders" : [ {
- "id" : "8deb273d-6dd6-407d-970a-01534035ac01",
- "funder_name" : "European Commission",
- "funder_identifier" : "https://doi.org/10.13039/501100000780",
- "funder_identifier_type" : "Crossref Funder ID",
- "award_title" : "Institutionalizing global genetic-resource commons. Global Strategies for accessing and using essential public knowledge assets in the life science"
- } ],
- "query" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
- "execution" : "2018-11-07T10:59:12.000Z",
- "doi" : "10.12345/183",
- "publisher" : "Austrian Government",
- "owner" : {
- "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
- "username" : "junit1",
- "name" : "John Doe",
- "orcid" : "https://orcid.org/0000-0003-4216-302X",
- "qualified_name" : "John Doe — @junit1",
- "given_name" : "John",
- "family_name" : "Doe"
- },
- "licenses" : [ {
- "identifier" : "MIT",
- "uri" : "https://opensource.org/license/mit/"
- } ],
- "creators" : [ {
- "id" : "667cd1d6-4f94-4808-b5cb-12e5ec0788d8",
- "firstname" : "Max",
- "lastname" : "Mustermann",
- "affiliation" : "TU Graz",
- "creator_name" : "Mustermann, Max",
- "name_type" : "Personal",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID",
- "affiliation_identifier" : "https://ror.org/04wn28048",
- "affiliation_identifier_scheme" : "ROR",
- "affiliation_identifier_scheme_uri" : "https://ror.org/"
- } ],
- "status" : "published",
- "database_id" : "b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425",
- "query_id" : "60494137-f000-459e-acd3-4fcadbdf14ca",
- "query_normalized" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
- "query_hash" : "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992",
- "result_hash" : "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a",
- "result_number" : 2,
- "publication_month" : 5,
- "publication_year" : 2022
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-2.json b/lib/java/dbrepo-core/src/main/resources/identifier-2.json
deleted file mode 100644
index 73bd849cc24e5b96583e4cb8448fc24d65207ef5..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-2.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "id" : "fdb95f60-48e7-4e74-8122-d3c8d079c889",
- "links" : {
- "self" : "/api/identifier/fdb95f60-48e7-4e74-8122-d3c8d079c889",
- "data" : "/api/database/b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425/subset/60494137-f000-459e-acd3-4fcadbdf14ca/data",
- "self_html" : "/pid/fdb95f60-48e7-4e74-8122-d3c8d079c889"
- },
- "type" : "subset",
- "titles" : [ ],
- "descriptions" : [ ],
- "query" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
- "execution" : "2019-03-03T04:45:52.000Z",
- "publisher" : "Swedish Government",
- "owner" : {
- "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
- "username" : "junit1",
- "name" : "John Doe",
- "orcid" : "https://orcid.org/0000-0003-4216-302X",
- "qualified_name" : "John Doe — @junit1",
- "given_name" : "John",
- "family_name" : "Doe"
- },
- "licenses" : [ {
- "identifier" : "MIT",
- "uri" : "https://opensource.org/license/mit/"
- } ],
- "creators" : [ ],
- "status" : "published",
- "database_id" : "b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425",
- "query_id" : "60494137-f000-459e-acd3-4fcadbdf14ca",
- "query_normalized" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
- "query_hash" : "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992",
- "result_hash" : "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a",
- "result_number" : 2,
- "publication_day" : 10,
- "publication_month" : 7,
- "publication_year" : 2023
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-3.json b/lib/java/dbrepo-core/src/main/resources/identifier-3.json
deleted file mode 100644
index e7c835c959e6a227e62c948626a98228401bc314..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-3.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "id" : "e2d831c2-3694-4fdc-8c48-7a7e94b73c43",
- "links" : {
- "self" : "/api/identifier/e2d831c2-3694-4fdc-8c48-7a7e94b73c43",
- "data" : "/api/database/b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425/view/7d712cf7-78c7-4a47-90b0-d6b9f7f19b70/data",
- "self_html" : "/pid/e2d831c2-3694-4fdc-8c48-7a7e94b73c43"
- },
- "type" : "view",
- "titles" : [ ],
- "descriptions" : [ ],
- "query" : "SELECT `location`, `lat`, `lng` FROM `weather_location`",
- "execution" : "2019-03-03T04:45:52.000Z",
- "publisher" : "Polish Government",
- "owner" : {
- "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
- "username" : "junit1",
- "name" : "John Doe",
- "orcid" : "https://orcid.org/0000-0003-4216-302X",
- "qualified_name" : "John Doe — @junit1",
- "given_name" : "John",
- "family_name" : "Doe"
- },
- "licenses" : [ {
- "identifier" : "MIT",
- "uri" : "https://opensource.org/license/mit/"
- } ],
- "creators" : [ ],
- "status" : "published",
- "database_id" : "b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425",
- "view_id" : "7d712cf7-78c7-4a47-90b0-d6b9f7f19b70",
- "query_normalized" : "SELECT `location`, `lat`, `lng` FROM `weather_location`",
- "query_hash" : "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23",
- "publication_day" : 10,
- "publication_month" : 7,
- "publication_year" : 2023
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-4.json b/lib/java/dbrepo-core/src/main/resources/identifier-4.json
deleted file mode 100644
index 474a520d26db9281c8fae7a476ca657ef3a0cfe4..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-4.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "id" : "3bd69bb8-f7e3-48e4-9717-823787e7ba23",
- "links" : {
- "self" : "/api/identifier/3bd69bb8-f7e3-48e4-9717-823787e7ba23",
- "data" : "/api/database/b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425/table/666d0b6b-f017-4f7c-80d8-a47174d8b539/data",
- "self_html" : "/pid/3bd69bb8-f7e3-48e4-9717-823787e7ba23"
- },
- "type" : "table",
- "titles" : [ ],
- "descriptions" : [ ],
- "execution" : "2019-03-03T04:45:52.000Z",
- "publisher" : "Example Publisher",
- "owner" : {
- "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
- "username" : "junit1",
- "name" : "John Doe",
- "orcid" : "https://orcid.org/0000-0003-4216-302X",
- "qualified_name" : "John Doe — @junit1",
- "given_name" : "John",
- "family_name" : "Doe"
- },
- "licenses" : [ {
- "identifier" : "MIT",
- "uri" : "https://opensource.org/license/mit/"
- } ],
- "creators" : [ ],
- "status" : "published",
- "database_id" : "b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425",
- "table_id" : "666d0b6b-f017-4f7c-80d8-a47174d8b539",
- "publication_day" : 10,
- "publication_month" : 7,
- "publication_year" : 2023
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-5.json b/lib/java/dbrepo-core/src/main/resources/identifier-5.json
deleted file mode 100644
index e10ff809f21d242dc9e46a9c0f3cd5378e181823..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-5.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "id" : "e05bb4c9-ed26-48c9-bd91-5c48a93a04bd",
- "links" : {
- "self" : "/api/identifier/e05bb4c9-ed26-48c9-bd91-5c48a93a04bd",
- "data" : "/api/database/dd9dfee2-9fbd-46b0-92d5-98f0f8866ffe/subset/4e0ac92a-7cb3-4222-9b85-0498c73e0afd/data",
- "self_html" : "/pid/e05bb4c9-ed26-48c9-bd91-5c48a93a04bd",
- "dashboard_html" : "/d/7779bc9207daeae7e5a7"
- },
- "type" : "subset",
- "titles" : [ {
- "id" : "1a0ae9c2-61c6-44f8-b886-26a4f4dabc52",
- "title" : "Australische Wetterdaten",
- "language" : "de",
- "type" : "Subtitle"
- } ],
- "descriptions" : [ {
- "id" : "ab49bdca-f373-4823-9947-2a0cbfa88350",
- "description" : "Alle Wetterdaten in Australien",
- "language" : "de",
- "type" : "Abstract"
- } ],
- "query" : "SELECT `location` FROM `weather_aus`",
- "execution" : "2018-11-07T10:59:12.000Z",
- "doi" : "10.12345/13/50BBFCFE08A12",
- "publisher" : "Australian Government",
- "owner" : {
- "id" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
- "username" : "junit2",
- "name" : "Jane Doe",
- "orcid" : "https://orcid.org/0000-0002-9272-6225",
- "qualified_name" : "Jane Doe — @junit2",
- "given_name" : "Jane",
- "family_name" : "Doe"
- },
- "creators" : [ {
- "id" : "6844b684-93e4-47d2-a615-5939127fdafe",
- "firstname" : "Max",
- "lastname" : "Mustermann",
- "affiliation" : "TU Graz",
- "creator_name" : "Mustermann, Max",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID",
- "affiliation_identifier" : "https://ror.org/04wn28048",
- "affiliation_identifier_scheme" : "ROR",
- "affiliation_identifier_scheme_uri" : "https://ror.org/"
- }, {
- "id" : "14943ad6-a935-49f5-b07e-f9eb789b8604",
- "firstname" : "Martina",
- "lastname" : "Mustermann",
- "affiliation" : "TU Wien",
- "creator_name" : "Mustermann, Martina",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID"
- } ],
- "status" : "draft",
- "database_id" : "dd9dfee2-9fbd-46b0-92d5-98f0f8866ffe",
- "query_id" : "4e0ac92a-7cb3-4222-9b85-0498c73e0afd",
- "query_normalized" : "SELECT `location` FROM `weather_aus`",
- "query_hash" : "a2d2dd94ebc7653bb5a3b55dd8ed5e91d3d13c225c6855a1eb4eb7ca14c36ced",
- "result_hash" : "ff3f7cbe1b96d296957f6e39e55b8b1b577fa3d205d4795af99594cfd20cb80d",
- "result_number" : 2,
- "publication_day" : 14,
- "publication_month" : 7,
- "publication_year" : 2022
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-6.json b/lib/java/dbrepo-core/src/main/resources/identifier-6.json
deleted file mode 100644
index 3beed2b1e87e30e0c45d2a24412ba770eb95b9d4..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-6.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "id" : "a244204d-9671-42a0-be07-9b14402238fd",
- "links" : {
- "self" : "/api/identifier/a244204d-9671-42a0-be07-9b14402238fd",
- "data" : "/api/database/9d8cb9a9-9468-4801-a2e0-2dac8bc67c31/subset/a9849020-45a7-40a8-9a19-d4ae2b28dd46/data",
- "self_html" : "/pid/a244204d-9671-42a0-be07-9b14402238fd",
- "dashboard_html" : "/d/18d25f581fb272ac260b"
- },
- "type" : "subset",
- "titles" : [ {
- "id" : "0449011c-1490-4c8e-b46c-c1f862126aea",
- "title" : "Norwegian weather data",
- "language" : "en"
- } ],
- "descriptions" : [ {
- "id" : "aac03bbd-27e6-419d-8118-f996d594f00f",
- "description" : "Selecting all from the weather Norwegian table",
- "language" : "en"
- } ],
- "query" : "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10",
- "execution" : "2018-11-07T10:59:12.000Z",
- "publisher" : "Norwegian Government",
- "owner" : {
- "id" : "7b080e33-d8db-4276-9d53-47208e657006",
- "username" : "junit3",
- "name" : "System System",
- "qualified_name" : "System System — @junit3",
- "given_name" : "System",
- "family_name" : "System"
- },
- "licenses" : [ {
- "identifier" : "MIT",
- "uri" : "https://opensource.org/license/mit/"
- } ],
- "creators" : [ {
- "id" : "f8a52dca-8aec-46c1-b0e1-603dbe6a1a65",
- "firstname" : "Max",
- "lastname" : "Mustermann",
- "affiliation" : "TU Graz",
- "creator_name" : "Mustermann, Max",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID",
- "affiliation_identifier" : "https://ror.org/04wn28048",
- "affiliation_identifier_scheme" : "ROR",
- "affiliation_identifier_scheme_uri" : "https://ror.org/"
- }, {
- "id" : "eeae78cb-75a1-42e2-b608-7082e5fbecc6",
- "firstname" : "Martina",
- "lastname" : "Mustermann",
- "affiliation" : "TU Wien",
- "creator_name" : "Mustermann, Martina",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID"
- }, {
- "id" : "700058f1-6314-4cd1-9c0c-62e75c8f422b",
- "firstname" : "Max",
- "lastname" : "Mustermann",
- "affiliation" : "TU Graz",
- "creator_name" : "Mustermann, Max",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID",
- "affiliation_identifier" : "https://ror.org/04wn28048",
- "affiliation_identifier_scheme" : "ROR",
- "affiliation_identifier_scheme_uri" : "https://ror.org/"
- } ],
- "status" : "published",
- "database_id" : "9d8cb9a9-9468-4801-a2e0-2dac8bc67c31",
- "query_id" : "a9849020-45a7-40a8-9a19-d4ae2b28dd46",
- "query_normalized" : "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10",
- "query_hash" : "a3d3dd94ebc7653bb5a3b55dd8ed5e91d3d13c335c6855a1eb4eb7ca14c36ced",
- "result_hash" : "ff3f7cbe1b96d396957f6e39e55b8b1b577fa3d305d4795af99594cfd30cb80d",
- "result_number" : 2,
- "publication_day" : 14,
- "publication_month" : 7,
- "publication_year" : 2022
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-7.json b/lib/java/dbrepo-core/src/main/resources/identifier-7.json
deleted file mode 100644
index 4353b2714a988d21b9f4343beca159ab2540dde5..0000000000000000000000000000000000000000
--- a/lib/java/dbrepo-core/src/main/resources/identifier-7.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "id" : "b216ae00-a31d-4ecb-95fb-37eb4da3946f",
- "links" : {
- "self" : "/api/identifier/b216ae00-a31d-4ecb-95fb-37eb4da3946f",
- "self_html" : "/pid/b216ae00-a31d-4ecb-95fb-37eb4da3946f",
- "dashboard_html" : "/d/456a3760f69821a0f944"
- },
- "type" : "database",
- "titles" : [ ],
- "descriptions" : [ ],
- "funders" : [ ],
- "execution" : "2018-11-07T10:59:12.000Z",
- "publisher" : "Swedish Government",
- "owner" : {
- "id" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
- "username" : "junit4",
- "name" : "JUnit 4",
- "qualified_name" : "JUnit 4 — @junit4",
- "given_name" : "JUnit",
- "family_name" : "4"
- },
- "licenses" : [ ],
- "creators" : [ {
- "id" : "b899c367-06c7-4f47-8aea-5f15061ee3ee",
- "firstname" : "Max",
- "lastname" : "Mustermann",
- "affiliation" : "TU Graz",
- "creator_name" : "Mustermann, Max",
- "name_identifier" : "00000-00000-00000",
- "name_identifier_scheme" : "ORCID",
- "affiliation_identifier" : "https://ror.org/04wn28048",
- "affiliation_identifier_scheme" : "ROR",
- "affiliation_identifier_scheme_uri" : "https://ror.org/"
- } ],
- "status" : "draft",
- "database_id" : "c503d7f3-5952-4d97-b26a-da86bea4c20d",
- "related_identifiers" : [ ],
- "result_number" : 2,
- "publication_day" : 14,
- "publication_month" : 7,
- "publication_year" : 2022
-}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/image-1.json b/lib/java/dbrepo-core/src/main/resources/image-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..875f1fffbf8f6fc3335b2955ab1d89e25fa244d4
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/image-1.json
@@ -0,0 +1,12 @@
+{
+ "id" : "e5449ade-acc1-4ba4-8858-e3496cdecd9c",
+ "name" : "mariadb",
+ "registry" : "docker.io",
+ "version" : "11.1.3",
+ "driverClass" : "org.mariadb.jdbc.Driver",
+ "dialect" : "org.hibernate.dialect.MariaDBDialect",
+ "jdbcMethod" : "mariadb",
+ "defaultPort" : 3306,
+ "isDefault" : true,
+ "operators" : [ ]
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/user-1.json b/lib/java/dbrepo-core/src/main/resources/user-1.json
index 3eebc1e4847a3bdc560be2872a9525eab67d7e33..da8f3731b7c2ce3adbf75fd1fd8efdca44fe622c 100644
--- a/lib/java/dbrepo-core/src/main/resources/user-1.json
+++ b/lib/java/dbrepo-core/src/main/resources/user-1.json
@@ -1,14 +1,10 @@
{
- "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
- "name" : "John Doe",
- "username" : "junit1",
- "attributes" : {
- "theme" : "light",
- "orcid" : "https://orcid.org/0000-0003-4216-302X",
- "affiliation" : "TU Graz",
- "language" : "en"
- },
- "qualified_name" : "John Doe — @junit1",
- "given_name" : "John",
- "family_name" : "Doe"
+ "id": "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+ "username": "junit1",
+ "theme": "light",
+ "orcid": "https://orcid.org/0000-0003-4216-302X",
+ "affiliation": "TU Graz",
+ "language": "en",
+ "firstname": "John",
+ "lastname": "Doe"
}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/user-2.json b/lib/java/dbrepo-core/src/main/resources/user-2.json
index e935687704060b4c15880f8fc21970aaa09eab72..f42f6bf8a88a8abbd1dab7a43a452592ff25654c 100644
--- a/lib/java/dbrepo-core/src/main/resources/user-2.json
+++ b/lib/java/dbrepo-core/src/main/resources/user-2.json
@@ -1,14 +1,10 @@
{
- "id" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
- "name" : "Jane Doe",
- "username" : "junit2",
- "attributes" : {
- "theme" : "light",
- "orcid" : "https://orcid.org/0000-0002-9272-6225",
- "affiliation" : "TU Wien",
- "language" : "de"
- },
- "qualified_name" : "Jane Doe — @junit2",
- "given_name" : "Jane",
- "family_name" : "Doe"
+ "id": "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+ "username": "junit2",
+ "theme": "light",
+ "orcid": "https://orcid.org/0000-0002-9272-6225",
+ "affiliation": "TU Wien",
+ "language": "de",
+ "firstname": "Jane",
+ "lastname": "Doe"
}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/user-3.json b/lib/java/dbrepo-core/src/main/resources/user-3.json
index 73f468c45783922c8504ae072228bbe3ad2a9d17..51651e25c2712cbd9536e5aaf7d70ebb903165fe 100644
--- a/lib/java/dbrepo-core/src/main/resources/user-3.json
+++ b/lib/java/dbrepo-core/src/main/resources/user-3.json
@@ -1,12 +1,8 @@
{
- "id" : "7b080e33-d8db-4276-9d53-47208e657006",
- "name" : "System System",
- "username" : "junit3",
- "attributes" : {
- "theme" : "light",
- "affiliation" : "TU Wien"
- },
- "qualified_name" : "System System — @junit3",
- "given_name" : "System",
- "family_name" : "System"
+ "id": "7b080e33-d8db-4276-9d53-47208e657006",
+ "username": "junit3",
+ "theme": "light",
+ "affiliation": "TU Wien",
+ "firstname": "System",
+ "lastname": "System"
}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/user-4.json b/lib/java/dbrepo-core/src/main/resources/user-4.json
index 587e6f55009211a12938c6895c1cddb3459d9106..0a6a8fdd970163ca62466353d79de34b6a445def 100644
--- a/lib/java/dbrepo-core/src/main/resources/user-4.json
+++ b/lib/java/dbrepo-core/src/main/resources/user-4.json
@@ -1,12 +1,8 @@
{
- "id" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
- "name" : "JUnit 4",
- "username" : "junit4",
- "attributes" : {
- "theme" : "light",
- "affiliation" : "TU Wien"
- },
- "qualified_name" : "JUnit 4 — @junit4",
- "given_name" : "JUnit",
- "family_name" : "4"
+ "id": "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+ "username": "junit4",
+ "theme": "light",
+ "affiliation": "TU Wien",
+ "firstname": "JUnit",
+ "lastname": "4"
}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/user-5.json b/lib/java/dbrepo-core/src/main/resources/user-5.json
index 11391836803353b93f6721611f57f28f3465e3e1..909f4b08fba4b702243977ff5898f820c850f531 100644
--- a/lib/java/dbrepo-core/src/main/resources/user-5.json
+++ b/lib/java/dbrepo-core/src/main/resources/user-5.json
@@ -1,12 +1,8 @@
{
- "id" : "28ff851d-d7bc-4422-959c-edd7a5b15630",
- "name" : "No Body",
- "username" : "nobody",
- "attributes" : {
- "theme" : "dark",
- "affiliation" : "TU Wien"
- },
- "qualified_name" : "No Body — @nobody",
- "given_name" : "No",
- "family_name" : "Body"
+ "id": "28ff851d-d7bc-4422-959c-edd7a5b15630",
+ "username": "nobody",
+ "theme": "dark",
+ "affiliation": "TU Wien",
+ "firstname": "No",
+ "lastname": "Body"
}
\ No newline at end of file