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:34 UTC
[syncope] 03/03: shorten component names
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit b84541ab0c62bdccd05dfbaa584243c500c76437
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 5 11:52:54 2020 +0330
shorten component names
---
...Client.java => OIDCRelyingPartyRestClient.java} | 24 +++++++-------
...viderRestClient.java => SAML2SPRestClient.java} | 12 +++----
.../syncope/common/lib/to/ClientApplicationTO.java | 4 +--
...RelyingPartyTO.java => OIDCRelyingPartyTO.java} | 4 +--
...{SAML2ServiceProviderTO.java => SAML2SPTO.java} | 4 +--
...plicationService.java => ClientAppService.java} | 2 +-
...tyService.java => OIDCRelyingPartyService.java} | 4 +--
.../api/service/SAML2ServiceProviderService.java | 4 +--
...ationLogic.java => AbstractClientAppLogic.java} | 2 +-
...gPartyLogic.java => OIDCRelyingPartyLogic.java} | 38 +++++++++++-----------
...ServiceProviderLogic.java => SAML2SPLogic.java} | 24 +++++++-------
...Impl.java => AbstractClientAppServiceImpl.java} | 10 +++---
...eImpl.java => OIDCRelyingPartyServiceImpl.java} | 18 +++++-----
...derServiceImpl.java => SAML2SPServiceImpl.java} | 14 ++++----
...lyingPartyDAO.java => OIDCRelyingPartyDAO.java} | 2 +-
...AML2ServiceProviderDAO.java => SAML2SPDAO.java} | 2 +-
...ngPartyDAO.java => JPAOIDCRelyingPartyDAO.java} | 18 +++++-----
...2ServiceProviderDAO.java => JPASAML2SPDAO.java} | 5 ++-
...icationTest.java => AbstractClientAppTest.java} | 2 +-
...ingPartyTest.java => OIDCRelyingPartyTest.java} | 6 ++--
...L2ServiceProviderTest.java => SAML2SPTest.java} | 6 ++--
...Binder.java => OIDCRelyingPartyDataBinder.java} | 10 +++---
...viderDataBinder.java => SAML2SPDataBinder.java} | 10 +++---
...pl.java => OIDCRelyingPartyDataBinderImpl.java} | 18 +++++-----
...aBinderImpl.java => SAML2SPDataBinderImpl.java} | 22 +++++--------
.../org/apache/syncope/fit/AbstractITCase.java | 14 ++++----
...artyITCase.java => OIDCRelyingPartyITCase.java} | 18 +++++-----
27 files changed, 146 insertions(+), 151 deletions(-)
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
similarity index 55%
rename from client/am/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java
rename to client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
index d3d67c4..407712f 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OIDCRelyingPartyRestClient.java
@@ -18,36 +18,36 @@
*/
package org.apache.syncope.client.console.rest;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
-import org.apache.syncope.common.rest.api.service.OpenIdConnectRelyingPartyService;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.common.rest.api.service.OIDCRelyingPartyService;
import java.util.List;
/**
* Console client for invoking Rest Client Application's services.
*/
-public class OpenIdConnectRelyingPartyRestClient extends BaseRestClient {
+public class OIDCRelyingPartyRestClient extends BaseRestClient {
private static final long serialVersionUID = -3161863874876938094L;
public static void delete(final String key) {
- getService(OpenIdConnectRelyingPartyService.class).delete(key);
+ getService(OIDCRelyingPartyService.class).delete(key);
}
- public static OpenIdConnectRelyingPartyTO read(final String key) {
- return getService(OpenIdConnectRelyingPartyService.class).read(key);
+ public static OIDCRelyingPartyTO read(final String key) {
+ return getService(OIDCRelyingPartyService.class).read(key);
}
- public static void update(final OpenIdConnectRelyingPartyTO applicationTO) {
- getService(OpenIdConnectRelyingPartyService.class).update(applicationTO);
+ public static void update(final OIDCRelyingPartyTO applicationTO) {
+ getService(OIDCRelyingPartyService.class).update(applicationTO);
}
- public static void create(final OpenIdConnectRelyingPartyTO applicationTO) {
- getService(OpenIdConnectRelyingPartyService.class).create(applicationTO);
+ public static void create(final OIDCRelyingPartyTO applicationTO) {
+ getService(OIDCRelyingPartyService.class).create(applicationTO);
}
- public static List<OpenIdConnectRelyingPartyTO> list() {
- return getService(OpenIdConnectRelyingPartyService.class).list();
+ public static List<OIDCRelyingPartyTO> list() {
+ return getService(OIDCRelyingPartyService.class).list();
}
}
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
similarity index 79%
rename from client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java
rename to client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
index d5d9088..b7b484a 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2SPRestClient.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.client.console.rest;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
import org.apache.syncope.common.rest.api.service.SAML2ServiceProviderService;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
/**
* Console client for invoking Rest Client Application's services.
*/
-public class SAML2ServiceProviderRestClient extends BaseRestClient {
+public class SAML2SPRestClient extends BaseRestClient {
private static final long serialVersionUID = -3161863874876938094L;
@@ -34,19 +34,19 @@ public class SAML2ServiceProviderRestClient extends BaseRestClient {
getService(SAML2ServiceProviderService.class).delete(key);
}
- public static SAML2ServiceProviderTO read(final String key) {
+ public static SAML2SPTO read(final String key) {
return getService(SAML2ServiceProviderService.class).read(key);
}
- public static void update(final SAML2ServiceProviderTO applicationTO) {
+ public static void update(final SAML2SPTO applicationTO) {
getService(SAML2ServiceProviderService.class).update(applicationTO);
}
- public static void create(final SAML2ServiceProviderTO applicationTO) {
+ public static void create(final SAML2SPTO applicationTO) {
getService(SAML2ServiceProviderService.class).create(applicationTO);
}
- public static List<SAML2ServiceProviderTO> list() {
+ public static List<SAML2SPTO> list() {
return getService(SAML2ServiceProviderService.class).list();
}
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java
index 5004248..d10d0ca 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientApplicationTO.java
@@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
@XmlType
-@XmlSeeAlso({OpenIdConnectRelyingPartyTO.class, SAML2ServiceProviderTO.class})
+@XmlSeeAlso({OIDCRelyingPartyTO.class, SAML2SPTO.class})
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
@JsonPropertyOrder(value = {"@class", "key", "name", "description", "authenticationPolicy"})
-@Schema(subTypes = {OpenIdConnectRelyingPartyTO.class, SAML2ServiceProviderTO.class}, discriminatorProperty = "@class")
+@Schema(subTypes = {OIDCRelyingPartyTO.class, SAML2SPTO.class}, discriminatorProperty = "@class")
public abstract class ClientApplicationTO 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/OpenIdConnectRelyingPartyTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OpenIdConnectRelyingPartyTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java
index a8c5ec1..a39b7b7 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OpenIdConnectRelyingPartyTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/OIDCRelyingPartyTO.java
@@ -34,7 +34,7 @@ import java.util.List;
@XmlRootElement(name = "openIdConnectRelyingParty")
@XmlType
@Schema(allOf = { ClientApplicationTO.class })
-public class OpenIdConnectRelyingPartyTO extends ClientApplicationTO {
+public class OIDCRelyingPartyTO extends ClientApplicationTO {
private static final long serialVersionUID = -6370888503924521351L;
private String clientId;
@@ -87,7 +87,7 @@ public class OpenIdConnectRelyingPartyTO extends ClientApplicationTO {
if (obj.getClass() != getClass()) {
return false;
}
- OpenIdConnectRelyingPartyTO rhs = (OpenIdConnectRelyingPartyTO) obj;
+ OIDCRelyingPartyTO rhs = (OIDCRelyingPartyTO) obj;
return new EqualsBuilder()
.appendSuper(super.equals(obj))
.append(this.clientId, rhs.clientId)
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2ServiceProviderTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
similarity index 95%
rename from common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2ServiceProviderTO.java
rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
index 82c886b..08e37fd 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2ServiceProviderTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2SPTO.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "saml2ServiceProvider")
@XmlType
@Schema(allOf = { ClientApplicationTO.class })
-public class SAML2ServiceProviderTO extends ClientApplicationTO {
+public class SAML2SPTO extends ClientApplicationTO {
private static final long serialVersionUID = -6370888503924521351L;
private String entityId;
@@ -74,7 +74,7 @@ public class SAML2ServiceProviderTO extends ClientApplicationTO {
if (obj.getClass() != getClass()) {
return false;
}
- SAML2ServiceProviderTO rhs = (SAML2ServiceProviderTO) obj;
+ SAML2SPTO rhs = (SAML2SPTO) 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/ClientApplicationService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
similarity index 97%
rename from common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientApplicationService.java
rename to common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
index 4fbea7c..ad5358e 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientApplicationService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ClientAppService.java
@@ -45,7 +45,7 @@ import java.util.List;
/**
* REST operations for applications.
*/
-public interface ClientApplicationService<T extends ClientApplicationTO> extends JAXRSService {
+public interface ClientAppService<T extends ClientApplicationTO> extends JAXRSService {
/**
* Returns a list of all applications.
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OpenIdConnectRelyingPartyService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
similarity index 87%
rename from common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OpenIdConnectRelyingPartyService.java
rename to common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
index e127bbca..dadcef5 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OpenIdConnectRelyingPartyService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCRelyingPartyService.java
@@ -22,7 +22,7 @@ package org.apache.syncope.common.rest.api.service;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import javax.ws.rs.Path;
@@ -31,5 +31,5 @@ import javax.ws.rs.Path;
@SecurityRequirement(name = "BasicAuthentication"),
@SecurityRequirement(name = "Bearer")})
@Path("openIdConnectRelyingParties")
-public interface OpenIdConnectRelyingPartyService extends ClientApplicationService<OpenIdConnectRelyingPartyTO> {
+public interface OIDCRelyingPartyService extends ClientAppService<OIDCRelyingPartyTO> {
}
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
index 75912fe..eb4ca6c 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SAML2ServiceProviderService.java
@@ -22,7 +22,7 @@ package org.apache.syncope.common.rest.api.service;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
import javax.ws.rs.Path;
@@ -31,5 +31,5 @@ import javax.ws.rs.Path;
@SecurityRequirement(name = "BasicAuthentication"),
@SecurityRequirement(name = "Bearer")})
@Path("saml2ServiceProviders")
-public interface SAML2ServiceProviderService extends ClientApplicationService<SAML2ServiceProviderTO> {
+public interface SAML2ServiceProviderService extends ClientAppService<SAML2SPTO> {
}
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientApplicationLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
similarity index 94%
rename from core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientApplicationLogic.java
rename to core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
index 822ecf9..01e3410 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientApplicationLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/AbstractClientAppLogic.java
@@ -23,7 +23,7 @@ import org.apache.syncope.common.lib.to.ClientApplicationTO;
import java.lang.reflect.Method;
import java.util.List;
-public abstract class AbstractClientApplicationLogic<T extends ClientApplicationTO>
+public abstract class AbstractClientAppLogic<T extends ClientApplicationTO>
extends AbstractTransactionalLogic<ClientApplicationTO> {
@Override
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
similarity index 66%
rename from core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
rename to core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
index c42856b..7837116 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OIDCRelyingPartyLogic.java
@@ -18,12 +18,12 @@
*/
package org.apache.syncope.core.logic;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
-import org.apache.syncope.core.persistence.api.dao.authentication.OpenIdConnectRelyingPartyDAO;
+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.provisioning.api.data.OpenIdConnectRelyingPartyDataBinder;
+import org.apache.syncope.core.provisioning.api.data.OIDCRelyingPartyDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -34,19 +34,19 @@ import java.util.stream.Collectors;
import org.apache.syncope.common.lib.types.AMEntitlement;
@Component
-public class OpenIdConnectRelyingPartyLogic extends AbstractClientApplicationLogic<OpenIdConnectRelyingPartyTO> {
+public class OIDCRelyingPartyLogic extends AbstractClientAppLogic<OIDCRelyingPartyTO> {
@Autowired
- private OpenIdConnectRelyingPartyDAO openIdConnectRelyingPartyDAO;
+ private OIDCRelyingPartyDAO oidcRelyingPartyDAO;
@Autowired
- private OpenIdConnectRelyingPartyDataBinder binder;
+ private OIDCRelyingPartyDataBinder binder;
@PreAuthorize("hasRole('" + AMEntitlement.OIDC_RELYING_PARTY_READ + "')")
@Transactional(readOnly = true)
@Override
- public OpenIdConnectRelyingPartyTO read(final String key) {
- OIDCRelyingParty application = openIdConnectRelyingPartyDAO.find(key);
+ public OIDCRelyingPartyTO read(final String key) {
+ OIDCRelyingParty application = oidcRelyingPartyDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
@@ -59,41 +59,41 @@ public class OpenIdConnectRelyingPartyLogic extends AbstractClientApplicationLog
@PreAuthorize("hasRole('" + AMEntitlement.OIDC_RELYING_PARTY_LIST + "')")
@Transactional(readOnly = true)
@Override
- public List<OpenIdConnectRelyingPartyTO> list() {
- return openIdConnectRelyingPartyDAO.findAll()
+ public List<OIDCRelyingPartyTO> list() {
+ return oidcRelyingPartyDAO.findAll()
.stream().map(binder::getClientApplicationTO).collect(Collectors.toList());
}
@PreAuthorize("hasRole('" + AMEntitlement.OIDC_RELYING_PARTY_CREATE + "')")
@Override
- public OpenIdConnectRelyingPartyTO create(final OpenIdConnectRelyingPartyTO applicationTO) {
- return binder.getClientApplicationTO(openIdConnectRelyingPartyDAO.save(binder.create(applicationTO)));
+ public OIDCRelyingPartyTO create(final OIDCRelyingPartyTO applicationTO) {
+ return binder.getClientApplicationTO(oidcRelyingPartyDAO.save(binder.create(applicationTO)));
}
@Override
@PreAuthorize("hasRole('" + IdRepoEntitlement.APPLICATION_UPDATE + "')")
- public OpenIdConnectRelyingPartyTO update(final OpenIdConnectRelyingPartyTO applicationTO) {
- OIDCRelyingParty application = openIdConnectRelyingPartyDAO.find(applicationTO.getKey());
+ public OIDCRelyingPartyTO update(final OIDCRelyingPartyTO applicationTO) {
+ OIDCRelyingParty application = oidcRelyingPartyDAO.find(applicationTO.getKey());
if (application == null) {
LOG.error("Could not find application '" + applicationTO.getKey() + '\'');
throw new NotFoundException(applicationTO.getKey());
}
return binder.getClientApplicationTO(
- openIdConnectRelyingPartyDAO.save(binder.update(application, applicationTO)));
+ oidcRelyingPartyDAO.save(binder.update(application, applicationTO)));
}
@Override
@PreAuthorize("hasRole('" + AMEntitlement.OIDC_RELYING_PARTY_DELETE + "')")
- public OpenIdConnectRelyingPartyTO delete(final String key) {
- OIDCRelyingParty application = openIdConnectRelyingPartyDAO.find(key);
+ public OIDCRelyingPartyTO delete(final String key) {
+ OIDCRelyingParty application = oidcRelyingPartyDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
throw new NotFoundException(key);
}
- OpenIdConnectRelyingPartyTO deleted = binder.getClientApplicationTO(application);
- openIdConnectRelyingPartyDAO.delete(key);
+ OIDCRelyingPartyTO deleted = binder.getClientApplicationTO(application);
+ oidcRelyingPartyDAO.delete(key);
return deleted;
}
diff --git a/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2ServiceProviderLogic.java b/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
similarity index 80%
rename from core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2ServiceProviderLogic.java
rename to core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index 804c7cf..b7ba57e 100644
--- a/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2ServiceProviderLogic.java
+++ b/core/am/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -18,12 +18,12 @@
*/
package org.apache.syncope.core.logic;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
+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.SAML2ServiceProviderDataBinder;
+import org.apache.syncope.core.provisioning.api.data.SAML2SPDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -33,17 +33,17 @@ import java.util.stream.Collectors;
import org.apache.syncope.common.lib.types.AMEntitlement;
@Component
-public class SAML2ServiceProviderLogic extends AbstractClientApplicationLogic<SAML2ServiceProviderTO> {
+public class SAML2SPLogic extends AbstractClientAppLogic<SAML2SPTO> {
@Autowired
- private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
+ private SAML2SPDAO saml2ServiceProviderDAO;
@Autowired
- private SAML2ServiceProviderDataBinder binder;
+ private SAML2SPDataBinder binder;
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_DELETE + "')")
- public SAML2ServiceProviderTO delete(final String key) {
+ public SAML2SPTO delete(final String key) {
SAML2SP application = saml2ServiceProviderDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
@@ -51,7 +51,7 @@ public class SAML2ServiceProviderLogic extends AbstractClientApplicationLogic<SA
throw new NotFoundException(key);
}
- SAML2ServiceProviderTO deleted = binder.getClientApplicationTO(application);
+ SAML2SPTO deleted = binder.getClientApplicationTO(application);
saml2ServiceProviderDAO.delete(key);
return deleted;
}
@@ -59,7 +59,7 @@ public class SAML2ServiceProviderLogic extends AbstractClientApplicationLogic<SA
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_LIST + "')")
@Transactional(readOnly = true)
- public List<SAML2ServiceProviderTO> list() {
+ public List<SAML2SPTO> list() {
return saml2ServiceProviderDAO.findAll().stream()
.map(binder::getClientApplicationTO).collect(Collectors.toList());
}
@@ -67,7 +67,7 @@ public class SAML2ServiceProviderLogic extends AbstractClientApplicationLogic<SA
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_READ + "')")
@Transactional(readOnly = true)
@Override
- public SAML2ServiceProviderTO read(final String key) {
+ public SAML2SPTO read(final String key) {
SAML2SP application = saml2ServiceProviderDAO.find(key);
if (application == null) {
LOG.error("Could not find application '" + key + '\'');
@@ -80,13 +80,13 @@ public class SAML2ServiceProviderLogic extends AbstractClientApplicationLogic<SA
@Override
@PreAuthorize("hasRole('" + AMEntitlement.SAML2_SERVICE_PROVIDER_CREATE + "')")
- public SAML2ServiceProviderTO create(final SAML2ServiceProviderTO applicationTO) {
+ public SAML2SPTO create(final SAML2SPTO applicationTO) {
return binder.getClientApplicationTO(saml2ServiceProviderDAO.save(binder.create(applicationTO)));
}
@Override
@PreAuthorize("hasRole('" + IdRepoEntitlement.APPLICATION_UPDATE + "')")
- public SAML2ServiceProviderTO update(final SAML2ServiceProviderTO applicationTO) {
+ public SAML2SPTO update(final SAML2SPTO applicationTO) {
SAML2SP application = saml2ServiceProviderDAO.find(applicationTO.getKey());
if (application == null) {
LOG.error("Could not find application '" + applicationTO.getKey() + '\'');
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientApplicationServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
similarity index 82%
rename from core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientApplicationServiceImpl.java
rename to core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
index 1741e81..b87fc37 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientApplicationServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractClientAppServiceImpl.java
@@ -18,20 +18,20 @@
*/
package org.apache.syncope.core.rest.cxf.service;
-import org.apache.syncope.common.rest.api.service.ClientApplicationService;
+import org.apache.syncope.common.rest.api.service.ClientAppService;
import org.apache.syncope.common.lib.to.ClientApplicationTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
-import org.apache.syncope.core.logic.AbstractClientApplicationLogic;
+import org.apache.syncope.core.logic.AbstractClientAppLogic;
import javax.ws.rs.core.Response;
import java.net.URI;
import java.util.List;
-public abstract class AbstractClientApplicationServiceImpl<T extends ClientApplicationTO> extends AbstractServiceImpl
- implements ClientApplicationService<T> {
+public abstract class AbstractClientAppServiceImpl<T extends ClientApplicationTO> extends AbstractServiceImpl
+ implements ClientAppService<T> {
- protected abstract AbstractClientApplicationLogic<T> getLogic();
+ protected abstract AbstractClientAppLogic<T> getLogic();
@Override
public List<T> list() {
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OpenIdConnectRelyingPartyServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
similarity index 64%
rename from core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OpenIdConnectRelyingPartyServiceImpl.java
rename to core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
index c56a910..b69863f 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OpenIdConnectRelyingPartyServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCRelyingPartyServiceImpl.java
@@ -19,23 +19,23 @@
package org.apache.syncope.core.rest.cxf.service;
-import org.apache.syncope.common.rest.api.service.OpenIdConnectRelyingPartyService;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
-import org.apache.syncope.core.logic.AbstractClientApplicationLogic;
-import org.apache.syncope.core.logic.OpenIdConnectRelyingPartyLogic;
+import org.apache.syncope.common.rest.api.service.OIDCRelyingPartyService;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
+import org.apache.syncope.core.logic.AbstractClientAppLogic;
+import org.apache.syncope.core.logic.OIDCRelyingPartyLogic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class OpenIdConnectRelyingPartyServiceImpl
- extends AbstractClientApplicationServiceImpl<OpenIdConnectRelyingPartyTO>
- implements OpenIdConnectRelyingPartyService {
+public class OIDCRelyingPartyServiceImpl
+ extends AbstractClientAppServiceImpl<OIDCRelyingPartyTO>
+ implements OIDCRelyingPartyService {
@Autowired
- private OpenIdConnectRelyingPartyLogic logic;
+ private OIDCRelyingPartyLogic logic;
@Override
- protected AbstractClientApplicationLogic getLogic() {
+ protected AbstractClientAppLogic getLogic() {
return this.logic;
}
}
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2ServiceProviderServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
similarity index 73%
rename from core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2ServiceProviderServiceImpl.java
rename to core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
index 0851f1b..a151873 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2ServiceProviderServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SAML2SPServiceImpl.java
@@ -20,22 +20,22 @@
package org.apache.syncope.core.rest.cxf.service;
import org.apache.syncope.common.rest.api.service.SAML2ServiceProviderService;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
-import org.apache.syncope.core.logic.AbstractClientApplicationLogic;
-import org.apache.syncope.core.logic.SAML2ServiceProviderLogic;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
+import org.apache.syncope.core.logic.AbstractClientAppLogic;
+import org.apache.syncope.core.logic.SAML2SPLogic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class SAML2ServiceProviderServiceImpl
- extends AbstractClientApplicationServiceImpl<SAML2ServiceProviderTO>
+public class SAML2SPServiceImpl
+ extends AbstractClientAppServiceImpl<SAML2SPTO>
implements SAML2ServiceProviderService {
@Autowired
- private SAML2ServiceProviderLogic logic;
+ private SAML2SPLogic logic;
@Override
- protected AbstractClientApplicationLogic getLogic() {
+ protected AbstractClientAppLogic getLogic() {
return this.logic;
}
}
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OpenIdConnectRelyingPartyDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRelyingPartyDAO.java
similarity index 94%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OpenIdConnectRelyingPartyDAO.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRelyingPartyDAO.java
index 496d1ec..41cf508 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OpenIdConnectRelyingPartyDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/OIDCRelyingPartyDAO.java
@@ -23,7 +23,7 @@ import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelying
import java.util.List;
-public interface OpenIdConnectRelyingPartyDAO extends DAO<OIDCRelyingParty> {
+public interface OIDCRelyingPartyDAO extends DAO<OIDCRelyingParty> {
OIDCRelyingParty find(String key);
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
similarity index 95%
rename from core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java
rename to core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
index 4590fb5..347fa90 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2ServiceProviderDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/authentication/SAML2SPDAO.java
@@ -23,7 +23,7 @@ import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
import java.util.List;
-public interface SAML2ServiceProviderDAO extends DAO<SAML2SP> {
+public interface SAML2SPDAO extends DAO<SAML2SP> {
SAML2SP find(String key);
diff --git 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/JPAOIDCRelyingPartyDAO.java
similarity index 85%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOpenIdConnectRelyingPartyDAO.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPAOIDCRelyingPartyDAO.java
index b5340d4..3bc9fad 100644
--- 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/JPAOIDCRelyingPartyDAO.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.dao.authentication;
-import org.apache.syncope.core.persistence.api.dao.authentication.OpenIdConnectRelyingPartyDAO;
+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.jpa.dao.AbstractDAO;
import org.apache.syncope.core.persistence.jpa.entity.authentication.JPAOIDCRelyingParty;
@@ -31,8 +31,8 @@ import javax.persistence.TypedQuery;
import java.util.List;
@Repository
-public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingParty>
- implements OpenIdConnectRelyingPartyDAO {
+public class JPAOIDCRelyingPartyDAO extends AbstractDAO<OIDCRelyingParty>
+ implements OIDCRelyingPartyDAO {
@Override
public OIDCRelyingParty find(final String key) {
@@ -50,7 +50,7 @@ public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingPart
try {
result = query.getSingleResult();
} catch (NoResultException e) {
- LOG.debug("No OpenIdConnectRelyingParty found with name {}", name, e);
+ LOG.debug("No OIDCRelyingParty found with name {}", name, e);
}
return result;
@@ -67,7 +67,7 @@ public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingPart
try {
result = query.getSingleResult();
} catch (NoResultException e) {
- LOG.debug("No OpenIdConnectRelyingParty found with clientId {}", clientId, e);
+ LOG.debug("No OIDCRelyingParty found with clientId {}", clientId, e);
}
return result;
@@ -84,13 +84,13 @@ public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingPart
}
@Override
- public OIDCRelyingParty save(final OIDCRelyingParty policy) {
+ public OIDCRelyingParty save(final OIDCRelyingParty rpTO) {
return entityManager().merge(rpTO);
}
@Override
public void delete(final String key) {
- OIDCRelyingParty policy = find(key);
+ OIDCRelyingParty rpTO = find(key);
if (rpTO == null) {
return;
}
@@ -100,7 +100,7 @@ public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingPart
@Override
public void deleteByClientId(final String clientId) {
- OIDCRelyingParty policy = findByClientId(clientId);
+ OIDCRelyingParty rpTO = findByClientId(clientId);
if (rpTO == null) {
return;
}
@@ -108,7 +108,7 @@ public class JPAOpenIdConnectRelyingPartyDAO extends AbstractDAO<OIDCRelyingPart
}
@Override
- public void delete(final OIDCRelyingParty policy) {
+ public void delete(final OIDCRelyingParty rpTO) {
entityManager().remove(rpTO);
}
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2ServiceProviderDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
similarity index 96%
rename from core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2ServiceProviderDAO.java
rename to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
index 7de27d3..1539c5e 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2ServiceProviderDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/authentication/JPASAML2SPDAO.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.dao.authentication;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
+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.jpa.dao.AbstractDAO;
import org.apache.syncope.core.persistence.jpa.entity.authentication.JPASAML2SP;
@@ -31,8 +31,7 @@ import javax.persistence.TypedQuery;
import java.util.List;
@Repository
-public class JPASAML2ServiceProviderDAO extends AbstractDAO<SAML2SP>
- implements SAML2ServiceProviderDAO {
+public class JPASAML2SPDAO extends AbstractDAO<SAML2SP> implements SAML2SPDAO {
@Override
public SAML2SP find(final String key) {
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientApplicationTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
similarity index 98%
rename from core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientApplicationTest.java
rename to core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
index 0089c82..496b98c 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientApplicationTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AbstractClientAppTest.java
@@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import java.util.Map;
-public class AbstractClientApplicationTest extends AbstractTest {
+public class AbstractClientAppTest extends AbstractTest {
@Autowired
protected AuthenticationPolicyDAO authenticationPolicyDAO;
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OpenIdConnectRelyingPartyTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
similarity index 93%
rename from core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OpenIdConnectRelyingPartyTest.java
rename to core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
index 5b3690c..c2fd74f 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OpenIdConnectRelyingPartyTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/OIDCRelyingPartyTest.java
@@ -19,7 +19,7 @@
package org.apache.syncope.core.persistence.jpa.inner;
-import org.apache.syncope.core.persistence.api.dao.authentication.OpenIdConnectRelyingPartyDAO;
+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;
@@ -30,10 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.*;
@Transactional("Master")
-public class OpenIdConnectRelyingPartyTest extends AbstractClientApplicationTest {
+public class OIDCRelyingPartyTest extends AbstractClientAppTest {
@Autowired
- private OpenIdConnectRelyingPartyDAO openIdConnectRelyingPartyDAO;
+ private OIDCRelyingPartyDAO openIdConnectRelyingPartyDAO;
@Test
public void find() {
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/SAML2SPTest.java
similarity index 93%
rename from core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2ServiceProviderTest.java
rename to core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPTest.java
index 5e487e8..495f31c 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/SAML2SPTest.java
@@ -19,7 +19,7 @@
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.dao.authentication.SAML2SPDAO;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
@@ -30,10 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.*;
@Transactional("Master")
-public class SAML2ServiceProviderTest extends AbstractClientApplicationTest {
+public class SAML2SPTest extends AbstractClientAppTest {
@Autowired
- private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
+ private SAML2SPDAO saml2ServiceProviderDAO;
@Test
public void find() {
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OpenIdConnectRelyingPartyDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
similarity index 71%
rename from core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OpenIdConnectRelyingPartyDataBinder.java
rename to core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
index 31a38c3..e36f41a 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OpenIdConnectRelyingPartyDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/OIDCRelyingPartyDataBinder.java
@@ -19,13 +19,13 @@
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import org.apache.syncope.core.persistence.api.entity.authentication.OIDCRelyingParty;
-public interface OpenIdConnectRelyingPartyDataBinder {
- OIDCRelyingParty create(OpenIdConnectRelyingPartyTO applicationTO);
+public interface OIDCRelyingPartyDataBinder {
+ OIDCRelyingParty create(OIDCRelyingPartyTO applicationTO);
- OIDCRelyingParty update(OIDCRelyingParty application, OpenIdConnectRelyingPartyTO applicationTO);
+ OIDCRelyingParty update(OIDCRelyingParty application, OIDCRelyingPartyTO applicationTO);
- OpenIdConnectRelyingPartyTO getClientApplicationTO(OIDCRelyingParty application);
+ OIDCRelyingPartyTO getClientApplicationTO(OIDCRelyingParty application);
}
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
similarity index 74%
rename from core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java
rename to core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
index 68d1c2c..ee9287f 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2ServiceProviderDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/SAML2SPDataBinder.java
@@ -18,14 +18,14 @@
*/
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
import org.apache.syncope.core.persistence.api.entity.authentication.SAML2SP;
-public interface SAML2ServiceProviderDataBinder {
+public interface SAML2SPDataBinder {
- SAML2SP create(SAML2ServiceProviderTO applicationTO);
+ SAML2SP create(SAML2SPTO applicationTO);
- SAML2SP update(SAML2SP application, SAML2ServiceProviderTO applicationTO);
+ SAML2SP update(SAML2SP application, SAML2SPTO applicationTO);
- SAML2ServiceProviderTO getClientApplicationTO(SAML2SP application);
+ SAML2SPTO getClientApplicationTO(SAML2SP application);
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OpenIdConnectRelyingPartyDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
similarity index 85%
rename from core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OpenIdConnectRelyingPartyDataBinderImpl.java
rename to core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
index bbb4629..1a276e2 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OpenIdConnectRelyingPartyDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
@@ -21,23 +21,23 @@ package org.apache.syncope.core.provisioning.java.data;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.policy.AccessPolicyTO;
import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
-import org.apache.syncope.core.persistence.api.dao.authentication.OpenIdConnectRelyingPartyDAO;
+import org.apache.syncope.core.persistence.api.dao.authentication.OIDCRelyingPartyDAO;
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.AuthenticationPolicy;
-import org.apache.syncope.core.provisioning.api.data.OpenIdConnectRelyingPartyDataBinder;
+import org.apache.syncope.core.provisioning.api.data.OIDCRelyingPartyDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class OpenIdConnectRelyingPartyDataBinderImpl implements OpenIdConnectRelyingPartyDataBinder {
+public class OIDCRelyingPartyDataBinderImpl implements OIDCRelyingPartyDataBinder {
@Autowired
- private OpenIdConnectRelyingPartyDAO openIdConnectRelyingPartyDAO;
+ private OIDCRelyingPartyDAO openIdConnectRelyingPartyDAO;
@Autowired
private EntityFactory entityFactory;
@@ -46,14 +46,14 @@ public class OpenIdConnectRelyingPartyDataBinderImpl implements OpenIdConnectRel
private PolicyDAO policyDAO;
@Override
- public OIDCRelyingParty create(final OpenIdConnectRelyingPartyTO applicationTO) {
+ public OIDCRelyingParty create(final OIDCRelyingPartyTO applicationTO) {
return update(entityFactory.newEntity(OIDCRelyingParty.class), applicationTO);
}
@Override
public OIDCRelyingParty update(
final OIDCRelyingParty toBeUpdated,
- final OpenIdConnectRelyingPartyTO applicationTO) {
+ final OIDCRelyingPartyTO applicationTO) {
OIDCRelyingParty application = openIdConnectRelyingPartyDAO.save(toBeUpdated);
@@ -80,8 +80,8 @@ public class OpenIdConnectRelyingPartyDataBinderImpl implements OpenIdConnectRel
}
@Override
- public OpenIdConnectRelyingPartyTO getClientApplicationTO(final OIDCRelyingParty rp) {
- OpenIdConnectRelyingPartyTO applicationTO = new OpenIdConnectRelyingPartyTO();
+ public OIDCRelyingPartyTO getClientApplicationTO(final OIDCRelyingParty rp) {
+ OIDCRelyingPartyTO applicationTO = new OIDCRelyingPartyTO();
applicationTO.setKey(rp.getKey());
applicationTO.setDescription(rp.getDescription());
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/SAML2SPDataBinderImpl.java
similarity index 76%
rename from core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
rename to core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2SPDataBinderImpl.java
index 7efe554..2e9df75 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/SAML2SPDataBinderImpl.java
@@ -19,24 +19,20 @@
package org.apache.syncope.core.provisioning.java.data;
-import org.apache.syncope.common.lib.to.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.to.SAML2SPTO;
import org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationPolicyDAO;
-import org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
+import org.apache.syncope.core.persistence.api.dao.authentication.SAML2SPDAO;
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.policy.AuthenticationPolicy;
-import org.apache.syncope.core.provisioning.api.data.SAML2ServiceProviderDataBinder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.syncope.core.provisioning.api.data.SAML2SPDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderDataBinder {
- private static final Logger LOG = LoggerFactory.getLogger(SAML2ServiceProviderDataBinderImpl.class);
-
+public class SAML2SPDataBinderImpl implements SAML2SPDataBinder {
@Autowired
- private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
+ private SAML2SPDAO saml2ServiceProviderDAO;
@Autowired
private EntityFactory entityFactory;
@@ -45,13 +41,13 @@ public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderD
private AuthenticationPolicyDAO authenticationPolicyDAO;
@Override
- public SAML2SP create(final SAML2ServiceProviderTO applicationTO) {
+ public SAML2SP create(final SAML2SPTO applicationTO) {
return update(entityFactory.newEntity(SAML2SP.class), applicationTO);
}
@Override
public SAML2SP update(final SAML2SP toBeUpdated,
- final SAML2ServiceProviderTO applicationTO) {
+ final SAML2SPTO applicationTO) {
SAML2SP application = saml2ServiceProviderDAO.save(toBeUpdated);
application.setDescription(applicationTO.getDescription());
@@ -67,8 +63,8 @@ public class SAML2ServiceProviderDataBinderImpl implements SAML2ServiceProviderD
}
@Override
- public SAML2ServiceProviderTO getClientApplicationTO(final SAML2SP serviceProvider) {
- SAML2ServiceProviderTO applicationTO = new SAML2ServiceProviderTO();
+ public SAML2SPTO getClientApplicationTO(final SAML2SP serviceProvider) {
+ SAML2SPTO applicationTO = new SAML2SPTO();
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 85989a2..0b100da 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -70,7 +70,7 @@ import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.MembershipTO;
import org.apache.syncope.common.lib.to.NotificationTO;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.to.ProvisioningResult;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.to.RoleTO;
@@ -92,7 +92,7 @@ import org.apache.syncope.common.rest.api.service.ConnectorService;
import org.apache.syncope.common.rest.api.service.DynRealmService;
import org.apache.syncope.common.rest.api.service.LoggerService;
import org.apache.syncope.common.rest.api.service.NotificationService;
-import org.apache.syncope.common.rest.api.service.OpenIdConnectRelyingPartyService;
+import org.apache.syncope.common.rest.api.service.OIDCRelyingPartyService;
import org.apache.syncope.common.rest.api.service.PolicyService;
import org.apache.syncope.common.rest.api.service.ReportService;
import org.apache.syncope.common.rest.api.service.ResourceService;
@@ -290,7 +290,7 @@ public abstract class AbstractITCase {
protected static SCIMConfService scimConfService;
- protected static OpenIdConnectRelyingPartyService openIdConnectRelyingPartyService;
+ protected static OIDCRelyingPartyService openIdConnectRelyingPartyService;
protected static SAML2ServiceProviderService saml2ServiceProviderService;
@@ -363,7 +363,7 @@ public abstract class AbstractITCase {
oidcClientService = adminClient.getService(OIDCClientService.class);
oidcProviderService = adminClient.getService(OIDCProviderService.class);
scimConfService = adminClient.getService(SCIMConfService.class);
- openIdConnectRelyingPartyService = adminClient.getService(OpenIdConnectRelyingPartyService.class);
+ openIdConnectRelyingPartyService = adminClient.getService(OIDCRelyingPartyService.class);
saml2ServiceProviderService = adminClient.getService(SAML2ServiceProviderService.class);
}
@@ -567,7 +567,7 @@ public abstract class AbstractITCase {
return (T) getObject(response.getLocation(), PolicyService.class, policy.getClass());
}
- protected OpenIdConnectRelyingPartyTO createOpenIdConnectRelyingParty(final OpenIdConnectRelyingPartyTO rpTO) {
+ protected OIDCRelyingPartyTO createOpenIdConnectRelyingParty(final OIDCRelyingPartyTO rpTO) {
Response response = openIdConnectRelyingPartyService.create(rpTO);
if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) {
Exception ex = clientFactory.getExceptionMapper().fromResponse(response);
@@ -575,8 +575,8 @@ public abstract class AbstractITCase {
throw (RuntimeException) ex;
}
}
- return getObject(response.getLocation(), OpenIdConnectRelyingPartyService.class,
- OpenIdConnectRelyingPartyTO.class);
+ return getObject(response.getLocation(), OIDCRelyingPartyService.class,
+ OIDCRelyingPartyTO.class);
}
protected ResourceTO createResource(final ResourceTO resourceTO) {
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
similarity index 85%
rename from fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
rename to fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
index f212ef0..ee89dd7 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OIDCRelyingPartyITCase.java
@@ -20,7 +20,7 @@ package org.apache.syncope.fit.core;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.policy.AuthenticationPolicyTO;
-import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
+import org.apache.syncope.common.lib.to.OIDCRelyingPartyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.jupiter.api.Test;
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.*;
import org.apache.syncope.common.lib.SyncopeClientException;
-public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
+public class OIDCRelyingPartyITCase extends AbstractITCase {
@Test
public void create() {
@@ -39,10 +39,10 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
@Test
public void read() {
- OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
+ OIDCRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
- OpenIdConnectRelyingPartyTO found = openIdConnectRelyingPartyService.read(rpTO.getKey());
+ OIDCRelyingPartyTO found = openIdConnectRelyingPartyService.read(rpTO.getKey());
assertNotNull(found);
assertFalse(StringUtils.isBlank(found.getClientId()));
assertTrue(StringUtils.isBlank(found.getClientSecret()));
@@ -52,7 +52,7 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
@Test
public void update() {
- OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
+ OIDCRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
AccessPolicyTO accessPolicyTO = new AccessPolicyTO();
@@ -65,7 +65,7 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
rpTO.setAccessPolicy(accessPolicyTO);
openIdConnectRelyingPartyService.update(rpTO);
- OpenIdConnectRelyingPartyTO updated = openIdConnectRelyingPartyService.read(rpTO.getKey());
+ OIDCRelyingPartyTO updated = openIdConnectRelyingPartyService.read(rpTO.getKey());
assertNotNull(updated);
assertEquals("newClientId", updated.getClientId());
@@ -75,7 +75,7 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
@Test
public void delete() {
- OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
+ OIDCRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
openIdConnectRelyingPartyService.delete(rpTO.getKey());
@@ -88,7 +88,7 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
}
}
- private OpenIdConnectRelyingPartyTO buildRelyingParty() {
+ private OIDCRelyingPartyTO buildRelyingParty() {
AuthenticationPolicyTO authPolicyTO = new AuthenticationPolicyTO();
authPolicyTO.setKey("AuthPolicyTest_" + getUUIDString());
authPolicyTO.setDescription("Authentication Policy");
@@ -101,7 +101,7 @@ public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
accessPolicyTO = createPolicy(PolicyType.ACCESS, accessPolicyTO);
assertNotNull(accessPolicyTO);
- OpenIdConnectRelyingPartyTO rpTO = new OpenIdConnectRelyingPartyTO();
+ OIDCRelyingPartyTO rpTO = new OIDCRelyingPartyTO();
rpTO.setName("ExampleRP_" + getUUIDString());
rpTO.setDescription("Example OIDC RP application");
rpTO.setClientId("clientId_" + getUUIDString());