You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/05 09:03:20 UTC
[syncope] 02/02: reorg package structure- shorten names
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 15db96fd7b390d5c3fe72a861d41c73c4750b88e
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 5 12:32:57 2020 +0330
reorg package structure- shorten names
---
.../client/console/rest/OIDCRelyingPartyRestClient.java | 2 +-
.../apache/syncope/client/console/rest/SAML2SPRestClient.java | 2 +-
.../{authentication => access}/AbstractAccessPolicyConf.java | 2 +-
.../lib/{authentication => access}/AccessPolicyConf.java | 2 +-
.../{authentication => access}/DefaultAccessPolicyConf.java | 2 +-
.../common/lib/{policy => access/to}/AccessPolicyTO.java | 6 ++++--
.../{ => module}/AbstractAuthenticationModuleConf.java | 2 +-
.../authentication/{ => module}/AuthenticationModuleConf.java | 2 +-
.../{ => module}/GoogleMfaAuthenticationModuleConf.java | 2 +-
.../{ => module}/JaasAuthenticationModuleConf.java | 2 +-
.../{ => module}/LdapAuthenticationModuleConf.java | 2 +-
.../{ => module}/OIDCAuthenticationModuleConf.java | 2 +-
.../{ => module}/SAML2IdPAuthenticationModuleConf.java | 2 +-
.../{ => module}/StaticAuthenticationModuleConf.java | 2 +-
.../{ => policy}/AbstractAuthenticationPolicyConf.java | 2 +-
.../authentication/{ => policy}/AuthenticationPolicyConf.java | 2 +-
.../{ => policy}/DefaultAuthenticationPolicyConf.java | 2 +-
.../policy/to}/AuthenticationPolicyTO.java | 6 ++++--
.../to/{ClientApplicationTO.java => client/ClientAppTO.java} | 11 ++++++-----
.../common/lib/to/{ => client}/OIDCRelyingPartyTO.java | 6 +++---
.../apache/syncope/common/lib/to/{ => client}/SAML2SPTO.java | 6 +++---
.../apache/syncope/common/lib/types/AMImplementationType.java | 4 ++--
.../syncope/common/rest/api/service/ClientAppService.java | 4 ++--
.../common/rest/api/service/OIDCRelyingPartyService.java | 2 +-
.../common/rest/api/service/SAML2ServiceProviderService.java | 2 +-
.../org/apache/syncope/core/logic/AbstractClientAppLogic.java | 8 ++++----
.../org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java | 2 +-
.../main/java/org/apache/syncope/core/logic/SAML2SPLogic.java | 2 +-
.../core/logic/init/ClassPathScanImplementationLookup.java | 6 +++---
.../core/rest/cxf/service/AbstractClientAppServiceImpl.java | 4 ++--
.../core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java | 2 +-
.../syncope/core/rest/cxf/service/SAML2SPServiceImpl.java | 2 +-
.../persistence/jpa/entity/policy/JPAPolicyUtilsFactory.java | 4 ++--
.../core/persistence/jpa/inner/AbstractClientAppTest.java | 4 ++--
.../core/persistence/jpa/inner/AuthenticationModuleTest.java | 10 +++++-----
.../core/persistence/jpa/inner/AuthenticationPolicyTest.java | 2 +-
.../provisioning/api/data/OIDCRelyingPartyDataBinder.java | 2 +-
.../syncope/core/provisioning/api/data/SAML2SPDataBinder.java | 2 +-
.../provisioning/java/data/ImplementationDataBinderImpl.java | 6 +++---
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 6 +++---
.../core/provisioning/java/data/PolicyDataBinderImpl.java | 4 ++--
.../core/provisioning/java/data/SAML2SPDataBinderImpl.java | 2 +-
.../src/test/java/org/apache/syncope/fit/AbstractITCase.java | 2 +-
.../org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java | 6 +++---
.../test/java/org/apache/syncope/fit/core/PolicyITCase.java | 8 ++++----
45 files changed, 84 insertions(+), 79 deletions(-)
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
index 407712f..13888f7 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.client.console.rest;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.common.rest.api.service.OIDCRelyingPartyService;
import java.util.List;
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
index b7b484a..10bd1f9 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.client.console.rest;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import org.apache.syncope.common.rest.api.service.SAML2ServiceProviderService;
import java.util.List;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
similarity index 97%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
index 8e41b9a..0f26b4d 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.access;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
index bd4cf3a..f586e58 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AccessPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.access;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAccessPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAccessPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
index 643f4f2..ec728e3 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAccessPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/DefaultAccessPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.access;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/to/AccessPolicyTO.java
similarity index 90%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/access/to/AccessPolicyTO.java
index 768fc68..4849ff3 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AccessPolicyTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/to/AccessPolicyTO.java
@@ -16,10 +16,12 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.policy;
+package org.apache.syncope.common.lib.access.to;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import org.apache.syncope.common.lib.policy.PolicyTO;
+
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -32,7 +34,7 @@ public class AccessPolicyTO extends PolicyTO {
@XmlTransient
@JsonProperty("@class")
- @Schema(name = "@class", required = true, example = "org.apache.syncope.common.lib.policy.AccessPolicyTO")
+ @Schema(name = "@class", required = true, example = "org.apache.syncope.common.lib.access.to.AccessPolicyTO")
@Override
public String getDiscriminator() {
return getClass().getName();
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java
index 49dd7d1..4a3d52b 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java
index 77a8d6a..756a4c0 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/GoogleMfaAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java
similarity index 97%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/GoogleMfaAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java
index 7bb0382..acedd29 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/GoogleMfaAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/JaasAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java
similarity index 97%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/JaasAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java
index 6ccafd4..ed5f9ff 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/JaasAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/LdapAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LdapAuthenticationModuleConf.java
similarity index 98%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/LdapAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LdapAuthenticationModuleConf.java
index fc12084..26db3be 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/LdapAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LdapAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/OIDCAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java
similarity index 98%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/OIDCAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java
index de46774..602ce6c 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/OIDCAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/SAML2IdPAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java
similarity index 99%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/SAML2IdPAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java
index 18d7b77..06b0569 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/SAML2IdPAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/StaticAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/StaticAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java
index ddd2dbf..7383867 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/StaticAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java
index 1fa4367..f93592b 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.policy;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java
index f8e62aa..65a568c 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.policy;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java
index bd190c7..a5f0239 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java
@@ -16,7 +16,7 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.authentication;
+package org.apache.syncope.common.lib.authentication.policy;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthenticationPolicyTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/to/AuthenticationPolicyTO.java
similarity index 88%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthenticationPolicyTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/to/AuthenticationPolicyTO.java
index ede20e3..4b42110 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/AuthenticationPolicyTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/to/AuthenticationPolicyTO.java
@@ -16,10 +16,12 @@
* under the License.
*
*/
-package org.apache.syncope.common.lib.policy;
+package org.apache.syncope.common.lib.authentication.policy.to;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import org.apache.syncope.common.lib.policy.PolicyTO;
+
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -32,7 +34,7 @@ public class AuthenticationPolicyTO extends PolicyTO {
@XmlTransient
@JsonProperty("@class")
- @Schema(name = "@class", required = true, example = "org.apache.syncope.common.lib.policy.AuthenticationPolicyTO")
+ @Schema(name = "@class", required = true, example = "org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO")
@Override
public String getDiscriminator() {
return getClass().getName();
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
similarity index 91%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
index d10d0ca..0a200b8 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.to;
+package org.apache.syncope.common.lib.to.client;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -25,8 +25,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.syncope.common.lib.BaseBean;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.EntityTO;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
@@ -36,7 +37,7 @@ import javax.xml.bind.annotation.XmlType;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
@JsonPropertyOrder(value = {"@class", "key", "name", "description", "authenticationPolicy"})
@Schema(subTypes = {OIDCRelyingPartyTO.class, SAML2SPTO.class}, discriminatorProperty = "@class")
-public abstract class ClientApplicationTO extends BaseBean implements EntityTO {
+public abstract class ClientAppTO extends BaseBean implements EntityTO {
private static final long serialVersionUID = 6577639976115661357L;
@@ -118,7 +119,7 @@ public abstract class ClientApplicationTO extends BaseBean implements EntityTO {
if (obj.getClass() != getClass()) {
return false;
}
- ClientApplicationTO rhs = (ClientApplicationTO) obj;
+ ClientAppTO rhs = (ClientAppTO) obj;
return new EqualsBuilder()
.appendSuper(super.equals(obj))
.append(this.key, rhs.key)
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
index a39b7b7..eff4abd 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.to;
+package org.apache.syncope.common.lib.to.client;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -33,8 +33,8 @@ import java.util.List;
@XmlRootElement(name = "openIdConnectRelyingParty")
@XmlType
-@Schema(allOf = { ClientApplicationTO.class })
-public class OIDCRelyingPartyTO extends ClientApplicationTO {
+@Schema(allOf = { ClientAppTO.class })
+public class OIDCRelyingPartyTO extends ClientAppTO {
private static final long serialVersionUID = -6370888503924521351L;
private String clientId;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java
index 08e37fd..5c75698 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java
@@ -17,7 +17,7 @@
*
*/
-package org.apache.syncope.common.lib.to;
+package org.apache.syncope.common.lib.to.client;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,8 +30,8 @@ import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "saml2ServiceProvider")
@XmlType
-@Schema(allOf = { ClientApplicationTO.class })
-public class SAML2SPTO extends ClientApplicationTO {
+@Schema(allOf = { ClientAppTO.class })
+public class SAML2SPTO extends ClientAppTO {
private static final long serialVersionUID = -6370888503924521351L;
private String entityId;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
index 9bfb9aa..5a939bd 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
@@ -35,8 +35,8 @@ public final class AMImplementationType {
}
private static final Map<String, String> VALUES = Map.ofEntries(
- Pair.of(AUTH_MODULE_CONFIGURATIONS, "org.apache.syncope.common.lib.authentication.AuthenticationPolicyConf"),
- Pair.of(AUTH_POLICY_CONFIGURATIONS, "org.apache.syncope.common.lib.authentication.AuthenticationModuleConf"),
+ Pair.of(AUTH_MODULE_CONFIGURATIONS, "org.apache.syncope.common.lib.authentication.policy.AuthenticationPolicyConf"),
+ Pair.of(AUTH_POLICY_CONFIGURATIONS, "org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf"),
Pair.of(ACCESS_POLICY_CONFIGURATIONS, "org.apache.syncope.core.persistence.api.dao.AccessPolicyConf"));
public static Map<String, String> values() {
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
index ad5358e..e628704 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.apache.syncope.common.lib.to.ClientApplicationTO;
+import org.apache.syncope.common.lib.to.client.ClientAppTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
import javax.validation.constraints.NotNull;
@@ -45,7 +45,7 @@ import java.util.List;
/**
* REST operations for applications.
*/
-public interface ClientAppService<T extends ClientApplicationTO> extends JAXRSService {
+public interface ClientAppService<T extends ClientAppTO> extends JAXRSService {
/**
* Returns a list of all applications.
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
index dadcef5..b93d9df 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
@@ -22,7 +22,7 @@ package org.apache.syncope.common.rest.api.service;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import javax.ws.rs.Path;
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
index eb4ca6c..abd6319 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
@@ -22,7 +22,7 @@ package org.apache.syncope.common.rest.api.service;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import javax.ws.rs.Path;
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
index 01e3410..4f26b1b 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
@@ -18,16 +18,16 @@
*/
package org.apache.syncope.core.logic;
-import org.apache.syncope.common.lib.to.ClientApplicationTO;
+import org.apache.syncope.common.lib.to.client.ClientAppTO;
import java.lang.reflect.Method;
import java.util.List;
-public abstract class AbstractClientAppLogic<T extends ClientApplicationTO>
- extends AbstractTransactionalLogic<ClientApplicationTO> {
+public abstract class AbstractClientAppLogic<T extends ClientAppTO>
+ extends AbstractTransactionalLogic<ClientAppTO> {
@Override
- protected ClientApplicationTO resolveReference(final Method method, final Object... args)
+ protected ClientAppTO resolveReference(final Method method, final Object... args)
throws UnresolvedReferenceException {
throw new UnresolvedReferenceException();
}
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
index 7837116..1e37959 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.logic;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRelyingPartyDAO;
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index b7ba57e..fdea4b8 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.logic;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
index c9d7fea..31bd4ce 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
@@ -25,9 +25,9 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.apache.syncope.common.lib.authentication.AccessPolicyConf;
-import org.apache.syncope.common.lib.authentication.AuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.AuthenticationPolicyConf;
+import org.apache.syncope.common.lib.access.AccessPolicyConf;
+import org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.policy.AuthenticationPolicyConf;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.ImplementationTypesHolder;
import org.apache.syncope.core.persistence.api.ImplementationLookup;
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
index b87fc37..2849af9 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
@@ -19,7 +19,7 @@
package org.apache.syncope.core.rest.cxf.service;
import org.apache.syncope.common.rest.api.service.ClientAppService;
-import org.apache.syncope.common.lib.to.ClientApplicationTO;
+import org.apache.syncope.common.lib.to.client.ClientAppTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.core.logic.AbstractClientAppLogic;
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import java.net.URI;
import java.util.List;
-public abstract class AbstractClientAppServiceImpl<T extends ClientApplicationTO> extends AbstractServiceImpl
+public abstract class AbstractClientAppServiceImpl<T extends ClientAppTO> extends AbstractServiceImpl
implements ClientAppService<T> {
protected abstract AbstractClientAppLogic<T> getLogic();
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
index b69863f..8d2c842 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
@@ -20,7 +20,7 @@
package org.apache.syncope.core.rest.cxf.service;
import org.apache.syncope.common.rest.api.service.OIDCRelyingPartyService;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.core.logic.AbstractClientAppLogic;
import org.apache.syncope.core.logic.OIDCRelyingPartyLogic;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
index a151873..c9502e7 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
@@ -20,7 +20,7 @@
package org.apache.syncope.core.rest.cxf.service;
import org.apache.syncope.common.rest.api.service.SAML2ServiceProviderService;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import org.apache.syncope.core.logic.AbstractClientAppLogic;
import org.apache.syncope.core.logic.SAML2SPLogic;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtilsFactory.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtilsFactory.java
index 9eca22a..5051848 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtilsFactory.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtilsFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.syncope.core.persistence.jpa.entity.policy;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
import org.apache.syncope.common.lib.policy.PasswordPolicyTO;
import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.policy.PullPolicyTO;
import org.apache.syncope.common.lib.policy.PushPolicyTO;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
index 496b98c..cdfe2dd 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
@@ -19,8 +19,8 @@
package org.apache.syncope.core.persistence.jpa.inner;
-import org.apache.syncope.common.lib.authentication.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.authentication.DefaultAuthenticationPolicyConf;
+import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
index 736b556..37db549 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.syncope.core.persistence.jpa.inner;
-import org.apache.syncope.common.lib.authentication.AuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.GoogleMfaAuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.JaasAuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.LdapAuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.StaticAuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.module.GoogleMfaAuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.module.JaasAuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.module.LdapAuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.module.StaticAuthenticationModuleConf;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationPolicyTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationPolicyTest.java
index 4497144..9303c14 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationPolicyTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationPolicyTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.inner;
-import org.apache.syncope.common.lib.authentication.DefaultAuthenticationPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
index e36f41a..cec62aa 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
@@ -19,7 +19,7 @@
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
public interface OIDCRelyingPartyDataBinder {
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
index ee9287f..bf42275 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
public interface SAML2SPDataBinder {
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
index af630fb..2ce29f9 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ImplementationDataBinderImpl.java
@@ -21,9 +21,9 @@ package org.apache.syncope.core.provisioning.java.data;
import java.lang.reflect.Modifier;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.authentication.AccessPolicyConf;
-import org.apache.syncope.common.lib.authentication.AuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.AuthenticationPolicyConf;
+import org.apache.syncope.common.lib.access.AccessPolicyConf;
+import org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf;
+import org.apache.syncope.common.lib.authentication.policy.AuthenticationPolicyConf;
import org.apache.syncope.common.lib.policy.RuleConf;
import org.apache.syncope.common.lib.report.ReportletConf;
import org.apache.syncope.common.lib.to.ImplementationTO;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
index 1a276e2..4948348 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
@@ -19,9 +19,9 @@
package org.apache.syncope.core.provisioning.java.data;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRelyingPartyDAO;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
index 159f15d..3a31be2 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
@@ -19,11 +19,11 @@
package org.apache.syncope.core.provisioning.java.data;
import java.util.stream.Collectors;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
import org.apache.syncope.core.provisioning.api.data.PolicyDataBinder;
import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.policy.PasswordPolicyTO;
import org.apache.syncope.common.lib.policy.PullPolicyTO;
import org.apache.syncope.common.lib.policy.PushPolicyTO;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
index 2e9df75..2f8d3a5 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
@@ -19,7 +19,7 @@
package org.apache.syncope.core.provisioning.java.data;
-import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2SPTO;
import org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationPolicyDAO;
import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 0b100da..8290678 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -70,7 +70,7 @@ import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.MembershipTO;
import org.apache.syncope.common.lib.to.NotificationTO;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.to.ProvisioningResult;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.to.RoleTO;
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
index ee89dd7..a87d3a2 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
@@ -19,12 +19,12 @@
package org.apache.syncope.fit.core;
import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
-import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.jupiter.api.Test;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
index 5b436b1..6f94403 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
@@ -33,11 +33,11 @@ import javax.ws.rs.core.Response;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.authentication.DefaultAccessPolicyConf;
-import org.apache.syncope.common.lib.authentication.DefaultAuthenticationPolicyConf;
-import org.apache.syncope.common.lib.policy.AccessPolicyTO;
+import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
+import org.apache.syncope.common.lib.access.to.AccessPolicyTO;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
-import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.authentication.policy.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.policy.PasswordPolicyTO;
import org.apache.syncope.common.lib.policy.PullPolicyTO;
import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;