diff --git a/docs/modules/onecx-permission-bff/pages/onecx-permission-bff-extensions.adoc b/docs/modules/onecx-permission-bff/pages/onecx-permission-bff-extensions.adoc index 052a3bc..8a20edc 100644 --- a/docs/modules/onecx-permission-bff/pages/onecx-permission-bff-extensions.adoc +++ b/docs/modules/onecx-permission-bff/pages/onecx-permission-bff-extensions.adoc @@ -38,7 +38,7 @@ h| Version | https://github.com/quarkiverse/quarkus-openapi-generator/blob/2.4.1/docs/modules/ROOT/pages/includes/quarkus-openapi-generator.adoc[Link] | 2.4.1 -| quarkus-rest-client-reactive-jackson +| quarkus-rest-client-jackson | https://quarkus.io/guides/rest-client[Link] | @@ -98,12 +98,6 @@ h| Version | https://github.com/quarkusio/quarkusio.github.io/blob/develop/_generated-doc/latest/config/quarkus-oidc.adoc[Link] | 3.9.3 -| 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.9.3 - | onecx-core | https://onecx.github.io/docs/onecx-quarkus/current/onecx-quarkus/onecx-core.html[Link] @@ -123,6 +117,20 @@ h| Version | 3.9.3 +| quarkus-rest-client-oidc-filter + +| +| +| 3.9.3 + + +|===ntainer-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.9.3 + + |===us-container-image-docker.adoc[Link] | 3.9.3 diff --git a/pom.xml b/pom.xml index 6d958e1..151f1cf 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.quarkus - quarkus-rest-client-reactive-jackson + quarkus-rest-client-jackson @@ -80,7 +80,7 @@ io.quarkus - quarkus-oidc-client-reactive-filter + quarkus-rest-client-oidc-filter diff --git a/src/main/java/org/tkit/onecx/permission/bff/rs/controllers/WorkspaceRestController.java b/src/main/java/org/tkit/onecx/permission/bff/rs/controllers/WorkspaceRestController.java index 4787b55..96801a7 100644 --- a/src/main/java/org/tkit/onecx/permission/bff/rs/controllers/WorkspaceRestController.java +++ b/src/main/java/org/tkit/onecx/permission/bff/rs/controllers/WorkspaceRestController.java @@ -46,13 +46,6 @@ public class WorkspaceRestController implements WorkspaceApiService { @Inject ExceptionMapper exceptionMapper; - @Override - public Response getAllProductsByWorkspaceName(String workspaceName) { - try (Response response = workspaceClient.loadWorkspaceByName(workspaceName)) { - return Response.status(response.getStatus()).entity(mapper.map(response.readEntity(WorkspaceLoad.class))).build(); - } - } - @Override public Response searchWorkspaces(WorkspaceSearchCriteriaDTO criteriaDTO) { try (Response response = workspaceClient.searchWorkspaces(mapper.map(criteriaDTO))) { diff --git a/src/main/openapi/openapi-bff.yaml b/src/main/openapi/openapi-bff.yaml index 936921b..383612a 100644 --- a/src/main/openapi/openapi-bff.yaml +++ b/src/main/openapi/openapi-bff.yaml @@ -534,31 +534,6 @@ paths: application/json: schema: $ref: '#/components/schemas/WorkspacePageResult' - /workspaces/{workspaceName}/products: - get: - x-onecx: - permissions: - workspace: - - read - tags: - - workspace - description: get all products by workspace name - operationId: getAllProductsByWorkspaceName - parameters: - - name: workspaceName - in: path - required: true - schema: - type: string - responses: - "200": - description: OK - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/Product' /workspaces/{workspaceName}/details: get: x-onecx: diff --git a/src/test/java/org/tkit/onecx/permission/rs/WorkspaceRestControllerTest.java b/src/test/java/org/tkit/onecx/permission/rs/WorkspaceRestControllerTest.java index 0b600e9..0164c1b 100644 --- a/src/test/java/org/tkit/onecx/permission/rs/WorkspaceRestControllerTest.java +++ b/src/test/java/org/tkit/onecx/permission/rs/WorkspaceRestControllerTest.java @@ -6,7 +6,6 @@ import static org.mockserver.model.HttpResponse.response; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; @@ -27,7 +26,6 @@ import io.quarkiverse.mockserver.test.InjectMockServerClient; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; -import io.restassured.common.mapper.TypeRef; @QuarkusTest @TestHTTPEndpoint(WorkspaceRestController.class) @@ -110,43 +108,6 @@ void searchWorkspaces_Internal_Server_Error_Test() { .statusCode(Response.Status.BAD_REQUEST.getStatusCode()); } - @Test - void getAllProductsByWorkspaceNameTest() { - String workspaceName = "workspace1"; - - Product product1 = new Product(); - product1.productName("product1"); - Product product2 = new Product(); - product2.productName("product2"); - - ArrayList products = new ArrayList<>(); - products.add(product1); - products.add(product2); - WorkspaceLoad load = new WorkspaceLoad(); - load.setProducts(products); - - // create mock rest endpoint - mockServerClient - .when(request().withPath("/v1/workspaces/" + workspaceName + "/load").withMethod(HttpMethod.GET)) - .withId(MOCKID) - .respond(httpRequest -> response().withStatusCode(Response.Status.OK.getStatusCode()) - .withBody(JsonBody.json(load))); - - var output = given() - .when() - .auth().oauth2(keycloakClient.getAccessToken(ADMIN)) - .header(APM_HEADER_PARAM, ADMIN) - .pathParam("workspaceName", workspaceName) - .get("/{workspaceName}/products") - .then() - .statusCode(Response.Status.OK.getStatusCode()) - .extract().as(new TypeRef() { - }); - - Assertions.assertNotNull(output); - Assertions.assertEquals(2, Arrays.stream(output).toList().size()); - } - @Test void getDetailsByWorkspaceNameTest() {