diff --git a/index.html b/index.html deleted file mode 100644 index 1638783..0000000 --- a/index.html +++ /dev/null @@ -1,17 +0,0 @@ -Google
Suche Bilder Maps Play YouTube News Gmail Drive Mehr »
Webprotokoll | Einstellungen | Anmelden



 

Erweiterte Suche

© 2024 - Datenschutzerklärung - Nutzungsbedingungen

\ No newline at end of file diff --git a/pom.xml b/pom.xml index 0fba9ae..f8417ce 100644 --- a/pom.xml +++ b/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - io.github.onecx + org.tkit.onecx onecx-quarkus3-parent - 0.25.0 + 0.31.0 onecx-announcement-bff @@ -54,10 +54,7 @@ org.tkit.quarkus.lib tkit-quarkus-rest - - org.tkit.quarkus.lib - tkit-quarkus-jpa - + org.mapstruct mapstruct @@ -66,10 +63,7 @@ io.quarkus quarkus-hibernate-validator - - io.quarkus - quarkus-smallrye-health - + io.quarkus quarkus-opentelemetry @@ -78,6 +72,7 @@ io.quarkus quarkus-micrometer-registry-prometheus + io.quarkiverse.mockserver @@ -117,8 +112,8 @@ src/main/openapi/openapi-announcement-bff.yaml - gen.io.github.onecx.announcement.bff.rs.internal - gen.io.github.onecx.announcement.bff.rs.internal.model + gen.org.tkit.onecx.announcement.bff.rs.internal + gen.org.tkit.onecx.announcement.bff.rs.internal.model diff --git a/src/main/java/io/github/onecx/announcement/bff/rs/controller/AnnouncementRestController.java b/src/main/java/org/tkit/onecx/announcement/bff/rs/controller/AnnouncementRestController.java similarity index 88% rename from src/main/java/io/github/onecx/announcement/bff/rs/controller/AnnouncementRestController.java rename to src/main/java/org/tkit/onecx/announcement/bff/rs/controller/AnnouncementRestController.java index 992b5a7..f00642d 100644 --- a/src/main/java/io/github/onecx/announcement/bff/rs/controller/AnnouncementRestController.java +++ b/src/main/java/org/tkit/onecx/announcement/bff/rs/controller/AnnouncementRestController.java @@ -1,4 +1,4 @@ -package io.github.onecx.announcement.bff.rs.controller; +package org.tkit.onecx.announcement.bff.rs.controller; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -10,15 +10,15 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; +import org.tkit.onecx.announcement.bff.rs.mappers.AnnouncementMapper; +import org.tkit.onecx.announcement.bff.rs.mappers.ExceptionMapper; +import org.tkit.onecx.announcement.bff.rs.mappers.ProblemDetailMapper; import org.tkit.quarkus.log.cdi.LogService; -import gen.io.github.onecx.announcement.bff.clients.api.AnnouncementInternalApi; -import gen.io.github.onecx.announcement.bff.clients.model.*; -import gen.io.github.onecx.announcement.bff.rs.internal.AnnouncementInternalApiService; -import gen.io.github.onecx.announcement.bff.rs.internal.model.*; -import io.github.onecx.announcement.bff.rs.mappers.AnnouncementMapper; -import io.github.onecx.announcement.bff.rs.mappers.ExceptionMapper; -import io.github.onecx.announcement.bff.rs.mappers.ProblemDetailMapper; +import gen.org.tkit.onecx.announcement.bff.clients.api.AnnouncementInternalApi; +import gen.org.tkit.onecx.announcement.bff.clients.model.*; +import gen.org.tkit.onecx.announcement.bff.rs.internal.AnnouncementInternalApiService; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.*; @ApplicationScoped @Transactional(value = Transactional.TxType.NOT_SUPPORTED) diff --git a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java similarity index 82% rename from src/main/java/io/github/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java rename to src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java index 34d59f4..cee3179 100644 --- a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java +++ b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/AnnouncementMapper.java @@ -1,11 +1,11 @@ -package io.github.onecx.announcement.bff.rs.mappers; +package org.tkit.onecx.announcement.bff.rs.mappers; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.announcement.bff.clients.model.*; -import gen.io.github.onecx.announcement.bff.rs.internal.model.*; +import gen.org.tkit.onecx.announcement.bff.clients.model.*; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.*; @Mapper(uses = { OffsetDateTimeMapper.class }) public interface AnnouncementMapper { diff --git a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/ExceptionMapper.java b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ExceptionMapper.java similarity index 86% rename from src/main/java/io/github/onecx/announcement/bff/rs/mappers/ExceptionMapper.java rename to src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ExceptionMapper.java index 0379b8d..33b303d 100644 --- a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/ExceptionMapper.java +++ b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.onecx.announcement.bff.rs.mappers; +package org.tkit.onecx.announcement.bff.rs.mappers; import java.util.List; import java.util.Map; @@ -14,9 +14,9 @@ import org.mapstruct.Mapping; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.announcement.bff.rs.internal.model.ProblemDetailInvalidParamDTO; -import gen.io.github.onecx.announcement.bff.rs.internal.model.ProblemDetailParamDTO; -import gen.io.github.onecx.announcement.bff.rs.internal.model.ProblemDetailResponseDTO; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.ProblemDetailInvalidParamDTO; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.ProblemDetailParamDTO; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.ProblemDetailResponseDTO; @Mapper(uses = { OffsetDateTimeMapper.class }) public interface ExceptionMapper { diff --git a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java similarity index 65% rename from src/main/java/io/github/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java rename to src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java index 9c0d304..57b22c0 100644 --- a/src/main/java/io/github/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java +++ b/src/main/java/org/tkit/onecx/announcement/bff/rs/mappers/ProblemDetailMapper.java @@ -1,11 +1,11 @@ -package io.github.onecx.announcement.bff.rs.mappers; +package org.tkit.onecx.announcement.bff.rs.mappers; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.announcement.bff.clients.model.ProblemDetailResponse; -import gen.io.github.onecx.announcement.bff.rs.internal.model.ProblemDetailResponseDTO; +import gen.org.tkit.onecx.announcement.bff.clients.model.ProblemDetailResponse; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.ProblemDetailResponseDTO; @Mapper(uses = { OffsetDateTimeMapper.class }) public interface ProblemDetailMapper { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5aee6fb..c65f7f1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,14 +1,19 @@ +# propagate the apm-principal-token from requests we receive +org.eclipse.microprofile.rest.client.propagateHeaders=apm-principal-token + # PROD %prod.quarkus.rest-client.onecx_announcement_svc.url=http://onecx-announcement-svc:8080 -# DEV -%dev.quarkus.rest-client.onecx_announcement_svc.url=http://onecx-announcement-svc - # BUILD +quarkus.openapi-generator.codegen.input-base-dir=target/tmp/openapi + quarkus.openapi-generator.codegen.spec.onecx_announcement_svc_yaml.config-key=onecx_announcement_svc -quarkus.openapi-generator.codegen.spec.onecx_announcement_svc_yaml.base-package=gen.io.github.onecx.announcement.bff.clients +quarkus.openapi-generator.codegen.spec.onecx_announcement_svc_yaml.base-package=gen.org.tkit.onecx.announcement.bff.clients quarkus.openapi-generator.codegen.spec.onecx_announcement_svc_yaml.return-response=true -quarkus.openapi-generator.codegen.input-base-dir=target/tmp/openapi +quarkus.openapi-generator.codegen.spec.onecx_announcement_svc.additional-api-type-annotations=@org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; + +# DEV +%dev.quarkus.rest-client.onecx_announcement_svc.url=${quarkus.mockserver.endpoint} # INTEGRATION TEST quarkus.test.integration-test-profile=test @@ -23,4 +28,7 @@ quarkus.test.integration-test-profile=test %test.quarkus.mockserver.devservices.config-dir=/mockserver %test.quarkus.rest-client.onecx_announcement_svc.url=${quarkus.mockserver.endpoint} -# PIPE CONFIG \ No newline at end of file +# PIPE CONFIG + + + diff --git a/src/test/java/io/github/onecx/announcement/bff/rs/AbstractTest.java b/src/test/java/org/tkit/onecx/announcement/bff/rs/AbstractTest.java similarity index 95% rename from src/test/java/io/github/onecx/announcement/bff/rs/AbstractTest.java rename to src/test/java/org/tkit/onecx/announcement/bff/rs/AbstractTest.java index 154ce3e..6422f40 100644 --- a/src/test/java/io/github/onecx/announcement/bff/rs/AbstractTest.java +++ b/src/test/java/org/tkit/onecx/announcement/bff/rs/AbstractTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.announcement.bff.rs; +package org.tkit.onecx.announcement.bff.rs; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/src/test/java/io/github/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java b/src/test/java/org/tkit/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java similarity index 98% rename from src/test/java/io/github/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java rename to src/test/java/org/tkit/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java index 9c0f187..4aa9968 100644 --- a/src/test/java/io/github/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/announcement/bff/rs/AnnouncementRestControllerTest.java @@ -1,4 +1,4 @@ -package io.github.onecx.announcement.bff.rs; +package org.tkit.onecx.announcement.bff.rs; import static io.restassured.RestAssured.given; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @@ -18,11 +18,11 @@ import org.mockserver.client.MockServerClient; import org.mockserver.model.JsonBody; import org.mockserver.model.MediaType; +import org.tkit.onecx.announcement.bff.rs.controller.AnnouncementRestController; import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; -import gen.io.github.onecx.announcement.bff.clients.model.*; -import gen.io.github.onecx.announcement.bff.rs.internal.model.*; -import io.github.onecx.announcement.bff.rs.controller.AnnouncementRestController; +import gen.org.tkit.onecx.announcement.bff.clients.model.*; +import gen.org.tkit.onecx.announcement.bff.rs.internal.model.*; import io.quarkiverse.mockserver.test.InjectMockServerClient; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest;