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

feat: migration tkit.org #11

Merged
merged 1 commit into from
Feb 2, 2024
+267 −273
Merged

feat: migration tkit.org #11

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
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...permission/common/models/TokenConfig.java → ...permission/common/models/TokenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.common.models;
package org.tkit.onecx.permission.common.models;

import java.util.Optional;

Expand Down
4 changes: 2 additions & 2 deletions ...mission/common/services/ClaimService.java → ...mission/common/services/ClaimService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...mission/common/services/TokenService.java → ...mission/common/services/TokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...n/criteria/ApplicationSearchCriteria.java → ...n/criteria/ApplicationSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
2 changes: 1 addition & 1 deletion ...in/criteria/AssignmentSearchCriteria.java → ...in/criteria/AssignmentSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
2 changes: 1 addition & 1 deletion ...in/criteria/PermissionSearchCriteria.java → ...in/criteria/PermissionSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
2 changes: 1 addition & 1 deletion ...n/domain/criteria/RoleSearchCriteria.java → ...n/domain/criteria/RoleSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
2 changes: 1 addition & 1 deletion ...ia/WorkspaceAssignmentSearchCriteria.java → ...ia/WorkspaceAssignmentSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
2 changes: 1 addition & 1 deletion ...ia/WorkspacePermissionSearchCriteria.java → ...ia/WorkspacePermissionSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.criteria;
package org.tkit.onecx.permission.domain.criteria;

import lombok.Getter;
import lombok.Setter;
Expand Down
7 changes: 3 additions & 4 deletions ...ermission/domain/daos/ApplicationDAO.java → ...ermission/domain/daos/ApplicationDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
11 changes: 5 additions & 6 deletions ...permission/domain/daos/AssignmentDAO.java → ...permission/domain/daos/AssignmentDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
7 changes: 3 additions & 4 deletions ...permission/domain/daos/PermissionDAO.java → ...permission/domain/daos/PermissionDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
9 changes: 4 additions & 5 deletions ...onecx/permission/domain/daos/RoleDAO.java → ...onecx/permission/domain/daos/RoleDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
7 changes: 3 additions & 4 deletions ...n/domain/daos/WorkspaceAssignmentDAO.java → ...n/domain/daos/WorkspaceAssignmentDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
7 changes: 3 additions & 4 deletions ...n/domain/daos/WorkspacePermissionDAO.java → ...n/domain/daos/WorkspacePermissionDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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> {

Expand Down
4 changes: 2 additions & 2 deletions ...ion/domain/di/PermissionDataImportV1.java → ...ion/domain/di/PermissionDataImportV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.di;
package org.tkit.onecx.permission.domain.di;

import java.util.function.Consumer;

Expand All @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions ...on/domain/di/PermissionImportService.java → ...on/domain/di/PermissionImportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions ...domain/di/mappers/DataImportV1Mapper.java → ...domain/di/mappers/DataImportV1Mapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...permission/domain/models/Application.java → ...permission/domain/models/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.models;
package org.tkit.onecx.permission.domain.models;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion .../permission/domain/models/Assignment.java → .../permission/domain/models/Assignment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.models;
package org.tkit.onecx.permission.domain.models;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion .../permission/domain/models/Permission.java → .../permission/domain/models/Permission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.models;
package org.tkit.onecx.permission.domain.models;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion .../onecx/permission/domain/models/Role.java → .../onecx/permission/domain/models/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.models;
package org.tkit.onecx.permission.domain.models;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion ...on/domain/models/WorkspaceAssignment.java → ...on/domain/models/WorkspaceAssignment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.onecx.permission.domain.models;
package org.tkit.onecx.permission.domain.models;

import jakarta.persistence.*;

Expand Down
2 changes: 1 addition & 1 deletion ...on/domain/models/WorkspacePermission.java → ...on/domain/models/WorkspacePermission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading