This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push: new 987ee59 Restoring JAXB features 987ee59 is described below commit 987ee59e5f02e3cd7b51542fe92b0de0816812fe Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Thu Nov 22 17:56:11 2018 +0100 Restoring JAXB features --- .../org/apache/syncope/common/lib/BaseBean.java | 27 ++++++++++++++++++++++ .../common/lib/to/AbstractAnnotatedBean.java | 3 ++- .../common/lib/to/AbstractStartEndBean.java | 4 ++-- .../syncope/common/lib/to/AccessTokenTO.java | 3 ++- .../apache/syncope/common/lib/to/PagedResult.java | 3 ++- .../syncope/common/lib/to/RemediationTO.java | 3 ++- .../core/rest/cxf/service/AbstractServiceImpl.java | 4 ++-- .../apache/syncope/common/lib/to/UserRequest.java | 4 ++-- .../syncope/common/lib/to/UserRequestForm.java | 4 ++-- 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/BaseBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/BaseBean.java new file mode 100644 index 0000000..edfbeff --- /dev/null +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/BaseBean.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.common.lib; + +import java.io.Serializable; + +public abstract class BaseBean implements Serializable { + + private static final long serialVersionUID = 8243277089603485380L; + +} diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractAnnotatedBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractAnnotatedBean.java index 741083c..7a4df9e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractAnnotatedBean.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractAnnotatedBean.java @@ -25,12 +25,13 @@ import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.syncope.common.lib.BaseBean; /** * Abstract wrapper for common system information. */ @XmlType -public abstract class AbstractAnnotatedBean implements EntityTO { +public abstract class AbstractAnnotatedBean extends BaseBean implements EntityTO { private static final long serialVersionUID = -930797879027642457L; diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractStartEndBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractStartEndBean.java index f6fb7aa..e1bbe0f 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractStartEndBean.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractStartEndBean.java @@ -19,14 +19,14 @@ package org.apache.syncope.common.lib.to; import io.swagger.v3.oas.annotations.media.Schema; -import java.io.Serializable; import java.util.Date; import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.syncope.common.lib.BaseBean; @XmlType -public class AbstractStartEndBean implements Serializable { +public class AbstractStartEndBean extends BaseBean { private static final long serialVersionUID = 2399577415544539917L; diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java index 6dd39b3..c553e5d 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java @@ -21,10 +21,11 @@ package org.apache.syncope.common.lib.to; import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.syncope.common.lib.BaseBean; @XmlRootElement(name = "accessToken") @XmlType -public class AccessTokenTO implements EntityTO { +public class AccessTokenTO extends BaseBean implements EntityTO { private static final long serialVersionUID = 6577639976115661357L; 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 f5ec00f..27401d6 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 @@ -30,10 +30,11 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.syncope.common.lib.BaseBean; @XmlRootElement(name = "pagedResult") @XmlType -public class PagedResult<T extends Serializable> implements Serializable { +public class PagedResult<T extends BaseBean> implements Serializable { private static final long serialVersionUID = 3472875885259250934L; diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RemediationTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RemediationTO.java index 4354b55..91f9e3d 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RemediationTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RemediationTO.java @@ -23,12 +23,13 @@ import java.util.Date; import javax.ws.rs.PathParam; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.syncope.common.lib.BaseBean; import org.apache.syncope.common.lib.patch.AnyPatch; import org.apache.syncope.common.lib.types.ResourceOperation; @XmlRootElement(name = "remediation") @XmlType -public class RemediationTO implements EntityTO { +public class RemediationTO extends BaseBean implements EntityTO { private static final long serialVersionUID = 3983540425142284975L; 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 6f83b11..be1acfe 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 @@ -18,7 +18,6 @@ */ package org.apache.syncope.core.rest.cxf.service; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -35,6 +34,7 @@ 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.BaseBean; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.PagedResult; @@ -216,7 +216,7 @@ abstract class AbstractServiceImpl implements JAXRSService { * @param totalCount total result size (not considering pagination) * @return paged result */ - protected <T extends Serializable> PagedResult<T> buildPagedResult( + protected <T extends BaseBean> PagedResult<T> buildPagedResult( final List<T> list, final int page, final int size, final int totalCount) { PagedResult<T> result = new PagedResult<>(); diff --git a/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequest.java b/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequest.java index b3fbe23..b0ce0a5 100644 --- a/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequest.java +++ b/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequest.java @@ -18,14 +18,14 @@ */ package org.apache.syncope.common.lib.to; -import java.io.Serializable; import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.syncope.common.lib.BaseBean; @XmlRootElement(name = "userRequest") @XmlType -public class UserRequest implements Serializable { +public class UserRequest extends BaseBean { private static final long serialVersionUID = -8430826310789942133L; diff --git a/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequestForm.java b/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequestForm.java index 6e17e79..8508c2c 100644 --- a/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequestForm.java +++ b/ext/flowable/common-lib/src/main/java/org/apache/syncope/common/lib/to/UserRequestForm.java @@ -20,7 +20,6 @@ package org.apache.syncope.common.lib.to; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -29,11 +28,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.syncope.common.lib.BaseBean; import org.apache.syncope.common.lib.patch.UserPatch; @XmlRootElement(name = "userRequestForm") @XmlType -public class UserRequestForm implements Serializable { +public class UserRequestForm extends BaseBean { private static final long serialVersionUID = -7044543391316529128L;