From cdc21f05ba10b8748f52e79683e4a1025a236c80 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 28 Oct 2022 15:57:06 +0200 Subject: [PATCH] SpringBoot 3 upgrade --- README.md | 4 +- build.gradle | 36 +++++++++---- etc/allowed-licenses.json | 6 ++- gradle.properties | 11 ++-- settings.gradle | 9 ++++ .../config/PostgresCustomDialect.java | 9 ++-- .../hsadminng/context/Context.java | 22 +++----- .../context/HttpServletRequestBodyCache.java | 4 +- .../HttpServletRequestBodyCachingFilter.java | 8 +-- .../HttpServletRequestWithCachedBody.java | 6 +-- .../RestResponseEntityExceptionHandler.java | 21 +++++--- .../HsOfficeBankAccountController.java | 6 ++- .../HsOfficeBankAccountEntity.java | 10 ++-- .../HsOfficeBankAccountRepository.java | 2 +- .../office/contact/HsOfficeContactEntity.java | 2 +- ...OfficeCoopAssetsTransactionController.java | 5 +- .../HsOfficeCoopAssetsTransactionEntity.java | 9 +--- ...OfficeCoopSharesTransactionController.java | 7 ++- .../HsOfficeCoopSharesTransactionEntity.java | 9 +--- .../debitor/HsOfficeDebitorController.java | 4 +- .../office/debitor/HsOfficeDebitorEntity.java | 2 +- .../debitor/HsOfficeDebitorEntityPatcher.java | 6 +-- .../HsOfficeMembershipController.java | 6 +-- .../membership/HsOfficeMembershipEntity.java | 14 ++--- .../HsOfficeMembershipEntityPatcher.java | 2 +- .../partner/HsOfficePartnerController.java | 5 +- .../partner/HsOfficePartnerDetailsEntity.java | 2 +- .../HsOfficePartnerDetailsEntityPatcher.java | 4 +- .../office/partner/HsOfficePartnerEntity.java | 2 +- .../partner/HsOfficePartnerEntityPatcher.java | 6 +-- .../office/person/HsOfficePersonEntity.java | 9 +--- .../HsOfficeRelationshipController.java | 4 +- .../HsOfficeRelationshipEntity.java | 9 +--- .../HsOfficeRelationshipEntityPatcher.java | 6 +-- .../HsOfficeRelationshipRepository.java | 2 +- .../HsOfficeSepaMandateController.java | 8 ++- .../HsOfficeSepaMandateEntity.java | 9 ++-- .../hostsharing/hsadminng/mapper/Mapper.java | 9 ++-- .../rbac/rbacgrant/RbacGrantController.java | 4 +- .../rbac/rbacgrant/RbacGrantEntity.java | 2 +- .../rbac/rbacrole/RbacRoleEntity.java | 6 +-- .../rbac/rbacuser/RbacUserEntity.java | 12 ++--- .../hsadminng/stringify/Stringify.java | 2 +- .../test/cust/TestCustomerEntity.java | 2 +- .../hsadminng/test/pac/TestPackageEntity.java | 2 +- .../hsadminng/arch/ArchitectureTest.java | 14 ++--- .../context/ContextIntegrationTests.java | 8 +-- .../hsadminng/context/ContextUnitTest.java | 6 +-- ...esponseEntityExceptionHandlerUnitTest.java | 32 +++++------ ...ceBankAccountControllerAcceptanceTest.java | 8 ++- ...eBankAccountRepositoryIntegrationTest.java | 18 ++----- ...OfficeContactControllerAcceptanceTest.java | 6 +-- ...fficeContactRepositoryIntegrationTest.java | 9 ++-- ...tsTransactionControllerAcceptanceTest.java | 53 ++++++++++++++----- ...sTransactionRepositoryIntegrationTest.java | 10 ++-- ...esTransactionControllerAcceptanceTest.java | 6 +-- ...sTransactionRepositoryIntegrationTest.java | 9 ++-- ...OfficeDebitorControllerAcceptanceTest.java | 4 +- .../HsOfficeDebitorEntityPatcherUnitTest.java | 4 +- ...fficeDebitorRepositoryIntegrationTest.java | 13 ++--- ...iceMembershipControllerAcceptanceTest.java | 4 +- .../HsOfficeMembershipControllerRestTest.java | 11 ++-- ...OfficeMembershipEntityPatcherUnitTest.java | 3 +- .../HsOfficeMembershipEntityUnitTest.java | 2 +- ...ceMembershipRepositoryIntegrationTest.java | 13 ++--- ...OfficePartnerControllerAcceptanceTest.java | 4 +- ...cePartnerDetailsEntityPatcherUnitTest.java | 4 +- .../HsOfficePartnerEntityPatcherUnitTest.java | 4 +- ...fficePartnerRepositoryIntegrationTest.java | 13 ++--- ...sOfficePersonControllerAcceptanceTest.java | 4 +- ...OfficePersonRepositoryIntegrationTest.java | 8 ++- ...ficeRelationshipEntityPatcherUnitTest.java | 4 +- ...RelationshipRepositoryIntegrationTest.java | 11 ++-- ...ceSepaMandateControllerAcceptanceTest.java | 4 +- ...fficeSepaMandateEntityPatcherUnitTest.java | 2 +- ...eSepaMandateRepositoryIntegrationTest.java | 6 +-- .../rbac/rbacgrant/RawRbacGrantEntity.java | 5 +- .../RbacGrantControllerAcceptanceTest.java | 6 +-- .../RbacGrantRepositoryIntegrationTest.java | 10 ++-- .../rbac/rbacrole/RawRbacRoleEntity.java | 2 +- .../RbacRoleControllerAcceptanceTest.java | 6 +-- .../rbacrole/RbacRoleControllerRestTest.java | 7 ++- .../RbacRoleRepositoryIntegrationTest.java | 6 +-- .../RbacUserControllerAcceptanceTest.java | 6 +-- .../rbacuser/RbacUserControllerRestTest.java | 6 +-- .../RbacUserRepositoryIntegrationTest.java | 8 ++- .../TestCustomerControllerAcceptanceTest.java | 4 +- ...TestCustomerRepositoryIntegrationTest.java | 8 +-- .../TestPackageRepositoryIntegrationTest.java | 9 ++-- .../java/net/hostsharing/test/JpaAttempt.java | 2 +- .../net/hostsharing/test/MapperUnitTest.java | 6 +-- .../net/hostsharing/test/StringTemplater.java | 4 +- 92 files changed, 354 insertions(+), 363 deletions(-) diff --git a/README.md b/README.md index c5d42e59..1106e9da 100644 --- a/README.md +++ b/README.md @@ -718,11 +718,11 @@ Once generated, the interfaces for the Spring-Controllers can be found in `build These interfaces have to be implemented by subclasses named `*Controller`. -All gradle tasks which need the generated interfaces depend on the Gradle task `processSpring` which controls the code generation. +All gradle tasks which need the generated interfaces depend on the Gradle task `openApiGenerate` which controls the code generation. It can also be executed directly: ```shell -gw processSpring +gw openApiGenerate ``` ### How to Generate Database Table Diagrams? diff --git a/build.gradle b/build.gradle index 77abf0b0..e49af754 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' - id 'org.springframework.boot' version '2.7.5' - id 'io.openapiprocessor.openapi-processor' version '2022.2' + id 'org.springframework.boot' version '3.0.0-SNAPSHOT' id 'io.spring.dependency-management' version '1.1.0' + id 'io.openapiprocessor.openapi-processor' version '2022.2' id 'com.github.jk1.dependency-license-report' version '2.1' id "org.owasp.dependencycheck" version "7.3.0" id "com.diffplug.spotless" version "6.11.0" @@ -36,6 +36,8 @@ configurations { repositories { mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } } java { @@ -57,11 +59,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'com.github.gavlyukovskiy:datasource-proxy-spring-boot-starter:1.8.1' - implementation 'org.springdoc:springdoc-openapi-ui:1.6.12' + implementation 'org.springdoc:springdoc-openapi:2.0.0-M7' implementation 'org.liquibase:liquibase-core' - implementation 'com.vladmihalcea:hibernate-types-55:2.20.0' + implementation 'com.vladmihalcea:hibernate-types-60:2.20.0' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4' - implementation 'org.openapitools:jackson-databind-nullable:0.2.3' + implementation 'org.openapitools:jackson-databind-nullable:0.2.4' + implementation 'org.apache.commons:commons-text:1.10.0' implementation 'org.modelmapper:modelmapper:3.1.0' implementation 'org.iban4j:iban4j:3.2.3-RELEASE' @@ -112,7 +115,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition.yaml" mapping "$projectDir/src/main/resources/api-mappings.yaml" - targetDir "$projectDir/build/generated/sources/openapi" + targetDir "$projectDir/build/generated/sources/openapi-javax" showWarnings true openApiNullable true } @@ -121,7 +124,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/rbac/rbac.yaml" mapping "$projectDir/src/main/resources/api-definition/rbac/api-mappings.yaml" - targetDir "$projectDir/build/generated/sources/openapi" + targetDir "$projectDir/build/generated/sources/openapi-javax" showWarnings true openApiNullable true } @@ -130,7 +133,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/test/test.yaml" mapping "$projectDir/src/main/resources/api-definition/test/api-mappings.yaml" - targetDir "$projectDir/build/generated/sources/openapi" + targetDir "$projectDir/build/generated/sources/openapi-javax" showWarnings true openApiNullable true } @@ -139,7 +142,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/hs-office/hs-office.yaml" mapping "$projectDir/src/main/resources/api-definition/hs-office/api-mappings.yaml" - targetDir "$projectDir/build/generated/sources/openapi" + targetDir "$projectDir/build/generated/sources/openapi-javax" showWarnings true openApiNullable true } @@ -153,6 +156,17 @@ tasks.register('processSpring', ProcessSpring) project.tasks.processResources.dependsOn processSpring project.tasks.compileJava.dependsOn processSpring +// Rename javax to jakarta in OpenApi generated java files because +// io.openapiprocessor.openapi-processor 2022.2 does not yet support the openapiprocessor useSpringBoot3 config option. +task openApiGenerate(type: Copy) { + from "$buildDir/generated/sources/openapi-javax" + into "$buildDir/generated/sources/openapi" + filter { line -> line.replaceAll('javax', 'jakarta') } +} +compileJava.source "$buildDir/generated/sources/openapi" +compileJava.dependsOn openApiGenerate +openApiGenerate.dependsOn processSpring + // Spotless Code Formatting spotless { java { @@ -271,8 +285,8 @@ pitest { targetTests = ['net.hostsharing.hsadminng.**.*UnitTest', 'net.hostsharing.hsadminng.**.*RestTest'] excludedTestClasses = ['**AcceptanceTest*', '**IntegrationTest*'] - pitestVersion = '1.9.0' - junit5PluginVersion = '1.0.0' + pitestVersion = '1.9.9' + junit5PluginVersion = '1.1.0' threads = 4 diff --git a/etc/allowed-licenses.json b/etc/allowed-licenses.json index 62f079b4..31bbfab3 100644 --- a/etc/allowed-licenses.json +++ b/etc/allowed-licenses.json @@ -1,12 +1,14 @@ { "allowedLicenses": [ { "moduleLicense": "Apache 2.0" }, + { "moduleLicense": "Apache 2" }, { "moduleLicense": "Apache License 2.0" }, { "moduleLicense": "Apache License, Version 2.0" }, { "moduleLicense": "The Apache Software License, Version 2.0" }, { "moduleLicense": "BSD License" }, { "moduleLicense": "BSD-2-Clause" }, + { "moduleLicense": "The BSD License" }, { "moduleLicense": "CDDL 1.1" }, { "moduleLicense": "CDDL/GPLv2+CE" }, @@ -29,6 +31,8 @@ { "moduleLicense": "MIT License" }, { "moduleLicense": "MIT" }, { "moduleLicense": "The MIT License (MIT)" }, - { "moduleLicense": "The MIT License" } + { "moduleLicense": "The MIT License" }, + + { "moduleName": "org.springdoc:springdoc-openapi" } ] } diff --git a/gradle.properties b/gradle.properties index 96a64eb1..890a008c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # Spring BOM overrides -postgresql.version = 42.4.1 -snakeyaml.version = 1.32 -jackson-databind = 2.13.4 +# postgresql.version = 42.4.1 +# snakeyaml.version = 1.32 +# jackson-databind = 2.13.4 # TODO: can be removed if all dependencies are JDK 16 compliant, check with `gw clean check` # and check output for "cannot access class ... because module jdk.compiler does not export ..." @@ -11,4 +11,7 @@ org.gradle.jvmargs= \ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ + +# --add-exports com.vladmihalcea.hibernate.type.array.internal.StringArrayTypeDescriptor\ +# --add-exports org.hibernate.type.descriptor.java.BasicPluralJavaType diff --git a/settings.gradle b/settings.gradle index 285ecb0c..8c454c71 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,10 @@ +pluginManagement { + repositories { + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + gradlePluginPortal() + mavenCentral() + } +} + rootProject.name = 'hsadmin-ng' diff --git a/src/main/java/net/hostsharing/hsadminng/config/PostgresCustomDialect.java b/src/main/java/net/hostsharing/hsadminng/config/PostgresCustomDialect.java index 243de957..9cd2ec70 100644 --- a/src/main/java/net/hostsharing/hsadminng/config/PostgresCustomDialect.java +++ b/src/main/java/net/hostsharing/hsadminng/config/PostgresCustomDialect.java @@ -1,15 +1,14 @@ package net.hostsharing.hsadminng.config; -import org.hibernate.dialect.PostgreSQL95Dialect; +import org.hibernate.dialect.PostgreSQLDialect; -import java.sql.Types; +import static org.hibernate.dialect.DatabaseVersion.make; @SuppressWarnings("unused") // configured in application.yml -public class PostgresCustomDialect extends PostgreSQL95Dialect { +public class PostgresCustomDialect extends PostgreSQLDialect { public PostgresCustomDialect() { - this.registerHibernateType(Types.OTHER, "pg-uuid"); - this.registerHibernateType(Types.ARRAY, "array"); + super(make(13, 7)); } } diff --git a/src/main/java/net/hostsharing/hsadminng/context/Context.java b/src/main/java/net/hostsharing/hsadminng/context/Context.java index 21424069..f7f6f827 100644 --- a/src/main/java/net/hostsharing/hsadminng/context/Context.java +++ b/src/main/java/net/hostsharing/hsadminng/context/Context.java @@ -1,7 +1,5 @@ package net.hostsharing.hsadminng.context; -import com.vladmihalcea.hibernate.type.array.StringArrayType; -import com.vladmihalcea.hibernate.type.array.UUIDArrayType; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; @@ -10,9 +8,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestContextHolder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.Optional; import java.util.Set; @@ -79,21 +77,15 @@ public class Context { } public UUID getCurrentUserUUid() { - return (UUID) em.createNativeQuery("select currentUserUUid()").getSingleResult(); + return (UUID) em.createNativeQuery("select currentUserUUid()", UUID.class).getSingleResult(); } public String[] getAssumedRoles() { - return (String[]) em.createNativeQuery("select assumedRoles() as roles") - .unwrap(org.hibernate.query.NativeQuery.class) - .addScalar("roles", StringArrayType.INSTANCE) - .getSingleResult(); + return (String[]) em.createNativeQuery("select assumedRoles() as roles", String[].class).getSingleResult(); } public UUID[] currentSubjectsUuids() { - return (UUID[]) em.createNativeQuery("select currentSubjectsUuids() as uuids") - .unwrap(org.hibernate.query.NativeQuery.class) - .addScalar("uuids", UUIDArrayType.INSTANCE) // TODO.blog - .getSingleResult(); + return (UUID[]) em.createNativeQuery("select currentSubjectsUuids() as uuids", UUID[].class).getSingleResult(); } public static String getCallerMethodNameFromStackFrame(final int skipFrames) { @@ -105,7 +97,7 @@ public class Context { .filter(c -> c.getDeclaringClass() .getPackageName() .startsWith("net.hostsharing.hsadminng")) - .filter(c -> !c.getDeclaringClass().getName().contains("BySpringCGLIB$$")) + .filter(c -> !c.getDeclaringClass().getName().contains("$$SpringCGLIB$$")) .findFirst()); return caller.map( c -> c.getDeclaringClass().getSimpleName() + "." + c.getMethodName()) diff --git a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCache.java b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCache.java index 25605b62..6580d9e4 100644 --- a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCache.java +++ b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCache.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.context; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCachingFilter.java b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCachingFilter.java index 62979d76..fcca347c 100644 --- a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCachingFilter.java +++ b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCachingFilter.java @@ -3,10 +3,10 @@ package net.hostsharing.hsadminng.context; import org.springframework.stereotype.Component; 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 jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @Component diff --git a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestWithCachedBody.java b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestWithCachedBody.java index a3cd22ea..d642ff6c 100644 --- a/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestWithCachedBody.java +++ b/src/main/java/net/hostsharing/hsadminng/context/HttpServletRequestWithCachedBody.java @@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.context; import org.springframework.util.StreamUtils; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java b/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java index fdeee405..536cbf16 100644 --- a/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java +++ b/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java @@ -5,7 +5,9 @@ import org.springframework.core.NestedExceptionUtils; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.lang.Nullable; import org.springframework.orm.jpa.JpaObjectRetrievalFailureException; import org.springframework.orm.jpa.JpaSystemException; @@ -15,8 +17,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import javax.persistence.EntityNotFoundException; -import javax.validation.ValidationException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.validation.ValidationException; import java.util.NoSuchElementException; import java.util.Optional; import java.util.regex.Pattern; @@ -79,19 +81,26 @@ public class RestResponseEntityExceptionHandler @Override @SuppressWarnings("unchecked,rawtypes") protected ResponseEntity handleExceptionInternal( - Exception exc, @Nullable Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { + Exception exc, @Nullable Object body, HttpHeaders headers, HttpStatusCode statusCode, WebRequest request) { - final var response = super.handleExceptionInternal(exc, body, headers, status, request); - return errorResponse(request, response.getStatusCode(), + final var response = super.handleExceptionInternal(exc, body, headers, statusCode, request); + return errorResponse(request, HttpStatus.valueOf(statusCode.value()), Optional.ofNullable(response.getBody()).map(Object::toString).orElse(firstMessageLine(exc))); } + @Override + @SuppressWarnings("unchecked,rawtypes") + protected ResponseEntity handleHttpMessageNotReadable( + HttpMessageNotReadableException exc, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + final var message = line(exc.getMessage(), 0); + return errorResponse(request, HttpStatus.BAD_REQUEST, message); + } @Override @SuppressWarnings("unchecked,rawtypes") protected ResponseEntity handleMethodArgumentNotValid( MethodArgumentNotValidException exc, HttpHeaders headers, - HttpStatus status, + HttpStatusCode statusCode, WebRequest request) { final var errorList = exc .getBindingResult() diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java index bc6acfa8..a9dd02b9 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java @@ -1,10 +1,10 @@ package net.hostsharing.hsadminng.hs.office.bankaccount; -import net.hostsharing.hsadminng.mapper.Mapper; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeBankAccountsApi; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeBankAccountInsertResource; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeBankAccountResource; +import net.hostsharing.hsadminng.mapper.Mapper; import org.iban4j.BicUtil; import org.iban4j.IbanUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +57,11 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi { final var entityToSave = mapper.map(body, HsOfficeBankAccountEntity.class); + final var saved = bankAccountRepo.save(entityToSave); +// em.persist(entityToSave); +// final var saved = entityToSave; +// em.flush(); final var uri = MvcUriComponentsBuilder.fromController(getClass()) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java index da0be7fe..bbaacb1d 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java @@ -5,12 +5,11 @@ import lombok.experimental.FieldNameConstants; import net.hostsharing.hsadminng.errors.DisplayName; import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; -import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @@ -34,6 +33,7 @@ public class HsOfficeBankAccountEntity implements Stringifyable { @Id @GeneratedValue private UUID uuid; + private String holder; private String iban; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java index 84e88949..92b12960 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java @@ -21,7 +21,7 @@ public interface HsOfficeBankAccountRepository extends Repository findByIbanOrderByIban(String iban); - HsOfficeBankAccountEntity save(final HsOfficeBankAccountEntity entity); + S save(S entity); int deleteByUuid(final UUID uuid); diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java index a8787b6b..7a2c84e0 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java @@ -7,7 +7,7 @@ import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java index fdafbbf8..946b4626 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java @@ -4,7 +4,6 @@ import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopAssetsApi; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionInsertResource; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionResource; -import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionResource; import net.hostsharing.hsadminng.mapper.Mapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; @@ -14,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.validation.Valid; -import javax.validation.ValidationException; +import jakarta.validation.Valid; +import jakarta.validation.ValidationException; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java index 9a0efe7d..9955f6f1 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java @@ -8,9 +8,8 @@ import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.text.DecimalFormat; import java.time.LocalDate; @@ -20,10 +19,6 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity @Table(name = "hs_office_coopassetstransaction_rv") -@TypeDef( - name = "pgsql_enum", - typeClass = PostgreSQLEnumType.class -) @Getter @Setter @Builder @@ -52,7 +47,7 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable { @Column(name = "transactiontype") @Enumerated(EnumType.STRING) - @Type( type = "pgsql_enum" ) + @Type(PostgreSQLEnumType.class) private HsOfficeCoopAssetsTransactionType transactionType; @Column(name = "valuedate") diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java index 7b425acc..813d8b92 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java @@ -1,11 +1,10 @@ package net.hostsharing.hsadminng.hs.office.coopshares; -import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeContactResource; -import net.hostsharing.hsadminng.mapper.Mapper; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopSharesApi; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionInsertResource; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionResource; +import net.hostsharing.hsadminng.mapper.Mapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat.ISO; @@ -14,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.validation.Valid; -import javax.validation.ValidationException; +import jakarta.validation.Valid; +import jakarta.validation.ValidationException; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java index c05d0a47..1b5d1cc5 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java @@ -7,9 +7,8 @@ import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity; import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.util.UUID; @@ -17,10 +16,6 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity @Table(name = "hs_office_coopsharestransaction_rv") -@TypeDef( - name = "pgsql_enum", - typeClass = PostgreSQLEnumType.class -) @Getter @Setter @Builder @@ -48,7 +43,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable { @Column(name = "transactiontype") @Enumerated(EnumType.STRING) - @Type(type = "pgsql_enum") + @Type(PostgreSQLEnumType.class) private HsOfficeCoopSharesTransactionType transactionType; @Column(name = "valuedate") diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java index 4be8d611..bc4175ca 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java @@ -12,8 +12,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java index ae827649..4a29be90 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java @@ -9,7 +9,7 @@ import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcher.java index bc1e1683..b57b1ab2 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcher.java @@ -1,11 +1,11 @@ package net.hostsharing.hsadminng.hs.office.debitor; -import net.hostsharing.hsadminng.mapper.EntityPatcher; -import net.hostsharing.hsadminng.mapper.OptionalFromJson; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorPatchResource; +import net.hostsharing.hsadminng.mapper.EntityPatcher; +import net.hostsharing.hsadminng.mapper.OptionalFromJson; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; class HsOfficeDebitorEntityPatcher implements EntityPatcher { diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java index c10ff273..3553f616 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java @@ -12,9 +12,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.validation.Valid; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.validation.Valid; import java.util.List; import java.util.UUID; import java.util.function.BiConsumer; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java index 7bcdc86a..7a3e1a20 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java @@ -12,9 +12,8 @@ import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.util.UUID; @@ -23,20 +22,12 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity @Table(name = "hs_office_membership_rv") -@TypeDef( - name = "pgsql_enum", - typeClass = PostgreSQLEnumType.class -) @Getter @Setter @Builder @NoArgsConstructor @AllArgsConstructor @DisplayName("Membership") -@TypeDef( - typeClass = PostgreSQLRangeType.class, - defaultForType = Range.class -) public class HsOfficeMembershipEntity implements Stringifyable { private static Stringify stringify = stringify(HsOfficeMembershipEntity.class) @@ -65,11 +56,12 @@ public class HsOfficeMembershipEntity implements Stringifyable { private int memberNumber; @Column(name = "validity", columnDefinition = "daterange") + @Type(PostgreSQLRangeType.class) private Range validity; @Column(name = "reasonfortermination") @Enumerated(EnumType.STRING) - @Type(type = "pgsql_enum") + @Type(PostgreSQLEnumType.class) private HsOfficeReasonForTermination reasonForTermination; public void setValidFrom(final LocalDate validFrom) { diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java index d7436dca..f163434f 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java @@ -6,7 +6,7 @@ import net.hostsharing.hsadminng.mapper.EntityPatcher; import net.hostsharing.hsadminng.mapper.Mapper; import net.hostsharing.hsadminng.mapper.OptionalFromJson; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java index 5f86164f..42b7afe9 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java @@ -1,7 +1,6 @@ package net.hostsharing.hsadminng.hs.office.partner; import net.hostsharing.hsadminng.context.Context; -import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficePartnersApi; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerInsertResource; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource; @@ -13,8 +12,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java index 131fd735..abfd5d8b 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java @@ -5,7 +5,7 @@ import net.hostsharing.hsadminng.errors.DisplayName; import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcher.java index aead11e5..5940339a 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcher.java @@ -1,10 +1,10 @@ package net.hostsharing.hsadminng.hs.office.partner; +import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerDetailsPatchResource; import net.hostsharing.hsadminng.mapper.EntityPatcher; import net.hostsharing.hsadminng.mapper.OptionalFromJson; -import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerDetailsPatchResource; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; class HsOfficePartnerDetailsEntityPatcher implements EntityPatcher { diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java index b4ddfcd7..86b27c8d 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java @@ -9,7 +9,7 @@ import net.hostsharing.hsadminng.stringify.Stringifyable; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcher.java index 7b1af04f..bc5de4d7 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcher.java @@ -1,12 +1,12 @@ package net.hostsharing.hsadminng.hs.office.partner; -import net.hostsharing.hsadminng.mapper.EntityPatcher; -import net.hostsharing.hsadminng.mapper.OptionalFromJson; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; +import net.hostsharing.hsadminng.mapper.EntityPatcher; +import net.hostsharing.hsadminng.mapper.OptionalFromJson; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.UUID; class HsOfficePartnerEntityPatcher implements EntityPatcher { diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java index bb55bde0..cdc695f0 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java @@ -8,19 +8,14 @@ import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity @Table(name = "hs_office_person_rv") -@TypeDef( - name = "pgsql_enum", - typeClass = PostgreSQLEnumType.class -) @Getter @Setter @Builder @@ -42,7 +37,7 @@ public class HsOfficePersonEntity implements Stringifyable { @Column(name = "persontype") @Enumerated(EnumType.STRING) - @Type(type = "pgsql_enum") + @Type(PostgreSQLEnumType.class) private HsOfficePersonType personType; @Column(name = "tradename") diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipController.java index 62b3fc9f..3d6332e3 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipController.java @@ -12,8 +12,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java index 89b2926c..9e7fb5d9 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntity.java @@ -7,19 +7,14 @@ import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; import net.hostsharing.hsadminng.stringify.Stringify; import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @Entity @Table(name = "hs_office_relationship_rv") -@TypeDef( - name = "pgsql_enum", - typeClass = PostgreSQLEnumType.class -) @Getter @Setter @Builder @@ -52,7 +47,7 @@ public class HsOfficeRelationshipEntity { @Column(name = "reltype") @Enumerated(EnumType.STRING) - @Type(type = "pgsql_enum") + @Type(PostgreSQLEnumType.class) private HsOfficeRelationshipType relType; @Override diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcher.java index 1f7e4487..fa080ba2 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcher.java @@ -1,11 +1,11 @@ package net.hostsharing.hsadminng.hs.office.relationship; -import net.hostsharing.hsadminng.mapper.EntityPatcher; -import net.hostsharing.hsadminng.mapper.OptionalFromJson; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationshipPatchResource; +import net.hostsharing.hsadminng.mapper.EntityPatcher; +import net.hostsharing.hsadminng.mapper.OptionalFromJson; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.UUID; class HsOfficeRelationshipEntityPatcher implements EntityPatcher { diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepository.java index 6412e590..8b9e10fe 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepository.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepository.java @@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.relationship; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.Repository; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java index 2b8ad073..581cd577 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java @@ -1,7 +1,5 @@ package net.hostsharing.hsadminng.hs.office.sepamandate; -import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntityPatcher; -import net.hostsharing.hsadminng.mapper.Mapper; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeSepaMandatesApi; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeSepaMandateInsertResource; @@ -14,9 +12,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.validation.Valid; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.validation.Valid; import java.util.List; import java.util.UUID; import java.util.function.BiConsumer; diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java index a07770a5..db31adcb 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java @@ -8,9 +8,9 @@ import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity; import net.hostsharing.hsadminng.stringify.Stringify; import net.hostsharing.hsadminng.stringify.Stringifyable; -import org.hibernate.annotations.TypeDef; +import org.hibernate.annotations.Type; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.util.UUID; @@ -25,10 +25,6 @@ import static net.hostsharing.hsadminng.stringify.Stringify.stringify; @NoArgsConstructor @AllArgsConstructor @DisplayName("SEPA-Mandate") -@TypeDef( - typeClass = PostgreSQLRangeType.class, - defaultForType = Range.class -) public class HsOfficeSepaMandateEntity implements Stringifyable { private static Stringify stringify = stringify(HsOfficeSepaMandateEntity.class) @@ -57,6 +53,7 @@ public class HsOfficeSepaMandateEntity implements Stringifyable { private LocalDate agreement; @Column(name = "validity", columnDefinition = "daterange") + @Type(PostgreSQLRangeType.class) private Range validity = Range.infinite(LocalDate.class); public void setValidFrom(final LocalDate validFrom) { diff --git a/src/main/java/net/hostsharing/hsadminng/mapper/Mapper.java b/src/main/java/net/hostsharing/hsadminng/mapper/Mapper.java index 42a63674..642a36b9 100644 --- a/src/main/java/net/hostsharing/hsadminng/mapper/Mapper.java +++ b/src/main/java/net/hostsharing/hsadminng/mapper/Mapper.java @@ -2,13 +2,12 @@ package net.hostsharing.hsadminng.mapper; import net.hostsharing.hsadminng.errors.DisplayName; import org.modelmapper.ModelMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ReflectionUtils; -import javax.persistence.EntityManager; -import javax.persistence.ManyToOne; -import javax.persistence.PersistenceContext; -import javax.validation.ValidationException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PersistenceContext; +import jakarta.validation.ValidationException; import java.lang.reflect.Field; import java.util.List; import java.util.function.BiConsumer; diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantController.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantController.java index 901e16e4..29bdc2d8 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantController.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantController.java @@ -10,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import java.util.UUID; diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantEntity.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantEntity.java index 1f01eac6..a3abf528 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantEntity.java @@ -4,7 +4,7 @@ import lombok.*; import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleType; import org.springframework.data.annotation.Immutable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleEntity.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleEntity.java index a4dd3eeb..26528c8a 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleEntity.java @@ -2,10 +2,9 @@ package net.hostsharing.hsadminng.rbac.rbacrole; import lombok.*; import org.hibernate.annotations.Formula; -import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.Immutable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity @@ -19,8 +18,7 @@ import java.util.UUID; public class RbacRoleEntity { @Id - @GeneratedValue(generator = "UUID") - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue private UUID uuid; @Column(name = "objectuuid") diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserEntity.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserEntity.java index 82bc6149..8da64357 100644 --- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserEntity.java @@ -1,13 +1,12 @@ package net.hostsharing.hsadminng.rbac.rbacuser; import lombok.*; -import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.Immutable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -27,8 +26,7 @@ public class RbacUserEntity { private static DateTimeFormatter DATE_FORMAT_WITH_FULLHOUR = DateTimeFormatter.ofPattern("MM-dd-yyyy HH"); @Id - @GeneratedValue(generator = "UUID") - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue private UUID uuid; private String name; diff --git a/src/main/java/net/hostsharing/hsadminng/stringify/Stringify.java b/src/main/java/net/hostsharing/hsadminng/stringify/Stringify.java index e6b690ff..076f6209 100644 --- a/src/main/java/net/hostsharing/hsadminng/stringify/Stringify.java +++ b/src/main/java/net/hostsharing/hsadminng/stringify/Stringify.java @@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.stringify; import net.hostsharing.hsadminng.errors.DisplayName; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java b/src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java index 8c11ea58..1f2bb0e1 100644 --- a/src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageEntity.java b/src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageEntity.java index 0576ca38..8687666f 100644 --- a/src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageEntity.java +++ b/src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageEntity.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import net.hostsharing.hsadminng.test.cust.TestCustomerEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java index e6ac9b99..cafd3a0d 100644 --- a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java +++ b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.web.bind.annotation.RestController; -import static com.tngtech.archunit.core.domain.JavaModifier.*; +import static com.tngtech.archunit.core.domain.JavaModifier.ABSTRACT; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*; import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices; @@ -197,19 +197,19 @@ public class ArchitectureTest { @ArchTest @SuppressWarnings("unused") - public static final ArchRule doNotUseJavaxTransactionAnnotationAtClassLevel = noClasses() - .should().beAnnotatedWith(javax.transaction.Transactional.class.getName()) + public static final ArchRule doNotUsejakartaTransactionAnnotationAtClassLevel = noClasses() + .should().beAnnotatedWith(jakarta.transaction.Transactional.class.getName()) .as("Use @%s instead of @%s.".formatted( org.springframework.transaction.annotation.Transactional.class.getName(), - javax.transaction.Transactional.class)); + jakarta.transaction.Transactional.class)); @ArchTest @SuppressWarnings("unused") - public static final ArchRule doNotUseJavaxTransactionAnnotationAtMethodLevel = noMethods() - .should().beAnnotatedWith(javax.transaction.Transactional.class) + public static final ArchRule doNotUsejakartaTransactionAnnotationAtMethodLevel = noMethods() + .should().beAnnotatedWith(jakarta.transaction.Transactional.class) .as("Use @%s instead of @%s.".formatted( org.springframework.transaction.annotation.Transactional.class.getName(), - javax.transaction.Transactional.class.getName())); + jakarta.transaction.Transactional.class.getName())); @ArchTest @SuppressWarnings("unused") diff --git a/src/test/java/net/hostsharing/hsadminng/context/ContextIntegrationTests.java b/src/test/java/net/hostsharing/hsadminng/context/ContextIntegrationTests.java index 9985bbeb..c02cb944 100644 --- a/src/test/java/net/hostsharing/hsadminng/context/ContextIntegrationTests.java +++ b/src/test/java/net/hostsharing/hsadminng/context/ContextIntegrationTests.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -64,7 +64,7 @@ class ContextIntegrationTests { // then result.assertExceptionWithRootCauseMessage( - javax.persistence.PersistenceException.class, + jakarta.persistence.PersistenceException.class, "ERROR: [403] undefined has no permission to assume role test_package#yyy00.admin"); } @@ -77,7 +77,7 @@ class ContextIntegrationTests { // then result.assertExceptionWithRootCauseMessage( - javax.persistence.PersistenceException.class, + jakarta.persistence.PersistenceException.class, "[401] user unknown@example.org given in `defineContext(...)` does not exist"); } @@ -106,7 +106,7 @@ class ContextIntegrationTests { // then result.assertExceptionWithRootCauseMessage( - javax.persistence.PersistenceException.class, + jakarta.persistence.PersistenceException.class, "ERROR: [403] user customer-admin@xxx.example.com has no permission to assume role test_package#yyy00.admin"); } } diff --git a/src/test/java/net/hostsharing/hsadminng/context/ContextUnitTest.java b/src/test/java/net/hostsharing/hsadminng/context/ContextUnitTest.java index 5197973f..af78c76a 100644 --- a/src/test/java/net/hostsharing/hsadminng/context/ContextUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/context/ContextUnitTest.java @@ -10,9 +10,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerUnitTest.java b/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerUnitTest.java index 27d738f2..ad3cdfa0 100644 --- a/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerUnitTest.java @@ -9,7 +9,6 @@ import org.springframework.core.MethodParameter; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaObjectRetrievalFailureException; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.validation.BindingResult; @@ -17,7 +16,7 @@ import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.context.request.WebRequest; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import java.util.NoSuchElementException; @@ -40,7 +39,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleConflict(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(409); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(409); assertThat(errorResponse.getBody().getMessage()).isEqualTo("First Line"); } @@ -58,7 +57,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleConflict(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody()).isNotNull() .extracting(CustomErrorResponse::getMessage).isEqualTo("Second Line"); } @@ -74,7 +73,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaExceptions(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(401); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(401); assertThat(errorResponse.getBody().getMessage()).isEqualTo("ERROR: [401] First Line"); } @@ -91,7 +90,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaObjectRetrievalFailureException(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody().getMessage()).isEqualTo("Unable to find Partner with uuid 12345-123454"); } @@ -108,7 +107,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaObjectRetrievalFailureException(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody().getMessage()).isEqualTo( "Unable to find net.hostsharing.hsadminng.WhateverEntity with id 12345-123454"); } @@ -125,7 +124,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaObjectRetrievalFailureException(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody().getMessage()).isEqualTo("whatever error message"); } @@ -143,7 +142,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaObjectRetrievalFailureException(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody().getMessage()).isEqualTo("Unable to find NoDisplayNameEntity with uuid 12345-123454"); } @@ -158,7 +157,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleJpaExceptions(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(500); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(500); assertThat(errorResponse.getBody().getMessage()).isEqualTo("ERROR: [999] First Line"); } @@ -172,7 +171,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleNoSuchElementException(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(404); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(404); assertThat(errorResponse.getBody().getMessage()).isEqualTo("some error message"); } @@ -191,7 +190,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleIbanAndBicExceptions(givenException, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(400); assertThat(errorResponse.getBody().getMessage()).isEqualTo("given error message"); } @@ -214,9 +213,10 @@ class RestResponseEntityExceptionHandlerUnitTest { HttpHeaders.EMPTY, HttpStatus.BAD_REQUEST, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(400); assertThat(errorResponse.getBody()) .isInstanceOf(CustomErrorResponse.class) + .extracting("statusCode").isEqualTo(400); + assertThat(errorResponse.getBody()) .extracting("message") .isEqualTo("[someField expected to be something but is \"someRejectedValue\"]"); } @@ -231,7 +231,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleOtherExceptions(givenThrowable, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(500); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(500); assertThat(errorResponse.getBody().getMessage()).isEqualTo("First Line"); } @@ -245,7 +245,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleOtherExceptions(givenThrowable, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(418); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(418); assertThat(errorResponse.getBody().getMessage()).isEqualTo("ERROR: [418] First Line"); } @@ -259,7 +259,7 @@ class RestResponseEntityExceptionHandlerUnitTest { final var errorResponse = exceptionHandler.handleOtherExceptions(givenThrowable, givenWebRequest); // then - assertThat(errorResponse.getStatusCodeValue()).isEqualTo(500); + assertThat(errorResponse.getBody().getStatusCode()).isEqualTo(500); assertThat(errorResponse.getBody().getMessage()).isEqualTo("ERROR: [500] java.lang.Error"); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountControllerAcceptanceTest.java index 347976c9..a8ab2a7c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountControllerAcceptanceTest.java @@ -2,10 +2,9 @@ package net.hostsharing.hsadminng.hs.office.bankaccount; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.mapper.Mapper; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONException; @@ -15,8 +14,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid; @@ -322,7 +321,6 @@ class HsOfficeBankAccountControllerAcceptanceTest { return jpaAttempt.transacted(() -> { context.define(creatingUser); final var newBankAccount = HsOfficeBankAccountEntity.builder() - .uuid(UUID.randomUUID()) .holder("temp acc #" + RandomStringUtils.randomAlphabetic(3)) .iban("DE93500105179473626226") .bic("INGDDEFFXXX") diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepositoryIntegrationTest.java index 703b4af5..4861d2c1 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepositoryIntegrationTest.java @@ -11,19 +11,14 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; -import org.testcontainers.junit.jupiter.Container; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.function.Supplier; @@ -35,7 +30,7 @@ import static net.hostsharing.test.JpaAttempt.attempt; import static org.assertj.core.api.Assertions.assertThat; @DataJpaTest -@Import( { Context.class, JpaAttempt.class }) +@Import({ Context.class, JpaAttempt.class }) class HsOfficeBankAccountRepositoryIntegrationTest extends ContextBasedTest { @Autowired @@ -56,9 +51,6 @@ class HsOfficeBankAccountRepositoryIntegrationTest extends ContextBasedTest { @MockBean HttpServletRequest request; - @Container - Container postgres; - @Nested class CreateBankAccount { @@ -106,7 +98,7 @@ class HsOfficeBankAccountRepositoryIntegrationTest extends ContextBasedTest { // when attempt(em, () -> bankAccountRepo.save( hsOfficeBankAccount("some temp acc C", "DE25500105176934832579", "INGDDEFFXXX")) - ).assumeSuccessful(); + ).assertSuccessful(); // then final var roles = rawRoleRepo.findAll(); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java index 6067a9cc..536043e2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java @@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.hs.office.contact; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONException; @@ -17,8 +17,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java index 7bba6c18..a58aa824 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java @@ -14,14 +14,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; -import org.testcontainers.junit.jupiter.Container; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.function.Supplier; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java index 0f981266..292a947c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java @@ -4,8 +4,6 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; -import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionRepository; -import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionRepository; import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository; import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; @@ -18,8 +16,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.time.LocalDate; import java.util.UUID; @@ -235,16 +233,26 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest { } @Nested - @Accepts({"CoopAssetTransaction:R(Read)"}) + @Accepts({ "CoopAssetTransaction:R(Read)" }) class GetCoopAssetTransaction { @Test void globalAdmin_withoutAssumedRole_canGetArbitraryCoopAssetTransaction() { context.define("superuser-alex@hostsharing.net"); - final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(null, LocalDate.of(2010, 3, 15), LocalDate.of(2010, 3, 15)).get(0).getUuid(); + final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange( + null, + LocalDate.of(2010, 3, 15), + LocalDate.of(2010, 3, 15)).get(0).getUuid(); RestAssured // @formatter:off - .given().header("current-user", "superuser-alex@hostsharing.net").port(port).when().get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid).then().log().body().assertThat().statusCode(200).contentType("application/json").body("", lenientlyEquals(""" + .given().header("current-user", "superuser-alex@hostsharing.net") + .port(port) + .when() + .get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid) + .then().log().body().assertThat() + .statusCode(200) + .contentType("application/json") + .body("", lenientlyEquals(""" { "transactionType": "DEPOSIT" } @@ -252,23 +260,42 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest { } @Test - @Accepts({"CoopAssetTransaction:X(Access Control)"}) + @Accepts({ "CoopAssetTransaction:X(Access Control)" }) void normalUser_canNotGetUnrelatedCoopAssetTransaction() { context.define("superuser-alex@hostsharing.net"); - final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(null, LocalDate.of(2010, 3, 15), LocalDate.of(2010, 3, 15)).get(0).getUuid(); + final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange( + null, + LocalDate.of(2010, 3, 15), + LocalDate.of(2010, 3, 15)).get(0).getUuid(); RestAssured // @formatter:off - .given().header("current-user", "selfregistered-user-drew@hostsharing.org").port(port).when().get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid).then().log().body().assertThat().statusCode(404); // @formatter:on + .given().header("current-user", "selfregistered-user-drew@hostsharing.org") + .port(port) + .when() + .get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid) + .then().log().body().assertThat() + .statusCode(404); // @formatter:on } @Test - @Accepts({"CoopAssetTransaction:X(Access Control)"}) + @Accepts({ "CoopAssetTransaction:X(Access Control)" }) void contactAdminUser_canGetRelatedCoopAssetTransaction() { context.define("superuser-alex@hostsharing.net"); - final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(null, LocalDate.of(2010, 3, 15), LocalDate.of(2010, 3, 15)).get(0).getUuid(); + final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange( + null, + LocalDate.of(2010, 3, 15), + LocalDate.of(2010, 3, 15)).get(0).getUuid(); RestAssured // @formatter:off - .given().header("current-user", "contact-admin@firstcontact.example.com").port(port).when().get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid).then().log().body().assertThat().statusCode(200).contentType("application/json").body("", lenientlyEquals(""" + .given() + .header("current-user", "contact-admin@firstcontact.example.com") + .port(port) + .when() + .get("http://localhost/api/hs/office/coopassetstransactions/" + givenCoopAssetTransactionUuid) + .then().log().body().assertThat() + .statusCode(200) + .contentType("application/json") + .body("", lenientlyEquals(""" { "transactionType": "DEPOSIT", "assetValue": 320 diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java index e6610002..9728e438 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java @@ -14,19 +14,15 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.time.LocalDate; import java.util.Arrays; import java.util.List; -import java.util.UUID; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java index 85bdc5a5..f3c6cc33 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java @@ -2,10 +2,10 @@ package net.hostsharing.hsadminng.hs.office.coopshares; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -16,8 +16,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.time.LocalDate; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java index 6bb53532..772c59c2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java @@ -14,17 +14,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.util.Arrays; import java.util.List; -import java.util.UUID; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java index 5c3b08e9..22001cb2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java @@ -19,8 +19,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java index 3897ef9c..6edb6cd8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java @@ -1,16 +1,16 @@ package net.hostsharing.hsadminng.hs.office.debitor; -import net.hostsharing.test.PatchUnitTestBase; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorPatchResource; import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity; +import net.hostsharing.test.PatchUnitTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java index da34ccc9..b8ab0710 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java @@ -18,15 +18,16 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; -import java.util.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java index bb54995b..79e621ee 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java @@ -19,8 +19,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.time.LocalDate; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java index c848cb0a..a2aebfce 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java @@ -7,23 +7,18 @@ import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity; import net.hostsharing.hsadminng.mapper.Mapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestEntityManager; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SynchronizationType; import java.util.Map; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcherUnitTest.java index 453fd1a1..25f68f4b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcherUnitTest.java @@ -11,9 +11,8 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.beans.factory.annotation.Autowired; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java index 8bc26cf4..30ad5ac1 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityUnitTest.java @@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.membership; import com.vladmihalcea.hibernate.type.range.Range; import org.junit.jupiter.api.Test; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; import java.lang.reflect.InvocationTargetException; import java.time.LocalDate; import java.util.Arrays; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java index 8cd5be18..42f61495 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java @@ -16,16 +16,17 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDate; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java index 3e1a7797..899b151d 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java @@ -17,8 +17,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcherUnitTest.java index 1cc2b792..6dc2b66e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcherUnitTest.java @@ -1,16 +1,16 @@ package net.hostsharing.hsadminng.hs.office.partner; -import net.hostsharing.test.PatchUnitTestBase; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerDetailsPatchResource; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; +import net.hostsharing.test.PatchUnitTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java index 8671150c..5fe483ae 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java @@ -1,16 +1,16 @@ package net.hostsharing.hsadminng.hs.office.partner; -import net.hostsharing.test.PatchUnitTestBase; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; +import net.hostsharing.test.PatchUnitTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java index af755021..6b035f5b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java @@ -14,15 +14,16 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; -import java.util.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonControllerAcceptanceTest.java index b063932a..7a027106 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonControllerAcceptanceTest.java @@ -16,8 +16,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java index edc5a63d..6c75434e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java @@ -13,13 +13,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.function.Supplier; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcherUnitTest.java index 21695b34..c3537764 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipEntityPatcherUnitTest.java @@ -1,16 +1,16 @@ package net.hostsharing.hsadminng.hs.office.relationship; -import net.hostsharing.test.PatchUnitTestBase; import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity; import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationshipPatchResource; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; +import net.hostsharing.test.PatchUnitTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java index 365b1be0..b76175d9 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java @@ -17,10 +17,13 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; -import java.util.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.grantDisplaysOf; import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.roleNamesOf; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java index 100a411e..bbdfed5b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java @@ -19,8 +19,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.time.LocalDate; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityPatcherUnitTest.java index 7b025ecc..05f4ca07 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityPatcherUnitTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.util.UUID; import java.util.stream.Stream; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepositoryIntegrationTest.java index 98d5ecb7..241be448 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepositoryIntegrationTest.java @@ -20,9 +20,9 @@ import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantEntity.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantEntity.java index ccdd332c..bd1c8f41 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantEntity.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantEntity.java @@ -4,7 +4,10 @@ import lombok.*; import org.jetbrains.annotations.NotNull; import org.springframework.data.annotation.Immutable; -import javax.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java index ab230ef2..0402dbfe 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java @@ -3,13 +3,13 @@ package net.hostsharing.hsadminng.rbac.rbacgrant; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.ValidatableResponse; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.ContextBasedTest; import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleEntity; import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleRepository; import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserEntity; import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Nested; @@ -20,8 +20,8 @@ import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepositoryIntegrationTest.java index 5f51fde1..3ff9eda0 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepositoryIntegrationTest.java @@ -1,27 +1,25 @@ package net.hostsharing.hsadminng.rbac.rbacgrant; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.context.ContextBasedTest; import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleRepository; import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserEntity; import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java index c6b90c47..88dd2667 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java @@ -5,7 +5,7 @@ import org.hibernate.annotations.Formula; import org.jetbrains.annotations.NotNull; import org.springframework.data.annotation.Immutable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java index f24c1986..abed40ac 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java @@ -1,17 +1,17 @@ package net.hostsharing.hsadminng.rbac.rbacrole; import io.restassured.RestAssured; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository; +import net.hostsharing.test.Accepts; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerRestTest.java index 186a367a..c10a9cbc 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerRestTest.java @@ -15,10 +15,9 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SynchronizationType; - +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SynchronizationType; import java.util.Map; import static java.util.Arrays.asList; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepositoryIntegrationTest.java index fde68e07..197e0bc0 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepositoryIntegrationTest.java @@ -8,13 +8,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import static net.hostsharing.test.JpaAttempt.attempt; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerAcceptanceTest.java index cafa9780..76d738ad 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerAcceptanceTest.java @@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.rbac.rbacuser; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import net.hostsharing.test.Accepts; import net.hostsharing.hsadminng.HsadminNgApplication; import net.hostsharing.hsadminng.context.Context; +import net.hostsharing.test.Accepts; import net.hostsharing.test.JpaAttempt; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -13,8 +13,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerRestTest.java index 282f8238..6beec689 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerRestTest.java @@ -15,9 +15,9 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SynchronizationType; import java.util.Map; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepositoryIntegrationTest.java index 95e773c6..bd2257ef 100644 --- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepositoryIntegrationTest.java @@ -9,16 +9,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerControllerAcceptanceTest.java index 143e370a..6c695caa 100644 --- a/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerControllerAcceptanceTest.java @@ -14,8 +14,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java index ef421220..ca535142 100644 --- a/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java @@ -10,10 +10,10 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceException; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.PersistenceException; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageRepositoryIntegrationTest.java b/src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageRepositoryIntegrationTest.java index 1b25cf7d..53d28e0c 100644 --- a/src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageRepositoryIntegrationTest.java +++ b/src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageRepositoryIntegrationTest.java @@ -1,21 +1,18 @@ package net.hostsharing.hsadminng.test.pac; import net.hostsharing.hsadminng.context.Context; -import net.hostsharing.hsadminng.test.cust.TestCustomerRepository; import net.hostsharing.test.JpaAttempt; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.orm.ObjectOptimisticLockingFailureException; -import org.springframework.test.annotation.DirtiesContext; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/net/hostsharing/test/JpaAttempt.java b/src/test/java/net/hostsharing/test/JpaAttempt.java index 18c257ec..a7244e37 100644 --- a/src/test/java/net/hostsharing/test/JpaAttempt.java +++ b/src/test/java/net/hostsharing/test/JpaAttempt.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Optional; import java.util.function.Supplier; diff --git a/src/test/java/net/hostsharing/test/MapperUnitTest.java b/src/test/java/net/hostsharing/test/MapperUnitTest.java index 2af97741..b90bea08 100644 --- a/src/test/java/net/hostsharing/test/MapperUnitTest.java +++ b/src/test/java/net/hostsharing/test/MapperUnitTest.java @@ -9,9 +9,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.persistence.EntityManager; -import javax.persistence.ManyToOne; -import javax.validation.ValidationException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ManyToOne; +import jakarta.validation.ValidationException; import java.util.List; import java.util.UUID; diff --git a/src/test/java/net/hostsharing/test/StringTemplater.java b/src/test/java/net/hostsharing/test/StringTemplater.java index 23bf2cf0..38866f49 100644 --- a/src/test/java/net/hostsharing/test/StringTemplater.java +++ b/src/test/java/net/hostsharing/test/StringTemplater.java @@ -2,11 +2,11 @@ package net.hostsharing.test; import lombok.experimental.UtilityClass; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Map; -import static liquibase.repackaged.org.apache.commons.text.StringSubstitutor.replace; import static org.apache.commons.lang3.StringUtils.stripEnd; +import static org.apache.commons.text.StringSubstitutor.replace; @UtilityClass public class StringTemplater {