You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/09/25 14:55:47 UTC
[2/2] syncope git commit: Using the EntityTO interface for
PagedResult rather than AbstractBaseBean
Using the EntityTO interface for PagedResult rather than AbstractBaseBean
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3765af71
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3765af71
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3765af71
Branch: refs/heads/master
Commit: 3765af711f79103bc71cc2d35d46e5df439cb0d6
Parents: 6b31e4e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Sep 25 16:55:29 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Sep 25 16:55:38 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/common/lib/AbstractBaseBean.java | 3 ++-
.../main/java/org/apache/syncope/common/lib/to/PagedResult.java | 2 +-
.../syncope/core/rest/cxf/service/AbstractServiceImpl.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3765af71/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
index 0187d70..432b766 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
@@ -26,13 +26,14 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
@XmlType
// Reporting here only classes used via PagedResult
-@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class, GroupTO.class, UserTO.class })
+@XmlSeeAlso({ AbstractTaskTO.class, ReportTO.class, GroupTO.class, UserTO.class, AnyObjectTO.class })
public abstract class AbstractBaseBean implements Serializable {
private static final long serialVersionUID = 3119542005279892164L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/3765af71/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java
index b17db6d..9e08fcc 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java
@@ -31,7 +31,7 @@ import org.apache.syncope.common.lib.AbstractBaseBean;
@XmlRootElement(name = "pagedResult")
@XmlType
-public class PagedResult<T extends AbstractBaseBean> extends AbstractBaseBean {
+public class PagedResult<T extends EntityTO> extends AbstractBaseBean {
private static final long serialVersionUID = 3472875885259250934L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/3765af71/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractServiceImpl.java
index 4ca01dc..7661aa5 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractServiceImpl.java
@@ -34,8 +34,8 @@ import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.search.SearchBean;
import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchContext;
-import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.to.EntityTO;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.ProvisioningResult;
import org.apache.syncope.common.lib.types.ClientExceptionType;
@@ -199,7 +199,7 @@ abstract class AbstractServiceImpl implements JAXRSService {
* @param totalCount total result size (not considering pagination)
* @return paged result
*/
- protected <T extends AbstractBaseBean> PagedResult<T> buildPagedResult(
+ protected <T extends EntityTO> PagedResult<T> buildPagedResult(
final List<T> list, final int page, final int size, final int totalCount) {
PagedResult<T> result = new PagedResult<>();