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 16:35:10 UTC
[syncope] branch SYNCOPE-163-1 updated: revert name change for
saml2 sps
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
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 4d410a0 revert name change for saml2 sps
4d410a0 is described below
commit 4d410a0bf73222879d4e85da7bff52f7d06d51b0
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 5 20:04:50 2020 +0330
revert name change for saml2 sps
---
...nt.java => SAML2ServiceProviderRestClient.java} | 24 +++++------
.../syncope/common/lib/to/client/ClientAppTO.java | 4 +-
...{SAML2SPTO.java => SAML2ServiceProviderTO.java} | 4 +-
...rvice.java => SAML2ServiceProviderService.java} | 4 +-
...SPLogic.java => SAML2ServiceProviderLogic.java} | 32 +++++++--------
...l.java => SAML2ServiceProviderServiceImpl.java} | 14 +++----
...AML2SPDAO.java => SAML2ServiceProviderDAO.java} | 16 ++++----
.../{SAML2SP.java => SAML2ServiceProvider.java} | 2 +-
.../jpa/dao/authentication/JPASAML2SPDAO.java | 46 +++++++++++-----------
.../persistence/jpa/entity/JPAEntityFactory.java | 8 ++--
...PASAML2SP.java => JPASAML2ServiceProvider.java} | 6 +--
...L2SPTest.java => SAML2ServiceProviderTest.java} | 10 ++---
...er.java => SAML2ServiceProviderDataBinder.java} | 12 +++---
...ava => SAML2ServiceProviderDataBinderImpl.java} | 26 ++++++------
.../org/apache/syncope/fit/AbstractITCase.java | 6 +--
15 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java
similarity index 56%
rename from client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
rename to client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java
index becfc8b..485134e 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java
@@ -18,36 +18,36 @@
*/
package org.apache.syncope.client.console.rest;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
-import org.apache.syncope.common.rest.api.service.saml.SAML2SPService;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
+import org.apache.syncope.common.rest.api.service.saml.SAML2ServiceProviderService;
import java.util.List;
/**
* Console client for invoking Rest Client Application's services.
*/
-public class SAML2SPRestClient extends BaseRestClient {
+public class SAML2ServiceProviderRestClient extends BaseRestClient {
private static final long serialVersionUID = -3161863874876938094L;
public static void delete(final String key) {
- getService(SAML2SPService.class).delete(key);
+ getService(SAML2ServiceProviderService.class).delete(key);
}
- public static SAML2SPTO read(final String key) {
- return getService(SAML2SPService.class).read(key);
+ public static SAML2ServiceProviderTO read(final String key) {
+ return getService(SAML2ServiceProviderService.class).read(key);
}
- public static void update(final SAML2SPTO applicationTO) {
- getService(SAML2SPService.class).update(applicationTO);
+ public static void update(final SAML2ServiceProviderTO applicationTO) {
+ getService(SAML2ServiceProviderService.class).update(applicationTO);
}
- public static void create(final SAML2SPTO applicationTO) {
- getService(SAML2SPService.class).create(applicationTO);
+ public static void create(final SAML2ServiceProviderTO applicationTO) {
+ getService(SAML2ServiceProviderService.class).create(applicationTO);
}
- public static List<SAML2SPTO> list() {
- return getService(SAML2SPService.class).list();
+ public static List<SAML2ServiceProviderTO> list() {
+ return getService(SAML2ServiceProviderService.class).list();
}
}
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 0a200b8..d2ae687 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
@@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlSeeAlso;
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"})
-@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;
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
index 5c75698..7bf5289 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2SPTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "saml2ServiceProvider")
@XmlType
@Schema(allOf = { ClientAppTO.class })
-public class SAML2SPTO extends ClientAppTO {
+public class SAML2ServiceProviderTO extends ClientAppTO {
private static final long serialVersionUID = -6370888503924521351L;
private String entityId;
@@ -74,7 +74,7 @@ public class SAML2SPTO extends ClientAppTO {
if (obj.getClass() != getClass()) {
return false;
}
- SAML2SPTO rhs = (SAML2SPTO) obj;
+ SAML2ServiceProviderTO rhs = (SAML2ServiceProviderTO) obj;
return new EqualsBuilder()
.appendSuper(super.equals(obj))
.append(this.entityId, rhs.entityId)
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2SPService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
similarity index 88%
rename from common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2SPService.java
rename to common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
index 9d8b2b7..e99aa23 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2SPService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
@@ -22,7 +22,7 @@ package org.apache.syncope.common.rest.api.service.saml;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.common.rest.api.service.ClientAppService;
import javax.ws.rs.Path;
@@ -32,5 +32,5 @@ import javax.ws.rs.Path;
@SecurityRequirement(name = "BasicAuthentication"),
@SecurityRequirement(name = "Bearer")})
@Path("saml2ServiceProviders")
-public interface SAML2SPService extends ClientAppService<SAML2SPTO> {
+public interface SAML2ServiceProviderService extends ClientAppService<SAML2ServiceProviderTO> {
}
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2SPLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2ServiceProviderLogic.java
similarity index 74%
rename from core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2SPLogic.java
rename to core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2ServiceProviderLogic.java
index 7cd7a9d..a20c54f 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2SPLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/saml/SAML2ServiceProviderLogic.java
@@ -18,13 +18,13 @@
*/
package org.apache.syncope.core.logic.saml;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.apache.syncope.core.logic.AbstractClientAppLogic;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
-import org.apache.syncope.core.provisioning.api.data.SAML2SPDataBinder;
+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.provisioning.api.data.SAML2ServiceProviderDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -34,25 +34,25 @@ import java.util.stream.Collectors;
import org.apache.syncope.common.lib.types.AMEntitlement;
@Component
-public class SAML2SPLogic extends AbstractClientAppLogic<SAML2SPTO> {
+public class SAML2ServiceProviderLogic extends AbstractClientAppLogic<SAML2ServiceProviderTO> {
@Autowired
- private SAML2SPDAO saml2ServiceProviderDAO;
+ private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
@Autowired
- private SAML2SPDataBinder binder;
+ private SAML2ServiceProviderDataBinder binder;
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_DELETE + "')")
- public SAML2SPTO delete(final String key) {
- SAML2SP application = saml2ServiceProviderDAO.find(key);
+ public SAML2ServiceProviderTO delete(final String key) {
+ SAML2ServiceProvider application = saml2ServiceProviderDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
throw new NotFoundException(key);
}
- SAML2SPTO deleted = binder.getClientApplicationTO(application);
+ SAML2ServiceProviderTO deleted = binder.getClientApplicationTO(application);
saml2ServiceProviderDAO.delete(key);
return deleted;
}
@@ -60,7 +60,7 @@ public class SAML2SPLogic extends AbstractClientAppLogic<SAML2SPTO> {
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_LIST + "')")
@Transactional(readOnly = true)
- public List<SAML2SPTO> list() {
+ public List<SAML2ServiceProviderTO> list() {
return saml2ServiceProviderDAO.findAll().stream()
.map(binder::getClientApplicationTO).collect(Collectors.toList());
}
@@ -68,8 +68,8 @@ public class SAML2SPLogic extends AbstractClientAppLogic<SAML2SPTO> {
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_READ + "')")
@Transactional(readOnly = true)
@Override
- public SAML2SPTO read(final String key) {
- SAML2SP application = saml2ServiceProviderDAO.find(key);
+ public SAML2ServiceProviderTO read(final String key) {
+ SAML2ServiceProvider application = saml2ServiceProviderDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
@@ -81,14 +81,14 @@ public class SAML2SPLogic extends AbstractClientAppLogic<SAML2SPTO> {
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_CREATE + "')")
- public SAML2SPTO create(final SAML2SPTO applicationTO) {
+ public SAML2ServiceProviderTO create(final SAML2ServiceProviderTO applicationTO) {
return binder.getClientApplicationTO(saml2ServiceProviderDAO.save(binder.create(applicationTO)));
}
@Override
@PreAuthorize("hasRole('" + IdRepoEntitlement.APPLICATION_UPDATE + "')")
- public SAML2SPTO update(final SAML2SPTO applicationTO) {
- SAML2SP application = saml2ServiceProviderDAO.find(applicationTO.getKey());
+ public SAML2ServiceProviderTO update(final SAML2ServiceProviderTO applicationTO) {
+ SAML2ServiceProvider application = saml2ServiceProviderDAO.find(applicationTO.getKey());
if (application == null) {
LOG.error("Could not find application '" + applicationTO.getKey() + '\'');
throw new NotFoundException(applicationTO.getKey());
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2SPServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2ServiceProviderServiceImpl.java
similarity index 74%
rename from core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2SPServiceImpl.java
rename to core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2ServiceProviderServiceImpl.java
index 18d7967..4e045a8 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2SPServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/saml/SAML2ServiceProviderServiceImpl.java
@@ -19,21 +19,21 @@
package org.apache.syncope.core.rest.cxf.service.saml;
-import org.apache.syncope.common.rest.api.service.saml.SAML2SPService;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
+import org.apache.syncope.common.rest.api.service.saml.SAML2ServiceProviderService;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.core.logic.AbstractClientAppLogic;
-import org.apache.syncope.core.logic.saml.SAML2SPLogic;
+import org.apache.syncope.core.logic.saml.SAML2ServiceProviderLogic;
import org.apache.syncope.core.rest.cxf.service.AbstractClientAppServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class SAML2SPServiceImpl
- extends AbstractClientAppServiceImpl<SAML2SPTO>
- implements SAML2SPService {
+public class SAML2ServiceProviderServiceImpl
+ extends AbstractClientAppServiceImpl<SAML2ServiceProviderTO>
+ implements SAML2ServiceProviderService {
@Autowired
- private SAML2SPLogic logic;
+ private SAML2ServiceProviderLogic logic;
@Override
protected AbstractClientAppLogic getLogic() {
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java
similarity index 72%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java
index 347fa90..8807cc5 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java
@@ -19,26 +19,26 @@
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.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import java.util.List;
-public interface SAML2SPDAO extends DAO<SAML2SP> {
+public interface SAML2ServiceProviderDAO extends DAO<SAML2ServiceProvider> {
- SAML2SP find(String key);
+ SAML2ServiceProvider find(String key);
- SAML2SP findByName(String name);
+ SAML2ServiceProvider findByName(String name);
- SAML2SP findByEntityId(String clientId);
+ SAML2ServiceProvider findByEntityId(String clientId);
- List<SAML2SP> findAll();
+ List<SAML2ServiceProvider> findAll();
- SAML2SP save(SAML2SP application);
+ SAML2ServiceProvider save(SAML2ServiceProvider application);
void delete(String key);
void deleteByEntityId(String entityId);
- void delete(SAML2SP application);
+ void delete(SAML2ServiceProvider application);
}
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2ServiceProvider.java
similarity index 94%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2ServiceProvider.java
index 2b9a25d..3e5ad60 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2SP.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/SAML2ServiceProvider.java
@@ -19,7 +19,7 @@
package org.apache.syncope.core.persistence.api.entity.authentication;
-public interface SAML2SP extends ClientApp {
+public interface SAML2ServiceProvider extends ClientApp {
String getEntityId();
void setEntityId(String id);
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
index 1539c5e..cf4c7ff 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.core.persistence.jpa.dao.authentication;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+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.jpa.dao.AbstractDAO;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2SP;
+import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2ServiceProvider;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -31,21 +31,21 @@ import javax.persistence.TypedQuery;
import java.util.List;
@Repository
-public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
+public class JPASAML2SPDAO extends AbstractDAO<SAML2ServiceProvider> implements SAML2ServiceProviderDAO {
@Override
- public SAML2SP find(final String key) {
- return entityManager().find(JPASAML2SP.class, key);
+ public SAML2ServiceProvider find(final String key) {
+ return entityManager().find(JPASAML2ServiceProvider.class, key);
}
@Override
- public SAML2SP findByName(final String name) {
- final TypedQuery<SAML2SP> query = entityManager().createQuery(
- "SELECT e FROM " + JPASAML2SP.class.getSimpleName() + " e WHERE e.name=:name",
- SAML2SP.class);
+ public SAML2ServiceProvider findByName(final String name) {
+ final TypedQuery<SAML2ServiceProvider> query = entityManager().createQuery(
+ "SELECT e FROM " + JPASAML2ServiceProvider.class.getSimpleName() + " e WHERE e.name=:name",
+ SAML2ServiceProvider.class);
query.setParameter("name", name);
- SAML2SP result = null;
+ SAML2ServiceProvider result = null;
try {
result = query.getSingleResult();
} catch (final NoResultException e) {
@@ -56,13 +56,13 @@ public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
}
@Override
- public SAML2SP findByEntityId(final String entityId) {
- final TypedQuery<SAML2SP> query = entityManager().createQuery(
- "SELECT e FROM " + JPASAML2SP.class.getSimpleName() + " e WHERE e.entityId=:entityId",
- SAML2SP.class);
+ public SAML2ServiceProvider findByEntityId(final String entityId) {
+ final TypedQuery<SAML2ServiceProvider> query = entityManager().createQuery(
+ "SELECT e FROM " + JPASAML2ServiceProvider.class.getSimpleName() + " e WHERE e.entityId=:entityId",
+ SAML2ServiceProvider.class);
query.setParameter("entityId", entityId);
- SAML2SP result = null;
+ SAML2ServiceProvider result = null;
try {
result = query.getSingleResult();
} catch (final NoResultException e) {
@@ -74,21 +74,21 @@ public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
@Transactional(readOnly = true)
@Override
- public List<SAML2SP> findAll() {
- final TypedQuery<SAML2SP> query = entityManager().createQuery(
- "SELECT e FROM " + JPASAML2SP.class.getSimpleName() + " e", SAML2SP.class);
+ public List<SAML2ServiceProvider> findAll() {
+ final TypedQuery<SAML2ServiceProvider> query = entityManager().createQuery(
+ "SELECT e FROM " + JPASAML2ServiceProvider.class.getSimpleName() + " e", SAML2ServiceProvider.class);
return query.getResultList();
}
@Override
- public SAML2SP save(final SAML2SP policy) {
+ public SAML2ServiceProvider save(final SAML2ServiceProvider policy) {
return entityManager().merge(policy);
}
@Override
public void delete(final String key) {
- final SAML2SP policy = find(key);
+ final SAML2ServiceProvider policy = find(key);
if (policy == null) {
return;
}
@@ -98,7 +98,7 @@ public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
@Override
public void deleteByEntityId(final String entityId) {
- final SAML2SP app = findByEntityId(entityId);
+ final SAML2ServiceProvider app = findByEntityId(entityId);
if (app == null) {
return;
}
@@ -106,7 +106,7 @@ public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
}
@Override
- public void delete(final SAML2SP policy) {
+ public void delete(final SAML2ServiceProvider policy) {
entityManager().remove(policy);
}
}
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 2651a12..e7953e6 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
@@ -58,7 +58,7 @@ 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.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import org.apache.syncope.core.persistence.api.entity.group.GPlainAttr;
import org.apache.syncope.core.persistence.api.entity.group.GPlainAttrUniqueValue;
import org.apache.syncope.core.persistence.api.entity.group.GPlainAttrValue;
@@ -109,7 +109,7 @@ 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.JPAOIDCRelyingParty;
-import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2SP;
+import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2ServiceProvider;
import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttr;
import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttrUniqueValue;
import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttrValue;
@@ -311,8 +311,8 @@ public class JPAEntityFactory implements EntityFactory {
result = (E) new JPAAccessPolicy();
} else if (reference.equals(OIDCRelyingParty.class)) {
result = (E) new JPAOIDCRelyingParty();
- } else if (reference.equals(SAML2SP.class)) {
- result = (E) new JPASAML2SP();
+ } else if (reference.equals(SAML2ServiceProvider.class)) {
+ result = (E) new JPASAML2ServiceProvider();
} else {
throw new IllegalArgumentException("Could not find a JPA implementation of " + reference.getName());
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2ServiceProvider.java
similarity index 91%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2ServiceProvider.java
index 1a41567..27a5b46 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2SP.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/authentication/JPASAML2ServiceProvider.java
@@ -19,15 +19,15 @@
package org.apache.syncope.core.persistence.jpa.entity.authentication;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
-@Table(name = JPASAML2SP.TABLE)
-public class JPASAML2SP extends AbstractClientApp implements SAML2SP {
+@Table(name = JPASAML2ServiceProvider.TABLE)
+public class JPASAML2ServiceProvider extends AbstractClientApp implements SAML2ServiceProvider {
public static final String TABLE = "SAML2ServiceProvider";
private static final long serialVersionUID = 6422422526695279794L;
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
similarity index 90%
rename from core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
rename to core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
index 495f31c..19898d0 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
@@ -19,8 +19,8 @@
package org.apache.syncope.core.persistence.jpa.inner;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+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;
@@ -30,15 +30,15 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.*;
@Transactional("Master")
-public class SAML2SPTest extends AbstractClientAppTest {
+public class SAML2ServiceProviderTest extends AbstractClientAppTest {
@Autowired
- private SAML2SPDAO saml2ServiceProviderDAO;
+ private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
@Test
public void find() {
int beforeCount = saml2ServiceProviderDAO.findAll().size();
- SAML2SP rp = entityFactory.newEntity(SAML2SP.class);
+ SAML2ServiceProvider rp = entityFactory.newEntity(SAML2ServiceProvider.class);
rp.setName("SAML2");
rp.setDescription("This is a sample SAML2 SP");
rp.setEntityId("urn:example:saml2:sp");
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java
similarity index 69%
rename from core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
rename to core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java
index bf42275..fc36a9b 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java
@@ -18,14 +18,14 @@
*/
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
+import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
-public interface SAML2SPDataBinder {
+public interface SAML2ServiceProviderDataBinder {
- SAML2SP create(SAML2SPTO applicationTO);
+ SAML2ServiceProvider create(SAML2ServiceProviderTO applicationTO);
- SAML2SP update(SAML2SP application, SAML2SPTO applicationTO);
+ SAML2ServiceProvider update(SAML2ServiceProvider application, SAML2ServiceProviderTO applicationTO);
- SAML2SPTO getClientApplicationTO(SAML2SP application);
+ SAML2ServiceProviderTO getClientApplicationTO(SAML2ServiceProvider application);
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
similarity index 71%
rename from core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
rename to core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
index 2f8d3a5..dda8370 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
@@ -19,20 +19,20 @@
package org.apache.syncope.core.provisioning.java.data;
-import org.apache.syncope.common.lib.to.client.SAML2SPTO;
+import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationPolicyDAO;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
+import org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
-import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
+import org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
-import org.apache.syncope.core.provisioning.api.data.SAML2SPDataBinder;
+import org.apache.syncope.core.provisioning.api.data.SAML2ServiceProviderDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class SAML2SPDataBinderImpl implements SAML2SPDataBinder {
+public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderDataBinder {
@Autowired
- private SAML2SPDAO saml2ServiceProviderDAO;
+ private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
@Autowired
private EntityFactory entityFactory;
@@ -41,14 +41,14 @@ public class SAML2SPDataBinderImpl implements SAML2SPDataBinder {
private AuthenticationPolicyDAO authenticationPolicyDAO;
@Override
- public SAML2SP create(final SAML2SPTO applicationTO) {
- return update(entityFactory.newEntity(SAML2SP.class), applicationTO);
+ public SAML2ServiceProvider create(final SAML2ServiceProviderTO applicationTO) {
+ return update(entityFactory.newEntity(SAML2ServiceProvider.class), applicationTO);
}
@Override
- public SAML2SP update(final SAML2SP toBeUpdated,
- final SAML2SPTO applicationTO) {
- SAML2SP application = saml2ServiceProviderDAO.save(toBeUpdated);
+ public SAML2ServiceProvider update(final SAML2ServiceProvider toBeUpdated,
+ final SAML2ServiceProviderTO applicationTO) {
+ SAML2ServiceProvider application = saml2ServiceProviderDAO.save(toBeUpdated);
application.setDescription(applicationTO.getDescription());
application.setName(applicationTO.getName());
@@ -63,8 +63,8 @@ public class SAML2SPDataBinderImpl implements SAML2SPDataBinder {
}
@Override
- public SAML2SPTO getClientApplicationTO(final SAML2SP serviceProvider) {
- SAML2SPTO applicationTO = new SAML2SPTO();
+ public SAML2ServiceProviderTO getClientApplicationTO(final SAML2ServiceProvider serviceProvider) {
+ SAML2ServiceProviderTO applicationTO = new SAML2ServiceProviderTO();
applicationTO.setKey(serviceProvider.getKey());
applicationTO.setDescription(serviceProvider.getDescription());
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index b1f1008..ab2ddfd 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -108,7 +108,7 @@ import org.apache.syncope.common.rest.api.service.RemediationService;
import org.apache.syncope.common.rest.api.service.ReportTemplateService;
import org.apache.syncope.common.rest.api.service.RoleService;
import org.apache.syncope.common.rest.api.service.SAML2IdPService;
-import org.apache.syncope.common.rest.api.service.saml.SAML2SPService;
+import org.apache.syncope.common.rest.api.service.saml.SAML2ServiceProviderService;
import org.apache.syncope.common.rest.api.service.SCIMConfService;
import org.apache.syncope.common.rest.api.service.SchemaService;
import org.apache.syncope.common.rest.api.service.SecurityQuestionService;
@@ -291,7 +291,7 @@ public abstract class AbstractITCase {
protected static OIDCRelyingPartyService openIdConnectRelyingPartyService;
- protected static SAML2SPService saml2ServiceProviderService;
+ protected static SAML2ServiceProviderService saml2ServiceProviderService;
@BeforeAll
public static void securitySetup() {
@@ -363,7 +363,7 @@ public abstract class AbstractITCase {
oidcProviderService = adminClient.getService(OIDCProviderService.class);
scimConfService = adminClient.getService(SCIMConfService.class);
openIdConnectRelyingPartyService = adminClient.getService(OIDCRelyingPartyService.class);
- saml2ServiceProviderService = adminClient.getService(SAML2SPService.class);
+ saml2ServiceProviderService = adminClient.getService(SAML2ServiceProviderService.class);
}
@Autowired