From 93b284fe99e6bcab4dd6308a37015eb4a61aa20b Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 14 Jan 2023 17:06:07 +0800 Subject: [PATCH] maxkey-identitys rename maxkey-mxapis --- .../maxkey-mxapi-rest}/build.gradle | 2 +- .../rest/RestOrganizationController.java | 2 +- .../identity/rest/RestUserInfoController.java | 2 +- .../maxkey-mxapi-scim}/build.gradle | 2 +- .../identity/scim}/ScimGroupController.java | 12 ++++----- .../scim}/ScimOrganizationController.java | 10 +++---- .../ScimServiceProviderConfigController.java | 2 +- .../identity/scim}/ScimUserController.java | 26 +++++++++---------- .../scim/resources/ScimEnterprise.java | 2 +- .../scim/resources/ScimEnterpriseUser.java | 2 +- .../scim/resources/ScimFormattedName.java | 2 +- .../identity/scim/resources/ScimGroup.java | 2 +- .../identity/scim/resources/ScimGroupRef.java | 2 +- .../identity/scim/resources/ScimManager.java | 2 +- .../scim/resources/ScimMemberRef.java | 2 +- .../identity/scim/resources/ScimMeta.java | 2 +- .../resources/ScimMultiValuedAttribute.java | 2 +- .../scim/resources/ScimOrganization.java | 2 +- .../resources/ScimOrganizationAddress.java | 2 +- .../scim/resources/ScimOrganizationEmail.java | 2 +- .../ScimOrganizationPhoneNumber.java | 2 +- .../scim/resources/ScimParameters.java | 4 +-- .../identity/scim/resources/ScimResource.java | 2 +- .../scim/resources/ScimSearchResult.java | 2 +- .../identity/scim/resources/ScimUser.java | 2 +- .../scim/resources/ScimUserAddress.java | 2 +- .../scim/resources/ScimUserEmail.java | 2 +- .../scim/resources/ScimUserEntitlement.java | 2 +- .../scim/resources/ScimUserExtension.java | 2 +- .../identity/scim/resources/ScimUserIm.java | 2 +- .../scim/resources/ScimUserOrganization.java | 2 +- .../scim/resources/ScimUserPhoneNumber.java | 2 +- .../scim/resources/ScimUserPhoto.java | 2 +- .../identity/scim/resources/ScimUserRole.java | 2 +- .../resources/ScimUserX509Certificate.java | 2 +- .../scim/resources/ReadJson2String.java | 0 .../ScimEnterpriseUserJsonString.json | 0 ...imEnterpriseUserJsonString2ObjectTest.java | 1 + .../resources/ScimEnterpriseUserJsonTest.java | 7 +++++ .../scim/resources/ScimGroupJsonString.json | 0 .../ScimGroupJsonString2ObjectTest.java | 1 + .../scim/resources/ScimGroupJsonTest.java | 3 +++ .../scim/resources/ScimUserJsonString.json | 0 .../ScimUserJsonString2ObjectTest.java | 1 + .../scim/resources/ScimUserJsonTest.java | 6 +++++ maxkey-webs/maxkey-web-mgt/build.gradle | 6 ++--- .../java/org/maxkey/MaxKeyMgtApplication.java | 6 ++--- settings.gradle | 6 ++--- 48 files changed, 85 insertions(+), 66 deletions(-) rename {maxkey-identitys/maxkey-identity-rest => maxkey-mxapis/maxkey-mxapi-rest}/build.gradle (88%) rename {maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis}/identity/rest/RestOrganizationController.java (98%) rename {maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis}/identity/rest/RestUserInfoController.java (99%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/build.gradle (87%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim}/ScimGroupController.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim}/ScimOrganizationController.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim}/ScimServiceProviderConfigController.java (99%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim}/ScimUserController.java (91%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimEnterprise.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimEnterpriseUser.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimFormattedName.java (98%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimGroup.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimGroupRef.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimManager.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimMemberRef.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimMeta.java (98%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimMultiValuedAttribute.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimOrganization.java (98%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimOrganizationAddress.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimOrganizationEmail.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimOrganizationPhoneNumber.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimParameters.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimResource.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimSearchResult.java (98%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUser.java (99%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserAddress.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserEmail.java (97%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserEntitlement.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserExtension.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserIm.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserOrganization.java (95%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserPhoneNumber.java (96%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserPhoto.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserRole.java (94%) rename {maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey => maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis}/identity/scim/resources/ScimUserX509Certificate.java (94%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java (100%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json (100%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java (94%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java (87%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json (100%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java (94%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java (92%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json (100%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java (94%) rename {maxkey-identitys/maxkey-identity-scim => maxkey-mxapis/maxkey-mxapi-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java (89%) diff --git a/maxkey-identitys/maxkey-identity-rest/build.gradle b/maxkey-mxapis/maxkey-mxapi-rest/build.gradle similarity index 88% rename from maxkey-identitys/maxkey-identity-rest/build.gradle rename to maxkey-mxapis/maxkey-mxapi-rest/build.gradle index b3aa13161..f9cb5ad52 100644 --- a/maxkey-identitys/maxkey-identity-rest/build.gradle +++ b/maxkey-mxapis/maxkey-mxapi-rest/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-identity-rest" +description = "maxkey-mxapi-rest" apply plugin: 'java' apply plugin: 'eclipse-wtp' diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java b/maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java similarity index 98% rename from maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java rename to maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java index f85bc3cf8..34b9ffbc4 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java +++ b/maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.rest; +package org.maxkey.mxapis.identity.rest; import java.io.IOException; diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java b/maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java similarity index 99% rename from maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java rename to maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java index b52ba906d..f9b810f62 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java +++ b/maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.rest; +package org.maxkey.mxapis.identity.rest; import java.io.IOException; diff --git a/maxkey-identitys/maxkey-identity-scim/build.gradle b/maxkey-mxapis/maxkey-mxapi-scim/build.gradle similarity index 87% rename from maxkey-identitys/maxkey-identity-scim/build.gradle rename to maxkey-mxapis/maxkey-mxapi-scim/build.gradle index 4b1bc9031..39034d6b0 100644 --- a/maxkey-identitys/maxkey-identity-scim/build.gradle +++ b/maxkey-mxapis/maxkey-mxapi-scim/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-identity-scim" +description = "maxkey-mxapi-scim" apply plugin: 'java' diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java index adba3bccd..e6e13ea8b 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.controller; +package org.maxkey.mxapis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -26,11 +26,11 @@ import java.util.Set; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.entity.Roles; import org.maxkey.entity.UserInfo; -import org.maxkey.identity.scim.resources.ScimGroup; -import org.maxkey.identity.scim.resources.ScimMemberRef; -import org.maxkey.identity.scim.resources.ScimMeta; -import org.maxkey.identity.scim.resources.ScimParameters; -import org.maxkey.identity.scim.resources.ScimSearchResult; +import org.maxkey.mxapis.identity.scim.resources.ScimGroup; +import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; +import org.maxkey.mxapis.identity.scim.resources.ScimParameters; +import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; import org.maxkey.persistence.service.RoleMemberService; import org.maxkey.persistence.service.RolesService; import org.maxkey.util.DateUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java index 5c8710c8d..20b072488 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.controller; +package org.maxkey.mxapis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -23,10 +23,10 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.entity.Organizations; -import org.maxkey.identity.scim.resources.ScimMeta; -import org.maxkey.identity.scim.resources.ScimOrganization; -import org.maxkey.identity.scim.resources.ScimParameters; -import org.maxkey.identity.scim.resources.ScimSearchResult; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; +import org.maxkey.mxapis.identity.scim.resources.ScimOrganization; +import org.maxkey.mxapis.identity.scim.resources.ScimParameters; +import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; import org.maxkey.persistence.service.OrganizationsService; import org.maxkey.util.DateUtils; import org.maxkey.util.StringUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java similarity index 99% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java index 7b92c8591..a3259a31c 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.controller; +package org.maxkey.mxapis.identity.scim; import com.fasterxml.jackson.annotation.JsonInclude; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java similarity index 91% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java index a94239f76..8f030f10d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.controller; +package org.maxkey.mxapis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -24,18 +24,18 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstsStatus; import org.maxkey.entity.Roles; import org.maxkey.entity.UserInfo; -import org.maxkey.identity.scim.resources.ScimEnterprise; -import org.maxkey.identity.scim.resources.ScimGroupRef; -import org.maxkey.identity.scim.resources.ScimManager; -import org.maxkey.identity.scim.resources.ScimMeta; -import org.maxkey.identity.scim.resources.ScimParameters; -import org.maxkey.identity.scim.resources.ScimSearchResult; -import org.maxkey.identity.scim.resources.ScimOrganizationEmail.UserEmailType; -import org.maxkey.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; -import org.maxkey.identity.scim.resources.ScimUser; -import org.maxkey.identity.scim.resources.ScimUserEmail; -import org.maxkey.identity.scim.resources.ScimFormattedName; -import org.maxkey.identity.scim.resources.ScimUserPhoneNumber; +import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise; +import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; +import org.maxkey.mxapis.identity.scim.resources.ScimGroupRef; +import org.maxkey.mxapis.identity.scim.resources.ScimManager; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; +import org.maxkey.mxapis.identity.scim.resources.ScimParameters; +import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; +import org.maxkey.mxapis.identity.scim.resources.ScimUser; +import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; +import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; +import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; +import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.maxkey.persistence.service.RolesService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.DateUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterprise.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterprise.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java index 11f17264b..744f2c18c 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterprise.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterpriseUser.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterpriseUser.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java index b19ac219d..a0847aad6 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterpriseUser.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.util.HashSet; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimFormattedName.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java similarity index 98% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimFormattedName.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java index 3d789fa7c..efe8e1028 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimFormattedName.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroup.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroup.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java index e092d9208..54afd0d7f 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroup.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.util.HashSet; import java.util.Set; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroupRef.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroupRef.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java index 1cb879a31..4c3707091 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroupRef.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; public class ScimGroupRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimManager.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimManager.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java index 456aa50d7..7c09a204e 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimManager.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; public class ScimManager { diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMemberRef.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMemberRef.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java index 419b19928..bb5a36aa0 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMemberRef.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; public class ScimMemberRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMeta.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java similarity index 98% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMeta.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java index eaf6b2845..db26fc685 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMeta.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; import java.util.Date; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMultiValuedAttribute.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMultiValuedAttribute.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java index 9fa140e16..5c86aba64 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMultiValuedAttribute.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganization.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java similarity index 98% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganization.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java index dc583e1fb..03510dd67 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganization.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationAddress.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationAddress.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java index 728a2b9b1..2b02c7f9d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationAddress.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationEmail.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationEmail.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java index a98b90d16..9eadf4304 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationEmail.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationPhoneNumber.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationPhoneNumber.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java index d07913371..25172d4c6 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationPhoneNumber.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimParameters.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimParameters.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java index 9657dcd35..f7e4f494d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimParameters.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java @@ -15,9 +15,9 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; -import org.maxkey.identity.scim.controller.ScimServiceProviderConfigController; +import org.maxkey.mxapis.identity.scim.ScimServiceProviderConfigController; public class ScimParameters { int startIndex = 1; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimResource.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimResource.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java index ae751f064..94585141a 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimResource.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; import java.util.Set; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimSearchResult.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java similarity index 98% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimSearchResult.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java index b1c9056d8..cdeb1ece5 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimSearchResult.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.util.ArrayList; import java.util.Collections; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUser.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java similarity index 99% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUser.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java index 588bed00a..5289ba564 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUser.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserAddress.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserAddress.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java index 8ea9f1d57..70967679a 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserAddress.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEmail.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java similarity index 97% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEmail.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java index fed5af0f2..ee60817cb 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEmail.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEntitlement.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEntitlement.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java index 2362004a6..74b5222f0 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEntitlement.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserExtension.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserExtension.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java index 30e08eee5..d6dcc7ad2 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserExtension.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserIm.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserIm.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java index 3ea2d796e..ea053373f 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserIm.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserOrganization.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java similarity index 95% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserOrganization.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java index 213ead75a..fcb1597c7 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserOrganization.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoneNumber.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java similarity index 96% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoneNumber.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java index dbbdbed61..64858d720 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoneNumber.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoto.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoto.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java index 85160bd88..2ba85711a 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoto.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserRole.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserRole.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java index cfe7c9bf4..1e611f627 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserRole.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserX509Certificate.java b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserX509Certificate.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java index 40239b607..b435a0b6b 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserX509Certificate.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.scim.resources; +package org.maxkey.mxapis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java similarity index 100% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json similarity index 100% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java index 0ad4926c7..ac0ce1af4 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java @@ -17,6 +17,7 @@ package org.maxkey.identity.scim.resources; +import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java similarity index 87% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index f04c49ad1..d1b3a462e 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -20,6 +20,13 @@ package org.maxkey.identity.scim.resources; import java.util.ArrayList; import java.util.Date; import java.util.List; + +import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise; +import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser; +import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; +import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; +import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json similarity index 100% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java index cc136f02e..4d5a0f15c 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java @@ -17,6 +17,7 @@ package org.maxkey.identity.scim.resources; +import org.maxkey.mxapis.identity.scim.resources.ScimGroup; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java similarity index 92% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java index 66b971314..af1436b7f 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java @@ -21,6 +21,9 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; +import org.maxkey.mxapis.identity.scim.resources.ScimGroup; +import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json similarity index 100% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java similarity index 94% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java index 6c471ffa8..c5d4c92bd 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java @@ -17,6 +17,7 @@ package org.maxkey.identity.scim.resources; +import org.maxkey.mxapis.identity.scim.resources.ScimUser; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java similarity index 89% rename from maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java rename to maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index aada57365..3177dd51d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -20,6 +20,12 @@ package org.maxkey.identity.scim.resources; import java.util.ArrayList; import java.util.Date; import java.util.List; + +import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; +import org.maxkey.mxapis.identity.scim.resources.ScimMeta; +import org.maxkey.mxapis.identity.scim.resources.ScimUser; +import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; +import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index e56e00e58..d7f2fee65 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -17,9 +17,9 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") - //identity - implementation project(":maxkey-identitys:maxkey-identity-scim") - implementation project(":maxkey-identitys:maxkey-identity-rest") + //rest apis + implementation project(":maxkey-mxapis:maxkey-mxapi-scim") + implementation project(":maxkey-mxapis:maxkey-mxapi-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java index 7f55a0397..37707cbb3 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -39,9 +39,9 @@ import org.springframework.context.annotation.ComponentScan; "org.maxkey.entity", "org.maxkey.entity.apps", "org.maxkey.entity.userinfo", - "org.maxkey.identity.kafka", - "org.maxkey.identity.rest", - "org.maxkey.identity.scim.controller", + "org.maxkey.mxapis.identity.kafka", + "org.maxkey.mxapis.identity.rest", + "org.maxkey.mxapis.identity.scim", "org.maxkey.persistence", "org.maxkey.provision", "org.maxkey.synchronizer", diff --git a/settings.gradle b/settings.gradle index a5fcd0455..0e7d3af03 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,9 +32,9 @@ include ( 'maxkey-authentications:maxkey-authentication-otp', 'maxkey-authentications:maxkey-authentication-provider', 'maxkey-authentications:maxkey-authentication-sms', - //identity - 'maxkey-identitys:maxkey-identity-scim', - 'maxkey-identitys:maxkey-identity-rest', + //rest apis + 'maxkey-mxapis:maxkey-mxapi-scim', + 'maxkey-mxapis:maxkey-mxapi-rest', //synchronizers 'maxkey-synchronizers:maxkey-synchronizer', 'maxkey-synchronizers:maxkey-synchronizer-reorgdept',