feat: refactoring, migration org.tkit

onecx · Feb 2, 2024 · 27d3907 · 27d3907
1 parent 943740c
commit 27d3907
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 235 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,4 +20,5 @@ jobs:
     uses: onecx/ci-quarkus/.github/workflows/build.yml@v1
     secrets: inherit
     with:
-      helmEventTargetRepository: onecx/onecx-theme
+      helmEventTargetRepository: onecx/onecx-help
+
diff --git a/.github/workflows/create-new-build.yml b/.github/workflows/create-new-build.yml
@@ -0,0 +1,9 @@
+name: Create new build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: onecx/ci-common/.github/workflows/create-new-build.yml@v1
+    secrets: inherit
diff --git a/pom.xml b/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.onecx</groupId>
+        <groupId>org.tkit.onecx</groupId>
         <artifactId>onecx-quarkus3-parent</artifactId>
-        <version>0.25.0</version>
+        <version>0.31.0</version>
     </parent>
 
     <artifactId>onecx-help-bff</artifactId>
@@ -25,10 +25,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-health</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkiverse.openapi.generator</groupId>
             <artifactId>quarkus-openapi-generator</artifactId>
@@ -56,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.tkit.quarkus.lib</groupId>
-            <artifactId>tkit-quarkus-jpa</artifactId>
+            <artifactId>tkit-quarkus-rest-context</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -78,6 +74,18 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-reactive-filter</artifactId>
+        </dependency>
         <!-- DEV -->
         <dependency>
             <groupId>io.quarkiverse.mockserver</groupId>
@@ -117,8 +125,8 @@
                         </goals>
                         <configuration>
                             <inputSpec>src/main/openapi/openapi-help-bff.yaml</inputSpec>
-                            <apiPackage>gen.io.github.onecx.help.bff.rs.internal</apiPackage>
-                            <modelPackage>gen.io.github.onecx.help.bff.rs.internal.model</modelPackage>
+                            <apiPackage>gen.org.tkit.onecx.help.bff.rs.internal</apiPackage>
+                            <modelPackage>gen.org.tkit.onecx.help.bff.rs.internal.model</modelPackage>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml
@@ -1,13 +1,13 @@
 apiVersion: v2
-name: onecx-helm-bff
+name: onecx-help-bff
 version: 0.0.0
 appVersion: 0.0.0
-description: Onecx helm bff
+description: Onecx help bff
 keywords:
   - iam
   - parameters
 sources:
-  - https://github.com/onecx/onecx-helm-bff
+  - https://github.com/onecx/onecx-help-bff
 maintainers:
   - name: Tkit Developer
     email: [email protected]

diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
@@ -1,6 +1,4 @@
 app:
+  name: bff
   image:
-    repository: "onecx/onecx-announcement-bff"
-    tag: 999-SNAPSHOT
-  db:
-    enabled: true
+    repository: "onecx/onecx-help-bff"
diff --git a/...bff/rs/controller/HelpRestController.java → ...bff/rs/controller/HelpRestController.java b/...bff/rs/controller/HelpRestController.java → ...bff/rs/controller/HelpRestController.java
@@ -1,4 +1,4 @@
-package io.github.onecx.help.bff.rs.controller;
+package org.tkit.onecx.help.bff.rs.controller;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
@@ -10,18 +10,18 @@
 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.help.bff.rs.mappers.ExceptionMapper;
+import org.tkit.onecx.help.bff.rs.mappers.HelpMapper;
+import org.tkit.onecx.help.bff.rs.mappers.ProblemDetailMapper;
 import org.tkit.quarkus.log.cdi.LogService;
 
-import gen.io.github.onecx.help.bff.clients.api.HelpsInternalApi;
-import gen.io.github.onecx.help.bff.clients.model.Help;
-import gen.io.github.onecx.help.bff.clients.model.HelpAppIds;
-import gen.io.github.onecx.help.bff.clients.model.HelpPageResult;
-import gen.io.github.onecx.help.bff.clients.model.ProblemDetailResponse;
-import gen.io.github.onecx.help.bff.rs.internal.HelpsInternalApiService;
-import gen.io.github.onecx.help.bff.rs.internal.model.*;
-import io.github.onecx.help.bff.rs.mappers.ExceptionMapper;
-import io.github.onecx.help.bff.rs.mappers.HelpMapper;
-import io.github.onecx.help.bff.rs.mappers.ProblemDetailMapper;
+import gen.org.tkit.onecx.help.bff.clients.api.HelpsInternalApi;
+import gen.org.tkit.onecx.help.bff.clients.model.Help;
+import gen.org.tkit.onecx.help.bff.clients.model.HelpAppIds;
+import gen.org.tkit.onecx.help.bff.clients.model.HelpPageResult;
+import gen.org.tkit.onecx.help.bff.clients.model.ProblemDetailResponse;
+import gen.org.tkit.onecx.help.bff.rs.internal.HelpsInternalApiService;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.*;
 
 @ApplicationScoped
 @Transactional(value = Transactional.TxType.NOT_SUPPORTED)
@@ -78,24 +78,6 @@ public Response getHelpById(String id) {
         }
     }
 
-    @Override
-    public Response getHelpByItemId(String itemId) {
-        try (Response response = client.getHelpByItemId(itemId)) {
-            Help help = response.readEntity(Help.class);
-            HelpDTO helpDTO = helpMapper.mapHelp(help);
-            return Response.status(response.getStatus()).entity(helpDTO).build();
-        }
-    }
-
-    @Override
-    public Response getHelps(Integer pageNumber, Integer pageSize) {
-        try (Response response = client.getHelps(pageNumber, pageSize)) {
-            HelpPageResult helpPageResult = response.readEntity(HelpPageResult.class);
-            HelpPageResultDTO helpPageResultDTO = helpMapper.mapHelpPageResults(helpPageResult);
-            return Response.status(response.getStatus()).entity(helpPageResultDTO).build();
-        }
-    }
-
     @Override
     public Response searchHelps(HelpSearchCriteriaDTO helpSearchCriteriaDTO) {
 
@@ -118,13 +100,11 @@ public Response updateHelp(String id, UpdateHelpDTO updateHelpDTO) {
 
     @ServerExceptionMapper
     public RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationException ex) {
-
         return exceptionMapper.constraint(ex);
     }
 
     @ServerExceptionMapper
     public Response restException(WebApplicationException ex) {
-
         return Response.status(ex.getResponse().getStatus()).build();
     }
 }
diff --git a/.../help/bff/rs/mappers/ExceptionMapper.java → .../help/bff/rs/mappers/ExceptionMapper.java b/.../help/bff/rs/mappers/ExceptionMapper.java → .../help/bff/rs/mappers/ExceptionMapper.java
@@ -1,4 +1,4 @@
-package io.github.onecx.help.bff.rs.mappers;
+package org.tkit.onecx.help.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.help.bff.rs.internal.model.ProblemDetailInvalidParamDTO;
-import gen.io.github.onecx.help.bff.rs.internal.model.ProblemDetailParamDTO;
-import gen.io.github.onecx.help.bff.rs.internal.model.ProblemDetailResponseDTO;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.ProblemDetailInvalidParamDTO;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.ProblemDetailParamDTO;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.ProblemDetailResponseDTO;
 
 @Mapper(uses = { OffsetDateTimeMapper.class })
 public interface ExceptionMapper {

diff --git a/...onecx/help/bff/rs/mappers/HelpMapper.java → ...onecx/help/bff/rs/mappers/HelpMapper.java b/...onecx/help/bff/rs/mappers/HelpMapper.java → ...onecx/help/bff/rs/mappers/HelpMapper.java
@@ -1,11 +1,11 @@
-package io.github.onecx.help.bff.rs.mappers;
+package org.tkit.onecx.help.bff.rs.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper;
 
-import gen.io.github.onecx.help.bff.clients.model.*;
-import gen.io.github.onecx.help.bff.rs.internal.model.*;
+import gen.org.tkit.onecx.help.bff.clients.model.*;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.*;
 
 @Mapper(uses = { OffsetDateTimeMapper.class })
 public interface HelpMapper {

diff --git a/...p/bff/rs/mappers/ProblemDetailMapper.java → ...p/bff/rs/mappers/ProblemDetailMapper.java b/...p/bff/rs/mappers/ProblemDetailMapper.java → ...p/bff/rs/mappers/ProblemDetailMapper.java
@@ -1,11 +1,11 @@
-package io.github.onecx.help.bff.rs.mappers;
+package org.tkit.onecx.help.bff.rs.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper;
 
-import gen.io.github.onecx.help.bff.clients.model.ProblemDetailResponse;
-import gen.io.github.onecx.help.bff.rs.internal.model.ProblemDetailResponseDTO;
+import gen.org.tkit.onecx.help.bff.clients.model.ProblemDetailResponse;
+import gen.org.tkit.onecx.help.bff.rs.internal.model.ProblemDetailResponseDTO;
 
 @Mapper(uses = { OffsetDateTimeMapper.class })
 public interface ProblemDetailMapper {

diff --git a/src/main/openapi/openapi-help-bff.yaml b/src/main/openapi/openapi-help-bff.yaml
@@ -9,34 +9,6 @@ tags:
   - name: helpsInternal
 paths:
   /helps:
-    get:
-      tags:
-        - helpsInternal
-      description: Return list of helps
-      operationId: getHelps
-      parameters:
-        - name: pageNumber
-          in: query
-          schema:
-            format: int32
-            description: The number of page.
-            default: 0
-            type: integer
-        - name: pageSize
-          in: query
-          schema:
-            format: int32
-            description: The size of page
-            default: 10
-            type: integer
-      responses:
-        "200":
-          description: OK
-          content:
-            application/json:
-              schema:
-                items:
-                  $ref: '#/components/schemas/HelpPageResult'
     post:
       tags:
         - helpsInternal
@@ -162,27 +134,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/HelpPageResult'
-  /helps/itemId/{itemId}:
-    get:
-      tags:
-        - helpsInternal
-      description: Load a single help definition
-      operationId: getHelpByItemId
-      parameters:
-        - name: itemId
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        "200":
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Help'
-        "404":
-          description: Not found
 components:
   schemas:
     HelpSearchCriteria:
@@ -233,7 +184,7 @@ components:
         - itemId
       type: object
       properties:
-        version:
+        modificationCount:
           format: int32
           type: integer
         creationDate:
@@ -294,19 +245,6 @@ components:
         - itemId
       type: object
       properties:
-        version:
-          format: int32
-          type: integer
-        creationDate:
-          $ref: '#/components/schemas/OffsetDateTime'
-        creationUser:
-          type: string
-        modificationDate:
-          $ref: '#/components/schemas/OffsetDateTime'
-        modificationUser:
-          type: string
-        id:
-          type: string
         itemId:
           type: string
         context:
@@ -320,19 +258,13 @@ components:
     UpdateHelp:
       required:
         - name
+        - itemId
+        - modificationCount
       type: object
       properties:
-        version:
+        modificationCount:
           format: int32
           type: integer
-        creationDate:
-          $ref: '#/components/schemas/OffsetDateTime'
-        creationUser:
-          type: string
-        modificationDate:
-          $ref: '#/components/schemas/OffsetDateTime'
-        modificationUser:
-          type: string
         id:
           type: string
         itemId:

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,26 +1,40 @@
 # PROD
 %prod.quarkus.rest-client.onecx_help_svc.url=http://onecx-help-svc:8080
 
+# propagate the apm-principal-token from requests we receive
+org.eclipse.microprofile.rest.client.propagateHeaders=apm-principal-token
+
+# OIDC
+quarkus.oidc.enabled=false
+#quarkus.rest-client.onecx_help_svc_yaml.providers=io.quarkus.oidc.client.reactive.filter.OidcClientRequestReactiveFilter
+#quarkus.oidc-client.client-id=${quarkus.application.name}
+#quarkus.oidc-client.credentials.secret=
+#quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+
 # DEV
 %dev.quarkus.rest-client.onecx_help_svc.url=http://onecx-help-svc
 
 # BUILD
 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.io.github.onecx.help.bff.clients
+quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.base-package=gen.org.tkit.onecx.help.bff.clients
 quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.return-response=true
 quarkus.openapi-generator.codegen.input-base-dir=target/tmp/openapi
+quarkus.openapi-generator.codegen.spec.onecx_help_svc_yaml.additional-api-type-annotations=@org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+
 
 # INTEGRATION TEST
 quarkus.test.integration-test-profile=test
 
 # TEST
 %test.quarkus.http.test-port=0
-%test.tkit.log.json.enabled=false
 %test.quarkus.mockserver.devservices.config-class-path=true
 %test.quarkus.mockserver.devservices.log=false
 %test.quarkus.mockserver.devservices.reuse=true
 %test.quarkus.mockserver.devservices.config-file=/mockserver.properties
 %test.quarkus.mockserver.devservices.config-dir=/mockserver
 %test.quarkus.rest-client.onecx_help_svc.url=${quarkus.mockserver.endpoint}
 
-# PIPE CONFIG
+# PIPE CONFIG
+
+
+
diff --git a/...ithub/onecx/help/bff/rs/AbstractTest.java → .../tkit/onecx/help/bff/rs/AbstractTest.java b/...ithub/onecx/help/bff/rs/AbstractTest.java → .../tkit/onecx/help/bff/rs/AbstractTest.java
@@ -1,4 +1,4 @@
-package io.github.onecx.help.bff.rs;
+package org.tkit.onecx.help.bff.rs;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;