You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2020/03/17 10:38:27 UTC
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-160] Renaming
classes
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 6c2434b [SYNCOPE-160] Renaming classes
6c2434b is described below
commit 6c2434b8da83633e21578766a0d062e0cadd51f1
Author: skylark17 <sk...@apache.org>
AuthorDate: Tue Mar 17 11:33:41 2020 +0100
[SYNCOPE-160] Renaming classes
---
...ModuleConf.java => AbstractAuthModuleConf.java} | 8 +-
...ticationModuleConf.java => AuthModuleConf.java} | 2 +-
...oduleConf.java => GoogleMfaAuthModuleConf.java} | 4 +-
...tionModuleConf.java => JaasAuthModuleConf.java} | 4 +-
...tionModuleConf.java => LDAPAuthModuleConf.java} | 4 +-
...tionModuleConf.java => OIDCAuthModuleConf.java} | 4 +-
...ModuleConf.java => SAML2IdPAuthModuleConf.java} | 4 +-
...onModuleConf.java => StaticAuthModuleConf.java} | 6 +-
...PolicyConf.java => AbstractAuthPolicyConf.java} | 14 ++--
...nf.java => AbstractAuthPolicyCriteriaConf.java} | 9 +--
...ticationPolicyConf.java => AuthPolicyConf.java} | 4 +-
...iteriaConf.java => AuthPolicyCriteriaConf.java} | 2 +-
...nPolicyConf.java => DefaultAuthPolicyConf.java} | 17 ++--
...onf.java => DefaultAuthPolicyCriteriaConf.java} | 4 +-
...thenticationPolicyTO.java => AuthPolicyTO.java} | 6 +-
.../syncope/common/lib/to/client/ClientAppTO.java | 16 ++--
.../common/lib/types/AMImplementationType.java | 19 +++--
...ticationPolicyType.java => AuthPolicyType.java} | 7 +-
.../apache/syncope/common/lib/to/ResourceTO.java | 14 ++--
.../org/apache/syncope/common/lib/to/RealmTO.java | 14 ++--
.../init/ClassPathScanImplementationLookup.java | 20 ++---
.../core/persistence/api/dao/PolicyDAO.java | 4 +-
...enticationModuleDAO.java => AuthModuleDAO.java} | 15 ++--
.../syncope/core/persistence/api/entity/Realm.java | 6 +-
.../{AuthenticationModule.java => AuthModule.java} | 3 +-
.../api/entity/authentication/ClientApp.java | 6 +-
.../{AuthenticationPolicy.java => AuthPolicy.java} | 2 +-
.../src/test/resources/domains/MasterContent.xml | 14 ++--
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 74 +++++++++---------
.../core/persistence/jpa/dao/JPARealmDAO.java | 6 +-
...icationModuleDAO.java => JPAAuthModuleDAO.java} | 42 +++++-----
.../persistence/jpa/entity/JPAEntityFactory.java | 20 ++---
.../core/persistence/jpa/entity/JPARealm.java | 16 ++--
.../entity/authentication/AbstractClientApp.java | 18 ++---
...uthenticationModule.java => JPAAuthModule.java} | 18 ++---
...uthenticationPolicy.java => JPAAuthPolicy.java} | 8 +-
.../jpa/entity/policy/JPAPolicyUtils.java | 4 +-
.../jpa/entity/policy/JPAPolicyUtilsFactory.java | 8 +-
.../jpa/inner/AbstractClientAppTest.java | 22 +++---
...ticationModuleTest.java => AuthModuleTest.java} | 90 +++++++++++-----------
.../jpa/inner/OIDCRelyingPartyTest.java | 9 ++-
.../core/persistence/jpa/inner/PolicyTest.java | 64 +++++++--------
.../jpa/inner/SAML2ServiceProviderTest.java | 7 +-
.../core/persistence/jpa/outer/PolicyTest.java | 14 ++--
.../src/test/resources/domains/MasterContent.xml | 14 ++--
.../java/data/ImplementationDataBinderImpl.java | 30 ++++----
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 18 ++---
.../java/data/PolicyDataBinderImpl.java | 44 +++++------
.../java/data/RealmDataBinderImpl.java | 28 +++----
.../data/SAML2ServiceProviderDataBinderImpl.java | 18 ++---
.../syncope/fit/core/OIDCRelyingPartyITCase.java | 20 ++---
.../org/apache/syncope/fit/core/PolicyITCase.java | 64 ++++++++-------
.../org/apache/syncope/fit/core/RealmITCase.java | 26 +++----
.../fit/core/SAML2ServiceProviderITCase.java | 8 +-
54 files changed, 457 insertions(+), 465 deletions(-)
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
similarity index 83%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
index 7133aef..bc24376 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
import java.io.Serializable;
@XmlType
-@XmlSeeAlso({ JaasAuthenticationModuleConf.class, StaticAuthenticationModuleConf.class,
- LDAPAuthenticationModuleConf.class })
-public abstract class AbstractAuthenticationModuleConf implements Serializable, AuthenticationModuleConf {
+@XmlSeeAlso({ JaasAuthModuleConf.class, StaticAuthModuleConf.class,
+ LDAPAuthModuleConf.class })
+public abstract class AbstractAuthModuleConf implements Serializable, AuthModuleConf {
private static final long serialVersionUID = 4153200197344709778L;
@@ -33,7 +33,7 @@ public abstract class AbstractAuthenticationModuleConf implements Serializable,
private int order;
- public AbstractAuthenticationModuleConf() {
+ public AbstractAuthModuleConf() {
setName(getClass().getName());
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
index 9cb4e85..a6e66db 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
-public interface AuthenticationModuleConf extends Serializable {
+public interface AuthModuleConf extends Serializable {
/**
* Give name of related authentication module instance.
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
similarity index 94%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
index 9d697f0..2b22e2b 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/GoogleMfaAuthModuleConf.java
@@ -21,9 +21,9 @@ package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "googleMfaAuthenticationModuleConf")
+@XmlRootElement(name = "googleMfaAuthModuleConf")
@XmlType
-public class GoogleMfaAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class GoogleMfaAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -7883257599139312426L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
similarity index 94%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
index 5375614..bae7344 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/JaasAuthModuleConf.java
@@ -21,9 +21,9 @@ package org.apache.syncope.common.lib.authentication.module;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "jaasAuthenticationModuleConf")
+@XmlRootElement(name = "jaasAuthModuleConf")
@XmlType
-public class JaasAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class JaasAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -7775771400318503131L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
similarity index 96%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
index 06603c5..ca69e68 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/LDAPAuthModuleConf.java
@@ -26,9 +26,9 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-@XmlRootElement(name = "ldapAuthenticationModuleConf")
+@XmlRootElement(name = "ldapAuthModuleConf")
@XmlType
-public class LDAPAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class LDAPAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -471527731042579422L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
similarity index 97%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
index 5112afc..5b77280 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/OIDCAuthModuleConf.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter;
-@XmlRootElement(name = "oidcAuthenticationModuleConf")
+@XmlRootElement(name = "oidcAuthModuleConf")
@XmlType
-public class OIDCAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class OIDCAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -471527731042579422L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
similarity index 98%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
index fafd22d..c9e8bb4 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/SAML2IdPAuthModuleConf.java
@@ -26,9 +26,9 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-@XmlRootElement(name = "saml2IdPAuthenticationModuleConf")
+@XmlRootElement(name = "saml2IdPAuthModuleConf")
@XmlType
-public class SAML2IdPAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class SAML2IdPAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -471527731042579422L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
similarity index 88%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
index 59440fb..8ccfa18 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthenticationModuleConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/StaticAuthModuleConf.java
@@ -28,16 +28,16 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter;
-@XmlRootElement(name = "staticAuthenticationModuleConf")
+@XmlRootElement(name = "staticAuthModuleConf")
@XmlType
-public class StaticAuthenticationModuleConf extends AbstractAuthenticationModuleConf {
+public class StaticAuthModuleConf extends AbstractAuthModuleConf {
private static final long serialVersionUID = -7775771400318503131L;
@XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
private final Map<String, String> users = new HashMap<>();
- public StaticAuthenticationModuleConf(final Map<String, String> users) {
+ public StaticAuthModuleConf(final Map<String, String> users) {
setName(getClass().getSimpleName());
getUsers().clear();
getUsers().putAll(users);
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
similarity index 75%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
index fc2af48..5979afb 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyConf.java
@@ -23,29 +23,29 @@ import javax.xml.bind.annotation.XmlType;
import java.io.Serializable;
@XmlType
-@XmlSeeAlso({ DefaultAuthenticationPolicyConf.class })
-public abstract class AbstractAuthenticationPolicyConf implements Serializable, AuthenticationPolicyConf {
+@XmlSeeAlso({ DefaultAuthPolicyConf.class })
+public abstract class AbstractAuthPolicyConf implements Serializable, AuthPolicyConf {
private static final long serialVersionUID = 9185127128182430142L;
private String name;
- private AuthenticationPolicyCriteriaConf criteria;
+ private AuthPolicyCriteriaConf criteria;
- public AbstractAuthenticationPolicyConf() {
+ public AbstractAuthPolicyConf() {
setName(getClass().getName());
}
- public AbstractAuthenticationPolicyConf(final String name) {
+ public AbstractAuthPolicyConf(final String name) {
setName(name);
}
@Override
- public AuthenticationPolicyCriteriaConf getCriteria() {
+ public AuthPolicyCriteriaConf getCriteria() {
return criteria;
}
- public void setCriteria(final AuthenticationPolicyCriteriaConf criteria) {
+ public void setCriteria(final AuthPolicyCriteriaConf criteria) {
this.criteria = criteria;
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyCriteriaConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
similarity index 80%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyCriteriaConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
index 10e96c8..e17f816 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthenticationPolicyCriteriaConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AbstractAuthPolicyCriteriaConf.java
@@ -23,19 +23,18 @@ import javax.xml.bind.annotation.XmlType;
import java.io.Serializable;
@XmlType
-@XmlSeeAlso({ DefaultAuthenticationPolicyCriteriaConf.class })
-public abstract class AbstractAuthenticationPolicyCriteriaConf
- implements AuthenticationPolicyCriteriaConf, Serializable {
+@XmlSeeAlso({ DefaultAuthPolicyCriteriaConf.class })
+public abstract class AbstractAuthPolicyCriteriaConf implements AuthPolicyCriteriaConf, Serializable {
private static final long serialVersionUID = -6882164291962510245L;
private String name;
- public AbstractAuthenticationPolicyCriteriaConf() {
+ public AbstractAuthPolicyCriteriaConf() {
setName(getClass().getName());
}
- public AbstractAuthenticationPolicyCriteriaConf(final String name) {
+ public AbstractAuthPolicyCriteriaConf(final String name) {
setName(name);
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
similarity index 92%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
index dae9682..1cd5e6d 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyConf.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
-public interface AuthenticationPolicyConf extends Serializable {
+public interface AuthPolicyConf extends Serializable {
/**
* Give name of related authentication policy instance.
@@ -37,5 +37,5 @@ public interface AuthenticationPolicyConf extends Serializable {
*
* @return the criteria
*/
- AuthenticationPolicyCriteriaConf getCriteria();
+ AuthPolicyCriteriaConf getCriteria();
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyCriteriaConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyCriteriaConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
index 2081cd1..ba9208c 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthenticationPolicyCriteriaConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/AuthPolicyCriteriaConf.java
@@ -31,7 +31,7 @@ import java.io.Serializable;
*/
@FunctionalInterface
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
-public interface AuthenticationPolicyCriteriaConf extends Serializable {
+public interface AuthPolicyCriteriaConf extends Serializable {
/**
* Describe the name of the authentication policy criteria.
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
similarity index 71%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
index ea7d344..6a74833 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyConf.java
@@ -26,20 +26,19 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-@XmlRootElement(name = "DefaultAuthenticationPolicyConf")
+@XmlRootElement(name = "DefaultAuthPolicyConf")
@XmlType
-public class DefaultAuthenticationPolicyConf extends AbstractAuthenticationPolicyConf
- implements AuthenticationPolicyConf {
+public class DefaultAuthPolicyConf extends AbstractAuthPolicyConf implements AuthPolicyConf {
private static final long serialVersionUID = -2969836600059025380L;
- private final List<String> authenticationModules = new ArrayList<>();
+ private final List<String> authModules = new ArrayList<>();
- @XmlElementWrapper(name = "authenticationModules")
- @XmlElement(name = "authenticationModule")
- @JsonProperty("authenticationModules")
- public List<String> getAuthenticationModules() {
- return authenticationModules;
+ @XmlElementWrapper(name = "authModules")
+ @XmlElement(name = "authModule")
+ @JsonProperty("authModules")
+ public List<String> getAuthModules() {
+ return authModules;
}
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyCriteriaConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
similarity index 87%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyCriteriaConf.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
index aa3eb80..6d41a6d 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthenticationPolicyCriteriaConf.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/policy/DefaultAuthPolicyCriteriaConf.java
@@ -21,9 +21,9 @@ package org.apache.syncope.common.lib.authentication.policy;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "AnyAuthenticationPolicyCriteriaConf")
+@XmlRootElement(name = "AnyAuthPolicyCriteriaConf")
@XmlType
-public class DefaultAuthenticationPolicyCriteriaConf extends AbstractAuthenticationPolicyCriteriaConf {
+public class DefaultAuthPolicyCriteriaConf extends AbstractAuthPolicyCriteriaConf {
private static final long serialVersionUID = 3928807032588105869L;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthenticationPolicyTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthPolicyTO.java
similarity index 88%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthenticationPolicyTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthPolicyTO.java
index d6cea9a..a989130 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthenticationPolicyTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AuthPolicyTO.java
@@ -25,16 +25,16 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "authenticationPolicy")
+@XmlRootElement(name = "authPolicy")
@XmlType
-public class AuthenticationPolicyTO extends PolicyTO {
+public class AuthPolicyTO extends PolicyTO {
private static final long serialVersionUID = -6711411162433533300L;
@XmlTransient
@JsonProperty("@class")
@Schema(name = "@class", required = true,
- example = "org.apache.syncope.common.lib.to.AuthenticationPolicyTO")
+ example = "org.apache.syncope.common.lib.to.AuthPolicyTO")
@Override
public String getDiscriminator() {
return getClass().getName();
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
index 3f1bfc1..c141629 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlSeeAlso({ OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
@JsonPropertyOrder(value = { "@class", "key", "name", "description",
- "authenticationPolicy", "accessPolicy", "attReleasePolicy" })
+ "authPolicy", "accessPolicy", "attReleasePolicy" })
@Schema(subTypes = { OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class }, discriminatorProperty = "@class")
public abstract class ClientAppTO extends BaseBean implements EntityTO {
@@ -46,7 +46,7 @@ public abstract class ClientAppTO extends BaseBean implements EntityTO {
private String description;
- private String authenticationPolicy;
+ private String authPolicy;
private String accessPolicy;
@@ -68,12 +68,12 @@ public abstract class ClientAppTO extends BaseBean implements EntityTO {
this.accessPolicy = accessPolicy;
}
- public String getAuthenticationPolicy() {
- return authenticationPolicy;
+ public String getAuthPolicy() {
+ return authPolicy;
}
- public void setAuthenticationPolicy(final String authenticationPolicy) {
- this.authenticationPolicy = authenticationPolicy;
+ public void setAuthPolicy(final String authPolicy) {
+ this.authPolicy = authPolicy;
}
@Override
@@ -112,7 +112,7 @@ public abstract class ClientAppTO extends BaseBean implements EntityTO {
.append(key)
.append(name)
.append(description)
- .append(authenticationPolicy)
+ .append(authPolicy)
.append(accessPolicy)
.append(attrReleasePolicy)
.toHashCode();
@@ -135,7 +135,7 @@ public abstract class ClientAppTO extends BaseBean implements EntityTO {
.append(this.key, rhs.key)
.append(this.name, rhs.name)
.append(this.description, rhs.description)
- .append(this.authenticationPolicy, rhs.authenticationPolicy)
+ .append(this.authPolicy, rhs.authPolicy)
.append(this.accessPolicy, rhs.accessPolicy)
.append(this.attrReleasePolicy, rhs.attrReleasePolicy)
.isEquals();
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 cb344c0..430f0cf 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
@@ -19,11 +19,10 @@
package org.apache.syncope.common.lib.types;
import org.apache.commons.lang3.tuple.Pair;
-
import java.util.Map;
public final class AMImplementationType {
-
+
public static final String AUTH_MODULE_CONFIGURATIONS = "AUTH_MODULE_CONFIGURATIONS";
public static final String AUTH_POLICY_CONFIGURATIONS = "AUTH_POLICY_CONFIGURATIONS";
@@ -37,14 +36,14 @@ public final class AMImplementationType {
}
private static final Map<String, String> VALUES = Map.ofEntries(
- 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(ATTR_RELEASE_POLICY_CONFIGURATIONS,
- "org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf"),
- Pair.of(ACCESS_POLICY_CONFIGURATIONS,
- "org.apache.syncope.common.lib.attrs.AttrReleasePolicyConf"));
+ Pair.of(AUTH_MODULE_CONFIGURATIONS,
+ "org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf"),
+ Pair.of(AUTH_POLICY_CONFIGURATIONS,
+ "org.apache.syncope.common.lib.authentication.module.AuthModuleConf"),
+ Pair.of(ATTR_RELEASE_POLICY_CONFIGURATIONS,
+ "org.apache.syncope.common.lib.authentication.module.AuthModuleConf"),
+ Pair.of(ACCESS_POLICY_CONFIGURATIONS,
+ "org.apache.syncope.common.lib.attrs.AttrReleasePolicyConf"));
public static Map<String, String> values() {
return VALUES;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthenticationPolicyType.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthPolicyType.java
similarity index 91%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthenticationPolicyType.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthPolicyType.java
index b2bab89..3835bd8 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthenticationPolicyType.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AuthPolicyType.java
@@ -18,14 +18,13 @@
*/
package org.apache.syncope.common.lib.types;
+public final class AuthPolicyType {
-public final class AuthenticationPolicyType {
-
public static final String AUTHENTICATION_POLICY_BPM = "AUTHENTICATION_POLICY_BPM";
-
+
public static final String AUTHENTICATION_POLICY_CHAIN = "AUTHENTICATION_POLICY_CHAIN";
- private AuthenticationPolicyType() {
+ private AuthPolicyType() {
// private constructor for static utility class
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
index 4749fe4..945ab80 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
@@ -82,7 +82,7 @@ public class ResourceTO implements EntityTO {
private String provisionSorter;
- private String authenticationPolicy;
+ private String authPolicy;
private String accessPolicy;
@@ -209,12 +209,12 @@ public class ResourceTO implements EntityTO {
this.provisionSorter = provisionSorter;
}
- public String getAuthenticationPolicy() {
- return authenticationPolicy;
+ public String getAuthPolicy() {
+ return authPolicy;
}
- public void setAuthenticationPolicy(final String authenticationPolicy) {
- this.authenticationPolicy = authenticationPolicy;
+ public void setAuthPolicy(final String authPolicy) {
+ this.authPolicy = authPolicy;
}
public String getAccessPolicy() {
@@ -314,7 +314,7 @@ public class ResourceTO implements EntityTO {
append(accountPolicy, other.accountPolicy).
append(pullPolicy, other.pullPolicy).
append(pushPolicy, other.pushPolicy).
- append(authenticationPolicy, other.authenticationPolicy).
+ append(authPolicy, other.authPolicy).
append(accessPolicy, other.accessPolicy).
append(confOverride, other.confOverride).
append(capabilitiesOverride, other.capabilitiesOverride).
@@ -342,7 +342,7 @@ public class ResourceTO implements EntityTO {
append(accountPolicy).
append(pullPolicy).
append(pushPolicy).
- append(authenticationPolicy).
+ append(authPolicy).
append(accessPolicy).
append(confOverride).
append(overrideCapabilities).
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
index e0514eb..037f782 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
@@ -54,7 +54,7 @@ public class RealmTO extends BaseBean implements NamedEntityTO, TemplatableTO {
private String passwordPolicy;
- private String authenticationPolicy;
+ private String authPolicy;
private String accessPolicy;
@@ -120,12 +120,12 @@ public class RealmTO extends BaseBean implements NamedEntityTO, TemplatableTO {
this.passwordPolicy = passwordPolicy;
}
- public String getAuthenticationPolicy() {
- return authenticationPolicy;
+ public String getAuthPolicy() {
+ return authPolicy;
}
- public void setAuthenticationPolicy(final String authenticationPolicy) {
- this.authenticationPolicy = authenticationPolicy;
+ public void setAuthPolicy(final String authPolicy) {
+ this.authPolicy = authPolicy;
}
public String getAccessPolicy() {
@@ -183,7 +183,7 @@ public class RealmTO extends BaseBean implements NamedEntityTO, TemplatableTO {
append(fullPath, other.fullPath).
append(accountPolicy, other.accountPolicy).
append(passwordPolicy, other.passwordPolicy).
- append(authenticationPolicy, other.authenticationPolicy).
+ append(authPolicy, other.authPolicy).
append(accessPolicy, other.accessPolicy).
append(attrReleasePolicy, other.attrReleasePolicy).
append(actions, other.actions).
@@ -201,7 +201,7 @@ public class RealmTO extends BaseBean implements NamedEntityTO, TemplatableTO {
append(fullPath).
append(accountPolicy).
append(passwordPolicy).
- append(authenticationPolicy).
+ append(authPolicy).
append(accessPolicy).
append(attrReleasePolicy).
append(actions).
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 31bd4ce..c882de7 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
@@ -26,8 +26,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
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;
@@ -38,6 +36,8 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen
import org.springframework.core.Ordered;
import org.springframework.core.type.filter.AssignableTypeFilter;
import org.springframework.util.ClassUtils;
+import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
+import org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf;
/**
* Cache class names for all implementations of Syncope interfaces found in classpath, for later usage.
@@ -50,9 +50,9 @@ public class ClassPathScanImplementationLookup implements SyncopeCoreLoader {
private Map<String, Set<String>> classNames;
- private Map<Class<? extends AuthenticationPolicyConf>, Class<? extends AuthenticationPolicyConf>> authPolicyClasses;
+ private Map<Class<? extends AuthPolicyConf>, Class<? extends AuthPolicyConf>> authPolicyClasses;
- private Map<Class<? extends AuthenticationModuleConf>, Class<? extends AuthenticationModuleConf>> authModuleClasses;
+ private Map<Class<? extends AuthModuleConf>, Class<? extends AuthModuleConf>> authModuleClasses;
private Map<Class<? extends AccessPolicyConf>, Class<? extends AccessPolicyConf>> accessPolicyClasses;
@@ -95,10 +95,10 @@ public class ClassPathScanImplementationLookup implements SyncopeCoreLoader {
Objects.requireNonNull(bd.getBeanClassName()), ClassUtils.getDefaultClassLoader());
boolean isAbstractClazz = Modifier.isAbstract(clazz.getModifiers());
- if (AuthenticationPolicyConf.class.isAssignableFrom(clazz) && !isAbstractClazz) {
+ if (AuthPolicyConf.class.isAssignableFrom(clazz) && !isAbstractClazz) {
classNames.get(AMImplementationType.AUTH_POLICY_CONFIGURATIONS).add(bd.getBeanClassName());
}
- if (AuthenticationModuleConf.class.isAssignableFrom(clazz) && !isAbstractClazz) {
+ if (AuthModuleConf.class.isAssignableFrom(clazz) && !isAbstractClazz) {
classNames.get(AMImplementationType.AUTH_MODULE_CONFIGURATIONS).add(bd.getBeanClassName());
}
if (AccessPolicyConf.class.isAssignableFrom(clazz) && !isAbstractClazz) {
@@ -121,14 +121,14 @@ public class ClassPathScanImplementationLookup implements SyncopeCoreLoader {
return classNames.get(type);
}
- public Class<? extends AuthenticationPolicyConf> getAuthPolicyConfClass(
- final Class<? extends AuthenticationPolicyConf> authPolicyConfClass) {
+ public Class<? extends AuthPolicyConf> getAuthPolicyConfClass(
+ final Class<? extends AuthPolicyConf> authPolicyConfClass) {
return authPolicyClasses.get(authPolicyConfClass);
}
- public Class<? extends AuthenticationModuleConf> getAuthModuleConfClass(
- final Class<? extends AuthenticationModuleConf> authModuleConfClass) {
+ public Class<? extends AuthModuleConf> getAuthModuleConfClass(
+ final Class<? extends AuthModuleConf> authModuleConfClass) {
return authModuleClasses.get(authModuleConfClass);
}
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/PolicyDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/PolicyDAO.java
index 7dc74c2..6fb6f24 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/PolicyDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/PolicyDAO.java
@@ -23,12 +23,12 @@ import org.apache.syncope.core.persistence.api.entity.Implementation;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PullPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PushPolicy;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
public interface PolicyDAO extends DAO<Policy> {
@@ -42,7 +42,7 @@ public interface PolicyDAO extends DAO<Policy> {
List<PullPolicy> findByPullCorrelationRule(Implementation correlationRule);
- List<AuthenticationPolicy> findByAuthenticationPolicy(Implementation policy);
+ List<AuthPolicy> findByAuthPolicy(Implementation policy);
List<AccessPolicy> findByAccessPolicy(Implementation policy);
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthenticationModuleDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
similarity index 73%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthenticationModuleDAO.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
index 2876280..fc8ee3b 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthenticationModuleDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/AuthModuleDAO.java
@@ -20,22 +20,21 @@ package org.apache.syncope.core.persistence.api.dao.authentication;
import org.apache.syncope.core.persistence.api.dao.DAO;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
-
import java.util.List;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
-public interface AuthenticationModuleDAO extends DAO<AuthenticationModule> {
+public interface AuthModuleDAO extends DAO<AuthModule> {
- AuthenticationModule find(String key);
+ AuthModule find(String key);
- List<AuthenticationModule> findAll();
+ List<AuthModule> findAll();
- AuthenticationModule save(AuthenticationModule authenticationModule);
+ AuthModule save(AuthModule authModule);
void delete(String key);
- void delete(AuthenticationModule authenticationModule);
+ void delete(AuthModule authModule);
- List<AuthenticationModule> findByConfiguration(Implementation configuration);
+ List<AuthModule> findByConfiguration(Implementation configuration);
}
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Realm.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Realm.java
index bcdbd9d..3e2b23b 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Realm.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Realm.java
@@ -25,7 +25,7 @@ import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import java.util.List;
import java.util.Optional;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
public interface Realm extends Entity {
@@ -47,9 +47,9 @@ public interface Realm extends Entity {
void setPasswordPolicy(PasswordPolicy passwordPolicy);
- void setAuthenticationPolicy(AuthenticationPolicy authenticationPolicy);
+ void setAuthPolicy(AuthPolicy authPolicy);
- AuthenticationPolicy getAuthenticationPolicy();
+ AuthPolicy getAuthPolicy();
void setAccessPolicy(AccessPolicy accessPolicy);
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthenticationModule.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
similarity index 95%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthenticationModule.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
index 8ebd7c0..c786f0a 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthenticationModule.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/AuthModule.java
@@ -20,10 +20,9 @@ package org.apache.syncope.core.persistence.api.entity.authentication;
import org.apache.syncope.core.persistence.api.entity.Entity;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-
import java.util.List;
-public interface AuthenticationModule extends Entity {
+public interface AuthModule extends Entity {
String getName();
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
index fd4dbd0..3d67a89 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/ClientApp.java
@@ -22,7 +22,7 @@ import org.apache.syncope.core.persistence.api.entity.Entity;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
public interface ClientApp extends Entity {
@@ -34,9 +34,9 @@ public interface ClientApp extends Entity {
void setDescription(String description);
- AuthenticationPolicy getAuthenticationPolicy();
+ AuthPolicy getAuthPolicy();
- void setAuthenticationPolicy(AuthenticationPolicy policy);
+ void setAuthPolicy(AuthPolicy policy);
AccessPolicy getAccessPolicy();
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthenticationPolicy.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthPolicy.java
similarity index 95%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthenticationPolicy.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthPolicy.java
index d3e8399..c4beae1 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthenticationPolicy.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthPolicy.java
@@ -22,7 +22,7 @@ import org.apache.syncope.core.persistence.api.entity.Implementation;
import java.util.List;
-public interface AuthenticationPolicy extends Policy {
+public interface AuthPolicy extends Policy {
String getName();
diff --git a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
index c8a5d7c..07f3fdb 100644
--- a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
@@ -45,13 +45,13 @@ under the License.
<PasswordPolicyRule policy_id="55e5de0b-c79c-4e66-adda-251b6fb8579a" implementation_id="DefaultPasswordRuleConf3"/>
<!-- authentication policies -->
- <Implementation id="MyDefaultAuthenticationPolicyConf" type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
- body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf","authenticationModules":["LdapAuthenticationTest"]}'/>
- <AuthenticationPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4" name="MyDefaultAuthenticationPolicyConf"
- description="an authentication policy" />
- <AuthenticationPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028" name="DefaultAuthenticationPolicy"
- description="Default authentication policy"/>
- <AuthenticationModule id="be456831-593d-4003-b273-4c3fb61700df" name="DefaultAuthenticationModule"/>
+ <Implementation id="MyDefaultAuthPolicyConf" type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
+ body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
+ <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4" name="MyDefaultAuthPolicyConf"
+ description="an authentication policy" />
+ <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028" name="DefaultAuthPolicy"
+ description="Default authentication policy"/>
+ <AuthModule id="be456831-593d-4003-b273-4c3fb61700df" name="DefaultAuthModule"/>
<!-- access policies -->
<Implementation id="MyDefaultAccessPolicyConf" type="ACCESS_POLICY_CONFIGURATIONS" engine="JAVA"
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPolicyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPolicyDAO.java
index 6ee0369..cb7effa 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPolicyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPolicyDAO.java
@@ -25,7 +25,6 @@ import org.apache.syncope.core.persistence.api.entity.Implementation;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PullPolicy;
@@ -35,7 +34,7 @@ import org.apache.syncope.core.persistence.jpa.entity.policy.AbstractPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccessPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccountPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAttrReleasePolicy;
-import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthenticationPolicy;
+import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPasswordPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPullCorrelationRuleEntity;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPullPolicy;
@@ -48,6 +47,7 @@ import org.springframework.stereotype.Repository;
import javax.persistence.TypedQuery;
import java.util.List;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Repository
public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@@ -62,20 +62,20 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
private static <T extends Policy> Class<? extends AbstractPolicy> getEntityReference(final Class<T> reference) {
return AccountPolicy.class.isAssignableFrom(reference)
- ? JPAAccountPolicy.class
- : PasswordPolicy.class.isAssignableFrom(reference)
- ? JPAPasswordPolicy.class
- : PullPolicy.class.isAssignableFrom(reference)
- ? JPAPullPolicy.class
- : PushPolicy.class.isAssignableFrom(reference)
- ? JPAPushPolicy.class
- : AuthenticationPolicy.class.isAssignableFrom(reference)
- ? JPAAuthenticationPolicy.class
- : AccessPolicy.class.isAssignableFrom(reference)
- ? JPAAccessPolicy.class
- : AttrReleasePolicy.class.isAssignableFrom(reference)
- ? JPAAttrReleasePolicy.class
- : null;
+ ? JPAAccountPolicy.class
+ : PasswordPolicy.class.isAssignableFrom(reference)
+ ? JPAPasswordPolicy.class
+ : PullPolicy.class.isAssignableFrom(reference)
+ ? JPAPullPolicy.class
+ : PushPolicy.class.isAssignableFrom(reference)
+ ? JPAPushPolicy.class
+ : AuthPolicy.class.isAssignableFrom(reference)
+ ? JPAAuthPolicy.class
+ : AccessPolicy.class.isAssignableFrom(reference)
+ ? JPAAccessPolicy.class
+ : AttrReleasePolicy.class.isAssignableFrom(reference)
+ ? JPAAttrReleasePolicy.class
+ : null;
}
@SuppressWarnings("unchecked")
@@ -87,7 +87,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public <T extends Policy> List<T> find(final Class<T> reference) {
TypedQuery<T> query = entityManager().createQuery(
- "SELECT e FROM " + getEntityReference(reference).getSimpleName() + " e", reference);
+ "SELECT e FROM " + getEntityReference(reference).getSimpleName() + " e", reference);
return query.getResultList();
}
@@ -95,7 +95,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<AccountPolicy> findByAccountRule(final Implementation accountRule) {
TypedQuery<AccountPolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAccountPolicy.class.getSimpleName() + " e "
+ "SELECT e FROM " + JPAAccountPolicy.class.getSimpleName() + " e "
+ "WHERE :accountRule MEMBER OF e.rules", AccountPolicy.class);
query.setParameter("accountRule", accountRule);
@@ -105,7 +105,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<PasswordPolicy> findByPasswordRule(final Implementation passwordRule) {
TypedQuery<PasswordPolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAPasswordPolicy.class.getSimpleName() + " e "
+ "SELECT e FROM " + JPAPasswordPolicy.class.getSimpleName() + " e "
+ "WHERE :passwordRule MEMBER OF e.rules", PasswordPolicy.class);
query.setParameter("passwordRule", passwordRule);
@@ -115,7 +115,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<PullPolicy> findByPullCorrelationRule(final Implementation correlationRule) {
TypedQuery<PullPolicy> query = entityManager().createQuery(
- "SELECT DISTINCT e.pullPolicy FROM " + JPAPullCorrelationRuleEntity.class.getSimpleName() + " e "
+ "SELECT DISTINCT e.pullPolicy FROM " + JPAPullCorrelationRuleEntity.class.getSimpleName() + " e "
+ "WHERE e.implementation=:correlationRule", PullPolicy.class);
query.setParameter("correlationRule", correlationRule);
@@ -123,18 +123,18 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
}
@Override
- public List<AuthenticationPolicy> findByAuthenticationPolicy(final Implementation policy) {
- TypedQuery<AuthenticationPolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAuthenticationPolicy.class.getSimpleName() + " e "
- + "WHERE :authenticationPolicy MEMBER OF e.rules", AuthenticationPolicy.class);
- query.setParameter("authenticationPolicy", policy);
+ public List<AuthPolicy> findByAuthPolicy(final Implementation policy) {
+ TypedQuery<AuthPolicy> query = entityManager().createQuery("SELECT e FROM " + JPAAuthPolicy.class.
+ getSimpleName() + " e "
+ + "WHERE :authPolicy MEMBER OF e.rules", AuthPolicy.class);
+ query.setParameter("authPolicy", policy);
return query.getResultList();
}
@Override
public List<AccessPolicy> findByAccessPolicy(final Implementation policy) {
- TypedQuery<AccessPolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAuthenticationPolicy.class.getSimpleName() + " e "
+ TypedQuery<AccessPolicy> query = entityManager().createQuery("SELECT e FROM " + JPAAuthPolicy.class.
+ getSimpleName() + " e "
+ "WHERE :accessPolicy MEMBER OF e.rules", AccessPolicy.class);
query.setParameter("accessPolicy", policy);
return query.getResultList();
@@ -143,7 +143,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<AttrReleasePolicy> findByAttrReleasePolicy(final Implementation policy) {
TypedQuery<AttrReleasePolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAttrReleasePolicy.class.getSimpleName() + " e "
+ "SELECT e FROM " + JPAAttrReleasePolicy.class.getSimpleName() + " e "
+ "WHERE :attrReleasePolicy MEMBER OF e.rules", AttrReleasePolicy.class);
query.setParameter("attrReleasePolicy", policy);
return query.getResultList();
@@ -152,7 +152,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<PushPolicy> findByPushCorrelationRule(final Implementation correlationRule) {
TypedQuery<PushPolicy> query = entityManager().createQuery(
- "SELECT DISTINCT e.pushPolicy FROM " + JPAPushCorrelationRuleEntity.class.getSimpleName() + " e "
+ "SELECT DISTINCT e.pushPolicy FROM " + JPAPushCorrelationRuleEntity.class.getSimpleName() + " e "
+ "WHERE e.implementation=:correlationRule", PushPolicy.class);
query.setParameter("correlationRule", correlationRule);
@@ -162,7 +162,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<AccountPolicy> findByResource(final ExternalResource resource) {
TypedQuery<AccountPolicy> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAccountPolicy.class.getSimpleName() + " e "
+ "SELECT e FROM " + JPAAccountPolicy.class.getSimpleName() + " e "
+ "WHERE :resource MEMBER OF e.resources", AccountPolicy.class);
query.setParameter("resource", resource);
@@ -172,7 +172,7 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
@Override
public List<Policy> findAll() {
TypedQuery<Policy> query = entityManager().createQuery(
- "SELECT e FROM " + AbstractPolicy.class.getSimpleName() + " e", Policy.class);
+ "SELECT e FROM " + AbstractPolicy.class.getSimpleName() + " e", Policy.class);
return query.getResultList();
}
@@ -189,18 +189,18 @@ public class JPAPolicyDAO extends AbstractDAO<Policy> implements PolicyDAO {
realm.setAccountPolicy(null);
} else if (policy instanceof PasswordPolicy) {
realm.setPasswordPolicy(null);
- } else if (policy instanceof AuthenticationPolicy) {
- realm.setAuthenticationPolicy(null);
+ } else if (policy instanceof AuthPolicy) {
+ realm.setAuthPolicy(null);
} else if (policy instanceof AccessPolicy) {
realm.setAccessPolicy(null);
} else if (policy instanceof AttrReleasePolicy) {
realm.setAttrReleasePolicy(null);
}
});
-
- if (!(policy instanceof AuthenticationPolicy)
- && !(policy instanceof AttrReleasePolicy)
- && !(policy instanceof AccessPolicy)) {
+
+ if (!(policy instanceof AuthPolicy)
+ && !(policy instanceof AttrReleasePolicy)
+ && !(policy instanceof AccessPolicy)) {
resourceDAO.findByPolicy(policy).forEach(resource -> {
if (policy instanceof AccountPolicy) {
resource.setAccountPolicy(null);
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
index f98bba4..b0abd08 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
@@ -34,7 +34,6 @@ import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.ProvisioningPolicy;
@@ -44,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Repository
public class JPARealmDAO extends AbstractDAO<Realm> implements RealmDAO {
@@ -155,8 +155,8 @@ public class JPARealmDAO extends AbstractDAO<Realm> implements RealmDAO {
policyColumn = "accountPolicy";
} else if (policy instanceof PasswordPolicy) {
policyColumn = "passwordPolicy";
- } else if (policy instanceof AuthenticationPolicy) {
- policyColumn = "authenticationPolicy";
+ } else if (policy instanceof AuthPolicy) {
+ policyColumn = "authPolicy";
} else if (policy instanceof AccessPolicy) {
policyColumn = "accessPolicy";
} else if (policy instanceof AttrReleasePolicy) {
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthenticationModuleDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
similarity index 58%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthenticationModuleDAO.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
index 9e5930b..5a9679f 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthenticationModuleDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAAuthModuleDAO.java
@@ -18,63 +18,61 @@
*/
package org.apache.syncope.core.persistence.jpa.dao.authentication;
-import org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationModuleDAO;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
import org.apache.syncope.core.persistence.jpa.dao.AbstractDAO;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthenticationModule;
+import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthModule;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
-
import javax.persistence.TypedQuery;
-
import java.util.List;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.core.persistence.api.dao.authentication.AuthModuleDAO;
@Repository
-public class JPAAuthenticationModuleDAO extends AbstractDAO<AuthenticationModule> implements AuthenticationModuleDAO {
+public class JPAAuthModuleDAO extends AbstractDAO<AuthModule> implements AuthModuleDAO {
@Override
- public AuthenticationModule find(final String key) {
- return entityManager().find(JPAAuthenticationModule.class, key);
+ public AuthModule find(final String key) {
+ return entityManager().find(JPAAuthModule.class, key);
}
@Transactional(readOnly = true)
@Override
- public List<AuthenticationModule> findAll() {
- TypedQuery<AuthenticationModule> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAuthenticationModule.class.getSimpleName() + " e", AuthenticationModule.class);
+ public List<AuthModule> findAll() {
+ TypedQuery<AuthModule> query = entityManager().createQuery("SELECT e FROM " + JPAAuthModule.class.
+ getSimpleName() + " e", AuthModule.class);
return query.getResultList();
}
@Transactional(readOnly = true)
@Override
- public List<AuthenticationModule> findByConfiguration(final Implementation configuration) {
- TypedQuery<AuthenticationModule> query = entityManager().createQuery(
- "SELECT e FROM " + JPAAuthenticationModule.class.getSimpleName() + " e "
- + "WHERE :configuration MEMBER OF e.configurations", AuthenticationModule.class);
+ public List<AuthModule> findByConfiguration(final Implementation configuration) {
+ TypedQuery<AuthModule> query = entityManager().createQuery("SELECT e FROM " + JPAAuthModule.class.
+ getSimpleName() + " e "
+ + "WHERE :configuration MEMBER OF e.configurations", AuthModule.class);
query.setParameter("configuration", configuration);
return query.getResultList();
}
@Override
- public AuthenticationModule save(final AuthenticationModule authenticationModule) {
- return entityManager().merge(authenticationModule);
+ public AuthModule save(final AuthModule authModule) {
+ return entityManager().merge(authModule);
}
@Override
public void delete(final String key) {
- AuthenticationModule authenticationModule = find(key);
- if (authenticationModule == null) {
+ AuthModule authModule = find(key);
+ if (authModule == null) {
return;
}
- delete(authenticationModule);
+ delete(authModule);
}
@Override
- public void delete(final AuthenticationModule authenticationModule) {
- entityManager().remove(authenticationModule);
+ public void delete(final AuthModule authModule) {
+ entityManager().remove(authModule);
}
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
index 2dc357a..258485d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAEntityFactory.java
@@ -56,7 +56,6 @@ import org.apache.syncope.core.persistence.api.entity.anyobject.APlainAttrUnique
import org.apache.syncope.core.persistence.api.entity.anyobject.APlainAttrValue;
import org.apache.syncope.core.persistence.api.entity.anyobject.ARelationship;
import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import org.apache.syncope.core.persistence.api.entity.group.GPlainAttr;
@@ -67,7 +66,6 @@ import org.apache.syncope.core.persistence.api.entity.group.TypeExtension;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PullCorrelationRuleEntity;
import org.apache.syncope.core.persistence.api.entity.policy.PullPolicy;
@@ -108,7 +106,7 @@ import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAPlainAttrUni
import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAPlainAttrValue;
import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAARelationship;
import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAnyObject;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthenticationModule;
+import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAAuthModule;
import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAOIDCRelyingParty;
import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2ServiceProvider;
import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttr;
@@ -119,7 +117,7 @@ import org.apache.syncope.core.persistence.jpa.entity.group.JPATypeExtension;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccessPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccountPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAttrReleasePolicy;
-import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthenticationPolicy;
+import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPasswordPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPullCorrelationRuleEntity;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAPullPolicy;
@@ -153,6 +151,8 @@ import org.apache.syncope.core.persistence.jpa.entity.user.JPAUPlainAttrValue;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAURelationship;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAUser;
import org.apache.syncope.core.spring.security.SecureRandomUtils;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
public class JPAEntityFactory implements EntityFactory {
@@ -305,13 +305,13 @@ public class JPAEntityFactory implements EntityFactory {
result = (E) new JPABatch();
} else if (reference.equals(GatewayRoute.class)) {
result = (E) new JPAGatewayRoute();
- } else if (reference.equals(AuthenticationModule.class)) {
- result = (E) new JPAAuthenticationModule();
- } else if (reference.equals(AuthenticationPolicy.class)) {
- result = (E) new JPAAuthenticationPolicy();
- } else if (reference.equals(AccessPolicy.class)) {
+ } else if (reference.equals(AuthModule.class)) {
+ result = (E) new JPAAuthModule();
+ } else if (reference.equals(AuthPolicy.class)) {
+ result = (E) new JPAAuthPolicy();
+ } else if (reference.equals(AccessPolicy.class)) {
result = (E) new JPAAccessPolicy();
- } else if (reference.equals(AttrReleasePolicy.class)) {
+ } else if (reference.equals(AttrReleasePolicy.class)) {
result = (E) new JPAAttrReleasePolicy();
} else if (reference.equals(OIDCRelyingParty.class)) {
result = (E) new JPAOIDCRelyingParty();
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPARealm.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPARealm.java
index 91633d4..f520d5e 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPARealm.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPARealm.java
@@ -53,9 +53,9 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccessPolicy;
-import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthenticationPolicy;
+import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Entity
@Table(name = JPARealm.TABLE, uniqueConstraints =
@@ -81,7 +81,7 @@ public class JPARealm extends AbstractGeneratedKeyEntity implements Realm {
private JPAAccountPolicy accountPolicy;
@ManyToOne(fetch = FetchType.EAGER)
- private JPAAuthenticationPolicy authenticationPolicy;
+ private JPAAuthPolicy authPolicy;
@ManyToOne(fetch = FetchType.EAGER)
private JPAAccessPolicy accessPolicy;
@@ -162,14 +162,14 @@ public class JPARealm extends AbstractGeneratedKeyEntity implements Realm {
}
@Override
- public AuthenticationPolicy getAuthenticationPolicy() {
- return authenticationPolicy;
+ public AuthPolicy getAuthPolicy() {
+ return authPolicy;
}
@Override
- public void setAuthenticationPolicy(final AuthenticationPolicy authenticationPolicy) {
- checkType(authenticationPolicy, JPAAuthenticationPolicy.class);
- this.authenticationPolicy = (JPAAuthenticationPolicy) authenticationPolicy;
+ public void setAuthPolicy(final AuthPolicy authPolicy) {
+ checkType(authPolicy, JPAAuthPolicy.class);
+ this.authPolicy = (JPAAuthPolicy) authPolicy;
}
@Override
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
index 0934236..a115d02 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
@@ -21,17 +21,17 @@ package org.apache.syncope.core.persistence.jpa.entity.authentication;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.jpa.entity.AbstractGeneratedKeyEntity;
import org.apache.syncope.core.persistence.jpa.entity.JPARealm;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAttrReleasePolicy;
-import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthenticationPolicy;
+import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAuthPolicy;
import org.apache.syncope.core.persistence.jpa.entity.policy.JPAAccessPolicy;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@MappedSuperclass
public class AbstractClientApp extends AbstractGeneratedKeyEntity implements ClientApp {
@@ -46,9 +46,9 @@ public class AbstractClientApp extends AbstractGeneratedKeyEntity implements Cli
@ManyToOne(fetch = FetchType.EAGER)
private JPARealm realm;
-
+
@ManyToOne(fetch = FetchType.EAGER)
- private JPAAuthenticationPolicy authenticationPolicy;
+ private JPAAuthPolicy authPolicy;
@ManyToOne(fetch = FetchType.EAGER)
private JPAAccessPolicy accessPolicy;
@@ -77,14 +77,14 @@ public class AbstractClientApp extends AbstractGeneratedKeyEntity implements Cli
}
@Override
- public JPAAuthenticationPolicy getAuthenticationPolicy() {
- return authenticationPolicy;
+ public JPAAuthPolicy getAuthPolicy() {
+ return authPolicy;
}
@Override
- public void setAuthenticationPolicy(final AuthenticationPolicy authenticationPolicy) {
- checkType(authenticationPolicy, JPAAuthenticationPolicy.class);
- this.authenticationPolicy = (JPAAuthenticationPolicy) authenticationPolicy;
+ public void setAuthPolicy(final AuthPolicy authPolicy) {
+ checkType(authPolicy, JPAAuthPolicy.class);
+ this.authPolicy = (JPAAuthPolicy) authPolicy;
}
public JPAAccessPolicy getAccessPolicy() {
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthenticationModule.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
similarity index 83%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthenticationModule.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
index 33d0e98..7a0ed2f 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthenticationModule.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAAuthModule.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persistence.jpa.entity.authentication;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
import org.apache.syncope.core.persistence.jpa.entity.AbstractGeneratedKeyEntity;
import org.apache.syncope.core.persistence.jpa.entity.JPAImplementation;
@@ -34,12 +33,13 @@ import javax.persistence.Table;
import java.util.ArrayList;
import java.util.List;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
@Entity
-@Table(name = JPAAuthenticationModule.TABLE)
-public class JPAAuthenticationModule extends AbstractGeneratedKeyEntity implements AuthenticationModule {
+@Table(name = JPAAuthModule.TABLE)
+public class JPAAuthModule extends AbstractGeneratedKeyEntity implements AuthModule {
- public static final String TABLE = "AuthenticationModule";
+ public static final String TABLE = "AuthModule";
private static final long serialVersionUID = 7422422526695279794L;
@@ -48,10 +48,10 @@ public class JPAAuthenticationModule extends AbstractGeneratedKeyEntity implemen
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = TABLE + "Conf",
- joinColumns =
- @JoinColumn(name = "authentication_module_id"),
- inverseJoinColumns =
- @JoinColumn(name = "implementation_id"))
+ joinColumns =
+ @JoinColumn(name = "authentication_module_id"),
+ inverseJoinColumns =
+ @JoinColumn(name = "implementation_id"))
private List<JPAImplementation> configurations = new ArrayList<>();
@Override
@@ -74,6 +74,6 @@ public class JPAAuthenticationModule extends AbstractGeneratedKeyEntity implemen
checkType(configuration, JPAImplementation.class);
checkImplementationType(configuration, AMImplementationType.AUTH_MODULE_CONFIGURATIONS);
return configurations.contains((JPAImplementation) configuration)
- || configurations.add((JPAImplementation) configuration);
+ || configurations.add((JPAImplementation) configuration);
}
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthenticationPolicy.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthPolicy.java
similarity index 92%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthenticationPolicy.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthPolicy.java
index f0125b3..553c40c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthenticationPolicy.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAAuthPolicy.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persistence.jpa.entity.policy;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.jpa.entity.JPAImplementation;
import javax.persistence.Column;
@@ -34,12 +33,13 @@ import javax.persistence.UniqueConstraint;
import java.util.ArrayList;
import java.util.List;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Entity
-@Table(name = JPAAuthenticationPolicy.TABLE)
-public class JPAAuthenticationPolicy extends AbstractPolicy implements AuthenticationPolicy {
+@Table(name = JPAAuthPolicy.TABLE)
+public class JPAAuthPolicy extends AbstractPolicy implements AuthPolicy {
- public static final String TABLE = "AuthenticationPolicy";
+ public static final String TABLE = "AuthPolicy";
private static final long serialVersionUID = -4190607009908888884L;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtils.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtils.java
index 4e7905a..3e0c7b3 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtils.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/policy/JPAPolicyUtils.java
@@ -22,12 +22,12 @@ 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;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PolicyUtils;
import org.apache.syncope.core.persistence.api.entity.policy.PullPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PushPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
public class JPAPolicyUtils implements PolicyUtils {
@@ -55,7 +55,7 @@ public class JPAPolicyUtils implements PolicyUtils {
return PullPolicy.class;
case AUTHENTICATION:
- return AuthenticationPolicy.class;
+ return AuthPolicy.class;
case ATTR_RELEASE:
return AttrReleasePolicy.class;
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 205f371..711b6d1 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
@@ -25,12 +25,11 @@ 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.to.AttrReleasePolicyTO;
-import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
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;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PolicyUtils;
@@ -38,6 +37,7 @@ import org.apache.syncope.core.persistence.api.entity.policy.PolicyUtilsFactory;
import org.springframework.stereotype.Component;
import org.apache.syncope.core.persistence.api.entity.policy.PullPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PushPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class JPAPolicyUtilsFactory implements PolicyUtilsFactory {
@@ -58,7 +58,7 @@ public class JPAPolicyUtilsFactory implements PolicyUtilsFactory {
type = PolicyType.PULL;
} else if (policy instanceof PushPolicy) {
type = PolicyType.PUSH;
- } else if (policy instanceof AuthenticationPolicy) {
+ } else if (policy instanceof AuthPolicy) {
type = PolicyType.AUTHENTICATION;
} else if (policy instanceof AccessPolicy) {
type = PolicyType.ACCESS;
@@ -82,7 +82,7 @@ public class JPAPolicyUtilsFactory implements PolicyUtilsFactory {
type = PolicyType.PULL;
} else if (policyClass == PushPolicyTO.class) {
type = PolicyType.PUSH;
- } else if (policyClass == AuthenticationPolicyTO.class) {
+ } else if (policyClass == AuthPolicyTO.class) {
type = PolicyType.AUTHENTICATION;
} else if (policyClass == AccessPolicyTO.class) {
type = PolicyType.ACCESS;
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 5156a7a..9c20b25 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
@@ -22,14 +22,14 @@ import java.util.List;
import java.util.Map;
import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
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;
import org.apache.syncope.core.persistence.api.entity.Implementation;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
import org.apache.syncope.core.persistence.jpa.AbstractTest;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
@@ -51,7 +51,7 @@ public class AbstractClientAppTest extends AbstractTest {
AllowedAttrReleasePolicyConf conf = new AllowedAttrReleasePolicyConf();
conf.setName("Example Attr Rel Policy for an application");
conf.getAllowedAttributes().addAll(List.of("cn", "givenName"));
-
+
Implementation type = entityFactory.newEntity(Implementation.class);
type.setKey("AttrRelPolicyTest");
type.setEngine(ImplementationEngine.JAVA);
@@ -86,13 +86,13 @@ public class AbstractClientAppTest extends AbstractTest {
}
- protected AuthenticationPolicy buildAndSaveAuthenticationPolicy() {
- AuthenticationPolicy authenticationPolicy = entityFactory.newEntity(AuthenticationPolicy.class);
- authenticationPolicy.setName("AuthenticationPolicyTest");
- authenticationPolicy.setDescription("This is a sample authentication policy");
+ protected AuthPolicy buildAndSaveAuthPolicy() {
+ AuthPolicy authPolicy = entityFactory.newEntity(AuthPolicy.class);
+ authPolicy.setName("AuthPolicyTest");
+ authPolicy.setDescription("This is a sample authentication policy");
- DefaultAuthenticationPolicyConf conf = new DefaultAuthenticationPolicyConf();
- conf.getAuthenticationModules().addAll(List.of("LdapAuthentication1", "DatabaseAuthentication2"));
+ DefaultAuthPolicyConf conf = new DefaultAuthPolicyConf();
+ conf.getAuthModules().addAll(List.of("LdapAuthentication1", "DatabaseAuthentication2"));
Implementation type = entityFactory.newEntity(Implementation.class);
type.setKey("AuthPolicyConfKey");
@@ -101,8 +101,8 @@ public class AbstractClientAppTest extends AbstractTest {
type.setBody(POJOHelper.serialize(conf));
type = implementationDAO.save(type);
- authenticationPolicy.addConfiguration(type);
- return policyDAO.save(authenticationPolicy);
+ authPolicy.addConfiguration(type);
+ return policyDAO.save(authPolicy);
}
}
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/AuthModuleTest.java
similarity index 66%
rename from core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthenticationModuleTest.java
rename to core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
index b757ca7..2f641fb 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/AuthModuleTest.java
@@ -18,61 +18,60 @@
*/
package org.apache.syncope.core.persistence.jpa.inner;
-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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.apache.syncope.common.lib.authentication.module.GoogleMfaAuthModuleConf;
+import org.apache.syncope.common.lib.authentication.module.JaasAuthModuleConf;
+import org.apache.syncope.common.lib.authentication.module.LDAPAuthModuleConf;
+import org.apache.syncope.common.lib.authentication.module.StaticAuthModuleConf;
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;
-import org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationModuleDAO;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
import org.apache.syncope.core.persistence.jpa.AbstractTest;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-
import java.util.List;
import java.util.Map;
import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
+import org.apache.syncope.core.persistence.api.dao.authentication.AuthModuleDAO;
@Transactional("Master")
-public class AuthenticationModuleTest extends AbstractTest {
+public class AuthModuleTest extends AbstractTest {
@Autowired
- private AuthenticationModuleDAO authenticationModuleDAO;
+ private AuthModuleDAO authModuleDAO;
@Autowired
private ImplementationDAO implementationDAO;
@Test
public void find() {
- AuthenticationModule module = authenticationModuleDAO.find(
+ AuthModule module = authModuleDAO.find(
"be456831-593d-4003-b273-4c3fb61700df");
assertNotNull(module);
- module = authenticationModuleDAO.find(UUID.randomUUID().toString());
+ module = authModuleDAO.find(UUID.randomUUID().toString());
assertNull(module);
}
@Test
public void findAll() {
- List<AuthenticationModule> modules = authenticationModuleDAO.findAll();
+ List<AuthModule> modules = authModuleDAO.findAll();
assertNotNull(modules);
assertEquals(1, modules.size());
}
@Test
public void saveWithPredefinedModule() {
- StaticAuthenticationModuleConf conf =
- new StaticAuthenticationModuleConf(Map.of("user", UUID.randomUUID().toString()));
+ StaticAuthModuleConf conf =
+ new StaticAuthModuleConf(Map.of("user", UUID.randomUUID().toString()));
Implementation config = getImplementation(conf);
@@ -81,20 +80,20 @@ public class AuthenticationModuleTest extends AbstractTest {
assertNotNull(config);
assertNotNull(config.getKey());
- AuthenticationModule module = entityFactory.newEntity(AuthenticationModule.class);
- module.setName("AuthenticationModuleTest");
+ AuthModule module = entityFactory.newEntity(AuthModule.class);
+ module.setName("AuthModuleTest");
module.add(config);
- authenticationModuleDAO.save(module);
+ authModuleDAO.save(module);
assertNotNull(module);
assertNotNull(module.getKey());
- assertNotNull(authenticationModuleDAO.find(module.getKey()));
+ assertNotNull(authModuleDAO.find(module.getKey()));
}
@Test
public void saveWithJaasModule() {
- JaasAuthenticationModuleConf conf = new JaasAuthenticationModuleConf();
+ JaasAuthModuleConf conf = new JaasAuthModuleConf();
conf.setKerberosKdcSystemProperty("sample-value");
conf.setKerberosRealmSystemProperty("sample-value");
conf.setLoginConfigType("JavaLoginConfig");
@@ -107,20 +106,20 @@ public class AuthenticationModuleTest extends AbstractTest {
assertNotNull(config);
assertNotNull(config.getKey());
- AuthenticationModule module = entityFactory.newEntity(AuthenticationModule.class);
- module.setName("AuthenticationModuleTest");
+ AuthModule module = entityFactory.newEntity(AuthModule.class);
+ module.setName("AuthModuleTest");
module.add(config);
- authenticationModuleDAO.save(module);
+ authModuleDAO.save(module);
assertNotNull(module);
assertNotNull(module.getKey());
- assertNotNull(authenticationModuleDAO.find(module.getKey()));
+ assertNotNull(authModuleDAO.find(module.getKey()));
}
@Test
public void saveWithLdapModule() {
- LDAPAuthenticationModuleConf conf = new LDAPAuthenticationModuleConf();
+ LDAPAuthModuleConf conf = new LDAPAuthModuleConf();
conf.getAttributes().addAll(List.of("cn", "uid"));
conf.setBaseDn("dc=example,dc=org");
conf.setSearchFilter("cn={user}");
@@ -136,21 +135,21 @@ public class AuthenticationModuleTest extends AbstractTest {
assertNotNull(config);
assertNotNull(config.getKey());
- AuthenticationModule module = entityFactory.newEntity(AuthenticationModule.class);
- module.setName("AuthenticationModuleTest");
+ AuthModule module = entityFactory.newEntity(AuthModule.class);
+ module.setName("AuthModuleTest");
module.add(config);
- authenticationModuleDAO.save(module);
+ authModuleDAO.save(module);
assertNotNull(module);
assertNotNull(module.getKey());
- assertNotNull(authenticationModuleDAO.find(module.getKey()));
+ assertNotNull(authModuleDAO.find(module.getKey()));
}
@Test
public void saveWithGoogleAuthenticatorModule() {
- GoogleMfaAuthenticationModuleConf conf =
- new GoogleMfaAuthenticationModuleConf();
+ GoogleMfaAuthModuleConf conf =
+ new GoogleMfaAuthModuleConf();
conf.setCodeDigits(6);
conf.setIssuer("SyncopeTest");
conf.setLabel("Syncope");
@@ -163,18 +162,18 @@ public class AuthenticationModuleTest extends AbstractTest {
assertNotNull(config);
assertNotNull(config.getKey());
- AuthenticationModule module = entityFactory.newEntity(AuthenticationModule.class);
- module.setName("AuthenticationModuleTest");
+ AuthModule module = entityFactory.newEntity(AuthModule.class);
+ module.setName("AuthModuleTest");
module.add(config);
- authenticationModuleDAO.save(module);
+ authModuleDAO.save(module);
assertNotNull(module);
assertNotNull(module.getKey());
- assertNotNull(authenticationModuleDAO.find(module.getKey()));
+ assertNotNull(authModuleDAO.find(module.getKey()));
}
- private Implementation getImplementation(final AuthenticationModuleConf conf) {
+ private Implementation getImplementation(final AuthModuleConf conf) {
Implementation config = entityFactory.newEntity(Implementation.class);
config.setKey(UUID.randomUUID().toString());
config.setEngine(ImplementationEngine.JAVA);
@@ -185,14 +184,13 @@ public class AuthenticationModuleTest extends AbstractTest {
@Test
public void delete() {
- AuthenticationModule athAuthenticationModule = authenticationModuleDAO.find(
- "be456831-593d-4003-b273-4c3fb61700df");
- assertNotNull(athAuthenticationModule);
+ AuthModule authModule = authModuleDAO.find("be456831-593d-4003-b273-4c3fb61700df");
+ assertNotNull(authModule);
- authenticationModuleDAO.delete("be456831-593d-4003-b273-4c3fb61700df");
+ authModuleDAO.delete("be456831-593d-4003-b273-4c3fb61700df");
- athAuthenticationModule = authenticationModuleDAO.find("be456831-593d-4003-b273-4c3fb61700df");
- assertNull(athAuthenticationModule);
+ authModule = authModuleDAO.find("be456831-593d-4003-b273-4c3fb61700df");
+ assertNull(authModule);
}
}
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
index db764cc..a997fc7 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.jpa.inner;
import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRelyingPartyDAO;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +29,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
+
@Transactional("Master")
public class OIDCRelyingPartyTest extends AbstractClientAppTest {
@@ -49,8 +50,8 @@ public class OIDCRelyingPartyTest extends AbstractClientAppTest {
AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
rp.setAccessPolicy(accessPolicy);
- AuthenticationPolicy authPolicy = buildAndSaveAuthenticationPolicy();
- rp.setAuthenticationPolicy(authPolicy);
+ AuthPolicy authPolicy = buildAndSaveAuthPolicy();
+ rp.setAuthPolicy(authPolicy);
openIdConnectRelyingPartyDAO.save(rp);
@@ -62,7 +63,7 @@ public class OIDCRelyingPartyTest extends AbstractClientAppTest {
rp = openIdConnectRelyingPartyDAO.findByClientId("clientid");
assertNotNull(rp);
- assertNotNull(rp.getAuthenticationPolicy());
+ assertNotNull(rp.getAuthPolicy());
rp = openIdConnectRelyingPartyDAO.findByName("OIDC");
assertNotNull(rp);
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
index 39fa8f0..8f42058 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PolicyTest.java
@@ -20,8 +20,8 @@ package org.apache.syncope.core.persistence.jpa.inner;
import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
-import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyCriteriaConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyCriteriaConf;
import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
import org.apache.syncope.common.lib.policy.DefaultPullCorrelationRuleConf;
import org.apache.syncope.common.lib.policy.DefaultPushCorrelationRuleConf;
@@ -37,7 +37,6 @@ import org.apache.syncope.core.persistence.api.dao.PullCorrelationRule;
import org.apache.syncope.core.persistence.api.entity.Implementation;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PullCorrelationRuleEntity;
@@ -56,6 +55,8 @@ import java.util.UUID;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
+
@Transactional("Master")
public class PolicyTest extends AbstractTest {
@@ -107,12 +108,12 @@ public class PolicyTest extends AbstractTest {
accessPolicy = policyDAO.find(UUID.randomUUID().toString());
assertNull(accessPolicy);
- AuthenticationPolicy authenticationPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
- assertNotNull(authenticationPolicy);
- authenticationPolicy = policyDAO.find("659b9906-4b6e-4bc0-aca0-6809dff346d4");
- assertNotNull(authenticationPolicy);
- authenticationPolicy = policyDAO.find(UUID.randomUUID().toString());
- assertNull(authenticationPolicy);
+ AuthPolicy authPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
+ assertNotNull(authPolicy);
+ authPolicy = policyDAO.find("659b9906-4b6e-4bc0-aca0-6809dff346d4");
+ assertNotNull(authPolicy);
+ authPolicy = policyDAO.find(UUID.randomUUID().toString());
+ assertNull(authPolicy);
AttrReleasePolicy attrReleasePolicy = policyDAO.find("019935c7-deb3-40b3-8a9a-683037e523a2");
assertNull(attrReleasePolicy);
@@ -127,14 +128,15 @@ public class PolicyTest extends AbstractTest {
public void findByPolicyImpl() {
AccessPolicy accessPolicy = policyDAO.find("419935c7-deb3-40b3-8a9a-683037e523a2");
assertNotNull(accessPolicy);
- AuthenticationPolicy authenticationPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
- assertNotNull(authenticationPolicy);
+ AuthPolicy authPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
+ assertNotNull(authPolicy);
AttrReleasePolicy attrReleasePolicy = policyDAO.find("319935c7-deb3-40b3-8a9a-683037e523a2");
assertNotNull(attrReleasePolicy);
accessPolicy.getConfigurations().forEach(cfg -> assertFalse(policyDAO.findByAccessPolicy(cfg).isEmpty()));
- authenticationPolicy.getConfigurations().forEach(cfg -> assertFalse(policyDAO.findByAuthenticationPolicy(cfg).isEmpty()));
- attrReleasePolicy.getConfigurations().forEach(cfg -> assertFalse(policyDAO.findByAttrReleasePolicy(cfg).isEmpty()));
+ authPolicy.getConfigurations().forEach(cfg -> assertFalse(policyDAO.findByAuthPolicy(cfg).isEmpty()));
+ attrReleasePolicy.getConfigurations().forEach(cfg -> assertFalse(policyDAO.findByAttrReleasePolicy(cfg).
+ isEmpty()));
}
@Test
@@ -147,9 +149,9 @@ public class PolicyTest extends AbstractTest {
assertNotNull(accessPolicies);
assertEquals(1, accessPolicies.size());
- List<AuthenticationPolicy> authenticationPolicies = policyDAO.find(AuthenticationPolicy.class);
- assertNotNull(authenticationPolicies);
- assertEquals(2, authenticationPolicies.size());
+ List<AuthPolicy> authPolicies = policyDAO.find(AuthPolicy.class);
+ assertNotNull(authPolicies);
+ assertEquals(2, authPolicies.size());
List<AttrReleasePolicy> attrReleasePolicies = policyDAO.find(AttrReleasePolicy.class);
assertNotNull(attrReleasePolicies);
@@ -225,13 +227,13 @@ public class PolicyTest extends AbstractTest {
assertEquals(afterCount, beforeCount + 1);
beforeCount = policyDAO.findAll().size();
- AuthenticationPolicy authenticationPolicy = entityFactory.newEntity(AuthenticationPolicy.class);
- authenticationPolicy.setName("AuthenticationPolicyTest");
- authenticationPolicy.setDescription("This is a sample authentication policy");
+ AuthPolicy authPolicy = entityFactory.newEntity(AuthPolicy.class);
+ authPolicy.setName("AuthPolicyTest");
+ authPolicy.setDescription("This is a sample authentication policy");
- DefaultAuthenticationPolicyConf authPolicyConf = new DefaultAuthenticationPolicyConf();
- authPolicyConf.getAuthenticationModules().addAll(List.of("LdapAuthentication1", "DatabaseAuthentication2"));
- DefaultAuthenticationPolicyCriteriaConf criteria = new DefaultAuthenticationPolicyCriteriaConf();
+ DefaultAuthPolicyConf authPolicyConf = new DefaultAuthPolicyConf();
+ authPolicyConf.getAuthModules().addAll(List.of("LdapAuthentication1", "DatabaseAuthentication2"));
+ DefaultAuthPolicyCriteriaConf criteria = new DefaultAuthPolicyCriteriaConf();
criteria.setName("DefaultConf");
criteria.setAll(true);
authPolicyConf.setCriteria(criteria);
@@ -242,11 +244,11 @@ public class PolicyTest extends AbstractTest {
authPolicyType.setBody(POJOHelper.serialize(authPolicyConf));
authPolicyType = implementationDAO.save(authPolicyType);
- authenticationPolicy.addConfiguration(authPolicyType);
- authenticationPolicy = policyDAO.save(authenticationPolicy);
+ authPolicy.addConfiguration(authPolicyType);
+ authPolicy = policyDAO.save(authPolicy);
- assertNotNull(authenticationPolicy);
- assertNotNull(authenticationPolicy.getKey());
+ assertNotNull(authPolicy);
+ assertNotNull(authPolicy.getKey());
afterCount = policyDAO.findAll().size();
assertEquals(afterCount, beforeCount + 1);
@@ -324,11 +326,11 @@ public class PolicyTest extends AbstractTest {
accessPolicy = policyDAO.find("419935c7-deb3-40b3-8a9a-683037e523a2");
assertNull(accessPolicy);
- AuthenticationPolicy authenticationPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
- assertNotNull(authenticationPolicy);
- policyDAO.delete(authenticationPolicy);
- authenticationPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
- assertNull(authenticationPolicy);
+ AuthPolicy authPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
+ assertNotNull(authPolicy);
+ policyDAO.delete(authPolicy);
+ authPolicy = policyDAO.find("b912a0d4-a890-416f-9ab8-84ab077eb028");
+ assertNull(authPolicy);
AttrReleasePolicy attrReleasepolicy = policyDAO.find("319935c7-deb3-40b3-8a9a-683037e523a2");
assertNotNull(attrReleasepolicy);
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
index 738e569..73722f4 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.jpa.inner;
import org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +29,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
+
@Transactional("Master")
public class SAML2ServiceProviderTest extends AbstractClientAppTest {
@@ -48,8 +49,8 @@ public class SAML2ServiceProviderTest extends AbstractClientAppTest {
AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
rp.setAccessPolicy(accessPolicy);
- AuthenticationPolicy authnPolicy = buildAndSaveAuthenticationPolicy();
- rp.setAuthenticationPolicy(authnPolicy);
+ AuthPolicy authnPolicy = buildAndSaveAuthPolicy();
+ rp.setAuthPolicy(authnPolicy);
saml2ServiceProviderDAO.save(rp);
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
index af3251f..4ab711d 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/PolicyTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.persistence.jpa.outer;
import org.apache.syncope.common.lib.SyncopeConstants;
@@ -26,7 +25,7 @@ import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
import org.apache.syncope.core.persistence.jpa.inner.AbstractClientAppTest;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
@Transactional("Master")
public class PolicyTest extends AbstractClientAppTest {
+
@Autowired
private OIDCRelyingPartyDAO openIdConnectRelyingPartyDAO;
@@ -53,7 +53,7 @@ public class PolicyTest extends AbstractClientAppTest {
public void policyCannotBeRemovedForApps() {
// Create new policy
AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
- AuthenticationPolicy authPolicy = buildAndSaveAuthenticationPolicy();
+ AuthPolicy authPolicy = buildAndSaveAuthPolicy();
// Create new client app and assign policy
OIDCRelyingParty rp = entityFactory.newEntity(OIDCRelyingParty.class);
@@ -62,7 +62,7 @@ public class PolicyTest extends AbstractClientAppTest {
rp.setClientId(UUID.randomUUID().toString());
rp.setClientSecret("secret");
rp.setAccessPolicy(accessPolicy);
- rp.setAuthenticationPolicy(authPolicy);
+ rp.setAuthPolicy(authPolicy);
rp = openIdConnectRelyingPartyDAO.save(rp);
assertNotNull(rp);
@@ -89,7 +89,7 @@ public class PolicyTest extends AbstractClientAppTest {
rp.setClientId(UUID.randomUUID().toString());
rp.setClientSecret("secret");
rp.setRealm(realm);
-
+
assertDoesNotThrow(() -> {
openIdConnectRelyingPartyDAO.save(rp);
entityManager().flush();
@@ -98,13 +98,13 @@ public class PolicyTest extends AbstractClientAppTest {
@Test
public void policyForRealmsCanBeRemoved() {
- AuthenticationPolicy authPolicy = buildAndSaveAuthenticationPolicy();
+ AuthPolicy authPolicy = buildAndSaveAuthPolicy();
AccessPolicy accessPolicy = buildAndSaveAccessPolicy();
AttrReleasePolicy attrPolicy = buildAndSaveAttrRelPolicy();
Realm realm = realmDAO.findByFullPath(SyncopeConstants.ROOT_REALM);
assertNotNull(realm);
- realm.setAuthenticationPolicy(authPolicy);
+ realm.setAuthPolicy(authPolicy);
realm.setAccessPolicy(accessPolicy);
realm.setAttrReleasePolicy(attrPolicy);
realm = realmDAO.save(realm);
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index 1fcaf58..04b959e 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -45,13 +45,13 @@ under the License.
<PasswordPolicyRule policy_id="55e5de0b-c79c-4e66-adda-251b6fb8579a" implementation_id="DefaultPasswordRuleConf3"/>
<!-- authentication policies -->
- <Implementation id="MyDefaultAuthenticationPolicyConf" type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
- body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf","authenticationModules":["LdapAuthenticationTest"]}'/>
- <AuthenticationPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4" name="MyDefaultAuthenticationPolicyConf"
- description="an authentication policy" />
- <AuthenticationPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028" name="DefaultAuthenticationPolicy"
- description="Default authentication policy"/>
- <AuthenticationModule id="be456831-593d-4003-b273-4c3fb61700df" name="DefaultAuthenticationModule"/>
+ <Implementation id="MyDefaultAuthPolicyConf" type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
+ body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
+ <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4" name="MyDefaultAuthPolicyConf"
+ description="an authentication policy" />
+ <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028" name="DefaultAuthPolicy"
+ description="Default authentication policy"/>
+ <AuthModule id="be456831-593d-4003-b273-4c3fb61700df" name="DefaultAuthModule"/>
<!-- access policies -->
<Implementation id="MyDefaultAccessPolicyConf" type="ACCESS_POLICY_CONFIGURATIONS" engine="JAVA"
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 69ee3b4..fce1439 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
@@ -23,8 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.access.AccessPolicyConf;
import org.apache.syncope.common.lib.attrs.AttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.module.AuthenticationModuleConf;
-import org.apache.syncope.common.lib.authentication.policy.AuthenticationPolicyConf;
+import org.apache.syncope.common.lib.authentication.module.AuthModuleConf;
import org.apache.syncope.common.lib.policy.RuleConf;
import org.apache.syncope.common.lib.report.ReportletConf;
import org.apache.syncope.common.lib.to.ImplementationTO;
@@ -39,10 +38,8 @@ import org.apache.syncope.core.persistence.api.dao.PasswordRule;
import org.apache.syncope.core.persistence.api.dao.Reportlet;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.Implementation;
-import org.apache.syncope.core.persistence.api.entity.authentication.AuthenticationModule;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.provisioning.api.LogicActions;
import org.apache.syncope.core.provisioning.api.data.ImplementationDataBinder;
import org.apache.syncope.core.provisioning.api.data.ItemTransformer;
@@ -60,6 +57,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf;
+import org.apache.syncope.core.persistence.api.entity.authentication.AuthModule;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class ImplementationDataBinderImpl implements ImplementationDataBinder {
@@ -163,11 +163,11 @@ public class ImplementationDataBinderImpl implements ImplementationDataBinder {
break;
case AMImplementationType.AUTH_MODULE_CONFIGURATIONS:
- base = AuthenticationModule.class;
+ base = AuthModule.class;
break;
case AMImplementationType.AUTH_POLICY_CONFIGURATIONS:
- base = AuthenticationPolicy.class;
+ base = AuthPolicy.class;
break;
case AMImplementationType.ATTR_RELEASE_POLICY_CONFIGURATIONS:
@@ -192,25 +192,25 @@ public class ImplementationDataBinderImpl implements ImplementationDataBinder {
break;
case AMImplementationType.ATTR_RELEASE_POLICY_CONFIGURATIONS:
AttrReleasePolicyConf policyConf =
- POJOHelper.deserialize(implementation.getBody(), AttrReleasePolicyConf.class);
+ POJOHelper.deserialize(implementation.getBody(), AttrReleasePolicyConf.class);
if (policyConf == null) {
sce.getElements().add("Could not deserialize as AttrReleasePolicy");
throw sce;
}
break;
case AMImplementationType.AUTH_MODULE_CONFIGURATIONS:
- AuthenticationModuleConf authenticationModuleConf =
- POJOHelper.deserialize(implementation.getBody(), AuthenticationModuleConf.class);
- if (authenticationModuleConf == null) {
- sce.getElements().add("Could not deserialize as AuthenticationModule");
+ AuthModuleConf authModuleConf =
+ POJOHelper.deserialize(implementation.getBody(), AuthModuleConf.class);
+ if (authModuleConf == null) {
+ sce.getElements().add("Could not deserialize as AuthModule");
throw sce;
}
break;
case AMImplementationType.AUTH_POLICY_CONFIGURATIONS:
- AuthenticationPolicyConf authenticationPolicyConf =
- POJOHelper.deserialize(implementation.getBody(), AuthenticationPolicyConf.class);
- if (authenticationPolicyConf == null) {
- sce.getElements().add("Could not deserialize as AuthenticationPolicy");
+ AuthPolicyConf authPolicyConf =
+ POJOHelper.deserialize(implementation.getBody(), AuthPolicyConf.class);
+ if (authPolicyConf == null) {
+ sce.getElements().add("Could not deserialize as AuthPolicy");
throw sce;
}
break;
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 441d0ea..13b0f6a 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
@@ -27,11 +27,11 @@ import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.provisioning.api.data.OIDCRelyingPartyDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class OIDCRelyingPartyDataBinderImpl implements OIDCRelyingPartyDataBinder {
@@ -63,15 +63,15 @@ public class OIDCRelyingPartyDataBinderImpl implements OIDCRelyingPartyDataBinde
application.setClientId(applicationTO.getClientId());
application.setRedirectUris(applicationTO.getRedirectUris());
- if (applicationTO.getAuthenticationPolicy() == null) {
- application.setAuthenticationPolicy(null);
+ if (applicationTO.getAuthPolicy() == null) {
+ application.setAuthPolicy(null);
} else {
- Policy policy = policyDAO.find(applicationTO.getAuthenticationPolicy());
- if (policy instanceof AuthenticationPolicy) {
- application.setAuthenticationPolicy((AuthenticationPolicy) policy);
+ Policy policy = policyDAO.find(applicationTO.getAuthPolicy());
+ if (policy instanceof AuthPolicy) {
+ application.setAuthPolicy((AuthPolicy) policy);
} else {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
- sce.getElements().add("Expected " + AuthenticationPolicy.class.getSimpleName()
+ sce.getElements().add("Expected " + AuthPolicy.class.getSimpleName()
+ ", found " + policy.getClass().getSimpleName());
throw sce;
}
@@ -119,8 +119,8 @@ public class OIDCRelyingPartyDataBinderImpl implements OIDCRelyingPartyDataBinde
applicationTO.getRedirectUris().addAll(rp.getRedirectUris());
applicationTO.setName(rp.getName());
- applicationTO.setAuthenticationPolicy(rp.getAuthenticationPolicy() == null
- ? null : rp.getAuthenticationPolicy().getKey());
+ applicationTO.setAuthPolicy(rp.getAuthPolicy() == null
+ ? null : rp.getAuthPolicy().getKey());
applicationTO.setAccessPolicy(rp.getAccessPolicy() == null
? null : rp.getAccessPolicy().getKey());
applicationTO.setAttrReleasePolicy(rp.getAttrReleasePolicy() == null
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 a7ec8e3..8592701 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
@@ -25,7 +25,7 @@ import org.apache.syncope.common.lib.policy.PullPolicyTO;
import org.apache.syncope.common.lib.policy.PushPolicyTO;
import org.apache.syncope.common.lib.to.AccessPolicyTO;
import org.apache.syncope.common.lib.to.AttrReleasePolicyTO;
-import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
@@ -39,7 +39,6 @@ import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.policy.PullCorrelationRuleEntity;
@@ -54,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.stream.Collectors;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class PolicyDataBinderImpl implements PolicyDataBinder {
@@ -100,7 +100,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
});
// remove all implementations not contained in the TO
passwordPolicy.getRules().
- removeIf(implementation -> !passwordPolicyTO.getRules().contains(implementation.getKey()));
+ removeIf(implementation -> !passwordPolicyTO.getRules().contains(implementation.getKey()));
} else if (policyTO instanceof AccountPolicyTO) {
if (result == null) {
result = (T) entityFactory.newEntity(AccountPolicy.class);
@@ -122,7 +122,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
});
// remove all implementations not contained in the TO
accountPolicy.getRules().
- removeIf(implementation -> !accountPolicyTO.getRules().contains(implementation.getKey()));
+ removeIf(implementation -> !accountPolicyTO.getRules().contains(implementation.getKey()));
accountPolicy.getResources().clear();
accountPolicyTO.getPassthroughResources().forEach(resourceName -> {
@@ -165,7 +165,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
});
// remove all rules not contained in the TO
pullPolicy.getCorrelationRules().removeIf(anyFilter
- -> !pullPolicyTO.getCorrelationRules().containsKey(anyFilter.getAnyType().getKey()));
+ -> !pullPolicyTO.getCorrelationRules().containsKey(anyFilter.getAnyType().getKey()));
} else if (policyTO instanceof PushPolicyTO) {
if (result == null) {
result = (T) entityFactory.newEntity(PushPolicy.class);
@@ -198,16 +198,16 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
});
// remove all rules not contained in the TO
pushPolicy.getCorrelationRules().removeIf(anyFilter
- -> !pushPolicyTO.getCorrelationRules().containsKey(anyFilter.getAnyType().getKey()));
- } else if (policyTO instanceof AuthenticationPolicyTO) {
+ -> !pushPolicyTO.getCorrelationRules().containsKey(anyFilter.getAnyType().getKey()));
+ } else if (policyTO instanceof AuthPolicyTO) {
if (result == null) {
- result = (T) entityFactory.newEntity(AuthenticationPolicy.class);
+ result = (T) entityFactory.newEntity(AuthPolicy.class);
}
- AuthenticationPolicy authenticationPolicy = AuthenticationPolicy.class.cast(result);
- AuthenticationPolicyTO authenticationPolicyTO = AuthenticationPolicyTO.class.cast(policyTO);
+ AuthPolicy authPolicy = AuthPolicy.class.cast(result);
+ AuthPolicyTO authPolicyTO = AuthPolicyTO.class.cast(policyTO);
- authenticationPolicy.setName(authenticationPolicyTO.getKey());
+ authPolicy.setName(authPolicyTO.getKey());
} else if (policyTO instanceof AccessPolicyTO) {
if (result == null) {
result = (T) entityFactory.newEntity(AccessPolicy.class);
@@ -259,7 +259,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
passwordPolicyTO.setHistoryLength(passwordPolicy.getHistoryLength());
passwordPolicyTO.getRules().addAll(
- passwordPolicy.getRules().stream().map(Entity::getKey).collect(Collectors.toList()));
+ passwordPolicy.getRules().stream().map(Entity::getKey).collect(Collectors.toList()));
} else if (policy instanceof AccountPolicy) {
AccountPolicy accountPolicy = AccountPolicy.class.cast(policy);
AccountPolicyTO accountPolicyTO = new AccountPolicyTO();
@@ -269,10 +269,10 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
accountPolicyTO.setPropagateSuspension(accountPolicy.isPropagateSuspension());
accountPolicyTO.getRules().addAll(
- accountPolicy.getRules().stream().map(Entity::getKey).collect(Collectors.toList()));
+ accountPolicy.getRules().stream().map(Entity::getKey).collect(Collectors.toList()));
accountPolicyTO.getPassthroughResources().addAll(
- accountPolicy.getResources().stream().map(Entity::getKey).collect(Collectors.toList()));
+ accountPolicy.getResources().stream().map(Entity::getKey).collect(Collectors.toList()));
} else if (policy instanceof PullPolicy) {
PullPolicy pullPolicy = PullPolicy.class.cast(policy);
PullPolicyTO pullPolicyTO = new PullPolicyTO();
@@ -280,7 +280,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
pullPolicyTO.setConflictResolutionAction(((PullPolicy) policy).getConflictResolutionAction());
pullPolicy.getCorrelationRules().
- forEach(rule -> pullPolicyTO.getCorrelationRules().
+ forEach(rule -> pullPolicyTO.getCorrelationRules().
put(rule.getAnyType().getKey(), rule.getImplementation().getKey()));
} else if (policy instanceof PushPolicy) {
PushPolicy pushPolicy = PushPolicy.class.cast(policy);
@@ -289,11 +289,11 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
pushPolicyTO.setConflictResolutionAction(((PushPolicy) policy).getConflictResolutionAction());
pushPolicy.getCorrelationRules().
- forEach(rule -> pushPolicyTO.getCorrelationRules().
+ forEach(rule -> pushPolicyTO.getCorrelationRules().
put(rule.getAnyType().getKey(), rule.getImplementation().getKey()));
- } else if (policy instanceof AuthenticationPolicy) {
- AuthenticationPolicyTO authenticationPolicyTO = new AuthenticationPolicyTO();
- policyTO = (T) authenticationPolicyTO;
+ } else if (policy instanceof AuthPolicy) {
+ AuthPolicyTO authPolicyTO = new AuthPolicyTO();
+ policyTO = (T) authPolicyTO;
} else if (policy instanceof AccessPolicy) {
AccessPolicyTO accessPolicyTO = new AccessPolicyTO();
policyTO = (T) accessPolicyTO;
@@ -306,9 +306,9 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
policyTO.setKey(policy.getKey());
policyTO.setDescription(policy.getDescription());
- if (!(policy instanceof AuthenticationPolicy)
- && !(policy instanceof AccessPolicy)
- && !(policy instanceof AttrReleasePolicy)) {
+ if (!(policy instanceof AuthPolicy)
+ && !(policy instanceof AccessPolicy)
+ && !(policy instanceof AttrReleasePolicy)) {
for (ExternalResource resource : resourceDAO.findByPolicy(policy)) {
policyTO.getUsedByResources().add(resource.getKey());
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/RealmDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/RealmDataBinderImpl.java
index e42ab1d..00599ff 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/RealmDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/RealmDataBinderImpl.java
@@ -38,7 +38,6 @@ import org.apache.syncope.core.persistence.api.entity.policy.PasswordPolicy;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import org.apache.syncope.core.provisioning.api.data.RealmDataBinder;
@@ -46,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class RealmDataBinderImpl implements RealmDataBinder {
@@ -123,13 +123,13 @@ public class RealmDataBinderImpl implements RealmDataBinder {
throw sce;
}
}
- if (realmTO.getAuthenticationPolicy() != null) {
- Policy policy = policyDAO.find(realmTO.getAuthenticationPolicy());
- if (policy instanceof AuthenticationPolicy) {
- realm.setAuthenticationPolicy((AuthenticationPolicy) policy);
+ if (realmTO.getAuthPolicy() != null) {
+ Policy policy = policyDAO.find(realmTO.getAuthPolicy());
+ if (policy instanceof AuthPolicy) {
+ realm.setAuthPolicy((AuthPolicy) policy);
} else {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
- sce.getElements().add("Expected " + AuthenticationPolicy.class.getSimpleName()
+ sce.getElements().add("Expected " + AuthPolicy.class.getSimpleName()
+ ", found " + policy.getClass().getSimpleName());
throw sce;
}
@@ -213,15 +213,15 @@ public class RealmDataBinderImpl implements RealmDataBinder {
}
}
- if (realmTO.getAuthenticationPolicy() == null) {
- realm.setAuthenticationPolicy(null);
+ if (realmTO.getAuthPolicy() == null) {
+ realm.setAuthPolicy(null);
} else {
- Policy policy = policyDAO.find(realmTO.getAuthenticationPolicy());
- if (policy instanceof AuthenticationPolicy) {
- realm.setAuthenticationPolicy((AuthenticationPolicy) policy);
+ Policy policy = policyDAO.find(realmTO.getAuthPolicy());
+ if (policy instanceof AuthPolicy) {
+ realm.setAuthPolicy((AuthPolicy) policy);
} else {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
- sce.getElements().add("Expected " + AuthenticationPolicy.class.getSimpleName()
+ sce.getElements().add("Expected " + AuthPolicy.class.getSimpleName()
+ ", found " + policy.getClass().getSimpleName());
throw sce;
}
@@ -303,8 +303,8 @@ public class RealmDataBinderImpl implements RealmDataBinder {
if (admin) {
realmTO.setAccountPolicy(realm.getAccountPolicy() == null ? null : realm.getAccountPolicy().getKey());
realmTO.setPasswordPolicy(realm.getPasswordPolicy() == null ? null : realm.getPasswordPolicy().getKey());
- realmTO.setAuthenticationPolicy(
- realm.getAuthenticationPolicy() == null ? null : realm.getAuthenticationPolicy().getKey());
+ realmTO.setAuthPolicy(
+ realm.getAuthPolicy() == null ? null : realm.getAuthPolicy().getKey());
realmTO.setAccessPolicy(realm.getAccessPolicy() == null ? null : realm.getAccessPolicy().getKey());
realmTO.setAttrReleasePolicy(
realm.getAttrReleasePolicy() == null ? null : realm.getAttrReleasePolicy().getKey());
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
index f053291..4997917 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
@@ -27,11 +27,11 @@ import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AttrReleasePolicy;
-import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.Policy;
import org.apache.syncope.core.provisioning.api.data.SAML2ServiceProviderDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.syncope.core.persistence.api.entity.policy.AuthPolicy;
@Component
public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderDataBinder {
@@ -62,15 +62,15 @@ public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderD
application.setEntityId(applicationTO.getEntityId());
application.setMetadataLocation(applicationTO.getMetadataLocation());
- if (applicationTO.getAuthenticationPolicy() == null) {
- application.setAuthenticationPolicy(null);
+ if (applicationTO.getAuthPolicy() == null) {
+ application.setAuthPolicy(null);
} else {
- Policy policy = policyDAO.find(applicationTO.getAuthenticationPolicy());
- if (policy instanceof AuthenticationPolicy) {
- application.setAuthenticationPolicy((AuthenticationPolicy) policy);
+ Policy policy = policyDAO.find(applicationTO.getAuthPolicy());
+ if (policy instanceof AuthPolicy) {
+ application.setAuthPolicy((AuthPolicy) policy);
} else {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPolicy);
- sce.getElements().add("Expected " + AuthenticationPolicy.class.getSimpleName()
+ sce.getElements().add("Expected " + AuthPolicy.class.getSimpleName()
+ ", found " + policy.getClass().getSimpleName());
throw sce;
}
@@ -116,8 +116,8 @@ public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderD
applicationTO.setMetadataLocation(sp.getMetadataLocation());
applicationTO.setName(sp.getName());
- applicationTO.setAuthenticationPolicy(sp.getAuthenticationPolicy() == null
- ? null : sp.getAuthenticationPolicy().getKey());
+ applicationTO.setAuthPolicy(sp.getAuthPolicy() == null
+ ? null : sp.getAuthPolicy().getKey());
applicationTO.setAccessPolicy(sp.getAccessPolicy() == null
? null : sp.getAccessPolicy().getKey());
applicationTO.setAttrReleasePolicy(sp.getAttrReleasePolicy() == null
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 d6562d5..55c95ea 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
@@ -18,20 +18,20 @@
*/
package org.apache.syncope.fit.core;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.lib.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.to.AccessPolicyTO;
import org.apache.syncope.common.lib.SyncopeClientException;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
public class OIDCRelyingPartyITCase extends AbstractITCase {
@@ -50,7 +50,7 @@ public class OIDCRelyingPartyITCase extends AbstractITCase {
assertFalse(StringUtils.isBlank(found.getClientId()));
assertTrue(StringUtils.isBlank(found.getClientSecret()));
assertNotNull(found.getAccessPolicy());
- assertNotNull(found.getAuthenticationPolicy());
+ assertNotNull(found.getAuthPolicy());
}
@Test
@@ -91,7 +91,7 @@ public class OIDCRelyingPartyITCase extends AbstractITCase {
}
private OIDCRelyingPartyTO buildRelyingParty() {
- AuthenticationPolicyTO authPolicyTO = new AuthenticationPolicyTO();
+ AuthPolicyTO authPolicyTO = new AuthPolicyTO();
authPolicyTO.setKey("AuthPolicyTest_" + getUUIDString());
authPolicyTO.setDescription("Authentication Policy");
authPolicyTO = createPolicy(PolicyType.AUTHENTICATION, authPolicyTO);
@@ -108,7 +108,7 @@ public class OIDCRelyingPartyITCase extends AbstractITCase {
rpTO.setDescription("Example OIDC RP application");
rpTO.setClientId("clientId_" + getUUIDString());
rpTO.setClientSecret(StringUtils.EMPTY);
- rpTO.setAuthenticationPolicy(authPolicyTO.getKey());
+ rpTO.setAuthPolicy(authPolicyTO.getKey());
rpTO.setAccessPolicy(accessPolicyTO.getKey());
return rpTO;
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 18185d6..29c85a6 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
@@ -18,12 +18,18 @@
*/
package org.apache.syncope.fit.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
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.access.DefaultAccessPolicyConf;
import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;
import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
@@ -32,7 +38,6 @@ import org.apache.syncope.common.lib.policy.PullPolicyTO;
import org.apache.syncope.common.lib.policy.PushPolicyTO;
import org.apache.syncope.common.lib.to.AccessPolicyTO;
import org.apache.syncope.common.lib.to.AttrReleasePolicyTO;
-import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.to.ImplementationTO;
import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -47,25 +52,18 @@ import org.apache.syncope.fit.core.reference.DummyPullCorrelationRule;
import org.apache.syncope.fit.core.reference.DummyPushCorrelationRule;
import org.junit.jupiter.api.Test;
import org.junit.platform.commons.util.StringUtils;
-
import javax.ws.rs.core.Response;
-
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
public class PolicyITCase extends AbstractITCase {
- private static AuthenticationPolicyTO buildAuthenticationPolicyTO() {
- final String authPolicyName = "TestAuthenticationPolicy" + getUUIDString();
+ private static AuthPolicyTO buildAuthPolicyTO() {
+ final String authPolicyName = "TestAuthPolicy" + getUUIDString();
ImplementationTO implementationTO = null;
try {
implementationTO = implementationService.read(
@@ -77,8 +75,8 @@ public class PolicyITCase extends AbstractITCase {
implementationTO.setEngine(ImplementationEngine.JAVA);
implementationTO.setType(AMImplementationType.AUTH_POLICY_CONFIGURATIONS);
- DefaultAuthenticationPolicyConf conf = new DefaultAuthenticationPolicyConf();
- conf.getAuthenticationModules().addAll(List.of("LdapAuthentication1"));
+ DefaultAuthPolicyConf conf = new DefaultAuthPolicyConf();
+ conf.getAuthModules().addAll(List.of("LdapAuthentication1"));
implementationTO.setBody(POJOHelper.serialize(conf));
Response response = implementationService.create(implementationTO);
@@ -89,7 +87,7 @@ public class PolicyITCase extends AbstractITCase {
}
assertNotNull(implementationTO);
- AuthenticationPolicyTO policy = new AuthenticationPolicyTO();
+ AuthPolicyTO policy = new AuthPolicyTO();
policy.setDescription("Test Authentication policy");
policy.setKey(implementationTO.getKey());
@@ -252,8 +250,8 @@ public class PolicyITCase extends AbstractITCase {
}
@Test
- public void getAuthenticationPolicy() {
- AuthenticationPolicyTO policyTO =
+ public void getAuthPolicy() {
+ AuthPolicyTO policyTO =
policyService.read(PolicyType.AUTHENTICATION, "659b9906-4b6e-4bc0-aca0-6809dff346d4");
assertNotNull(policyTO);
@@ -288,10 +286,10 @@ public class PolicyITCase extends AbstractITCase {
assertNotNull(pushPolicyTO);
assertEquals("TestPushRule", pushPolicyTO.getCorrelationRules().get(AnyTypeKind.USER.name()));
- AuthenticationPolicyTO authenticationPolicyTO = createPolicy(PolicyType.AUTHENTICATION,
- buildAuthenticationPolicyTO());
- assertNotNull(authenticationPolicyTO);
- assertEquals("Test Authentication policy", authenticationPolicyTO.getDescription());
+ AuthPolicyTO authPolicyTO = createPolicy(PolicyType.AUTHENTICATION,
+ buildAuthPolicyTO());
+ assertNotNull(authPolicyTO);
+ assertEquals("Test Authentication policy", authPolicyTO.getDescription());
AccessPolicyTO accessPolicyTO = createPolicy(PolicyType.ACCESS, buildAccessPolicyTO());
assertNotNull(accessPolicyTO);
@@ -329,20 +327,20 @@ public class PolicyITCase extends AbstractITCase {
}
@Test
- public void updateAuthenticationPolicy() {
- AuthenticationPolicyTO newAuthPolicyTO = buildAuthenticationPolicyTO();
+ public void updateAuthPolicy() {
+ AuthPolicyTO newAuthPolicyTO = buildAuthPolicyTO();
assertNotNull(newAuthPolicyTO);
newAuthPolicyTO = createPolicy(PolicyType.AUTHENTICATION, newAuthPolicyTO);
ImplementationTO authPolicyImplementationTO = implementationService.read(
- AMImplementationType.AUTH_POLICY_CONFIGURATIONS, "MyDefaultAuthenticationPolicyConf");
+ AMImplementationType.AUTH_POLICY_CONFIGURATIONS, "MyDefaultAuthPolicyConf");
assertNotNull(authPolicyImplementationTO);
assertFalse(StringUtils.isBlank(authPolicyImplementationTO.getBody()));
- DefaultAuthenticationPolicyConf authPolicyConf =
- POJOHelper.deserialize(authPolicyImplementationTO.getBody(), DefaultAuthenticationPolicyConf.class);
+ DefaultAuthPolicyConf authPolicyConf =
+ POJOHelper.deserialize(authPolicyImplementationTO.getBody(), DefaultAuthPolicyConf.class);
assertNotNull(authPolicyConf);
- authPolicyConf.getAuthenticationModules().add("LdapAuthentication");
+ authPolicyConf.getAuthModules().add("LdapAuthentication");
authPolicyImplementationTO.setBody(POJOHelper.serialize(authPolicyConf));
// update new authentication policy
@@ -351,10 +349,10 @@ public class PolicyITCase extends AbstractITCase {
assertNotNull(newAuthPolicyTO);
authPolicyConf = POJOHelper.deserialize(authPolicyImplementationTO.getBody(),
- DefaultAuthenticationPolicyConf.class);
+ DefaultAuthPolicyConf.class);
assertNotNull(authPolicyConf);
- assertEquals(2, authPolicyConf.getAuthenticationModules().size());
- assertTrue(authPolicyConf.getAuthenticationModules().contains("LdapAuthentication"));
+ assertEquals(2, authPolicyConf.getAuthModules().size());
+ assertTrue(authPolicyConf.getAuthModules().contains("LdapAuthentication"));
}
@Test
@@ -442,9 +440,9 @@ public class PolicyITCase extends AbstractITCase {
assertNotNull(e);
}
- AuthenticationPolicyTO authPolicy = buildAuthenticationPolicyTO();
+ AuthPolicyTO authPolicy = buildAuthPolicyTO();
- AuthenticationPolicyTO authPolicyTO = createPolicy(PolicyType.AUTHENTICATION, authPolicy);
+ AuthPolicyTO authPolicyTO = createPolicy(PolicyType.AUTHENTICATION, authPolicy);
assertNotNull(authPolicyTO);
policyService.delete(PolicyType.AUTHENTICATION, authPolicyTO.getKey());
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index 28b761c..a8cf053 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -34,13 +34,13 @@ import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
-import org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
+import org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
import org.apache.syncope.common.lib.to.RealmTO;
import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;
import org.apache.syncope.common.lib.to.AccessPolicyTO;
import org.apache.syncope.common.lib.to.AttrReleasePolicyTO;
-import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
import org.apache.syncope.common.lib.to.ImplementationTO;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.ProvisioningResult;
@@ -106,7 +106,7 @@ public class RealmITCase extends AbstractITCase {
// 2. update setting policies
actual.setAccountPolicy("06e2ed52-6966-44aa-a177-a0ca7434201f");
actual.setPasswordPolicy("986d1236-3ac5-4a19-810c-5ab21d79cba1");
- actual.setAuthenticationPolicy("b912a0d4-a890-416f-9ab8-84ab077eb028");
+ actual.setAuthPolicy("b912a0d4-a890-416f-9ab8-84ab077eb028");
actual.setAccessPolicy("419935c7-deb3-40b3-8a9a-683037e523a2");
actual.setAttrReleasePolicy("319935c7-deb3-40b3-8a9a-683037e523a2");
realmService.update(actual);
@@ -114,7 +114,7 @@ public class RealmITCase extends AbstractITCase {
actual = getRealm(actual.getFullPath()).get();
assertNotNull(actual.getAccountPolicy());
assertNotNull(actual.getPasswordPolicy());
- assertNotNull(actual.getAuthenticationPolicy());
+ assertNotNull(actual.getAuthPolicy());
assertNotNull(actual.getAccessPolicy());
assertNotNull(actual.getAttrReleasePolicy());
@@ -211,20 +211,20 @@ public class RealmITCase extends AbstractITCase {
}
@Test
- public void deletingAuthenticationPolicy() {
+ public void deletingAuthPolicy() {
// 1. create authentication policy
- DefaultAuthenticationPolicyConf ruleConf = new DefaultAuthenticationPolicyConf();
- ruleConf.getAuthenticationModules().addAll(List.of("LdapAuthentication1"));
+ DefaultAuthPolicyConf ruleConf = new DefaultAuthPolicyConf();
+ ruleConf.getAuthModules().addAll(List.of("LdapAuthentication1"));
ImplementationTO rule = new ImplementationTO();
- rule.setKey("TestAuthenticationPolicy" + getUUIDString());
+ rule.setKey("TestAuthPolicy" + getUUIDString());
rule.setEngine(ImplementationEngine.JAVA);
rule.setType(AMImplementationType.AUTH_POLICY_CONFIGURATIONS);
rule.setBody(POJOHelper.serialize(ruleConf));
Response response = implementationService.create(rule);
rule.setKey(response.getHeaderString(RESTHeaders.RESOURCE_KEY));
- AuthenticationPolicyTO policy = new AuthenticationPolicyTO();
+ AuthPolicyTO policy = new AuthPolicyTO();
policy.setDescription("Test Authentication policy");
policy.setKey(rule.getKey());
policy = createPolicy(PolicyType.AUTHENTICATION, policy);
@@ -240,23 +240,23 @@ public class RealmITCase extends AbstractITCase {
assertTrue(actuals.length > 0);
realm = actuals[0];
- String existingAuthenticationPolicy = realm.getAuthenticationPolicy();
+ String existingAuthPolicy = realm.getAuthPolicy();
- realm.setAuthenticationPolicy(policy.getKey());
+ realm.setAuthPolicy(policy.getKey());
realmService.update(realm);
actuals = getObject(response.getLocation(), RealmService.class, RealmTO[].class);
assertNotNull(actuals);
assertTrue(actuals.length > 0);
RealmTO actual = actuals[0];
- assertEquals(policy.getKey(), actual.getAuthenticationPolicy());
+ assertEquals(policy.getKey(), actual.getAuthPolicy());
// 3. remove policy
policyService.delete(PolicyType.AUTHENTICATION, policy.getKey());
// 4. verify
actual = getRealm(actual.getFullPath()).get();
- assertEquals(existingAuthenticationPolicy, actual.getAuthenticationPolicy());
+ assertEquals(existingAuthPolicy, actual.getAuthPolicy());
}
@Test
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
index 6536059..cbee0bf 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.AccessPolicyTO;
-import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
+import org.apache.syncope.common.lib.to.AuthPolicyTO;
import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.fit.AbstractITCase;
@@ -49,7 +49,7 @@ public class SAML2ServiceProviderITCase extends AbstractITCase {
assertFalse(StringUtils.isBlank(found.getEntityId()));
assertFalse(StringUtils.isBlank(found.getMetadataLocation()));
assertNotNull(found.getAccessPolicy());
- assertNotNull(found.getAuthenticationPolicy());
+ assertNotNull(found.getAuthPolicy());
}
@Test
@@ -90,7 +90,7 @@ public class SAML2ServiceProviderITCase extends AbstractITCase {
}
private SAML2ServiceProviderTO buildSAML2SP() {
- AuthenticationPolicyTO authPolicyTO = new AuthenticationPolicyTO();
+ AuthPolicyTO authPolicyTO = new AuthPolicyTO();
authPolicyTO.setKey("AuthPolicyTest_" + getUUIDString());
authPolicyTO.setDescription("Authentication Policy");
authPolicyTO = createPolicy(PolicyType.AUTHENTICATION, authPolicyTO);
@@ -107,7 +107,7 @@ public class SAML2ServiceProviderITCase extends AbstractITCase {
saml2spto.setDescription("Example SAML 2.0 service provider");
saml2spto.setEntityId("SAML2SPEntityId_" + getUUIDString());
saml2spto.setMetadataLocation("file:./test");
- saml2spto.setAuthenticationPolicy(authPolicyTO.getKey());
+ saml2spto.setAuthPolicy(authPolicyTO.getKey());
saml2spto.setAccessPolicy(accessPolicyTO.getKey());
return saml2spto;