diff --git a/pom.xml b/pom.xml index 2f61f80..af0181b 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,10 @@ io.quarkus quarkus-liquibase - + + com.github.blagerweij + liquibase-sessionlock + io.quarkus quarkus-smallrye-health @@ -156,8 +159,8 @@ src/main/openapi/di-v1.yaml - gen.io.github.onecx.parameters.di.v1 - gen.io.github.onecx.parameters.di.v1.model + gen.org.tkit.onecx.parameters.di.v1 + gen.org.tkit.onecx.parameters.di.v1.model DTOV1 true @@ -169,8 +172,8 @@ src/main/openapi/openapi-internal.yaml - gen.io.github.onecx.parameters.rs.internal - gen.io.github.onecx.parameters.rs.internal.model + gen.org.tkit.onecx.parameters.rs.internal + gen.org.tki.onecx.parameters.rs.internal.model @@ -180,8 +183,8 @@ src/main/openapi/openapi-v2.yaml - gen.io.github.onecx.parameters.rs.v2 - gen.io.github.onecx.parameters.rs.v2.model + gen.org.tkit.onecx.parameters.rs.v2 + gen.org.tkit.onecx.parameters.rs.v2.model DTOV2 @@ -192,8 +195,8 @@ src/main/openapi/openapi-v3.yaml - gen.io.github.onecx.parameters.rs.v3 - gen.io.github.onecx.parameters.rs.v3.model + gen.org.tkit.onecx.parameters.rs.v3 + gen.org.tkit.onecx.parameters.rs.v3.model DTOV3 diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 818f9b1..7776de3 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -1,13 +1,7 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:1.15 - -ENV LANGUAGE='en_US:en' +FROM ghcr.io/onecx/docker-quarkus-jvm:0.5.0 COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ COPY --chown=185 target/quarkus-app/*.jar /deployments/ COPY --chown=185 target/quarkus-app/app/ /deployments/app/ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ - -EXPOSE 8080 -USER 185 -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" \ No newline at end of file +USER 185 \ No newline at end of file diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index 2cdc686..6a76191 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -1,11 +1,3 @@ -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +FROM ghcr.io/onecx/docker-quarkus-native:0.3.0 -EXPOSE 8080 -USER 1001 - -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file +COPY --chown=1001:root target/*-runner /work/application \ No newline at end of file diff --git a/src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java b/src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java similarity index 89% rename from src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java rename to src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java index bd726b0..1adf981 100644 --- a/src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterHistorySearchCriteria.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.criteria; +package org.tkit.onecx.parameters.domain.criteria; import java.util.List; diff --git a/src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java b/src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java similarity index 90% rename from src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java rename to src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java index cfbc1e8..871d2ec 100644 --- a/src/main/java/io/github/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/criteria/ApplicationParameterSearchCriteria.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.criteria; +package org.tkit.onecx.parameters.domain.criteria; import java.util.List; diff --git a/src/main/java/io/github/onecx/parameters/domain/criteria/KeysSearchCriteria.java b/src/main/java/org/tkit/onecx/parameters/domain/criteria/KeysSearchCriteria.java similarity index 72% rename from src/main/java/io/github/onecx/parameters/domain/criteria/KeysSearchCriteria.java rename to src/main/java/org/tkit/onecx/parameters/domain/criteria/KeysSearchCriteria.java index dfa8d69..382c13e 100644 --- a/src/main/java/io/github/onecx/parameters/domain/criteria/KeysSearchCriteria.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/criteria/KeysSearchCriteria.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.criteria; +package org.tkit.onecx.parameters.domain.criteria; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAO.java similarity index 96% rename from src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAO.java rename to src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAO.java index 4644a38..1fdb6fd 100644 --- a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAO.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAO.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import java.util.ArrayList; import java.util.List; @@ -10,16 +10,15 @@ import jakarta.persistence.criteria.*; import jakarta.transaction.Transactional; +import org.tkit.onecx.parameters.domain.criteria.ApplicationParameterSearchCriteria; +import org.tkit.onecx.parameters.domain.criteria.KeysSearchCriteria; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter_; import org.tkit.quarkus.jpa.daos.AbstractDAO; import org.tkit.quarkus.jpa.daos.Page; import org.tkit.quarkus.jpa.daos.PageResult; import org.tkit.quarkus.jpa.exceptions.DAOException; -import io.github.onecx.parameters.domain.criteria.ApplicationParameterSearchCriteria; -import io.github.onecx.parameters.domain.criteria.KeysSearchCriteria; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.domain.models.ApplicationParameter_; - @ApplicationScoped @Transactional(value = Transactional.TxType.NOT_SUPPORTED, rollbackOn = DAOException.class) public class ApplicationParameterDAO extends AbstractDAO { diff --git a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java similarity index 93% rename from src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java rename to src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java index f72d717..e2cd1a4 100644 --- a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAO.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import java.util.List; @@ -10,12 +10,11 @@ import jakarta.persistence.criteria.Root; import jakarta.transaction.Transactional; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData_; import org.tkit.quarkus.jpa.daos.AbstractDAO; import org.tkit.quarkus.jpa.exceptions.DAOException; -import io.github.onecx.parameters.domain.models.ApplicationParameterData; -import io.github.onecx.parameters.domain.models.ApplicationParameterData_; - @ApplicationScoped @Transactional(value = Transactional.TxType.NOT_SUPPORTED, rollbackOn = DAOException.class) public class ApplicationParameterDataDAO extends AbstractDAO { diff --git a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java similarity index 93% rename from src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java rename to src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java index b975887..9615b76 100644 --- a/src/main/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAO.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import java.time.LocalDateTime; import java.util.ArrayList; @@ -8,6 +8,11 @@ import jakarta.persistence.criteria.*; import jakarta.transaction.Transactional; +import org.tkit.onecx.parameters.domain.criteria.ApplicationParameterHistorySearchCriteria; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory_; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter_; +import org.tkit.onecx.parameters.domain.models.ParameterHistoryCountTuple; import org.tkit.quarkus.jpa.daos.AbstractDAO; import org.tkit.quarkus.jpa.daos.Page; import org.tkit.quarkus.jpa.daos.PageResult; @@ -15,12 +20,6 @@ import org.tkit.quarkus.jpa.models.AbstractTraceableEntity_; import org.tkit.quarkus.jpa.models.TraceableEntity_; -import io.github.onecx.parameters.domain.criteria.ApplicationParameterHistorySearchCriteria; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory_; -import io.github.onecx.parameters.domain.models.ApplicationParameter_; -import io.github.onecx.parameters.domain.models.ParameterHistoryCountTuple; - @ApplicationScoped @Transactional(value = Transactional.TxType.NOT_SUPPORTED, rollbackOn = DAOException.class) public class ApplicationParameterHistoryDAO extends AbstractDAO { diff --git a/src/main/java/io/github/onecx/parameters/domain/daos/JobDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/JobDAO.java similarity index 93% rename from src/main/java/io/github/onecx/parameters/domain/daos/JobDAO.java rename to src/main/java/org/tkit/onecx/parameters/domain/daos/JobDAO.java index 76dddbd..bb34b62 100644 --- a/src/main/java/io/github/onecx/parameters/domain/daos/JobDAO.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/daos/JobDAO.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import jakarta.enterprise.context.ApplicationScoped; import jakarta.persistence.LockModeType; @@ -8,12 +8,11 @@ import jakarta.persistence.criteria.Root; import jakarta.transaction.Transactional; +import org.tkit.onecx.parameters.domain.models.Job; import org.tkit.quarkus.jpa.daos.AbstractDAO; import org.tkit.quarkus.jpa.exceptions.DAOException; import org.tkit.quarkus.jpa.models.TraceableEntity_; -import io.github.onecx.parameters.domain.models.Job; - @ApplicationScoped public class JobDAO extends AbstractDAO { diff --git a/src/main/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportService.java b/src/main/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportService.java similarity index 94% rename from src/main/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportService.java rename to src/main/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportService.java index 168800b..994aa45 100644 --- a/src/main/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportService.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportService.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.di.v1; +package org.tkit.onecx.parameters.domain.di.v1; import java.util.ArrayList; import java.util.HashMap; @@ -11,16 +11,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; import org.tkit.quarkus.dataimport.DataImport; import org.tkit.quarkus.dataimport.DataImportConfig; import org.tkit.quarkus.dataimport.DataImportService; import com.fasterxml.jackson.databind.ObjectMapper; -import gen.io.github.onecx.parameters.di.v1.model.DataImportDTOV1; -import gen.io.github.onecx.parameters.di.v1.model.DataImportParamDTOV1; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameter; +import gen.org.tkit.onecx.parameters.di.v1.model.DataImportDTOV1; +import gen.org.tkit.onecx.parameters.di.v1.model.DataImportParamDTOV1; /** * Import JSON format. Openapi: ./src/main/openapi/di-v1.yaml diff --git a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameter.java b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameter.java similarity index 97% rename from src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameter.java rename to src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameter.java index 59ee166..86f0a27 100644 --- a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameter.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameter.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.models; +package org.tkit.onecx.parameters.domain.models; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterData.java b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterData.java similarity index 93% rename from src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterData.java rename to src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterData.java index 67a2ed5..aea06f8 100644 --- a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterData.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterData.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.models; +package org.tkit.onecx.parameters.domain.models; import java.util.UUID; diff --git a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterHistory.java b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterHistory.java similarity index 96% rename from src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterHistory.java rename to src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterHistory.java index 0396efd..0195f9f 100644 --- a/src/main/java/io/github/onecx/parameters/domain/models/ApplicationParameterHistory.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/models/ApplicationParameterHistory.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.models; +package org.tkit.onecx.parameters.domain.models; import java.time.LocalDateTime; diff --git a/src/main/java/io/github/onecx/parameters/domain/models/Job.java b/src/main/java/org/tkit/onecx/parameters/domain/models/Job.java similarity index 84% rename from src/main/java/io/github/onecx/parameters/domain/models/Job.java rename to src/main/java/org/tkit/onecx/parameters/domain/models/Job.java index bf39e1b..dbe588f 100644 --- a/src/main/java/io/github/onecx/parameters/domain/models/Job.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/models/Job.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.models; +package org.tkit.onecx.parameters.domain.models; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/src/main/java/io/github/onecx/parameters/domain/models/ParameterHistoryCountTuple.java b/src/main/java/org/tkit/onecx/parameters/domain/models/ParameterHistoryCountTuple.java similarity index 89% rename from src/main/java/io/github/onecx/parameters/domain/models/ParameterHistoryCountTuple.java rename to src/main/java/org/tkit/onecx/parameters/domain/models/ParameterHistoryCountTuple.java index ab9efc9..8132c43 100644 --- a/src/main/java/io/github/onecx/parameters/domain/models/ParameterHistoryCountTuple.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/models/ParameterHistoryCountTuple.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.models; +package org.tkit.onecx.parameters.domain.models; import java.time.LocalDateTime; diff --git a/src/main/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryService.java b/src/main/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryService.java similarity index 86% rename from src/main/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryService.java rename to src/main/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryService.java index d7b0df5..fede0e9 100644 --- a/src/main/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryService.java +++ b/src/main/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryService.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.timer; +package org.tkit.onecx.parameters.domain.timer; import java.time.Duration; import java.time.LocalDateTime; @@ -8,11 +8,11 @@ import jakarta.transaction.Transactional; import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; +import org.tkit.onecx.parameters.domain.daos.JobDAO; +import org.tkit.onecx.parameters.domain.models.Job; import org.tkit.quarkus.jpa.exceptions.DAOException; -import io.github.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; -import io.github.onecx.parameters.domain.daos.JobDAO; -import io.github.onecx.parameters.domain.models.Job; import io.quarkus.scheduler.Scheduled; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/controllers/ParameterRestControllerV2.java similarity index 86% rename from src/main/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v2/controllers/ParameterRestControllerV2.java index 53c34d1..4cba247 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/controllers/ParameterRestControllerV2.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v2; +package org.tkit.onecx.parameters.rs.external.v2.controllers; import java.util.List; import java.util.function.Function; @@ -9,15 +9,16 @@ import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; -import gen.io.github.onecx.parameters.rs.v2.ExternalApi; -import gen.io.github.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; -import gen.io.github.onecx.parameters.rs.v2.model.ApplicationParameterTypeDTOV2; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDAO; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDataDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.domain.models.ApplicationParameterData; -import io.github.onecx.parameters.rs.external.v2.mappers.ApplicationParameterDataMapperV2; -import io.github.onecx.parameters.rs.external.v2.mappers.ApplicationParameterMapperV2; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDAO; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDataDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData; +import org.tkit.onecx.parameters.rs.external.v2.mappers.ApplicationParameterDataMapperV2; +import org.tkit.onecx.parameters.rs.external.v2.mappers.ApplicationParameterMapperV2; + +import gen.org.tkit.onecx.parameters.rs.v2.ExternalApi; +import gen.org.tkit.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; +import gen.org.tkit.onecx.parameters.rs.v2.model.ApplicationParameterTypeDTOV2; @ApplicationScoped @Transactional(value = Transactional.TxType.NOT_SUPPORTED) diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java similarity index 80% rename from src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java index 9368d47..55a6e82 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterDataMapperV2.java @@ -1,11 +1,11 @@ -package io.github.onecx.parameters.rs.external.v2.mappers; +package org.tkit.onecx.parameters.rs.external.v2.mappers; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData; -import gen.io.github.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; -import io.github.onecx.parameters.domain.models.ApplicationParameterData; +import gen.org.tkit.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; @Mapper public interface ApplicationParameterDataMapperV2 { diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java similarity index 80% rename from src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java index 38f6d9b..20e1fd1 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v2/mappers/ApplicationParameterMapperV2.java @@ -1,11 +1,11 @@ -package io.github.onecx.parameters.rs.external.v2.mappers; +package org.tkit.onecx.parameters.rs.external.v2.mappers; import java.util.List; import org.mapstruct.*; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; -import gen.io.github.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; -import io.github.onecx.parameters.domain.models.ApplicationParameter; +import gen.org.tkit.onecx.parameters.rs.v2.model.ApplicationParameterDTOV2; @Mapper @MapperConfig(unmappedTargetPolicy = ReportingPolicy.ERROR) diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/controllers/ParameterRestControllerV3.java similarity index 72% rename from src/main/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v3/controllers/ParameterRestControllerV3.java index df16f5d..5c4539c 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/controllers/ParameterRestControllerV3.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3; +package org.tkit.onecx.parameters.rs.external.v3.controllers; import java.util.ArrayList; import java.util.List; @@ -9,15 +9,15 @@ import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDAO; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; +import org.tkit.onecx.parameters.rs.external.v3.mappers.ApplicationParameterHistoryMapper; +import org.tkit.onecx.parameters.rs.internal.mappers.ExceptionMapper; import org.tkit.quarkus.log.cdi.LogService; -import gen.io.github.onecx.parameters.rs.v3.ExternalApi; -import gen.io.github.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDAO; -import io.github.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; -import io.github.onecx.parameters.rs.external.v3.mappers.ApplicationParameterHistoryMapper; -import io.github.onecx.parameters.rs.internal.mappers.ExceptionMapper; +import gen.org.tkit.onecx.parameters.rs.v3.ExternalApi; +import gen.org.tkit.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; @LogService @ApplicationScoped diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java similarity index 77% rename from src/main/java/io/github/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java index e817600..89e5784 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/log/ExternalV3LogParam.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3.log; +package org.tkit.onecx.parameters.rs.external.v3.log; import java.util.List; @@ -6,7 +6,7 @@ import org.tkit.quarkus.log.cdi.LogParam; -import gen.io.github.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; +import gen.org.tkit.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; @ApplicationScoped public class ExternalV3LogParam implements LogParam { diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java similarity index 83% rename from src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java index 7a7aa43..b293321 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ApplicationParameterHistoryMapper.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3.mappers; +package org.tkit.onecx.parameters.rs.external.v3.mappers; import java.time.OffsetDateTime; @@ -6,10 +6,10 @@ import org.mapstruct.MapperConfig; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.parameters.rs.v3.model.ParameterInfoDTOV3; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; +import gen.org.tkit.onecx.parameters.rs.v3.model.ParameterInfoDTOV3; @Mapper(uses = OffsetDateTimeMapper.class) @MapperConfig(unmappedTargetPolicy = ReportingPolicy.ERROR) diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ExceptionMapper.java b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java similarity index 90% rename from src/main/java/io/github/onecx/parameters/rs/internal/mappers/ExceptionMapper.java rename to src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java index 15237dd..9ab4642 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ExceptionMapper.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal.mappers; +package org.tkit.onecx.parameters.rs.external.v3.mappers; import java.util.List; import java.util.Map; @@ -17,9 +17,9 @@ import org.tkit.quarkus.log.cdi.LogService; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailInvalidParamDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailParamDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailResponseDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailInvalidParamDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailParamDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailResponseDTO; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestController.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterHistoryRestController.java similarity index 84% rename from src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestController.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterHistoryRestController.java index b0668e3..e42e830 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestController.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterHistoryRestController.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal.controllers; import java.util.List; @@ -7,13 +7,13 @@ import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; +import org.tkit.onecx.parameters.rs.internal.mappers.ApplicationParameterInternalMapper; +import org.tkit.onecx.parameters.rs.internal.mappers.ExceptionMapper; import org.tkit.quarkus.log.cdi.LogService; -import gen.io.github.onecx.parameters.rs.internal.HistoriesApi; -import io.github.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; -import io.github.onecx.parameters.rs.internal.mappers.ApplicationParameterInternalMapper; -import io.github.onecx.parameters.rs.internal.mappers.ExceptionMapper; +import gen.org.tkit.onecx.parameters.rs.internal.HistoriesApi; @LogService @ApplicationScoped diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestController.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterRestController.java similarity index 91% rename from src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestController.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterRestController.java index 3289237..480e0d2 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestController.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/controllers/ApplicationParameterRestController.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal.controllers; import java.util.List; import java.util.stream.Collectors; @@ -13,18 +13,18 @@ import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDAO; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDataDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData; +import org.tkit.onecx.parameters.rs.internal.mappers.ApplicationParameterDataMapper; +import org.tkit.onecx.parameters.rs.internal.mappers.ApplicationParameterInternalMapper; +import org.tkit.onecx.parameters.rs.internal.mappers.ExceptionMapper; import org.tkit.quarkus.jpa.exceptions.ConstraintException; import org.tkit.quarkus.log.cdi.LogService; -import gen.io.github.onecx.parameters.rs.internal.ParametersApi; -import gen.io.github.onecx.parameters.rs.internal.model.*; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDAO; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDataDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.domain.models.ApplicationParameterData; -import io.github.onecx.parameters.rs.internal.mappers.ApplicationParameterDataMapper; -import io.github.onecx.parameters.rs.internal.mappers.ApplicationParameterInternalMapper; -import io.github.onecx.parameters.rs.internal.mappers.ExceptionMapper; +import gen.org.tki.onecx.parameters.rs.internal.model.*; +import gen.org.tkit.onecx.parameters.rs.internal.ParametersApi; @LogService @ApplicationScoped diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/log/InternalLogParam.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/log/InternalLogParam.java similarity index 73% rename from src/main/java/io/github/onecx/parameters/rs/internal/log/InternalLogParam.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/log/InternalLogParam.java index 6ef378a..d51e55b 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/log/InternalLogParam.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/log/InternalLogParam.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal.log; +package org.tkit.onecx.parameters.rs.internal.log; import java.util.List; @@ -6,8 +6,8 @@ import org.tkit.quarkus.log.cdi.LogParam; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterCreateDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterUpdateDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterCreateDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterUpdateDTO; @ApplicationScoped public class InternalLogParam implements LogParam { diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java similarity index 86% rename from src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java index 963af21..7dcd70b 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterDataMapper.java @@ -1,15 +1,15 @@ -package io.github.onecx.parameters.rs.internal.mappers; +package org.tkit.onecx.parameters.rs.internal.mappers; import org.apache.commons.lang3.StringUtils; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterData; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterCreateDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterUpdateDTO; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.domain.models.ApplicationParameterData; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterCreateDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterUpdateDTO; @Mapper public interface ApplicationParameterDataMapper { diff --git a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java similarity index 81% rename from src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java index 93c0100..fc82150 100644 --- a/src/main/java/io/github/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ApplicationParameterInternalMapper.java @@ -1,18 +1,18 @@ -package io.github.onecx.parameters.rs.internal.mappers; +package org.tkit.onecx.parameters.rs.internal.mappers; import java.util.List; import org.mapstruct.*; +import org.tkit.onecx.parameters.domain.criteria.ApplicationParameterHistorySearchCriteria; +import org.tkit.onecx.parameters.domain.criteria.ApplicationParameterSearchCriteria; +import org.tkit.onecx.parameters.domain.criteria.KeysSearchCriteria; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; +import org.tkit.onecx.parameters.domain.models.ParameterHistoryCountTuple; import org.tkit.quarkus.jpa.daos.PageResult; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.parameters.rs.internal.model.*; -import io.github.onecx.parameters.domain.criteria.ApplicationParameterHistorySearchCriteria; -import io.github.onecx.parameters.domain.criteria.ApplicationParameterSearchCriteria; -import io.github.onecx.parameters.domain.criteria.KeysSearchCriteria; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; -import io.github.onecx.parameters.domain.models.ParameterHistoryCountTuple; +import gen.org.tki.onecx.parameters.rs.internal.model.*; @Mapper(uses = { OffsetDateTimeMapper.class }) public interface ApplicationParameterInternalMapper { diff --git a/src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ExceptionMapper.java similarity index 90% rename from src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java rename to src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ExceptionMapper.java index 8d67bb8..240446e 100644 --- a/src/main/java/io/github/onecx/parameters/rs/external/v3/mappers/ExceptionMapper.java +++ b/src/main/java/org/tkit/onecx/parameters/rs/internal/mappers/ExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3.mappers; +package org.tkit.onecx.parameters.rs.internal.mappers; import java.util.List; import java.util.Map; @@ -17,9 +17,9 @@ import org.tkit.quarkus.log.cdi.LogService; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailInvalidParamDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailParamDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ProblemDetailResponseDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailInvalidParamDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailParamDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ProblemDetailResponseDTO; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/openapi/di-v1.yaml b/src/main/openapi/di-v1.yaml index ec19443..bf3a94e 100644 --- a/src/main/openapi/di-v1.yaml +++ b/src/main/openapi/di-v1.yaml @@ -1,6 +1,22 @@ --- openapi: 3.0.3 +info: + title: onecx-parameter data import + version: 1.0.0 +servers: + - url: "http://localhost" paths: + /import/parameter: + post: + operationId: importParameter + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/DataImport' + responses: + 200: + description: ok components: schemas: DataImport: diff --git a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java similarity index 98% rename from src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java index e229449..90516d8 100644 --- a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOExceptionTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; diff --git a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java similarity index 87% rename from src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java index dd55c7c..e12cd02 100644 --- a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAOTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import java.util.Map; import java.util.Set; @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.tkit.onecx.parameters.domain.di.v1.ParameterDataImportService; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; import org.tkit.quarkus.test.WithDBData; -import io.github.onecx.parameters.domain.di.v1.ParameterDataImportService; -import io.github.onecx.parameters.domain.models.ApplicationParameter; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest diff --git a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java similarity index 95% rename from src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java index 37e9de4..71519b2 100644 --- a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDataDAOExceptionTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; diff --git a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java similarity index 96% rename from src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java index ef6aa26..fb39c90 100644 --- a/src/test/java/io/github/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterHistoryDAOExceptionTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; diff --git a/src/test/java/io/github/onecx/parameters/domain/daos/JobDAOExceptionTest.java b/src/test/java/org/tkit/onecx/parameters/domain/daos/JobDAOExceptionTest.java similarity index 94% rename from src/test/java/io/github/onecx/parameters/domain/daos/JobDAOExceptionTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/daos/JobDAOExceptionTest.java index c75487d..abc1770 100644 --- a/src/test/java/io/github/onecx/parameters/domain/daos/JobDAOExceptionTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/daos/JobDAOExceptionTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.daos; +package org.tkit.onecx.parameters.domain.daos; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; diff --git a/src/test/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java b/src/test/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java similarity index 94% rename from src/test/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java index 886f1af..93eaf0a 100644 --- a/src/test/java/io/github/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/di/v1/ParameterDataImportServiceTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.di.v1; +package org.tkit.onecx.parameters.domain.di.v1; import java.util.HashMap; import java.util.List; @@ -9,17 +9,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameter; +import org.tkit.onecx.parameters.test.AbstractTest; import org.tkit.quarkus.dataimport.DataImportConfig; import org.tkit.quarkus.test.WithDBData; import com.fasterxml.jackson.databind.ObjectMapper; -import gen.io.github.onecx.parameters.di.v1.model.DataImportAppDTOV1; -import gen.io.github.onecx.parameters.di.v1.model.DataImportDTOV1; -import gen.io.github.onecx.parameters.di.v1.model.DataImportParamDTOV1; -import io.github.onecx.parameters.domain.daos.ApplicationParameterDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameter; -import io.github.onecx.parameters.test.AbstractTest; +import gen.org.tkit.onecx.parameters.di.v1.model.DataImportAppDTOV1; +import gen.org.tkit.onecx.parameters.di.v1.model.DataImportDTOV1; +import gen.org.tkit.onecx.parameters.di.v1.model.DataImportParamDTOV1; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest diff --git a/src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java b/src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java similarity index 78% rename from src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java index 1d0397b..9b023d5 100644 --- a/src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceExceptionTest.java @@ -1,6 +1,6 @@ -package io.github.onecx.parameters.domain.timer; +package org.tkit.onecx.parameters.domain.timer; -import static io.github.onecx.parameters.domain.timer.MaintenanceHistoryService.JOB_ID; +import static org.tkit.onecx.parameters.domain.timer.MaintenanceHistoryService.JOB_ID; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; @@ -9,11 +9,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; +import org.tkit.onecx.parameters.domain.daos.JobDAO; +import org.tkit.onecx.parameters.domain.models.Job; import org.tkit.quarkus.jpa.exceptions.DAOException; -import io.github.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; -import io.github.onecx.parameters.domain.daos.JobDAO; -import io.github.onecx.parameters.domain.models.Job; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; diff --git a/src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java b/src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java similarity index 84% rename from src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java rename to src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java index aa8d7f4..14e748a 100644 --- a/src/test/java/io/github/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java +++ b/src/test/java/org/tkit/onecx/parameters/domain/timer/MaintenanceHistoryServiceTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.domain.timer; +package org.tkit.onecx.parameters.domain.timer; import java.util.List; import java.util.stream.Collectors; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.tkit.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; +import org.tkit.onecx.parameters.domain.daos.JobDAO; +import org.tkit.onecx.parameters.domain.models.ApplicationParameterHistory; import org.tkit.quarkus.test.WithDBData; -import io.github.onecx.parameters.domain.daos.ApplicationParameterHistoryDAO; -import io.github.onecx.parameters.domain.daos.JobDAO; -import io.github.onecx.parameters.domain.models.ApplicationParameterHistory; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest diff --git a/src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java b/src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java similarity index 97% rename from src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java rename to src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java index 0601d8a..36aa549 100644 --- a/src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2Test.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v2; +package org.tkit.onecx.parameters.rs.external.v2; import static io.restassured.RestAssured.given; @@ -14,9 +14,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.tkit.onecx.parameters.rs.external.v2.controllers.ParameterRestControllerV2; +import org.tkit.onecx.parameters.test.AbstractTest; import org.tkit.quarkus.test.WithDBData; -import io.github.onecx.parameters.test.AbstractTest; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java b/src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java similarity index 76% rename from src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java rename to src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java index 56d24d1..3cfc135 100644 --- a/src/test/java/io/github/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/external/v2/ParameterRestControllerV2TestIT.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v2; +package org.tkit.onecx.parameters.rs.external.v2; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java b/src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java similarity index 95% rename from src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java rename to src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java index 8017b42..469476a 100644 --- a/src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3Test.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3; +package org.tkit.onecx.parameters.rs.external.v3; import static io.restassured.RestAssured.given; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @@ -9,12 +9,12 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.tkit.onecx.parameters.test.AbstractTest; import org.tkit.quarkus.test.WithDBData; -import gen.io.github.onecx.parameters.rs.v3.ExternalApi; -import gen.io.github.onecx.parameters.rs.v3.model.ParameterInfoDTOV3; -import gen.io.github.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; -import io.github.onecx.parameters.test.AbstractTest; +import gen.org.tkit.onecx.parameters.rs.v3.ExternalApi; +import gen.org.tkit.onecx.parameters.rs.v3.model.ParameterInfoDTOV3; +import gen.org.tkit.onecx.parameters.rs.v3.model.ParametersBucketDTOV3; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; import io.restassured.path.json.JsonPath; diff --git a/src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java b/src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java similarity index 76% rename from src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java rename to src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java index ef0467d..ce4afbc 100644 --- a/src/test/java/io/github/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/external/v3/ParameterRestControllerV3TestIT.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.external.v3; +package org.tkit.onecx.parameters.rs.external.v3; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java similarity index 79% rename from src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java rename to src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java index 2eda005..cdf9c6e 100644 --- a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerIT.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java similarity index 94% rename from src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java rename to src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java index 1186320..e99530e 100644 --- a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterHistoryRestControllerTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal; import static io.restassured.RestAssured.given; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @@ -13,11 +13,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.tkit.onecx.parameters.rs.internal.controllers.ApplicationParameterHistoryRestController; +import org.tkit.onecx.parameters.test.AbstractTest; import org.tkit.quarkus.test.WithDBData; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterHistoryDTO; -import gen.io.github.onecx.parameters.rs.internal.model.ApplicationParameterHistoryPageResultDTO; -import io.github.onecx.parameters.test.AbstractTest; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterHistoryDTO; +import gen.org.tki.onecx.parameters.rs.internal.model.ApplicationParameterHistoryPageResultDTO; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java similarity index 98% rename from src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java rename to src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java index 0165b5c..a97e381 100644 --- a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal; import static io.restassured.RestAssured.given; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @@ -14,10 +14,11 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.tkit.onecx.parameters.rs.internal.controllers.ApplicationParameterRestController; +import org.tkit.onecx.parameters.test.AbstractTest; import org.tkit.quarkus.test.WithDBData; -import gen.io.github.onecx.parameters.rs.internal.model.*; -import io.github.onecx.parameters.test.AbstractTest; +import gen.org.tki.onecx.parameters.rs.internal.model.*; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; diff --git a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java similarity index 79% rename from src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java rename to src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java index 00f8099..39aa342 100644 --- a/src/test/java/io/github/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java +++ b/src/test/java/org/tkit/onecx/parameters/rs/internal/ApplicationParameterRestControllerTestIT.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.rs.internal; +package org.tkit.onecx.parameters.rs.internal; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/src/test/java/io/github/onecx/parameters/test/AbstractTest.java b/src/test/java/org/tkit/onecx/parameters/test/AbstractTest.java similarity index 95% rename from src/test/java/io/github/onecx/parameters/test/AbstractTest.java rename to src/test/java/org/tkit/onecx/parameters/test/AbstractTest.java index 1cdbd57..61850a7 100644 --- a/src/test/java/io/github/onecx/parameters/test/AbstractTest.java +++ b/src/test/java/org/tkit/onecx/parameters/test/AbstractTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.parameters.test; +package org.tkit.onecx.parameters.test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature;