diff --git a/dbrepo-container-service/Dockerfile b/dbrepo-container-service/Dockerfile index c48dfba282439e6bb72e22626f162fd9d2b6c87e..de2b0a1463246614a3f0fce1022afc80f9d94323 100644 --- a/dbrepo-container-service/Dockerfile +++ b/dbrepo-container-service/Dockerfile @@ -3,7 +3,8 @@ FROM dbrepo-metadata-db:latest as dependency MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> ###### SECOND STAGE ###### -FROM maven:slim as build +FROM maven:3-openjdk-17 as build +MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> COPY ./pom.xml ./ @@ -19,7 +20,8 @@ COPY ./report ./report RUN mvn -q clean package -DskipTests ###### THIRD STAGE ###### -FROM openjdk:11-jre-slim as runtime +FROM openjdk:17-alpine as runtime +MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> ENV METADATA_DB=fda ENV METADATA_USERNAME=root diff --git a/dbrepo-container-service/pom.xml b/dbrepo-container-service/pom.xml index 8aa570d6a9d0cc0e55008680f3673039bae9c1e5..df49de3c81535e0011fc094ddd1119b54c8d4809 100644 --- a/dbrepo-container-service/pom.xml +++ b/dbrepo-container-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.3.10.RELEASE</version> + <version>3.0.6</version> </parent> <groupId>at.tuwien</groupId> @@ -22,13 +22,12 @@ </modules> <properties> - <java.version>11</java.version> - <spring-cloud.version>3.0.1</spring-cloud.version> - <mapstruct.version>1.4.2.Final</mapstruct.version> - <docker.version>3.2.7</docker.version> - <swagger.version>2.2.2</swagger.version> - <jacoco.version>0.8.7</jacoco.version> - <sqlserver.version>9.2.1.jre11</sqlserver.version> + <java.version>17</java.version> + <spring-cloud.version>4.0.2</spring-cloud.version> + <mapstruct.version>1.5.5.Final</mapstruct.version> + <docker.version>3.3.0</docker.version> + <swagger.version>2.2.9</swagger.version> + <jacoco.version>0.8.10</jacoco.version> <jwt.version>4.3.0</jwt.version> </properties> @@ -79,7 +78,7 @@ <dependency> <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-core</artifactId> - <version>2.2.2</version> + <version>${swagger.version}</version> </dependency> <!-- Data Source --> <dependency> @@ -109,16 +108,6 @@ <artifactId>mariadb-java-client</artifactId> <version>${mariadb.version}</version> </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql.version}</version> - </dependency> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>mssql-jdbc</artifactId> - <version>${sqlserver.version}</version> - </dependency> <!-- Testing --> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java index 38d02adb7b4ad5b9aa706cb4136c14d11890bdb7..8f69d140c8386a5f0f6ca1df4b392c5610b7c98e 100644 --- a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java +++ b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java @@ -6,7 +6,6 @@ import at.tuwien.entities.container.Container; import at.tuwien.entities.user.User; import at.tuwien.exception.*; import at.tuwien.mapper.ContainerMapper; -import at.tuwien.service.ContainerService; import at.tuwien.service.UserService; import at.tuwien.service.impl.ContainerServiceImpl; import io.micrometer.core.annotation.Timed; @@ -22,12 +21,11 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContext; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.security.Principal; import java.util.List; import java.util.Optional; diff --git a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java index fbd45d747b9dcf75567fa740f5b436411ed0db52..aa854398e960e056ada4920b73ebddcdc2031900 100644 --- a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java +++ b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java @@ -24,8 +24,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.security.Principal; import java.util.List; import java.util.stream.Collectors; diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ImageEndpointUnitTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ImageEndpointUnitTest.java index e16d70f74a3b12ad2829e4c7bc7eb1f0ef9a6308..0bf820155589bd32f066c166851031716031821a 100644 --- a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ImageEndpointUnitTest.java +++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ImageEndpointUnitTest.java @@ -18,11 +18,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.test.context.support.WithAnonymousUser; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java index 97aa1edfd0f155704e63a467f1f0f5714ee2bea9..9c6cd35a83a32be64c353145a053fb9e2539efd1 100644 --- a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java +++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java @@ -3,7 +3,6 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.api.container.image.ImageCreateDto; import at.tuwien.config.ReadyConfig; -import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.exception.*; import at.tuwien.repository.jpa.ContainerRepository; import at.tuwien.repository.jpa.ImageRepository; diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java index c86d1f2ee9a3a9157de87ba13f9a3132ca2bc923..0ba2fa37720adf93cb8bf30acd1cbc69b2c7b57a 100644 --- a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java +++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java @@ -16,8 +16,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit.jupiter.SpringExtension; -import javax.persistence.EntityNotFoundException; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.validation.ConstraintViolationException; import java.security.Principal; import java.util.List; import java.util.Optional; diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-container-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java index b2b01c42ee9868215962426b18b3a70450bff7ac..92b60f4f8a5ed8a566e2504d71b63478b1593f68 100644 --- a/dbrepo-container-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java +++ b/dbrepo-container-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java @@ -6,6 +6,10 @@ import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -16,10 +20,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-container-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java index 5724f37ead9f6c73b81ced1d049aa9b200372bda..061bd0cd72d36951d514373811d7f1783f074e4c 100644 --- a/dbrepo-container-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java +++ b/dbrepo-container-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java @@ -9,14 +9,14 @@ import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; @Configuration @EnableWebSecurity @@ -27,15 +27,15 @@ import javax.servlet.http.HttpServletResponse; bearerFormat = "JWT", scheme = "bearer" ) -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { @Bean public AuthTokenFilter authTokenFilter() { return new AuthTokenFilter(); } - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { /* enable CORS and disable CSRF */ http = http.cors().and().csrf().disable(); /* set session management to stateless */ @@ -56,11 +56,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { /* set permissions on endpoints */ http.authorizeRequests() /* our internal endpoints */ - .antMatchers(HttpMethod.GET, "/actuator/prometheus/**").permitAll() + .requestMatchers(HttpMethod.GET, "/actuator/prometheus/**").permitAll() /* our public endpoints */ - .antMatchers(HttpMethod.GET, "/api/container/**").permitAll() - .antMatchers(HttpMethod.GET, "/api/image/**").permitAll() - .antMatchers("/v3/api-docs.yaml", + .requestMatchers(HttpMethod.GET, "/api/container/**").permitAll() + .requestMatchers(HttpMethod.GET, "/api/image/**").permitAll() + .requestMatchers("/v3/api-docs.yaml", "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() @@ -70,6 +70,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.addFilterBefore(authTokenFilter(), UsernamePasswordAuthenticationFilter.class ); + return http.build(); } @Bean diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java index a3f620572aabc234756f2a151c192f7d86e95832..8c18fc898711887755d17b4661182df37f2f6cc1 100644 --- a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java +++ b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import org.springframework.util.SocketUtils; import org.springframework.transaction.annotation.Transactional; @@ -71,10 +70,8 @@ public class ContainerServiceImpl implements ContainerService { throw new ImageNotFoundException("image was not found in metadata database."); } /* entity */ - final Integer availableTcpPort = SocketUtils.findAvailableTcpPort(10000); Container container = new Container(); container.setImageId(image.get().getId()); - container.setPort(availableTcpPort); container.setName(createDto.getName()); container.setInternalName(containerMapper.containerToInternalContainerName(container)); /* check duplicate */ @@ -92,11 +89,10 @@ public class ContainerServiceImpl implements ContainerService { /* create host mapping */ final HostConfig hostConfig = this.hostConfig .withNetworkMode(dockerDaemonConfig.getUserNetwork()) - .withBinds(Bind.parse(dockerDaemonConfig.getMountPath() + ":/tmp"), Bind.parse(response.getName() + ":/var/lib/mysql")) - .withPortBindings(PortBinding.parse(availableTcpPort + ":" + image.get().getDefaultPort())); - log.debug("container has network {}, volume bind {}, volume bind {} and port bind {}", + .withBinds(Bind.parse(dockerDaemonConfig.getMountPath() + ":/tmp"), Bind.parse(response.getName() + ":/var/lib/mysql")); + log.debug("container has network {}, volume bind {}, volume bind {}", dockerDaemonConfig.getUserNetwork(), dockerDaemonConfig.getMountPath() + ":/tmp", - response.getName() + ":/var/lib/mysql", availableTcpPort + ":" + image.get().getDefaultPort()); + response.getName() + ":/var/lib/mysql"); log.trace("host config {}", hostConfig); final User user = userService.findByUsername(principal.getName()); container.setCreatedBy(user.getId()); diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java index ccb3dbae797cfd70d52009355c2f07405a78082b..fa1de29edb17ae5571f9a16671067395ccf8cbfd 100644 --- a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java +++ b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java @@ -2,7 +2,6 @@ package at.tuwien.service.impl; import at.tuwien.api.container.image.ImageChangeDto; import at.tuwien.api.container.image.ImageCreateDto; -import at.tuwien.api.container.image.ImageEnvItemDto; import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.container.image.ContainerImageEnvironmentItem; import at.tuwien.exception.*; @@ -21,11 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.stereotype.Service; -import org.springframework.transaction.UnexpectedRollbackException; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityNotFoundException; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.validation.ConstraintViolationException; import java.security.Principal; import java.time.Duration; import java.time.Instant; diff --git a/dbrepo-database-service/Dockerfile b/dbrepo-database-service/Dockerfile index 7ed04b677ee7d1b06355485f38a2bbe48964c827..b676839354a6fb0f90bf83ed560bc9f80ed130d9 100644 --- a/dbrepo-database-service/Dockerfile +++ b/dbrepo-database-service/Dockerfile @@ -3,7 +3,8 @@ FROM dbrepo-metadata-db:latest as dependency MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> ###### SECOND STAGE ###### -FROM maven:slim as build +FROM maven:3-openjdk-17 as build +MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> COPY ./pom.xml ./ @@ -19,7 +20,8 @@ COPY ./report ./report RUN mvn -q clean package -DskipTests ###### THIRD STAGE ###### -FROM openjdk:11-jre-slim as runtime +FROM openjdk:17-alpine as runtime +MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> ENV METADATA_DB=fda ENV METADATA_USERNAME=root diff --git a/dbrepo-database-service/pom.xml b/dbrepo-database-service/pom.xml index 49aac1bc36b2f4c2e0b70dae7e9774b1e1674c2c..5ab357dea19a5ad969d78db8e5f86f84ac515ce4 100644 --- a/dbrepo-database-service/pom.xml +++ b/dbrepo-database-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.3.10.RELEASE</version> + <version>3.0.6</version> </parent> <groupId>at.tuwien</groupId> @@ -22,16 +22,14 @@ </modules> <properties> - <java.version>11</java.version> - <spring-cloud.version>3.0.1</spring-cloud.version> - <mapstruct.version>1.4.2.Final</mapstruct.version> - <docker.version>3.2.7</docker.version> - <testcontainers.version>1.15.2</testcontainers.version> - <swagger.version>2.1.7</swagger.version> - <springfox.version>3.0.0</springfox.version> - <jacoco.version>0.8.7</jacoco.version> - <hibernate-c3po.version>5.6.3.Final</hibernate-c3po.version> + <java.version>17</java.version> + <spring-cloud.version>4.0.2</spring-cloud.version> + <mapstruct.version>1.5.5.Final</mapstruct.version> + <docker.version>3.3.0</docker.version> + <swagger.version>2.2.9</swagger.version> + <jacoco.version>0.8.10</jacoco.version> <jwt.version>4.3.0</jwt.version> + <hibernate-c3po.version>5.6.3.Final</hibernate-c3po.version> </properties> <dependencies> @@ -80,9 +78,11 @@ </dependency> <!-- elasticsearch --> <dependency> - <groupId>org.springframework.data</groupId> - <artifactId>spring-data-elasticsearch</artifactId> + <groupId>co.elastic.clients</groupId> + <artifactId>elasticsearch-java</artifactId> + <version>${elasticsearch-client.version}</version> </dependency> + <!-- AMQP --> <dependency> <groupId>org.springframework.amqp</groupId> <artifactId>spring-rabbit</artifactId> @@ -194,12 +194,6 @@ <artifactId>amqp-client</artifactId> <version>${rabbit-amqp-client.version}</version> </dependency> - <!-- Gateway --> - <dependency> - <groupId>org.projectreactor</groupId> - <artifactId>reactor-spring</artifactId> - <version>1.0.1.RELEASE</version> - </dependency> </dependencies> <build> diff --git a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java index a05d168cff50ca9447942d4da26a2bc05a19baf8..955f7e8816d1a25ba894b3bdf624a4e96c07862b 100644 --- a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java +++ b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java @@ -7,10 +7,7 @@ import at.tuwien.api.error.ApiErrorDto; import at.tuwien.entities.database.DatabaseAccess; import at.tuwien.exception.*; import at.tuwien.mapper.DatabaseMapper; -import at.tuwien.repository.jpa.DatabaseAccessRepository; import at.tuwien.service.AccessService; -import at.tuwien.service.ContainerService; -import at.tuwien.service.DatabaseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -24,9 +21,9 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.security.Principal; @Log4j2 diff --git a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java index d2f571e4d2fab5b4d864306fd3a005595dd67551..63114d8ccee3353eca4e90fc34f36dfb98e65f3a 100644 --- a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java +++ b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java @@ -26,8 +26,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.security.Principal; import java.util.List; import java.util.stream.Collectors; diff --git a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java index 3a05bdad9dfc92cfa7027dbed423c00b47a45deb..8a2a9e62e49443ae50902a4fe854dff7cf21e511 100644 --- a/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java +++ b/dbrepo-database-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java @@ -19,7 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.List; import java.util.stream.Collectors; diff --git a/dbrepo-database-service/rest-service/src/main/resources/application-local.yml b/dbrepo-database-service/rest-service/src/main/resources/application-local.yml index 271232d6ef9e140b4fc633d80692240a9abbc4c3..7820b6a06297f27c7dda6ee1959775dfaa5d444e 100644 --- a/dbrepo-database-service/rest-service/src/main/resources/application-local.yml +++ b/dbrepo-database-service/rest-service/src/main/resources/application-local.yml @@ -27,6 +27,10 @@ spring: virtual-host: dbrepo username: fda password: fda + elasticsearch: + password: elastic + username: elastic + uris: http://localhost:9200 management.endpoints.web.exposure.include: health,info,prometheus server: port: 9092 @@ -37,10 +41,6 @@ logging: at.tuwien.: info org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug fda: - elastic: - endpoint: localhost:9200 - username: elastic - password: elastic ready.path: ./ready jwt: issuer: https://localhost/realms/dbrepo diff --git a/dbrepo-database-service/rest-service/src/main/resources/application.yml b/dbrepo-database-service/rest-service/src/main/resources/application.yml index 1c0305e3a16b3df76291baf5c973168fa6214633..f3bbe67a229ca7e98b6c58647c2a50baea698eb0 100644 --- a/dbrepo-database-service/rest-service/src/main/resources/application.yml +++ b/dbrepo-database-service/rest-service/src/main/resources/application.yml @@ -27,6 +27,10 @@ spring: virtual-host: dbrepo username: "${BROKER_USERNAME}" password: "${BROKER_PASSWORD}" + elasticsearch: + password: "${ELASTIC_PASSWORD}" + username: elastic + uris: http://search-service:9200 management.endpoints.web.exposure.include: health,info,prometheus server: port: 9092 @@ -37,10 +41,6 @@ logging: at.tuwien.: "${LOG_LEVEL}" org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug fda: - elastic: - endpoint: search-service:9200 - username: elastic - password: "${ELASTIC_PASSWORD}" ready.path: /ready jwt: issuer: "${JWT_ISSUER}" diff --git a/dbrepo-database-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-database-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java index b2b01c42ee9868215962426b18b3a70450bff7ac..92b60f4f8a5ed8a566e2504d71b63478b1593f68 100644 --- a/dbrepo-database-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java +++ b/dbrepo-database-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java @@ -6,6 +6,10 @@ import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -16,10 +20,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; diff --git a/dbrepo-database-service/services/src/main/java/at/tuwien/config/ElasticsearchConfig.java b/dbrepo-database-service/services/src/main/java/at/tuwien/config/ElasticsearchConfig.java index dd42aa517fb5bda732d39a5660918bbe61cfc6ce..cf0c63513c1083a29b63862d8a6c218e137d3859 100644 --- a/dbrepo-database-service/services/src/main/java/at/tuwien/config/ElasticsearchConfig.java +++ b/dbrepo-database-service/services/src/main/java/at/tuwien/config/ElasticsearchConfig.java @@ -1,20 +1,25 @@ package at.tuwien.config; +import co.elastic.clients.elasticsearch.ElasticsearchClient; +import co.elastic.clients.json.jackson.JacksonJsonpMapper; +import co.elastic.clients.transport.ElasticsearchTransport; +import co.elastic.clients.transport.rest_client.RestClientTransport; import lombok.extern.log4j.Log4j2; -import org.elasticsearch.client.RestHighLevelClient; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.elasticsearch.client.RestClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.client.ClientConfiguration; -import org.springframework.data.elasticsearch.client.RestClients; -import org.springframework.data.elasticsearch.core.ElasticsearchOperations; -import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; @Log4j2 @Configuration public class ElasticsearchConfig { - @Value("${fda.elastic.endpoint}") + @Value("${spring.elasticsearch.uris}") private String elasticEndpoint; @Value("${fda.elastic.username}") @@ -24,19 +29,17 @@ public class ElasticsearchConfig { private String elasticPassword; @Bean - public RestHighLevelClient client() { + public ElasticsearchClient elasticsearchClient() { log.debug("elastic endpoint={}", elasticEndpoint); - final ClientConfiguration clientConfiguration = ClientConfiguration.builder() - .connectedTo(elasticEndpoint) - .withBasicAuth(elasticUsername, elasticPassword) + final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(elasticUsername, elasticPassword)); + final RestClient restClient = RestClient.builder(HttpHost.create(elasticEndpoint)) + .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder + .setDefaultCredentialsProvider(credentialsProvider)) .build(); - return RestClients.create(clientConfiguration) - .rest(); - } - - @Bean - public ElasticsearchOperations elasticsearchTemplate() { - return new ElasticsearchRestTemplate(client()); + ElasticsearchTransport transport = new RestClientTransport( + restClient, new JacksonJsonpMapper()); + return new ElasticsearchClient(transport); } } \ No newline at end of file diff --git a/dbrepo-database-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-database-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java index afff7f2dada93e811b56959c1eca37e92fe08546..02dfbbb34d12f237acdb91c20f3fed3d94092e9b 100644 --- a/dbrepo-database-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java +++ b/dbrepo-database-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java @@ -9,14 +9,14 @@ import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; @Configuration @EnableWebSecurity @@ -27,15 +27,15 @@ import javax.servlet.http.HttpServletResponse; bearerFormat = "JWT", scheme = "bearer" ) -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { @Bean public AuthTokenFilter authTokenFilter() { return new AuthTokenFilter(); } - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { /* enable CORS and disable CSRF */ http = http.cors().and().csrf().disable(); /* set session management to stateless */ @@ -56,10 +56,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { /* set permissions on endpoints */ http.authorizeRequests() /* our internal endpoints */ - .antMatchers(HttpMethod.GET, "/actuator/prometheus/**").permitAll() + .requestMatchers(HttpMethod.GET, "/actuator/prometheus/**").permitAll() /* our public endpoints */ - .antMatchers(HttpMethod.GET, "/api/container/**/database/**").permitAll() - .antMatchers("/v3/api-docs.yaml", + .requestMatchers(HttpMethod.GET, "/api/container/**/database/**").permitAll() + .requestMatchers("/v3/api-docs.yaml", "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() @@ -69,6 +69,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.addFilterBefore(authTokenFilter(), UsernamePasswordAuthenticationFilter.class ); + return http.build(); } @Bean diff --git a/dbrepo-database-service/services/src/main/java/at/tuwien/service/MessageQueueService.java b/dbrepo-database-service/services/src/main/java/at/tuwien/service/MessageQueueService.java index 16dcd2a550ec06aaf66a6960107be2caa71622d0..fb1a90439bbb54abea38161a90c3d26938e425ca 100644 --- a/dbrepo-database-service/services/src/main/java/at/tuwien/service/MessageQueueService.java +++ b/dbrepo-database-service/services/src/main/java/at/tuwien/service/MessageQueueService.java @@ -4,7 +4,7 @@ import at.tuwien.entities.database.Database; import at.tuwien.entities.user.User; import at.tuwien.exception.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.security.Principal; public interface MessageQueueService { diff --git a/dbrepo-metadata-db/Dockerfile b/dbrepo-metadata-db/Dockerfile index 264b9e76f3e9a031250f8804a90c8b265a942351..58227b0c92b69a29c3ca049272d6ab443a1a48ef 100644 --- a/dbrepo-metadata-db/Dockerfile +++ b/dbrepo-metadata-db/Dockerfile @@ -1,7 +1,6 @@ ###### FIRST STAGE ###### -FROM maven:slim as build -MAINTAINER Cornelia Michlits <cornelia.michlits@tuwien.ac.at> -LABEL db=metadata +FROM maven:3-openjdk-17 as build +MAINTAINER Martin Weise <martin.weise@tuwien.ac.at> COPY ./pom.xml ./ diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java index c04f00ca75fcfd6ba16cffed53927e8f5d3c736d..5bb53142728782bce67b2577815f9648a32ad22f 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java @@ -1,12 +1,9 @@ package at.tuwien.api.amqp; import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; - @Getter @Setter @ToString diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java index 0b97d003fbae89fb9fc795fa661e882a1e208459..e604a70c4ec4a0302790e986f15df8056db21583 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java index 4cc41915033db99254c9e79fd854429222d6debd..b405ee3fd1edb22e5081d6b6b165b068f38205b3 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java index faa08c26d5e07096634626ac5e2f542468b6a6da..f1149f1b23b3182626e6bd9c7780c749aad99ee9 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.amqp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java index aec1b744872186ffdc05aa6e81816b6dca03fe2a..d90d9c57a356ef21b4d65081e20176f0c12a33f4 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java index 2bd94cdbbc630ffa36e53595da0eb55f753f7f75..8c7f54e2b19b2b7743d3219bf97ba461bcd28b75 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.amqp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java index 968c703de919e98dcec70e9adb16ef78d4c77ba5..aaedcdf0bf39872fcea9c0a888d4f2852cbb1120 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueDto.java index f3af4937782237fe8553a407163b34ed8934d8d7..30cc16733ede9ca3e2be9c5061a97d7794b3c2cb 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/QueueDto.java @@ -3,8 +3,8 @@ package at.tuwien.api.amqp; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/TupleDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/TupleDto.java index caf19dbc935ce207f6de2163f118a24cefd67264..c94c04b4666cbc2473a48ed1ee84d0fd6f9f5196 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/TupleDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/TupleDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.amqp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java index 740d94730b247bbfc18d1beef4a8208ad87f1b96..a5174f42fa20283dc0852277389664ee56e0cb12 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java index d300e6696719e5206c61e57269c26e40a71e1f3d..70a57b265438f736618daf37247b43efbd3dff4e 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java @@ -3,9 +3,9 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CredentialDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CredentialDto.java index fe1400d3ab94ffd7a0ce46c571ae99b5f463b7a9..dae6cc8f63bafb51cd73df7f5db21821e96b3672 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CredentialDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/CredentialDto.java @@ -3,8 +3,8 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/JwtResponseDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/JwtResponseDto.java index c92b4913c8d02e5f44677bd7d18cfdb0362081be..2e2d793b2ce956acb38839d075f3aa1646b2f3e7 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/JwtResponseDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/JwtResponseDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/LoginRequestDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/LoginRequestDto.java index 87d34649f9242bc092f3fb1d3d3493539b7ee1dd..c961774794065528ff9dc1f41d6ebb498415d5d9 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/LoginRequestDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/LoginRequestDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java index 268d959905e1043f7ac0048067f0e072cdf1e127..cd63b55bae116dee18203cd1dda3d14f7656c5a7 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java index 3f6784bdd0eef1322ac391408e1e6e88e0b6cb5f..44a0b4b4c5f29cc7a38bab93491220ffcc9b3f16 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/SignupRequestDto.java @@ -3,10 +3,10 @@ package at.tuwien.api.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/TokenIntrospectDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/TokenIntrospectDto.java index 93e38adb6f7c2c8b1eda6d018ddc35a97ce1aa82..0df11f14412ee46974af2bd888945f597c7b5043 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/TokenIntrospectDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/auth/TokenIntrospectDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java index 77b76c1dd2a59b4bd62033d187717995a4f692a2..1a3bccd269bc0238042c1e12592db8c6d4055214 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerChangeDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerChangeDto.java index e49c5678704418c86c5cbd322031a95bb6e2cbfc..6de5684bfdde21d2cb5a24edcf587d19d068112d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerChangeDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerChangeDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.container; import io.swagger.v3.oas.annotations.Parameter; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerCreateRequestDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerCreateRequestDto.java index 50b82adab8372d4c3635e1c1a4dacdeb9e3eaee8..98e6170ca876d5aac2460b3fedc44c4ec334d2bd 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerCreateRequestDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerCreateRequestDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.container; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java index e4d32aeb5df225b3b74625935640a144dd6a928a..cd112e1da40d733aa4d545afb603cfed6202cd49 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java index 036a25460530d8601b5bab293339e93ed2e0f97c..999657db55d3e8aa697d2b801b21da9bf978db3f 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java @@ -3,8 +3,8 @@ package at.tuwien.api.container.image; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java index 5336558b858d5fd8d9e43b1f6772b2d2439922d3..894e5a675ef95735f41c958ae249035c6ca8f90c 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java index 78a4c5f3dc5e218f27282a01f99763bacb71b903..a0698abf37b64c94bec14922f4c251a610739f6c 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java @@ -5,8 +5,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java index 4db420f6f73c8af969c2404b5f6e4c6b9089d93d..47802b583ab8784e811b16c05460b2d6f9cd90ec 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDto.java index a2eaeaf213119506eff83af7980c21dd1d593061..8e20b2ab3787db82b02023b7624e1b851eaf64b8 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageDto.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigInteger; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemDto.java index d07f054f62449a233c94b79df6bc93f0a7f82219..9d81cac9674d990d64f62f932c651c644f87438f 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageEnvItemDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java index be111aa08ccb1a04d7a8b010107ceb8bfc4f5c46..eeee96c6275f8acaf111403a5efba3e451fff85d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java index f227746ba793be6ab19e1b8f37667990cf231bee..4a582e118848a3919277b43f4bf7fcd67a1dcae6 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java index 766e2a97e2bf5f1fe0a94d210f7eaa5f43fa347b..5960ae6df8d8100bc6da882397b207d29bf83ee8 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseCreateDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java index 5d55626797f62f056b63ada80ef1b5dca348cc90..6554f69071c25ef597eef4175a494aed40b33b77 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java @@ -14,8 +14,8 @@ import org.springframework.data.elasticsearch.annotations.DateFormat; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseGiveAccessDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseGiveAccessDto.java index b23d904d35ac65793e75f445b69f014a4d1a4dc9..67acd217669636c272721a05ee9d0138c6b4e53c 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseGiveAccessDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseGiveAccessDto.java @@ -2,8 +2,8 @@ package at.tuwien.api.database; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyAccessDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyAccessDto.java index d8a7053c0333b902c84dde02d75ca9b42350d0f8..871ee5295830b107e3cb24091c96d39c7ec3ae18 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyAccessDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyAccessDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.database; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java index 09eba06f56017bd04e0fb8f49d052d424cbb7904..eeb8574e2f8d0c2240388d014f7fdc87d8db5588 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java index f75caebecd89e5df63c8700c9b347700bd1a4d2e..b7682cbbed01f48c9b5be489033f7efca6f06a3d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.database; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/LicenseDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/LicenseDto.java index bf8b6b10e6d59cd1618610a71cbf52e38c61c743..d657108d711205c08385633e71d759418f926c35 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/LicenseDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/LicenseDto.java @@ -3,8 +3,8 @@ package at.tuwien.api.database; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/SubjectModifyDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/SubjectModifyDto.java index c66c8690913f360a64a835dde823e38c55123baf..a3e9af8769ad689d94c7890574f99cfafb6efb5f 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/SubjectModifyDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/SubjectModifyDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.database; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java index ee656d297bbe0b8261c9569554509f4908e15751..3d51ae4a657e52c119c1354fec9f3e77c1037ddf 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java index d4b6b81f014ce8045132851fd9e743fad56238a8..aea8de5a99666beaa7fb947d25d389c28dfb37e5 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewCreateDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewDto.java index 867e83e77178e81902a6447c5756b9fc35af13bb..6c521b5e066d0d3b019201fb40a8c75908afc9de 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/ViewDto.java @@ -8,8 +8,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.data.elasticsearch.annotations.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java index 0754b88bbbc6ad0cf513bb9b7067f8c219c2eae0..d84afd9afb1134328df5ea6d9dec462220d6d8a6 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExportDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExportDto.java index 2b136bf378d400736f0a32fb0ae61e737c452aa6..c5b80615dd6837ed6afdebd2e93620f1ed50fb10 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExportDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExportDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.database.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ImportDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ImportDto.java index 77bad91c8b0afe4cf6c32f319e0a84e8e929ead4..e7636a95c040cfd414feb2d73ee15614883bbe99 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ImportDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/ImportDto.java @@ -5,9 +5,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java index 3f641f1a1c700d3d5ca0a284e73f830ec70fd46b..e3acd7c51531b547709f9417234ed8b4d9c4b0de 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java @@ -10,8 +10,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java index db5cb11fb743e344f8cb95d9df4e228a470c1e59..216267dbaca238f5ac9da9ac41d152dc85f61973 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java index a9ece1cb1dc59d4df135194fa228751370828f90..fb9f1d9f714d8590a4e3d85ac368afd2b2dfe498 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java index eaf459ba16919e8add187b3d8ee97af0964fdae2..4987b6c2f99f6d8442daae26713984ea8e26a7a7 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.database.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java index aa4f25af3b379ac3731af006208dbe2299f2908b..d1d3ca5c606096a4311ae2074e3a24ff3751ed85 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java index cca2d8bec2ee7233c5ffabf62f0999c3d49433e9..a1101f8e9a4bf51750479defee09794ebe23202d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java @@ -5,8 +5,8 @@ import at.tuwien.api.database.table.constraints.ConstraintsCreateDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDeleteDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDeleteDto.java index 77350153d841b998f34b175398f8aed1fc2ced42..1e90e0214997962653b9b85add9dee99152cf8b5 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDeleteDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDeleteDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.database.table; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Map; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDto.java index cec90849d4f505cf13eae307a09547d9e951fd80..4b7c7c14cb0c52f150f5d58eff9e3fe52a37b9ef 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.database.table; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Map; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvInformationDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvInformationDto.java index 6857fb96ba876023035f2fa991adeba013c30ccd..3d1975b5d75504124f97c36010f0dcb7fb8e7c66 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvInformationDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvInformationDto.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvUpdateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvUpdateDto.java index 43c74af87fd55c1ea775dfacf3aabd88f9d4e7f5..ff5e358eda311db3e401e9a519c1036bf27320ef 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvUpdateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCsvUpdateDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.database.table; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Map; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableDto.java index 25315bd658cff125b4a0fba15564ec3c719d683b..4e0368cb6c1b2012851557170692bdb4be07f37b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableDto.java @@ -10,8 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.data.elasticsearch.annotations.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java index f0cacdcfa0e887a0b500d6c918f7d70e5183fa46..f51b2e77a9dd2b1083ebcb3b64ded22ae4356989 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java index 77c4b576ee298613bbe6704feabc056b008a0fd4..16d0cd661967c6567d208b9a335506698d7e391e 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java index 5c7786aad0de93cef5bc11d8991caafec5811f5b..204fc024c942c9315e6cfbb18ada0900ae7bc04b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java @@ -1,13 +1,11 @@ package at.tuwien.api.database.table.columns; import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.persistence.Column; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java index e9996c708813bf9826a34afb41bf14383d3c655a..a79cd937679f2a35768f81b3c1b67cd7e0cdfcca 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java @@ -10,8 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.data.elasticsearch.annotations.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java index 3381397c7ec1d816c4ab5ecdd0b8b595f4a4c6e2..ca02d1189dfb4e383d97e9d0d83c5aeed6dc4680 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java index 1ffcbe7ef8510e27f9830d15d4736db6d3fb41b1..af56ff3c215de734a163f3ddcacd6ed728c50623 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/constraints/foreignKey/ForeignKeyDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/constraints/foreignKey/ForeignKeyDto.java index fbd0d3b2671ba2b3a8626525a30465cd7d305d44..e2b1889622f2bfd0e858b0c4b89b950f6307d9f5 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/constraints/foreignKey/ForeignKeyDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/constraints/foreignKey/ForeignKeyDto.java @@ -1,13 +1,10 @@ package at.tuwien.api.database.table.constraints.foreignKey; import at.tuwien.api.database.table.TableBriefDto; -import at.tuwien.api.database.table.TableDto; import at.tuwien.api.database.table.columns.ColumnDto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import javax.persistence.Entity; -import javax.persistence.Transient; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java index d2c9889e42aececc7571160f76866035cda46693..b46bf4d3a487789ffbd012f66ce5f845f5f2135d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java @@ -2,8 +2,8 @@ package at.tuwien.api.datacite.doi; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java index 87aa1fcbf5f346631e37fc3d819fb9946923ca89..7d67a0a731574b8b2ed3efcbcff79517a0588e4a 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java @@ -2,7 +2,7 @@ package at.tuwien.api.datacite.doi; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java index 8446813f11dbdfc6006c2c0bf40df6f04664f00d..644a4508cbe70b2b072ae7e9d1ec34c666dbbc86 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java @@ -3,7 +3,7 @@ package at.tuwien.api.datacite.doi; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.io.Serializable; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java index dcb5016867f1e0d7ac2dfa0e9b7749596558b68e..4218e120098ce30e019a5b0a7201456e006836cf 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java @@ -2,7 +2,7 @@ package at.tuwien.api.datacite.doi; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java index 66a1aeda0c593413fd4e5bfb0d751e1a228dec22..2d6d83db34f363367ce6f66c9598a83e7b91088a 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.http.HttpStatus; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java index ad0910407b22e7c89f9e9f10a18e622a475e6cf7..ea386c146134a84f83d48efeb1f871a4fdfc274b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorCreateDto.java index a81faae44a361965af2638f860bf9689ddb70c2d..0d0bc83fb6d82eb1741a26dff66263f99443352a 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorCreateDto.java @@ -7,7 +7,7 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.jackson.Jacksonized; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Data @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java index 8423fe4120f7464b225981c608ed6d19d1c83cb2..8513d10380b6ef61a63e18b20b292b959353131d 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java @@ -7,8 +7,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java index 6b2f0dc3668d45d8a9dee2f5b7ceacf8e5690a15..817e1fdb59242d1a83db1c1c15a41300389ebe5e 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java @@ -9,8 +9,8 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java index e460cd8c59061e831aad1ba27c8378d5bd32e9f0..a38ccfe4ed1da7d586cd77071eacba22348973d4 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierCreateDto.java @@ -9,9 +9,9 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; import java.util.List; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java index 1234beec9630665c55479a7c7929e3ffca2a86d9..bb3ebcc8bcd4a88d05a81f4e19ed1c08854247c0 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java @@ -10,8 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.data.elasticsearch.annotations.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierUpdateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierUpdateDto.java index 3827019e11f95f046770d8cd1d52ad8dc7dbba6f..610533188b0e2563a5493e3412f78ff79687ed8b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierUpdateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierUpdateDto.java @@ -9,9 +9,9 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; import java.util.List; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierCreateDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierCreateDto.java index f6e9e1c312954b1d29553df285232d9db83375de..8b0457543250ce773e2431b42af6804e4a2a7def 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierCreateDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierCreateDto.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.extern.jackson.Jacksonized; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Data @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java index b7ffb97c90ee374befd82606d1305efc49c2e55c..390ee3e1e885b6b0e43b80c8ca5e6fda062606ac 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java @@ -8,7 +8,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.time.Instant; @Data diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java index 57d639f9165ddbefa08a8132dd9e473039526049..d1f1f218e89e40b3096fce984825aaa73e49e8a6 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserAttributeDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserAttributeDto.java index fc95f67dc682ff1639116ea859f4f20bd9d1eaa0..3f77686aab3727b9f2932da5d4f83addd61263ca 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserAttributeDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserAttributeDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.UUID; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserBriefDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserBriefDto.java index 62dfb946fe85884fa91e48b745583fa253a26f80..1030fb41a27b0717d35d0a76d4d1be8d20a14aee 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserBriefDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserBriefDto.java @@ -1,14 +1,10 @@ package at.tuwien.api.user; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.springframework.security.core.userdetails.UserDetails; -import javax.validation.constraints.NotNull; -import java.util.List; +import jakarta.validation.constraints.NotNull; import java.util.UUID; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java index 53e238e3c84c1030a99f7fff0ed544a9bcdd92ee..56eeda482968571d083f1166815a4928e87521d4 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java @@ -4,8 +4,8 @@ import lombok.*; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDto.java index 2c824f4acae33668863d931571e96cc9546e1f15..fd5c7ca85f63a16ab008306b88e1d7c1ac058d59 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.UUID; diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserEmailDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserEmailDto.java index b0bda4ebfe63cf1f7f83eb2bc393a0f61aa96bb2..6d2db1975763e474f2ce18e428cf9506e30527ae 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserEmailDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserEmailDto.java @@ -3,8 +3,8 @@ package at.tuwien.api.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserForgotDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserForgotDto.java index 2a6bf21283bb51a0bff614990c5fadbc69d49711..9433ede1a3af71168b888e1ea3131ffc6b6e0c8b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserForgotDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserForgotDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Email; +import jakarta.validation.constraints.Email; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java index 78d9c32846f9ee4c4c89a93871e9ea57c31a58e1..c9763ee84fc5f9defd3cf93d2b45c011009c8d7b 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java index b5c70ad502f948babdd1a55e6c96cfafbb81899f..34926e85f5bea65b57bf44b4ef491a501989f963 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.user; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserResetDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserResetDto.java index 938d38ae5d7f073362a167ec4ae82c4425efe497..9c00094f826f1ba6667aab2f248cc77af7e7d326 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserResetDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserResetDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.user; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserRolesDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserRolesDto.java index df584500723a6886883d23c433455974c209a44a..b33182c99e1218255bd5698a13873f4c559a98a6 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserRolesDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserRolesDto.java @@ -2,7 +2,7 @@ package at.tuwien.api.user; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java index ab700636b809a187e55b47253203f75cec8e02ef..2ebf9bd4f2e19b00d5e611ed7f7ac7e8e13ce61e 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java index dc6b9e44f3fac682864afcabdd8719679f698b68..6c69d5bc68ca430796d3e0bba2f86ccae37d4154 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java @@ -3,7 +3,7 @@ package at.tuwien.api.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java index c2e510881d7cd71f7d2b342e55618bec9f797312..bcbfa6aff00b77497caf180205c0b960d61fac76 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java @@ -3,15 +3,13 @@ package at.tuwien.entities.container; import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.database.Database; import at.tuwien.entities.user.User; -import com.github.dockerjava.api.model.HealthCheck; +import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; import java.time.Instant; import java.util.UUID; @@ -35,7 +33,6 @@ public class Container { @ToString.Exclude @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID createdBy; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) @@ -46,7 +43,6 @@ public class Container { @ToString.Exclude @Column(name = "ownedBy", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID ownedBy; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java index 5708abaf3510e7acf7c84e6e69f6372ed2733bd4..b359185f8aeeb95c807d8411c4931e8c96574f9f 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java @@ -1,13 +1,13 @@ package at.tuwien.entities.container.image; import at.tuwien.entities.container.Container; +import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; import java.time.Instant; import java.util.List; diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java index d593a17e250b79169b1bc895be2229edc381bddf..b68947339ed2194ad0f04078554d25126192e963 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; @Data diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java index 8891b85f23634dd65f392e9dc9f8b1a9ad5c5cd4..f567bdd190fdf2f9186b223a99ecd687c8ba719d 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java @@ -6,7 +6,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; @Data diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java index 01c73861237606f8dacdd2af0a4206ac53c1ebb2..931638022de9cccd924fdee960fe1a81ac82318e 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java @@ -10,9 +10,9 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; -import javax.persistence.CascadeType; -import javax.persistence.Entity; +import jakarta.persistence.*;; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; import java.io.Serializable; import java.time.Instant; import java.util.List; @@ -25,7 +25,7 @@ import java.util.UUID; @AllArgsConstructor @NoArgsConstructor @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_databases", uniqueConstraints = { +@jakarta.persistence.Table(name = "mdb_databases", uniqueConstraints = { @UniqueConstraint(columnNames = {"id", "internalName"}) }) public class Database implements Serializable { @@ -37,10 +37,8 @@ public class Database implements Serializable { @ToString.Exclude @Column(name = "created_by", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID createdBy; - @Type(type = "uuid-char") @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) @JoinColumns({ @JoinColumn(name = "created_by", referencedColumnName = "ID", insertable = false, updatable = false) @@ -49,7 +47,6 @@ public class Database implements Serializable { @ToString.Exclude @Column(name = "owned_by", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID ownedBy; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) @@ -80,10 +77,8 @@ public class Database implements Serializable { @ToString.Exclude @Column(name = "contact_person", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID contactPerson; - @Type(type = "uuid-char") @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST) @JoinColumns({ @JoinColumn(name = "contact_person", referencedColumnName = "ID", updatable = false, insertable = false) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java index 19d71711fe5c8badea79eb4f3b3233cb72037e48..b3e2790399839d5b4646222fd2fcb1cbfb5dfbe7 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.Type; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.UUID; @@ -18,11 +18,10 @@ import java.util.UUID; @NoArgsConstructor @IdClass(DatabaseAccessKey.class) @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_have_access") +@jakarta.persistence.Table(name = "mdb_have_access") public class DatabaseAccess { @Id - @Type(type = "uuid-char") @EqualsAndHashCode.Include @Column(name = "user_id", updatable = false, columnDefinition = "VARCHAR(36)") private UUID huserid; diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java index baad81f5a3024ca1a98f0b8d262500c8bf0d2407..5159794d7798a1ddc98a4bf1528b9fb2b4655832 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java @@ -3,7 +3,7 @@ package at.tuwien.entities.database; import lombok.*; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; @Data @Entity @@ -12,7 +12,7 @@ import javax.persistence.*; @AllArgsConstructor @NoArgsConstructor @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_licenses", uniqueConstraints = { +@jakarta.persistence.Table(name = "mdb_licenses", uniqueConstraints = { @UniqueConstraint(columnNames = {"uri"}) }) public class License { diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java index 90cca36bed3dd9134e9e339be307564300a0e01d..552052c5d9fa0091db7bb5068a8a462a211cb772 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java @@ -5,13 +5,11 @@ import at.tuwien.entities.user.User; import lombok.*; import net.sf.jsqlparser.statement.select.FromItem; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.List; import java.util.UUID; @@ -24,7 +22,7 @@ import java.util.UUID; @NoArgsConstructor @IdClass(ViewKey.class) @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_view") +@jakarta.persistence.Table(name = "mdb_view") public class View { @Id @@ -44,7 +42,6 @@ public class View { @ToString.Exclude @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID createdBy; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java index 75b506a6c6aff6ef94051ff6caee2e760b3dcef9..c6784ed1b5707515826073c47980765aa3089155 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java @@ -11,7 +11,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.List; @@ -23,7 +23,7 @@ import java.util.List; @NoArgsConstructor @EntityListeners(AuditingEntityListener.class) @IdClass(TableKey.class) -@javax.persistence.Table(name = "mdb_tables", uniqueConstraints = { +@jakarta.persistence.Table(name = "mdb_tables", uniqueConstraints = { @UniqueConstraint(columnNames = {"tdbid", "internalName"}) }) public class Table { diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java index 02ad037bd67f2247460bd268af91d674e8b81c70..e90d48e921e98561b7f72097936fc6251f4e1d34 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java @@ -11,7 +11,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.List; import java.util.UUID; @@ -24,7 +24,7 @@ import java.util.UUID; @NoArgsConstructor @IdClass(TableColumnKey.class) @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_columns", uniqueConstraints = { +@jakarta.persistence.Table(name = "mdb_columns", uniqueConstraints = { @UniqueConstraint(columnNames = {"tid", "internalName"}) }) public class TableColumn implements Comparable<TableColumn> { diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java index a06f93e2dbc4ed9d19ddb4c7a899eb6e75a8a4ea..c90c1f9fef81e8ecce1a3a7a04166ee06d6f4373 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java @@ -4,7 +4,7 @@ import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; @ToString @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@javax.persistence.Table(name = "mdb_concepts") +@jakarta.persistence.Table(name = "mdb_concepts") public class TableColumnConcept { @Id diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java index 114d08e789fa9547ca63766fbe338b6fac7f0611..2a64f611b2157f53888a92457a9fa5b19757ed75 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java @@ -4,7 +4,7 @@ import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; @NoArgsConstructor @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@javax.persistence.Table(name = "mdb_units") +@jakarta.persistence.Table(name = "mdb_units") public class TableColumnUnit { @Id diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java index c2c5768a252d559f56fc98e526cd57e7c69f7ba6..229b19ed647e64e4c67961e615fef8bd02551d49 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java @@ -4,7 +4,7 @@ import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey; import at.tuwien.entities.database.table.constraints.unique.Unique; import lombok.*; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.List; import java.util.Set; diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java index c68cc278517075bce0f9dcbddd1ef9aebdc893f5..af0b10ee74961a3abb61084a94213f3077dc618d 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java @@ -5,7 +5,7 @@ import lombok.*; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.List; @Data @@ -16,7 +16,7 @@ import java.util.List; @ToString @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@javax.persistence.Table(name = "mdb_constraints_foreign_key") +@jakarta.persistence.Table(name = "mdb_constraints_foreign_key") public class ForeignKey { @Id diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java index 892c07cc43e1ed94607f219eee31b4b136c35251..0f58ed646278c7f95ce6135d8c7e076b9c4746ca 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java @@ -5,7 +5,7 @@ import lombok.*; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; @Data @Entity @@ -15,7 +15,7 @@ import javax.persistence.*; @ToString @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@javax.persistence.Table(name = "mdb_constraints_foreign_key_reference") +@jakarta.persistence.Table(name = "mdb_constraints_foreign_key_reference") public class ForeignKeyReference { @Id diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java index 7be883b78ee3b7e1c7191e540810ffa0b528bf3c..792c57dbaa7593ab3905880dbb58c36e742d7193 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java @@ -6,7 +6,7 @@ import lombok.*; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.List; import java.util.Set; @@ -18,7 +18,7 @@ import java.util.Set; @ToString @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@javax.persistence.Table(name = "mdb_constraints_unique") +@jakarta.persistence.Table(name = "mdb_constraints_unique") public class Unique { @Id diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java index 740fe5a4e5cbf278d49e56942287b4bcbe0e17e4..91a68d69c8ab3ac3f024f47d3179973eb897c9a4 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java @@ -8,7 +8,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java index 6210ab7c35d4215f5d8090a7d9064dcd0b54f839..fd08d841d5ce4a71a22d0e4f543350628692c0f8 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java @@ -10,8 +10,8 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.*;; +import jakarta.validation.constraints.NotBlank; import java.io.Serializable; import java.time.Instant; import java.util.List; @@ -23,7 +23,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @EntityListeners(AuditingEntityListener.class) -@javax.persistence.Table(name = "mdb_identifiers", uniqueConstraints = { +@jakarta.persistence.Table(name = "mdb_identifiers", uniqueConstraints = { @UniqueConstraint(columnNames = {"qid", "cid", "dbid"}) }) public class Identifier implements Serializable { diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java index 54b90615a794dba57c251e1fe622704507f1d448..47716154fef4aa475d6335f2db4677f705630f66 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java @@ -10,7 +10,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.time.Instant; import java.util.UUID; diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Credential.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Credential.java index 85dafd353db73deaab0c2706e52f584bdf28a760..e4080c44cb9bf1af35a882824f3b2dfb9f4499c8 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Credential.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Credential.java @@ -5,7 +5,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.UUID; @Data @@ -22,14 +22,12 @@ public class Credential { @Id @EqualsAndHashCode.Include @Column(name = "ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID id; @Column(nullable = false) private String type; @Column(name = "user_id", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID userId; @Column(nullable = false) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Realm.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Realm.java index 3890974c2ee82062e526a6636e584420c9a18522..5c7816af6ab6f160a8967b1d43b5e3e9f139da47 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Realm.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Realm.java @@ -5,7 +5,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Immutable; import org.hibernate.annotations.Type; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.List; import java.util.UUID; @@ -26,7 +26,6 @@ public class Realm { @Id @EqualsAndHashCode.Include @Column(name = "ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID id; @Column(nullable = false) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Role.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Role.java index 17a0446bc87509b8ddb4754815b8e4f18fb06e57..e50a902bd054eb1be8d3ad8ab959353ca0b90606 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Role.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/Role.java @@ -2,10 +2,9 @@ package at.tuwien.entities.user; import lombok.*; import org.hibernate.annotations.Immutable; -import org.hibernate.annotations.Type; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.List; import java.util.UUID; @@ -24,14 +23,12 @@ public class Role { @Id @EqualsAndHashCode.Include @Column(name = "ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID id; @Column(name = "NAME", nullable = false) private String name; @Column(name = "REALM_ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID realmId; @ToString.Exclude diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/RoleMapping.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/RoleMapping.java index 08d5df4b4d1ae70f6dbe15dd86cd45352141003c..674b9b8608b85318042334a400877ec8e1959109 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/RoleMapping.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/RoleMapping.java @@ -1,10 +1,9 @@ package at.tuwien.entities.user; import lombok.*; -import org.hibernate.annotations.Type; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.UUID; @Data @@ -24,13 +23,11 @@ public class RoleMapping { @Id @EqualsAndHashCode.Include @Column(name = "USER_ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID userId; @Id @EqualsAndHashCode.Include @Column(name = "ROLE_ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID roleId; } diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java index 109e63b06dc8f96e0ddfce6328901f5c34fc87ca..bf12e29066a2e03f1d4436484d464c9fba340600 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java @@ -4,12 +4,10 @@ import at.tuwien.entities.container.Container; import at.tuwien.entities.database.Database; import at.tuwien.entities.identifier.Identifier; import lombok.*; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.security.core.Authentication; -import javax.persistence.*; +import jakarta.persistence.*;; import java.security.Principal; import java.util.List; import java.util.UUID; @@ -36,7 +34,6 @@ public class User { @Id @EqualsAndHashCode.Include @Column(name = "ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID id; @Column(nullable = false) @@ -49,7 +46,6 @@ public class User { private String lastname; @Column(name = "REALM_ID", columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID realmId; @Column(nullable = false) diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/UserAttribute.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/UserAttribute.java index bbc19e8ef83978cb0a0d494ee7f77dcd1c45fe67..199dcdd149a9bc3607d204de77fad86fa5e2b7d0 100644 --- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/UserAttribute.java +++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/user/UserAttribute.java @@ -1,11 +1,9 @@ package at.tuwien.entities.user; import lombok.*; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*;; import java.util.UUID; @Data @@ -22,12 +20,10 @@ public class UserAttribute { @Id @EqualsAndHashCode.Include @Column(name = "ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID id; @ToString.Exclude @Column(name = "USER_ID", nullable = false, columnDefinition = "VARCHAR(36)") - @Type(type = "uuid-char") private UUID userId; @Column(name = "NAME", nullable = false) diff --git a/dbrepo-metadata-db/pom.xml b/dbrepo-metadata-db/pom.xml index c7f3b2990d618df0124b1b7030ee2bcdf53db6f5..924d8d9c0790e83aea8d88b72ca6d26d409a9b15 100644 --- a/dbrepo-metadata-db/pom.xml +++ b/dbrepo-metadata-db/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.4.3</version> + <version>3.0.6</version> </parent> <groupId>at.tuwien</groupId> @@ -24,17 +24,12 @@ </modules> <properties> - <java.version>11</java.version> + <java.version>17</java.version> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> - <spring-cloud.version>Hoxton.SR8</spring-cloud.version> - <mapstruct.version>1.4.2.Final</mapstruct.version> <docker.version>3.3.0</docker.version> - <testcontainers.version>1.15.2</testcontainers.version> - <swagger.version>2.1.7</swagger.version> - <springfox.version>3.0.0</springfox.version> - <jsql.version>3.1</jsql.version> - <jackson-datatype.version>2.13.3</jackson-datatype.version> + <jsql-parser.version>4.6</jsql-parser.version> + <jackson-datatype.version>2.15.0</jackson-datatype.version> <commons.version>2.11.0</commons.version> </properties> @@ -52,11 +47,6 @@ <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency> <!-- DataSource --> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.springframework.data</groupId> <artifactId>spring-data-elasticsearch</artifactId> @@ -82,7 +72,7 @@ <dependency> <groupId>com.github.jsqlparser</groupId> <artifactId>jsqlparser</artifactId> - <version>${jsql.version}</version> + <version>${jsql-parser.version}</version> </dependency> <!-- IDE --> <dependency> diff --git a/dbrepo-metadata-db/querystore/src/main/java/at/tuwien/querystore/Query.java b/dbrepo-metadata-db/querystore/src/main/java/at/tuwien/querystore/Query.java index f589913ec36b76fdc99fe90dff41b3ecae5d060f..e6925b48c5bfa30a1b568d7647358233e5daf2c2 100644 --- a/dbrepo-metadata-db/querystore/src/main/java/at/tuwien/querystore/Query.java +++ b/dbrepo-metadata-db/querystore/src/main/java/at/tuwien/querystore/Query.java @@ -4,20 +4,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; -import javax.persistence.Column; -import javax.persistence.Table; +import jakarta.persistence.*;; import java.io.Serializable; -import java.math.BigInteger; import java.time.Instant; -import java.util.List; @Data @Entity -@javax.persistence.Table(name = "qs_queries") +@jakarta.persistence.Table(name = "qs_queries") @Builder @AllArgsConstructor @NoArgsConstructor @@ -35,37 +30,37 @@ public class Query implements Serializable { ) private Long id; - @javax.persistence.Column(nullable = false, columnDefinition = "TEXT") + @jakarta.persistence.Column(nullable = false, columnDefinition = "TEXT") @Schema(example = "SELECT `id` FROM `air_quality`") private String query; - @javax.persistence.Column(name = "query_normalized", columnDefinition = "TEXT") + @jakarta.persistence.Column(name = "query_normalized", columnDefinition = "TEXT") @Schema(example = "SELECT `id` FROM `air_quality`") private String queryNormalized; - @javax.persistence.Column(name = "query_hash", nullable = false) + @jakarta.persistence.Column(name = "query_hash", nullable = false) @Schema(example = "17e682f060b5f8e47ea04c5c4855908b0a5ad612022260fe50e11ecb0cc0ab76") private String queryHash; - @javax.persistence.Column(name = "result_hash") + @jakarta.persistence.Column(name = "result_hash") @Schema(example = "17e682f060b5f8e47ea04c5c4855908b0a5ad612022260fe50e11ecb0cc0ab76") private String resultHash; - @javax.persistence.Column(name = "result_number") + @jakarta.persistence.Column(name = "result_number") @Schema(example = "1") private Long resultNumber; - @javax.persistence.Column(nullable = false) + @jakarta.persistence.Column(nullable = false) private Boolean isPersisted; - @javax.persistence.Column(nullable = false, updatable = false) + @jakarta.persistence.Column(nullable = false, updatable = false) @CreatedDate private Instant created; - @javax.persistence.Column(nullable = false, updatable = false) + @jakarta.persistence.Column(nullable = false, updatable = false) private Instant executed; - @javax.persistence.Column(nullable = false) + @jakarta.persistence.Column(nullable = false) private String createdBy; } diff --git a/dbrepo-metadata-db/test/src/main/java/at/tuwien/config/H2Utils.java b/dbrepo-metadata-db/test/src/main/java/at/tuwien/config/H2Utils.java index 82ec75d14a3d001a36116db2a186faa0a58b4044..a1f0e6a838b1d003e3802671a042ce7bb87ea1cc 100644 --- a/dbrepo-metadata-db/test/src/main/java/at/tuwien/config/H2Utils.java +++ b/dbrepo-metadata-db/test/src/main/java/at/tuwien/config/H2Utils.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets;