feat: migration tkit.org (#11)

onecx · Feb 2, 2024 · 887f691 · 887f691
1 parent ec58d71
commit 887f691
Show file tree

Hide file tree

Showing 76 changed files with 267 additions and 273 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,21 +5,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.onecx</groupId>
+        <groupId>org.tkit.onecx</groupId>
         <artifactId>onecx-quarkus3-parent</artifactId>
-        <version>0.29.0</version>
+        <version>0.31.0</version>
     </parent>
 
     <artifactId>onecx-permission-svc</artifactId>
     <version>999-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>io.github.onecx.quarkus</groupId>
+            <groupId>org.tkit.onecx.quarkus</groupId>
             <artifactId>onecx-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.github.onecx.quarkus</groupId>
+            <groupId>org.tkit.onecx.quarkus</groupId>
             <artifactId>onecx-tenant</artifactId>
         </dependency>
         <!-- 1000kit -->
@@ -190,8 +190,8 @@
                         </goals>
                         <configuration>
                             <inputSpec>src/main/openapi/onecx-permission-di-v1.yaml</inputSpec>
-                            <apiPackage>gen.io.github.onecx.permission.domain.di.v1</apiPackage>
-                            <modelPackage>gen.io.github.onecx.permission.domain.di.v1.model</modelPackage>
+                            <apiPackage>gen.org.tkit.onecx.permission.domain.di.v1</apiPackage>
+                            <modelPackage>gen.org.tkit.onecx.permission.domain.di.v1.model</modelPackage>
                             <modelNameSuffix>DTOV1</modelNameSuffix>
                             <generateApis>false</generateApis>
                         </configuration>
@@ -203,8 +203,8 @@
                         </goals>
                         <configuration>
                             <inputSpec>src/main/openapi/onecx-permission-internal-openapi.yaml</inputSpec>
-                            <apiPackage>gen.io.github.onecx.permission.rs.internal</apiPackage>
-                            <modelPackage>gen.io.github.onecx.permission.rs.internal.model</modelPackage>
+                            <apiPackage>gen.org.tkit.onecx.permission.rs.internal</apiPackage>
+                            <modelPackage>gen.org.tkit.onecx.permission.rs.internal.model</modelPackage>
                             <modelNameSuffix>DTO</modelNameSuffix>
                         </configuration>
                     </execution>
@@ -215,8 +215,8 @@
                         </goals>
                         <configuration>
                             <inputSpec>src/main/openapi/onecx-permission-operator-v1.yaml</inputSpec>
-                            <apiPackage>gen.io.github.onecx.permission.rs.operator.v1</apiPackage>
-                            <modelPackage>gen.io.github.onecx.permission.rs.operator.v1.model</modelPackage>
+                            <apiPackage>gen.org.tkit.onecx.permission.rs.operator.v1</apiPackage>
+                            <modelPackage>gen.org.tkit.onecx.permission.rs.operator.v1.model</modelPackage>
                             <modelNameSuffix>DTOV1</modelNameSuffix>
                         </configuration>
                     </execution>
@@ -227,8 +227,8 @@
                         </goals>
                         <configuration>
                             <inputSpec>src/main/openapi/onecx-permission-v1.yaml</inputSpec>
-                            <apiPackage>gen.io.github.onecx.permission.rs.external.v1</apiPackage>
-                            <modelPackage>gen.io.github.onecx.permission.rs.external.v1.model</modelPackage>
+                            <apiPackage>gen.org.tkit.onecx.permission.rs.external.v1</apiPackage>
+                            <modelPackage>gen.org.tkit.onecx.permission.rs.external.v1.model</modelPackage>
                             <modelNameSuffix>DTOV1</modelNameSuffix>
                             <apiNameSuffix>ApiV1</apiNameSuffix>
                         </configuration>

diff --git a/...permission/common/models/TokenConfig.java → ...permission/common/models/TokenConfig.java b/...permission/common/models/TokenConfig.java → ...permission/common/models/TokenConfig.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.common.models;
+package org.tkit.onecx.permission.common.models;
 
 import java.util.Optional;
 

diff --git a/...mission/common/services/ClaimService.java → ...mission/common/services/ClaimService.java b/...mission/common/services/ClaimService.java → ...mission/common/services/ClaimService.java
@@ -1,12 +1,12 @@
-package io.github.onecx.permission.common.services;
+package org.tkit.onecx.permission.common.services;
 
 import java.util.regex.Pattern;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
-import io.github.onecx.permission.common.models.TokenConfig;
+import org.tkit.onecx.permission.common.models.TokenConfig;
 
 @ApplicationScoped
 public class ClaimService {

diff --git a/...mission/common/services/TokenService.java → ...mission/common/services/TokenService.java b/...mission/common/services/TokenService.java → ...mission/common/services/TokenService.java
@@ -1,15 +1,15 @@
-package io.github.onecx.permission.common.services;
+package org.tkit.onecx.permission.common.services;
 
 import java.util.List;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
+import org.tkit.onecx.permission.common.models.TokenConfig;
 import org.tkit.quarkus.rs.context.token.TokenClaimUtility;
 import org.tkit.quarkus.rs.context.token.TokenParserRequest;
 import org.tkit.quarkus.rs.context.token.TokenParserService;
 
-import io.github.onecx.permission.common.models.TokenConfig;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

diff --git a/...n/criteria/ApplicationSearchCriteria.java → ...n/criteria/ApplicationSearchCriteria.java b/...n/criteria/ApplicationSearchCriteria.java → ...n/criteria/ApplicationSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...in/criteria/AssignmentSearchCriteria.java → ...in/criteria/AssignmentSearchCriteria.java b/...in/criteria/AssignmentSearchCriteria.java → ...in/criteria/AssignmentSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...in/criteria/PermissionSearchCriteria.java → ...in/criteria/PermissionSearchCriteria.java b/...in/criteria/PermissionSearchCriteria.java → ...in/criteria/PermissionSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...n/domain/criteria/RoleSearchCriteria.java → ...n/domain/criteria/RoleSearchCriteria.java b/...n/domain/criteria/RoleSearchCriteria.java → ...n/domain/criteria/RoleSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ia/WorkspaceAssignmentSearchCriteria.java → ...ia/WorkspaceAssignmentSearchCriteria.java b/...ia/WorkspaceAssignmentSearchCriteria.java → ...ia/WorkspaceAssignmentSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ia/WorkspacePermissionSearchCriteria.java → ...ia/WorkspacePermissionSearchCriteria.java b/...ia/WorkspacePermissionSearchCriteria.java → ...ia/WorkspacePermissionSearchCriteria.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.criteria;
+package org.tkit.onecx.permission.domain.criteria;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ermission/domain/daos/ApplicationDAO.java → ...ermission/domain/daos/ApplicationDAO.java b/...ermission/domain/daos/ApplicationDAO.java → ...ermission/domain/daos/ApplicationDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -10,14 +10,13 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.ApplicationSearchCriteria;
+import org.tkit.onecx.permission.domain.models.*;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 
-import io.github.onecx.permission.domain.criteria.ApplicationSearchCriteria;
-import io.github.onecx.permission.domain.models.*;
-
 @ApplicationScoped
 public class ApplicationDAO extends AbstractDAO<Application> {
 

diff --git a/...permission/domain/daos/AssignmentDAO.java → ...permission/domain/daos/AssignmentDAO.java b/...permission/domain/daos/AssignmentDAO.java → ...permission/domain/daos/AssignmentDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -10,18 +10,17 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.AssignmentSearchCriteria;
+import org.tkit.onecx.permission.domain.models.Assignment;
+import org.tkit.onecx.permission.domain.models.Assignment_;
+import org.tkit.onecx.permission.domain.models.Permission_;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 import org.tkit.quarkus.jpa.models.AbstractTraceableEntity_;
 import org.tkit.quarkus.jpa.models.TraceableEntity_;
 
-import io.github.onecx.permission.domain.criteria.AssignmentSearchCriteria;
-import io.github.onecx.permission.domain.models.Assignment;
-import io.github.onecx.permission.domain.models.Assignment_;
-import io.github.onecx.permission.domain.models.Permission_;
-
 @ApplicationScoped
 public class AssignmentDAO extends AbstractDAO<Assignment> {
 

diff --git a/...permission/domain/daos/PermissionDAO.java → ...permission/domain/daos/PermissionDAO.java b/...permission/domain/daos/PermissionDAO.java → ...permission/domain/daos/PermissionDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -10,15 +10,14 @@
 import jakarta.persistence.criteria.Subquery;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.PermissionSearchCriteria;
+import org.tkit.onecx.permission.domain.models.*;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 import org.tkit.quarkus.jpa.models.TraceableEntity_;
 
-import io.github.onecx.permission.domain.criteria.PermissionSearchCriteria;
-import io.github.onecx.permission.domain.models.*;
-
 @ApplicationScoped
 public class PermissionDAO extends AbstractDAO<Permission> {
 

diff --git a/...onecx/permission/domain/daos/RoleDAO.java → ...onecx/permission/domain/daos/RoleDAO.java b/...onecx/permission/domain/daos/RoleDAO.java → ...onecx/permission/domain/daos/RoleDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -10,16 +10,15 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.RoleSearchCriteria;
+import org.tkit.onecx.permission.domain.models.Role;
+import org.tkit.onecx.permission.domain.models.Role_;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 import org.tkit.quarkus.jpa.models.TraceableEntity_;
 
-import io.github.onecx.permission.domain.criteria.RoleSearchCriteria;
-import io.github.onecx.permission.domain.models.Role;
-import io.github.onecx.permission.domain.models.Role_;
-
 @ApplicationScoped
 public class RoleDAO extends AbstractDAO<Role> {
 

diff --git a/...n/domain/daos/WorkspaceAssignmentDAO.java → ...n/domain/daos/WorkspaceAssignmentDAO.java b/...n/domain/daos/WorkspaceAssignmentDAO.java → ...n/domain/daos/WorkspaceAssignmentDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -10,16 +10,15 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.WorkspaceAssignmentSearchCriteria;
+import org.tkit.onecx.permission.domain.models.*;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 import org.tkit.quarkus.jpa.models.AbstractTraceableEntity_;
 import org.tkit.quarkus.jpa.models.TraceableEntity_;
 
-import io.github.onecx.permission.domain.criteria.WorkspaceAssignmentSearchCriteria;
-import io.github.onecx.permission.domain.models.*;
-
 @ApplicationScoped
 public class WorkspaceAssignmentDAO extends AbstractDAO<WorkspaceAssignment> {
 

diff --git a/...n/domain/daos/WorkspacePermissionDAO.java → ...n/domain/daos/WorkspacePermissionDAO.java b/...n/domain/daos/WorkspacePermissionDAO.java → ...n/domain/daos/WorkspacePermissionDAO.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.daos;
+package org.tkit.onecx.permission.domain.daos;
 
 import static org.tkit.quarkus.jpa.utils.QueryCriteriaUtil.addSearchStringPredicate;
 
@@ -11,15 +11,14 @@
 import jakarta.persistence.criteria.Subquery;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.criteria.WorkspacePermissionSearchCriteria;
+import org.tkit.onecx.permission.domain.models.*;
 import org.tkit.quarkus.jpa.daos.AbstractDAO;
 import org.tkit.quarkus.jpa.daos.Page;
 import org.tkit.quarkus.jpa.daos.PageResult;
 import org.tkit.quarkus.jpa.exceptions.DAOException;
 import org.tkit.quarkus.jpa.models.TraceableEntity_;
 
-import io.github.onecx.permission.domain.criteria.WorkspacePermissionSearchCriteria;
-import io.github.onecx.permission.domain.models.*;
-
 @ApplicationScoped
 public class WorkspacePermissionDAO extends AbstractDAO<WorkspacePermission> {
 

diff --git a/...ion/domain/di/PermissionDataImportV1.java → ...ion/domain/di/PermissionDataImportV1.java b/...ion/domain/di/PermissionDataImportV1.java → ...ion/domain/di/PermissionDataImportV1.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.di;
+package org.tkit.onecx.permission.domain.di;
 
 import java.util.function.Consumer;
 
@@ -12,7 +12,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import gen.io.github.onecx.permission.domain.di.v1.model.DataImportDTOV1;
+import gen.org.tkit.onecx.permission.domain.di.v1.model.DataImportDTOV1;
 
 @DataImport("permission")
 public class PermissionDataImportV1 implements DataImportService {

diff --git a/...on/domain/di/PermissionImportService.java → ...on/domain/di/PermissionImportService.java b/...on/domain/di/PermissionImportService.java → ...on/domain/di/PermissionImportService.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.di;
+package org.tkit.onecx.permission.domain.di;
 
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -7,15 +7,15 @@
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 
+import org.tkit.onecx.permission.domain.daos.*;
+import org.tkit.onecx.permission.domain.di.mappers.DataImportV1Mapper;
+import org.tkit.onecx.permission.domain.models.Permission;
+import org.tkit.onecx.permission.domain.models.Role;
 import org.tkit.quarkus.context.ApplicationContext;
 import org.tkit.quarkus.context.Context;
 
-import gen.io.github.onecx.permission.domain.di.v1.model.DataImportApplicationWrapperValueDTOV1;
-import gen.io.github.onecx.permission.domain.di.v1.model.DataImportTenantWrapperDTOV1;
-import io.github.onecx.permission.domain.daos.*;
-import io.github.onecx.permission.domain.di.mappers.DataImportV1Mapper;
-import io.github.onecx.permission.domain.models.Permission;
-import io.github.onecx.permission.domain.models.Role;
+import gen.org.tkit.onecx.permission.domain.di.v1.model.DataImportApplicationWrapperValueDTOV1;
+import gen.org.tkit.onecx.permission.domain.di.v1.model.DataImportTenantWrapperDTOV1;
 
 @ApplicationScoped
 public class PermissionImportService {

diff --git a/...domain/di/mappers/DataImportV1Mapper.java → ...domain/di/mappers/DataImportV1Mapper.java b/...domain/di/mappers/DataImportV1Mapper.java → ...domain/di/mappers/DataImportV1Mapper.java
@@ -1,12 +1,12 @@
-package io.github.onecx.permission.domain.di.mappers;
+package org.tkit.onecx.permission.domain.di.mappers;
 
 import java.util.*;
 
 import org.mapstruct.*;
+import org.tkit.onecx.permission.domain.models.*;
 
-import gen.io.github.onecx.permission.domain.di.v1.model.DataImportApplicationWrapperValueDTOV1;
-import gen.io.github.onecx.permission.domain.di.v1.model.DataImportRoleDTOV1;
-import io.github.onecx.permission.domain.models.*;
+import gen.org.tkit.onecx.permission.domain.di.v1.model.DataImportApplicationWrapperValueDTOV1;
+import gen.org.tkit.onecx.permission.domain.di.v1.model.DataImportRoleDTOV1;
 
 @Mapper
 public interface DataImportV1Mapper {

diff --git a/...permission/domain/models/Application.java → ...permission/domain/models/Application.java b/...permission/domain/models/Application.java → ...permission/domain/models/Application.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.*;
 

diff --git a/.../permission/domain/models/Assignment.java → .../permission/domain/models/Assignment.java b/.../permission/domain/models/Assignment.java → .../permission/domain/models/Assignment.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.*;
 

diff --git a/.../permission/domain/models/Permission.java → .../permission/domain/models/Permission.java b/.../permission/domain/models/Permission.java → .../permission/domain/models/Permission.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.*;
 

diff --git a/.../onecx/permission/domain/models/Role.java → .../onecx/permission/domain/models/Role.java b/.../onecx/permission/domain/models/Role.java → .../onecx/permission/domain/models/Role.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.*;
 

diff --git a/...on/domain/models/WorkspaceAssignment.java → ...on/domain/models/WorkspaceAssignment.java b/...on/domain/models/WorkspaceAssignment.java → ...on/domain/models/WorkspaceAssignment.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.*;
 

diff --git a/...on/domain/models/WorkspacePermission.java → ...on/domain/models/WorkspacePermission.java b/...on/domain/models/WorkspacePermission.java → ...on/domain/models/WorkspacePermission.java
@@ -1,4 +1,4 @@
-package io.github.onecx.permission.domain.models;
+package org.tkit.onecx.permission.domain.models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;