You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/05 08:23:33 UTC
[syncope] 02/03: Merge branches 'SYNCOPE-163-1' and 'SYNCOPE-163-1'
of github.com:apache/syncope 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 ab9c23b63887a123e5c4df46f848178938a55ada
Merge: 848bb18 03caca5
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 5 11:38:47 2020 +0330
Merge branches 'SYNCOPE-163-1' and 'SYNCOPE-163-1' of github.com:apache/syncope into SYNCOPE-163-1
# Conflicts:
# core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRelyingParty.java
# core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOpenIdConnectRelyingPartyDAO.java
# core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OpenIdConnectRelyingPartyDataBinderImpl.java
.../init/ClassPathScanImplementationLookup.java | 2 +-
.../core/logic/OpenIdConnectRelyingPartyLogic.java | 8 +-
.../entity/authentication/OIDCRelyingParty.java | 2 +-
.../JPAOpenIdConnectRelyingPartyDAO.java | 15 ++--
.../entity/authentication/AbstractClientApp.java | 11 +--
.../entity/authentication/JPAOIDCRelyingParty.java | 5 +-
.../jpa/inner/OpenIdConnectRelyingPartyTest.java | 4 +-
.../OpenIdConnectRelyingPartyDataBinderImpl.java | 5 +-
.../org/apache/syncope/fit/AbstractITCase.java | 13 ++++
.../fit/core/OpenIdConnectRelyingPartyITCase.java | 85 ++++++++++++++++++----
.../org/apache/syncope/fit/core/SAML2SPITCase.java | 27 ++++---
11 files changed, 127 insertions(+), 50 deletions(-)
diff --cc core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRelyingParty.java
index 481b302,90d2025..6c40486
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRelyingParty.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OIDCRelyingParty.java
@@@ -21,7 -20,8 +20,8 @@@ package org.apache.syncope.core.persist
import java.util.List;
-public interface OpenIdConnectRelyingParty extends ClientApplication {
+public interface OIDCRelyingParty extends ClientApp {
+
void setClientId(String id);
String getClientId();
diff --cc core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOpenIdConnectRelyingPartyDAO.java
index 7266828,6c7b7bd..b5340d4
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOpenIdConnectRelyingPartyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOpenIdConnectRelyingPartyDAO.java
@@@ -32,12 -31,12 +31,12 @@@ import javax.persistence.TypedQuery
import java.util.List;
@Repository
-public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OpenIdConnectRelyingParty>
+public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingParty>
- implements OpenIdConnectRelyingPartyDAO {
+ implements OpenIdConnectRelyingPartyDAO {
@Override
- public OpenIdConnectRelyingParty find(final String key) {
- return entityManager().find(JPAOpenIdConnectRelyingParty.class, key);
+ public OIDCRelyingParty find(final String key) {
+ return entityManager().find(JPAOIDCRelyingParty.class, key);
}
@Override
@@@ -85,14 -84,14 +84,14 @@@
}
@Override
- public OpenIdConnectRelyingParty save(final OpenIdConnectRelyingParty rpTO) {
+ public OIDCRelyingParty save(final OIDCRelyingParty policy) {
- return entityManager().merge(policy);
+ return entityManager().merge(rpTO);
}
@Override
public void delete(final String key) {
- OpenIdConnectRelyingParty rpTO = find(key);
+ OIDCRelyingParty policy = find(key);
- if (policy == null) {
+ if (rpTO == null) {
return;
}
@@@ -101,15 -100,15 +100,15 @@@
@Override
public void deleteByClientId(final String clientId) {
- OpenIdConnectRelyingParty rpTO = findByClientId(clientId);
+ OIDCRelyingParty policy = findByClientId(clientId);
- if (policy == null) {
+ if (rpTO == null) {
return;
}
- delete(policy);
+ delete(rpTO);
}
@Override
- public void delete(final OpenIdConnectRelyingParty rpTO) {
+ public void delete(final OIDCRelyingParty policy) {
- entityManager().remove(policy);
+ entityManager().remove(rpTO);
}
}
diff --cc core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/AbstractClientApp.java
index c3fd5a6,8234dee..58ae710
--- 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
@@@ -16,10 -16,9 +16,9 @@@
* under the License.
*
*/
-
package org.apache.syncope.core.persistence.jpa.entity.authentication;
-import org.apache.syncope.core.persistence.api.entity.authentication.ClientApplication;
+import org.apache.syncope.core.persistence.api.entity.authentication.ClientApp;
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;
@@@ -28,11 -27,11 +27,11 @@@ import org.apache.syncope.core.persiste
import javax.persistence.Column;
import javax.persistence.FetchType;
+ import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
- import javax.persistence.OneToOne;
@MappedSuperclass
-public class AbstractClientApplication extends AbstractGeneratedKeyEntity implements ClientApplication {
+public class AbstractClientApp extends AbstractGeneratedKeyEntity implements ClientApp {
private static final long serialVersionUID = 7422422526695279794L;
diff --cc core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRelyingParty.java
index c2099fd,7e9120d..ac8cd24
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRelyingParty.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPAOIDCRelyingParty.java
@@@ -16,10 -16,9 +16,9 @@@
* under the License.
*
*/
-
package org.apache.syncope.core.persistence.jpa.entity.authentication;
-import org.apache.syncope.core.persistence.api.entity.authentication.OpenIdConnectRelyingParty;
+import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
import javax.persistence.CollectionTable;
import javax.persistence.Column;