You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/07 15:49:47 UTC
[syncope] 03/06: Merge branch 'temp' into SYNCOPE-163-1
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 39d4c0ce98f48efd8a1a1996bb5f30b450c3595e
Merge: 4d410a0 0df22a1
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 5 20:10:36 2020 +0330
Merge branch 'temp' into SYNCOPE-163-1
* temp:
working on attribute release policies
working on attribute release policies
# Conflicts:
# common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
.../AbstractAttrReleasePolicyConf.java} | 34 +++++----
.../AllAttrReleasePolicyConf.java} | 22 ++----
.../AllowedAttrReleasePolicyConf.java} | 29 ++++----
.../common/lib/attrs/AttrReleasePolicyConf.java} | 41 ++++-------
.../common/lib/{access => }/to/AccessPolicyTO.java | 4 +-
.../AttrReleasePolicyTO.java} | 13 ++--
.../policy => }/to/AuthenticationPolicyTO.java | 5 +-
.../syncope/common/lib/to/client/ClientAppTO.java | 19 ++++-
.../common/lib/types/AMImplementationType.java | 13 +++-
.../syncope/common/lib/types/PolicyType.java | 4 ++
.../core/persistence/api/dao/PolicyDAO.java | 3 +
.../api/entity/policy/AttrReleasePolicy.java | 51 +++++---------
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 15 +++-
.../jpa/entity/policy/JPAAttrReleasePolicy.java | 81 ++++++++++++++++++++++
.../jpa/entity/policy/JPAPolicyUtils.java | 4 ++
.../jpa/entity/policy/JPAPolicyUtilsFactory.java | 10 ++-
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 4 +-
.../java/data/PolicyDataBinderImpl.java | 4 +-
.../syncope/fit/core/OIDCRelyingPartyITCase.java | 4 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 4 +-
20 files changed, 227 insertions(+), 137 deletions(-)
diff --cc common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
index d2ae687,db79686..f988f3f
--- 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
@@@ -33,10 -34,11 +34,10 @@@ import javax.xml.bind.annotation.XmlSee
import javax.xml.bind.annotation.XmlType;
@XmlType
-@XmlSeeAlso({OIDCRelyingPartyTO.class, SAML2SPTO.class})
+@XmlSeeAlso({OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class})
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
- @JsonPropertyOrder(value = {"@class", "key", "name", "description", "authenticationPolicy"})
+ @JsonPropertyOrder(value = {"@class", "key", "name", "description",
- "authenticationPolicy", "accessPolicy", "attrReleasePolicy"})
-@Schema(subTypes = {OIDCRelyingPartyTO.class, SAML2SPTO.class}, discriminatorProperty = "@class")
+@Schema(subTypes = {OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class}, discriminatorProperty = "@class")
public abstract class ClientAppTO extends BaseBean implements EntityTO {
private static final long serialVersionUID = 6577639976115661357L;