feat: refactoring model and api (#80)

* feat: refactoring * feat: refactoring liquibase configuration * fix: tests
onecx · Dec 13, 2024 · 11f0c17 · 11f0c17
1 parent 27333b4
commit 11f0c17
Show file tree

Hide file tree

Showing 47 changed files with 613 additions and 1,293 deletions.
diff --git a/docs/modules/onecx-parameter-svc/pages/onecx-parameter-svc-docs.adoc b/docs/modules/onecx-parameter-svc/pages/onecx-parameter-svc-docs.adoc
@@ -17,7 +17,6 @@ quarkus.http.auth.permission.health.paths=/q/*
 quarkus.http.auth.permission.health.policy=permit
 quarkus.http.auth.permission.default.paths=/*
 quarkus.http.auth.permission.default.policy=authenticated
-quarkus.banner.enabled=false
 quarkus.hibernate-orm.database.generation=validate
 quarkus.hibernate-orm.multitenant=DISCRIMINATOR
 quarkus.liquibase.migrate-at-start=true
@@ -65,3 +64,7 @@ app:
 
 ----
 
+pes: [ ocx-tn:read ]
+
+----
+
diff --git a/docs/modules/onecx-parameter-svc/pages/onecx-parameter-svc-extensions.adoc b/docs/modules/onecx-parameter-svc/pages/onecx-parameter-svc-extensions.adoc
@@ -8,12 +8,6 @@ h| Documentation
 h| Configuration
 h| Version
 
-| tkit-quarkus-data-import
-
-| https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-data-import.html[Link]
-| https://github.com/1000kit/tkit-quarkus/blob/2.36.0/docs/modules/tkit-quarkus/pages/includes/tkit-quarkus-data-import.adoc[Link]
-| 2.36.0
-
 | tkit-quarkus-jpa
 
 | https://1000kit.github.io/tkit-quarkus/current/tkit-quarkus/tkit-quarkus-jpa.html[Link]
@@ -166,4 +160,22 @@ h| Version
 | 3.15.1
 
 
+|===ps://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.15.1
+
+
+| onecx-security
+
+| 
+| 
+| 0.34.0
+
+| quarkus-scheduler
+
+| 
+| 
+| 3.15.1
+
+
 |===
diff --git a/pom.xml b/pom.xml
@@ -16,10 +16,6 @@
     <dependencies>
 
         <!-- 1000kit -->
-        <dependency>
-            <groupId>org.tkit.quarkus.lib</groupId>
-            <artifactId>tkit-quarkus-data-import</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.tkit.quarkus.lib</groupId>
             <artifactId>tkit-quarkus-jpa</artifactId>
@@ -187,19 +183,6 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>di-v1</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <inputSpec>src/main/openapi/di-v1.yaml</inputSpec>
-                            <apiPackage>gen.org.tkit.onecx.parameters.di.v1</apiPackage>
-                            <modelPackage>gen.org.tkit.onecx.parameters.di.v1.model</modelPackage>
-                            <modelNameSuffix>DTOV1</modelNameSuffix>
-                            <skipValidateSpec>true</skipValidateSpec>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>internal</id>
                         <goals>

diff --git a/...ameters/domain/timer/ParameterConfig.java → ...meters/domain/config/ParameterConfig.java b/...ameters/domain/timer/ParameterConfig.java → ...meters/domain/config/ParameterConfig.java
@@ -1,4 +1,4 @@
-package org.tkit.onecx.parameters.domain.timer;
+package org.tkit.onecx.parameters.domain.config;
 
 import io.quarkus.runtime.annotations.ConfigDocFilename;
 import io.quarkus.runtime.annotations.ConfigPhase;

diff --git a/...cationParameterHistorySearchCriteria.java → ...teria/ParameterHistorySearchCriteria.java b/...cationParameterHistorySearchCriteria.java → ...teria/ParameterHistorySearchCriteria.java
@@ -10,7 +10,7 @@
  */
 @Getter
 @Setter
-public class ApplicationParameterHistorySearchCriteria {
+public class ParameterHistorySearchCriteria {
 
     /**
      * The application ID.

diff --git a/...a/ApplicationParameterSearchCriteria.java → ...ain/criteria/ParameterSearchCriteria.java b/...a/ApplicationParameterSearchCriteria.java → ...ain/criteria/ParameterSearchCriteria.java
@@ -8,7 +8,7 @@
  */
 @Getter
 @Setter
-public class ApplicationParameterSearchCriteria {
+public class ParameterSearchCriteria {
 
     /**
      * The application ID.

diff --git a/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/ApplicationParameterDAO.java
diff --git a/src/main/java/org/tkit/onecx/parameters/domain/daos/JobDAO.java b/src/main/java/org/tkit/onecx/parameters/domain/daos/JobDAO.java
@@ -28,7 +28,7 @@ public Job getJob(String id) throws DAOException {
                     .createQuery(cq)
                     .setMaxResults(1)
                     .setLockMode(LockModeType.PESSIMISTIC_WRITE)
-                    .setHint("javax.persistence.lock.timeout", -2)
+                    .setHint("jakarta.persistence.lock.timeout", -2)
                     .getSingleResult();
 
         } catch (NoResultException ex) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
      */
     @Getter
     @Setter
-    public class ApplicationParameterHistorySearchCriteria {
+    public class ParameterHistorySearchCriteria {
         /**
          * The application ID.
@@ Expand Down @@