Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sonar issues #35

Merged
merged 1 commit into from
Jul 19, 2024
Merged

fix: sonar issues #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions docs/modules/onecx-tenant-bff/pages/onecx-tenant-bff-docs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ quarkus.openapi-generator.codegen.spec.onecx_tenant_internal_yaml.base-package=g
quarkus.openapi-generator.codegen.spec.onecx_tenant_internal_yaml.return-response=true
quarkus.openapi-generator.codegen.spec.onecx_tenant_internal_yaml.additional-api-type-annotations=@org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
quarkus.openapi-generator.codegen.spec.onecx_tenant_internal_yaml.additional-model-type-annotations=@io.quarkus.runtime.annotations.RegisterForReflection;
%prod.quarkus.rest-client.onecx_tenant_internal_yaml.providers=io.quarkus.oidc.client.reactive.filter.OidcClientRequestReactiveFilter
quarkus.openapi-generator.codegen.spec.onecx_tenant_internal_yaml.enable-security-generation=false
%prod.quarkus.rest-client.onecx_tenant_internal.providers=io.quarkus.oidc.client.reactive.filter.OidcClientRequestReactiveFilter
%prod.quarkus.oidc-client.client-id=${quarkus.application.name}
quarkus.openapi-generator.codegen.input-base-dir=target/tmp/openapi
----
Expand Down Expand Up @@ -59,8 +60,11 @@ app:
read: permission on all GET requests and POST search
write: permission on PUT, POST, PATCH requests, where objects are saved or updated
delete: permission on all DELETE requests
keycloak:
client:
enabled: true
keycloak:
client:
enabled: true
spec:
kcConfig:
defaultClientScopes: [ ocx-tn:all, ocx-pm:read ]
----

58 changes: 29 additions & 29 deletions docs/modules/onecx-tenant-bff/pages/onecx-tenant-bff-extensions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,37 @@ 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.1
| 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.1
| 3.12.2

| quarkus-rest-jackson

| https://quarkus.io/guides/rest-json[Link]
|
| 3.11.1
| 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.1
| 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.1
| 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.1
| 3.12.2

| quarkus-openapi-generator

Expand All @@ -54,92 +54,92 @@ h| Version

| https://quarkus.io/guides/rest-client[Link]
|
| 3.11.1
| 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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-cdi.adoc[Link]
| 2.25.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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-rs.adoc[Link]
| 2.25.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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-log-json.adoc[Link]
| 2.25.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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest.adoc[Link]
| 2.25.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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-rest-context.adoc[Link]
| 2.25.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

| tkit-quarkus-jpa

| https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-jpa.html[Link]
| https://github.com/1000kit/tkit-quarkus/blob/2.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.adoc[Link]
| 2.25.0
| https://github.com/1000kit/tkit-quarkus/blob/2.28.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-jpa.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.1
| 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.20.0/docs/modules/onecx-quarkus/pages/includes/onecx-permissions.adoc[Link]
| 0.20.0
| https://github.com/onecx/onecx-quarkus/blob/0.24.0/docs/modules/onecx-quarkus/pages/includes/onecx-permissions.adoc[Link]
| 0.24.0

| 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.1
| 3.12.2

| 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.25.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-security.adoc[Link]
| 2.25.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.20.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.1
| 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.1
| 3.12.2


| quarkus-rest-client-oidc-filter

|
|
| 3.11.1
| 3.12.2


|===
20 changes: 10 additions & 10 deletions src/test/java/org/tkit/onecx/tenant/bff/rs/TenantRestControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ class TenantRestControllerTest extends AbstractTest {
@InjectMockServerClient
MockServerClient mockServerClient;

static final String mockId = "MOCK";
static final String MOCK_ID = "MOCK";

@BeforeEach
void resetExpectation() {
try {
mockServerClient.clear(mockId);
mockServerClient.clear(MOCK_ID);
} catch (Exception ex) {
// mockId not existing
}
Expand All @@ -56,7 +56,7 @@ void getTenantTest_shouldReturnTenant() {

// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants/" + data.getId()).withMethod(HttpMethod.GET))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.OK.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(data)));
Expand Down Expand Up @@ -91,7 +91,7 @@ void getTenantTest_shouldReturnNotFound() {

// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants/" + data.getId()).withMethod(HttpMethod.GET))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.NOT_FOUND.getStatusCode()));
var output = given()
.when()
Expand Down Expand Up @@ -132,7 +132,7 @@ void searchTenantsTest_shouldReturnTenantPageResult() {
// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants/search").withMethod(HttpMethod.POST)
.withBody(JsonBody.json(tenantSearchCriteria)))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.OK.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(tenantPageResult)));
Expand Down Expand Up @@ -172,7 +172,7 @@ void searchTenantsTest_shouldReturnBadRequest() {
mockServerClient.when(request().withPath("/internal/tenants/search").withMethod(HttpMethod.POST)
.withBody(JsonBody.json(tenantSearchCriteria)))
.withPriority(100)
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.BAD_REQUEST.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(problemDetailResponse)));
Expand Down Expand Up @@ -208,7 +208,7 @@ void createTenantTest_shouldReturnCreated() {
// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants").withMethod(HttpMethod.POST)
.withBody(JsonBody.json(createTenantRequest)))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.CREATED.getStatusCode()));

CreateTenantRequestDTO createTenantRequestDTO = new CreateTenantRequestDTO();
Expand Down Expand Up @@ -242,7 +242,7 @@ void createTenantTest_shouldReturnBadRequest() {
// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants").withMethod(HttpMethod.POST)
.withBody(JsonBody.json(createTenantRequest)))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.BAD_REQUEST.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(problemDetailResponse)));
Expand Down Expand Up @@ -284,7 +284,7 @@ void updateTenantTest_shouldReturnOK() {
// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants/" + updateId).withMethod(HttpMethod.PUT)
.withBody(JsonBody.json(updateTenantRequest)))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.OK.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(tenant)));
Expand Down Expand Up @@ -327,7 +327,7 @@ void updateTenantTest_shouldReturnBadRequest() {
// create mock rest endpoint
mockServerClient.when(request().withPath("/internal/tenants/" + updateId).withMethod(HttpMethod.PUT)
.withBody(JsonBody.json(updateTenantRequest)))
.withId(mockId)
.withId(MOCK_ID)
.respond(httpRequest -> response().withStatusCode(Response.Status.OK.getStatusCode())
.withContentType(MediaType.APPLICATION_JSON)
.withBody(JsonBody.json(tenant)));
Expand Down
Loading