From f9c12e9472af1deb21513a6704bff1c0bf1e66f0 Mon Sep 17 00:00:00 2001 From: Andrej Petras Date: Fri, 19 Jul 2024 08:56:36 +0200 Subject: [PATCH] fix: sonar issues --- docs/modules/onecx-help-bff/pages/index.adoc | 3 + .../pages/onecx-help-bff-docs.adoc | 7 ++- .../pages/onecx-help-bff-extensions.adoc | 56 +++++++++---------- .../help/bff/rs/HelpRestControllerTest.java | 1 - 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/docs/modules/onecx-help-bff/pages/index.adoc b/docs/modules/onecx-help-bff/pages/index.adoc index 2be252b..b2785de 100644 --- a/docs/modules/onecx-help-bff/pages/index.adoc +++ b/docs/modules/onecx-help-bff/pages/index.adoc @@ -2,4 +2,7 @@ include::onecx-help-bff-attributes.adoc[opts=optional] == onecx-help-bff +include::docs.adoc[opts=optional] + + include::onecx-help-bff-docs.adoc[opts=optional] diff --git a/docs/modules/onecx-help-bff/pages/onecx-help-bff-docs.adoc b/docs/modules/onecx-help-bff/pages/onecx-help-bff-docs.adoc index 51ad4a1..9e5d272 100644 --- a/docs/modules/onecx-help-bff/pages/onecx-help-bff-docs.adoc +++ b/docs/modules/onecx-help-bff/pages/onecx-help-bff-docs.adoc @@ -19,7 +19,6 @@ org.eclipse.microprofile.rest.client.propagateHeaders=apm-principal-token %prod.quarkus.rest-client.onecx_help_svc.providers=io.quarkus.oidc.client.reactive.filter.OidcClientRequestReactiveFilter %prod.quarkus.rest-client.onecx_product_store.providers=io.quarkus.oidc.client.reactive.filter.OidcClientRequestReactiveFilter %prod.quarkus.oidc-client.client-id=${quarkus.application.name} -generator.codegen.enable-security-generation=false quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.config-key=onecx_help_svc quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.base-package=gen.org.tkit.onecx.help.client quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.return-response=true @@ -76,7 +75,11 @@ app: enabled: true spec: kcConfig: - defaultClientScopes: [ ocx-hp:all, ocx-ps:read ] + defaultClientScopes: [ ocx-hp:all, ocx-ps:read, ocx-pm:read ] + +---- + +s: [ ocx-hp:all, ocx-ps:read ] ---- diff --git a/docs/modules/onecx-help-bff/pages/onecx-help-bff-extensions.adoc b/docs/modules/onecx-help-bff/pages/onecx-help-bff-extensions.adoc index 3209cea..29f128c 100644 --- a/docs/modules/onecx-help-bff/pages/onecx-help-bff-extensions.adoc +++ b/docs/modules/onecx-help-bff/pages/onecx-help-bff-extensions.adoc @@ -12,19 +12,19 @@ h| Version | https://quarkus.io/guides/rest[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-rest.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-smallrye-openapi | https://quarkus.io/guides/openapi-swaggerui[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-smallrye-openapi.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-rest-jackson | https://quarkus.io/guides/rest-json[Link] | -| 3.11.3 +| 3.12.2 | quarkus-openapi-generator @@ -36,110 +36,110 @@ h| Version | https://quarkus.io/guides/rest-client[Link] | -| 3.11.3 +| 3.12.2 | tkit-quarkus-log-cdi | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-cdi.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link] +| 2.28.0 | tkit-quarkus-log-rs | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-rs.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link] +| 2.28.0 | tkit-quarkus-log-json | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-log-json.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link] +| 2.28.0 | tkit-quarkus-rest | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link] +| 2.28.0 | tkit-quarkus-rest-context | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-rest-context.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link] +| 2.28.0 | quarkus-hibernate-validator | https://quarkus.io/guides/validation[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-hibernate-validator.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-smallrye-health | https://quarkus.io/guides/smallrye-health[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-smallrye-health.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-opentelemetry | https://quarkus.io/guides/opentelemetry[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-opentelemetry.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-micrometer-registry-prometheus | https://quarkus.io/guides/telemetry-micrometer[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-micrometer-registry-prometheus.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-oidc | https://quarkus.io/guides/security-oidc-bearer-token-authentication-tutorial[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-oidc.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-oidc-client-reactive-filter | https://quarkus.io/guides/security-openid-connect-client-reference[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-oidc-client-reactive-filter.adoc[Link] -| 3.11.3 +| 3.12.2 | onecx-permissions | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-permissions.html[Link] -| https://github.com/onecx/onecx-quarkus/blob/0.21.0/docs/modules/onecx-quarkus/pages/includes/onecx-permissions.adoc[Link] -| 0.21.0 +| https://github.com/onecx/onecx-quarkus/blob/0.24.0/docs/modules/onecx-quarkus/pages/includes/onecx-permissions.adoc[Link] +| 0.24.0 | tkit-quarkus-security | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-security.html[Link] -| https://github.com/1000kit/tkit-quarkus/blob/2.26.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-security.adoc[Link] -| 2.26.0 +| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-security.adoc[Link] +| 2.28.0 | onecx-core | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-core.html[Link] | -| 0.21.0 +| 0.24.0 | quarkus-arc | https://quarkus.io/guides/cdi-reference[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-arc.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-container-image-docker | https://quarkus.io/guides/container-image[Link] | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-container-image-docker.adoc[Link] -| 3.11.3 +| 3.12.2 | quarkus-oidc-client | | -| 3.11.3 +| 3.12.2 |=== \ No newline at end of file diff --git a/src/test/java/org/tkit/onecx/help/bff/rs/HelpRestControllerTest.java b/src/test/java/org/tkit/onecx/help/bff/rs/HelpRestControllerTest.java index 70a0e08..175b5a6 100644 --- a/src/test/java/org/tkit/onecx/help/bff/rs/HelpRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/help/bff/rs/HelpRestControllerTest.java @@ -214,7 +214,6 @@ void getHelpById() { String id = "82689h23-9624-2234-c50b-8749d073c287"; var offsetDateTime = OffsetDateTime.parse("2023-11-30T13:53:03.688710200+01:00"); - OffsetDateTimeMapper offsetDateTimeMapper = new OffsetDateTimeMapper(); Help data = createHelp("appId1", "123-456-789", "testContext",