Restoring JAXB functionality for WADL
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3981685e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3981685e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3981685e Branch: refs/heads/master Commit: 3981685eacf255b05c08437081a97decc749bbf7 Parents: a1210cf Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Oct 3 17:55:05 2017 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Oct 3 17:55:14 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/syncope/common/lib/to/PagedResult.java | 2 +- .../syncope/core/rest/cxf/service/AbstractServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3981685e/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 9e08fcc..b17db6d 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 EntityTO> extends AbstractBaseBean { +public class PagedResult<T extends AbstractBaseBean> extends AbstractBaseBean { private static final long serialVersionUID = 3472875885259250934L; http://git-wip-us.apache.org/repos/asf/syncope/blob/3981685e/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 7661aa5..4ca01dc 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 EntityTO> PagedResult<T> buildPagedResult( + protected <T extends AbstractBaseBean> PagedResult<T> buildPagedResult( final List<T> list, final int page, final int size, final int totalCount) { PagedResult<T> result = new PagedResult<>();
