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 2016/07/05 09:41:20 UTC
[3/6] syncope git commit: Promising: almost everything works,
but WADL has no XSD anymore
Promising: almost everything works, but WADL has no XSD anymore
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0fad00ab
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0fad00ab
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0fad00ab
Branch: refs/heads/2_0_NO_JAXB
Commit: 0fad00ab96139187faa19e71b7068f2059a6f12f
Parents: 920476b
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Jul 4 15:35:02 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Jul 4 16:09:10 2016 +0200
----------------------------------------------------------------------
.../client/lib/SyncopeClientFactoryBean.java | 15 +---
common/lib/pom.xml | 23 +++--
.../syncope/common/lib/AbstractBaseBean.java | 9 --
.../syncope/common/lib/SyncopeConstants.java | 4 +-
.../syncope/common/lib/info/NumbersInfo.java | 7 --
.../syncope/common/lib/info/PlatformInfo.java | 4 -
.../syncope/common/lib/info/SystemInfo.java | 6 --
.../syncope/common/lib/info/package-info.java | 26 ------
.../lib/jackson/UnwrappedObjectMapper.java | 93 +++++++++++++++++++
.../common/lib/jackson/UnwrappedXmlMapper.java | 94 ++++++++++++++++++++
.../apache/syncope/common/lib/package-info.java | 25 ------
.../syncope/common/lib/patch/AbstractPatch.java | 4 -
.../common/lib/patch/AbstractPatchItem.java | 5 --
.../lib/patch/AbstractReplacePatchItem.java | 4 -
.../common/lib/patch/AnyObjectPatch.java | 4 -
.../syncope/common/lib/patch/AnyPatch.java | 2 -
.../common/lib/patch/AssociationPatch.java | 4 -
.../syncope/common/lib/patch/AttrPatch.java | 4 -
.../lib/patch/BooleanReplacePatchItem.java | 5 --
.../common/lib/patch/DeassociationPatch.java | 4 -
.../syncope/common/lib/patch/GroupPatch.java | 4 -
.../syncope/common/lib/patch/LongPatchItem.java | 5 --
.../common/lib/patch/MembershipPatch.java | 4 -
.../syncope/common/lib/patch/PasswordPatch.java | 6 --
.../common/lib/patch/RelationshipPatch.java | 4 -
.../lib/patch/ResourceDeassociationPatch.java | 4 -
.../syncope/common/lib/patch/StatusPatch.java | 4 -
.../common/lib/patch/StringPatchItem.java | 5 --
.../lib/patch/StringReplacePatchItem.java | 7 --
.../syncope/common/lib/patch/UserPatch.java | 4 -
.../syncope/common/lib/patch/package-info.java | 26 ------
.../lib/policy/AbstractAccountRuleConf.java | 4 -
.../lib/policy/AbstractPasswordRuleConf.java | 4 -
.../common/lib/policy/AbstractPolicyTO.java | 6 --
.../common/lib/policy/AccountPolicyTO.java | 4 -
.../lib/policy/DefaultAccountRuleConf.java | 4 -
.../lib/policy/DefaultPasswordRuleConf.java | 4 -
.../common/lib/policy/PasswordPolicyTO.java | 4 -
.../common/lib/policy/PullPolicySpec.java | 2 -
.../syncope/common/lib/policy/PullPolicyTO.java | 5 --
.../common/lib/policy/PushPolicySpec.java | 2 -
.../syncope/common/lib/policy/package-info.java | 26 ------
.../lib/report/AbstractAnyReportletConf.java | 3 -
.../lib/report/AbstractReportletConf.java | 6 --
.../common/lib/report/AuditReportletConf.java | 5 --
.../common/lib/report/GroupReportletConf.java | 7 --
.../lib/report/ReconciliationReportletConf.java | 7 --
.../common/lib/report/StaticReportletConf.java | 4 -
.../common/lib/report/UserReportletConf.java | 7 --
.../syncope/common/lib/report/package-info.java | 26 ------
.../syncope/common/lib/search/package-info.java | 26 ------
.../common/lib/to/AbstractAnnotatedBean.java | 2 -
.../lib/to/AbstractProvisioningTaskTO.java | 6 --
.../syncope/common/lib/to/AbstractSchemaTO.java | 6 --
.../common/lib/to/AbstractStartEndBean.java | 2 -
.../syncope/common/lib/to/AbstractTaskTO.java | 6 --
.../syncope/common/lib/to/AnyObjectTO.java | 4 -
.../org/apache/syncope/common/lib/to/AnyTO.java | 4 -
.../syncope/common/lib/to/AnyTypeClassTO.java | 4 -
.../apache/syncope/common/lib/to/AnyTypeTO.java | 4 -
.../apache/syncope/common/lib/to/AttrTO.java | 4 -
.../syncope/common/lib/to/BulkAction.java | 7 --
.../syncope/common/lib/to/BulkActionResult.java | 15 ----
.../syncope/common/lib/to/ConnBundleTO.java | 4 -
.../common/lib/to/ConnIdObjectClassTO.java | 4 -
.../syncope/common/lib/to/ConnInstanceTO.java | 4 -
.../syncope/common/lib/to/ConnObjectTO.java | 4 -
.../syncope/common/lib/to/ConnPoolConfTO.java | 4 -
.../syncope/common/lib/to/DerSchemaTO.java | 5 --
.../apache/syncope/common/lib/to/DomainTO.java | 4 -
.../apache/syncope/common/lib/to/ErrorTO.java | 4 -
.../syncope/common/lib/to/EventCategoryTO.java | 4 -
.../apache/syncope/common/lib/to/ExecTO.java | 4 -
.../apache/syncope/common/lib/to/GroupTO.java | 7 --
.../org/apache/syncope/common/lib/to/JobTO.java | 4 -
.../apache/syncope/common/lib/to/LoggerTO.java | 4 -
.../syncope/common/lib/to/MailTemplateTO.java | 4 -
.../syncope/common/lib/to/MappingItemTO.java | 4 -
.../apache/syncope/common/lib/to/MappingTO.java | 4 -
.../syncope/common/lib/to/MembershipTO.java | 4 -
.../syncope/common/lib/to/NotificationTO.java | 4 -
.../common/lib/to/NotificationTaskTO.java | 4 -
.../apache/syncope/common/lib/to/OrgUnitTO.java | 4 -
.../common/lib/to/PagedConnObjectTOResult.java | 4 -
.../syncope/common/lib/to/PagedResult.java | 4 -
.../syncope/common/lib/to/PlainSchemaTO.java | 5 --
.../common/lib/to/PropagationStatus.java | 4 -
.../common/lib/to/PropagationTaskTO.java | 4 -
.../syncope/common/lib/to/ProvisionTO.java | 4 -
.../common/lib/to/ProvisioningResult.java | 4 -
.../syncope/common/lib/to/PullTaskTO.java | 11 ---
.../syncope/common/lib/to/PushTaskTO.java | 11 ---
.../apache/syncope/common/lib/to/RealmTO.java | 4 -
.../syncope/common/lib/to/RelationshipTO.java | 4 -
.../common/lib/to/RelationshipTypeTO.java | 4 -
.../apache/syncope/common/lib/to/ReportTO.java | 4 -
.../syncope/common/lib/to/ReportTemplateTO.java | 4 -
.../syncope/common/lib/to/ResourceTO.java | 4 -
.../apache/syncope/common/lib/to/RoleTO.java | 4 -
.../syncope/common/lib/to/SchedTaskTO.java | 7 --
.../common/lib/to/SecurityQuestionTO.java | 4 -
.../syncope/common/lib/to/TypeExtensionTO.java | 4 -
.../apache/syncope/common/lib/to/UserTO.java | 4 -
.../syncope/common/lib/to/VirSchemaTO.java | 3 -
.../common/lib/to/WorkflowFormPropertyTO.java | 4 -
.../syncope/common/lib/to/WorkflowFormTO.java | 4 -
.../syncope/common/lib/to/package-info.java | 26 ------
.../syncope/common/lib/types/AnyTypeKind.java | 2 -
.../common/lib/types/AttrSchemaType.java | 2 -
.../syncope/common/lib/types/AuditElements.java | 3 -
.../common/lib/types/BulkMembersActionType.java | 3 -
.../common/lib/types/CipherAlgorithm.java | 3 -
.../lib/types/ConflictResolutionAction.java | 4 +-
.../common/lib/types/ConnConfPropSchema.java | 4 -
.../common/lib/types/ConnConfProperty.java | 4 -
.../common/lib/types/ConnectorCapability.java | 3 -
.../common/lib/types/EntityViolationType.java | 3 -
.../syncope/common/lib/types/JobAction.java | 3 -
.../syncope/common/lib/types/JobType.java | 3 -
.../syncope/common/lib/types/LoggerLevel.java | 2 -
.../syncope/common/lib/types/LoggerType.java | 2 -
.../common/lib/types/MailTemplateFormat.java | 2 -
.../syncope/common/lib/types/MatchingRule.java | 5 +-
.../common/lib/types/PatchOperation.java | 3 -
.../syncope/common/lib/types/PolicyType.java | 3 -
.../lib/types/PropagationTaskExecStatus.java | 3 -
.../syncope/common/lib/types/PullMode.java | 3 -
.../lib/types/ReportExecExportFormat.java | 3 -
.../common/lib/types/ReportExecStatus.java | 3 -
.../common/lib/types/ReportTemplateFormat.java | 3 -
.../lib/types/ResourceAssociationAction.java | 3 -
.../lib/types/ResourceDeassociationAction.java | 3 -
.../common/lib/types/ResourceOperation.java | 3 -
.../syncope/common/lib/types/SchemaType.java | 2 -
.../common/lib/types/StatusPatchType.java | 3 -
.../syncope/common/lib/types/TaskType.java | 3 -
.../syncope/common/lib/types/TraceLevel.java | 3 -
.../common/lib/types/UnmatchingRule.java | 3 -
.../lib/types/WorkflowFormPropertyType.java | 3 -
.../syncope/common/lib/types/WorkflowTasks.java | 2 -
.../syncope/common/lib/types/package-info.java | 26 ------
.../org/apache/syncope/common/lib/JSONTest.java | 3 +-
.../org/apache/syncope/common/lib/XMLTest.java | 7 +-
core/rest-cxf/pom.xml | 4 -
.../core/rest/cxf/JacksonXMLProvider.java | 33 +++++++
.../core/rest/cxf/UnwrappedObjectMapper.java | 93 -------------------
.../src/main/resources/restCXFContext.xml | 9 +-
.../syncope/common/lib/to/CamelMetrics.java | 12 ---
.../syncope/common/lib/to/CamelRouteTO.java | 4 -
149 files changed, 249 insertions(+), 893 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClientFactoryBean.java
----------------------------------------------------------------------
diff --git a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClientFactoryBean.java b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClientFactoryBean.java
index e0f12ef..7412c45 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClientFactoryBean.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClientFactoryBean.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.client.lib;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.fasterxml.jackson.datatype.joda.JodaModule;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
import java.util.ArrayList;
@@ -30,6 +27,8 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.feature.LoggingFeature;
+import org.apache.syncope.common.lib.jackson.UnwrappedObjectMapper;
+import org.apache.syncope.common.lib.jackson.UnwrappedXmlMapper;
import org.apache.syncope.common.rest.api.DateParamConverterProvider;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -78,17 +77,11 @@ public class SyncopeClientFactoryBean {
private RestClientFactoryBean restClientFactoryBean;
protected JacksonJsonProvider defaultJsonProvider() {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.registerModule(new JodaModule());
- objectMapper.configure(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
- return new JacksonJsonProvider(objectMapper, JacksonJsonProvider.BASIC_ANNOTATIONS);
+ return new JacksonJsonProvider(new UnwrappedObjectMapper(), JacksonJsonProvider.BASIC_ANNOTATIONS);
}
protected JacksonXMLProvider defaultXMLProvider() {
- XmlMapper xmlMapper = new XmlMapper();
- xmlMapper.registerModule(new JodaModule());
- xmlMapper.configure(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
- return new JacksonXMLProvider(xmlMapper, JacksonXMLProvider.BASIC_ANNOTATIONS);
+ return new JacksonXMLProvider(new UnwrappedXmlMapper(), JacksonXMLProvider.BASIC_ANNOTATIONS);
}
protected RestClientExceptionMapper defaultExceptionMapper() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/pom.xml
----------------------------------------------------------------------
diff --git a/common/lib/pom.xml b/common/lib/pom.xml
index 3666037..05e5e7d 100644
--- a/common/lib/pom.xml
+++ b/common/lib/pom.xml
@@ -50,9 +50,18 @@ under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -72,16 +81,6 @@ under the License.
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/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 bd8b06e..01bc093 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
@@ -19,20 +19,11 @@
package org.apache.syncope.common.lib;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.builder.EqualsBuilder;
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.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 })
public abstract class AbstractBaseBean implements Serializable {
private static final long serialVersionUID = 3119542005279892164L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
index f3a6b90..543cfad 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
@@ -25,10 +25,10 @@ import java.util.regex.Pattern;
public final class SyncopeConstants {
- public static final String NAMESPACE = "http://syncope.apache.org/2.0";
-
public static final String NAMESPACE_PREFIX = "syncope";
+ public static final String NAMESPACE = "http://syncope.apache.org/2.0";
+
public static final String MASTER_DOMAIN = "Master";
public static final String ROOT_REALM = "/";
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java
index 063bdf6..96db65b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java
@@ -20,19 +20,12 @@ package org.apache.syncope.common.lib.info;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "numbersInfo")
-@XmlType
public class NumbersInfo extends AbstractBaseBean {
private static final long serialVersionUID = 7691187370598649583L;
- @XmlEnum
- @XmlType(name = "confItem")
public enum ConfItem {
RESOURCE(20),
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java
index c535fe5..288f484 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java
@@ -20,12 +20,8 @@ package org.apache.syncope.common.lib.info;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "platformInfo")
-@XmlType
public class PlatformInfo extends AbstractBaseBean {
private static final long serialVersionUID = -7941853999417673827L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
index 5d4d0e8..52eb9fc 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
@@ -18,13 +18,9 @@
*/
package org.apache.syncope.common.lib.info;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.queue.CircularFifoQueue;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "systemInfo")
-@XmlType
public class SystemInfo extends AbstractBaseBean {
private static final long serialVersionUID = -352727968865892499L;
@@ -85,8 +81,6 @@ public class SystemInfo extends AbstractBaseBean {
return load;
}
- @XmlRootElement(name = "loadInstant")
- @XmlType
public static class LoadInstant extends AbstractBaseBean {
private static final long serialVersionUID = 1700788373758716478L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
deleted file mode 100644
index 32e93e4..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib.info;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedObjectMapper.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedObjectMapper.java b/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedObjectMapper.java
new file mode 100644
index 0000000..d34ff8b
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedObjectMapper.java
@@ -0,0 +1,93 @@
+/*
+ * 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.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Map;
+
+/**
+ * Jackson {@link ObjectMapper} that unwraps singleton map values and configure date (de)serialization via Joda.
+ */
+public class UnwrappedObjectMapper extends ObjectMapper {
+
+ private static final long serialVersionUID = -317191546835195103L;
+
+ public UnwrappedObjectMapper() {
+ super();
+
+ registerModule(new JodaModule());
+ configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ }
+
+ /**
+ * Unwraps the given value if it implements the Map interface and contains only a single entry, otherwise the
+ * value is returned unmodified.
+ *
+ * @param value the potential Map to unwrap
+ * @return the unwrapped map or the original value
+ */
+ private Object unwrapMap(final Object value) {
+ if (value instanceof Map) {
+ Map<?, ?> map = (Map<?, ?>) value;
+ if (map.size() == 1) {
+ return map.values().iterator().next();
+ }
+ }
+
+ return value;
+ }
+
+ @Override
+ public void writeValue(final JsonGenerator jgen, final Object value) throws IOException {
+ super.writeValue(jgen, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final File resultFile, final Object value) throws IOException {
+ super.writeValue(resultFile, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final OutputStream out, final Object value) throws IOException {
+ super.writeValue(out, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final Writer writer, final Object value) throws IOException {
+ super.writeValue(writer, unwrapMap(value));
+ }
+
+ @Override
+ public byte[] writeValueAsBytes(final Object value) throws JsonProcessingException {
+ return super.writeValueAsBytes(unwrapMap(value));
+ }
+
+ @Override
+ public String writeValueAsString(final Object value) throws JsonProcessingException {
+ return super.writeValueAsString(unwrapMap(value));
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedXmlMapper.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedXmlMapper.java b/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedXmlMapper.java
new file mode 100644
index 0000000..7d69301
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/jackson/UnwrappedXmlMapper.java
@@ -0,0 +1,94 @@
+/*
+ * 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.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Map;
+
+/**
+ * Jackson {@link XmlMapper} that unwraps singleton map values, configure date (de)serialization via Joda.
+ */
+public class UnwrappedXmlMapper extends XmlMapper {
+
+ private static final long serialVersionUID = -317191546835195103L;
+
+ public UnwrappedXmlMapper() {
+ super();
+
+ registerModule(new JodaModule());
+ configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
+ }
+
+ /**
+ * Unwraps the given value if it implements the Map interface and contains only a single entry, otherwise the
+ * value is returned unmodified.
+ *
+ * @param value the potential Map to unwrap
+ * @return the unwrapped map or the original value
+ */
+ private Object unwrapMap(final Object value) {
+ if (value instanceof Map) {
+ Map<?, ?> map = (Map<?, ?>) value;
+ if (map.size() == 1) {
+ return map.values().iterator().next();
+ }
+ }
+
+ return value;
+ }
+
+ @Override
+ public void writeValue(final JsonGenerator jgen, final Object value) throws IOException {
+ super.writeValue(jgen, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final File resultFile, final Object value) throws IOException {
+ super.writeValue(resultFile, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final OutputStream out, final Object value) throws IOException {
+ super.writeValue(out, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final Writer writer, final Object value) throws IOException {
+ super.writeValue(writer, unwrapMap(value));
+ }
+
+ @Override
+ public byte[] writeValueAsBytes(final Object value) throws JsonProcessingException {
+ return super.writeValueAsBytes(unwrapMap(value));
+ }
+
+ @Override
+ public String writeValueAsString(final Object value) throws JsonProcessingException {
+ return super.writeValueAsString(unwrapMap(value));
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
deleted file mode 100644
index acfb284..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatch.java
index bb881a7..841e9b6 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatch.java
@@ -18,13 +18,9 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.PatchOperation;
-@XmlType
-@XmlSeeAlso({ AbstractPatchItem.class, AttrPatch.class, MembershipPatch.class, RelationshipPatch.class })
public abstract class AbstractPatch extends AbstractBaseBean {
private static final long serialVersionUID = -4729181508529829580L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatchItem.java
index ee86a88..9a30049 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractPatchItem.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlType
-@XmlSeeAlso({ AbstractReplacePatchItem.class, LongPatchItem.class, StringPatchItem.class })
public abstract class AbstractPatchItem<T> extends AbstractPatch {
private static final long serialVersionUID = -8889326446009942028L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractReplacePatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractReplacePatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractReplacePatchItem.java
index 8282427..50c2e26 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractReplacePatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AbstractReplacePatchItem.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.PatchOperation;
/**
@@ -29,8 +27,6 @@ import org.apache.syncope.common.lib.types.PatchOperation;
*
* @param <T> {@code String}, {@code Long} or {@code Boolean}
*/
-@XmlType
-@XmlSeeAlso({ BooleanReplacePatchItem.class, StringReplacePatchItem.class })
public abstract class AbstractReplacePatchItem<T> extends AbstractPatchItem<T> {
private static final long serialVersionUID = 2027599764019829563L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
index 97cc44b..36f5b75 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
@@ -20,11 +20,7 @@ package org.apache.syncope.common.lib.patch;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "anyObjectPatch")
-@XmlType
public class AnyObjectPatch extends AnyPatch {
private static final long serialVersionUID = -1644118942622556097L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyPatch.java
index c372767..32350ff 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyPatch.java
@@ -22,11 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.HashSet;
import java.util.Set;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.to.AttrTO;
-@XmlType
public abstract class AnyPatch extends AbstractBaseBean implements AttributablePatch {
private static final long serialVersionUID = -7445489774552440544L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AssociationPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AssociationPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AssociationPatch.java
index 56efe7e..5d47619 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AssociationPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AssociationPatch.java
@@ -19,12 +19,8 @@
package org.apache.syncope.common.lib.patch;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.ResourceAssociationAction;
-@XmlRootElement(name = "associationPatch")
-@XmlType
public class AssociationPatch extends PasswordPatch {
private static final long serialVersionUID = 6295778399633883767L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AttrPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AttrPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AttrPatch.java
index f41a054..22beb7b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AttrPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AttrPatch.java
@@ -19,12 +19,8 @@
package org.apache.syncope.common.lib.patch;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.to.AttrTO;
-@XmlRootElement(name = "attrPatch")
-@XmlType
public class AttrPatch extends AbstractPatch {
private static final long serialVersionUID = 6881634224246176673L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/BooleanReplacePatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/BooleanReplacePatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/BooleanReplacePatchItem.java
index 9cf1097..481c904 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/BooleanReplacePatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/BooleanReplacePatchItem.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "booleanReplacePatchItem")
-@XmlType
public class BooleanReplacePatchItem extends AbstractReplacePatchItem<Boolean> {
private static final long serialVersionUID = 4013349284181583101L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/DeassociationPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/DeassociationPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/DeassociationPatch.java
index 23777f7..7f6004c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/DeassociationPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/DeassociationPatch.java
@@ -21,13 +21,9 @@ package org.apache.syncope.common.lib.patch;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
-@XmlRootElement(name = "deassociationPatch")
-@XmlType
public class DeassociationPatch extends AbstractBaseBean {
private static final long serialVersionUID = 6295778399633883767L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java
index da4671b..6849cb9 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java
@@ -24,14 +24,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.common.lib.to.TypeExtensionTO;
-@XmlRootElement(name = "groupPatch")
-@XmlType
public class GroupPatch extends AnyPatch {
private static final long serialVersionUID = -460284378124440077L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/LongPatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/LongPatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/LongPatchItem.java
index 96c6050..19e3426 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/LongPatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/LongPatchItem.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "stringPatchItem")
-@XmlType
public class LongPatchItem extends AbstractPatchItem<Long> {
private static final long serialVersionUID = 7308597905137875993L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/MembershipPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/MembershipPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/MembershipPatch.java
index 0ed42c1..037ec5f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/MembershipPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/MembershipPatch.java
@@ -20,12 +20,8 @@ package org.apache.syncope.common.lib.patch;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.to.AttrTO;
-@XmlRootElement(name = "membershipPatch")
-@XmlType
public class MembershipPatch extends AbstractPatch implements AttributablePatch {
private static final long serialVersionUID = -6783121761221554433L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/PasswordPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/PasswordPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/PasswordPatch.java
index c07c44d..00097a2 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/PasswordPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/PasswordPatch.java
@@ -21,14 +21,8 @@ package org.apache.syncope.common.lib.patch;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.CollectionUtils;
-@XmlRootElement(name = "passwordPatch")
-@XmlType
-@XmlSeeAlso({ AssociationPatch.class, StatusPatch.class })
public class PasswordPatch extends StringReplacePatchItem {
private static final long serialVersionUID = 961023537479513071L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/RelationshipPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/RelationshipPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/RelationshipPatch.java
index f7925e9..e71d1da 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/RelationshipPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/RelationshipPatch.java
@@ -18,12 +18,8 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.to.RelationshipTO;
-@XmlRootElement(name = "relationshipPatch")
-@XmlType
public class RelationshipPatch extends AbstractPatch {
private static final long serialVersionUID = 1314175521205206511L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/ResourceDeassociationPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/ResourceDeassociationPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/ResourceDeassociationPatch.java
index c583607..f907e9f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/ResourceDeassociationPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/ResourceDeassociationPatch.java
@@ -21,13 +21,9 @@ package org.apache.syncope.common.lib.patch;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
-@XmlRootElement(name = "resourceDeassociationPatch")
-@XmlType
public class ResourceDeassociationPatch extends AbstractBaseBean {
private static final long serialVersionUID = -9116268525079837276L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StatusPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StatusPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StatusPatch.java
index b7d9c1e..66862ed 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StatusPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StatusPatch.java
@@ -19,12 +19,8 @@
package org.apache.syncope.common.lib.patch;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.StatusPatchType;
-@XmlRootElement(name = "statusPatch")
-@XmlType
public class StatusPatch extends PasswordPatch {
private static final long serialVersionUID = 99309988426922612L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringPatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringPatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringPatchItem.java
index d9aacf8..1813df9 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringPatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringPatchItem.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "stringPatchItem")
-@XmlType
public class StringPatchItem extends AbstractPatchItem<String> {
private static final long serialVersionUID = -4956965404796800689L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringReplacePatchItem.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringReplacePatchItem.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringReplacePatchItem.java
index b924484..04cf2d0 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringReplacePatchItem.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/StringReplacePatchItem.java
@@ -18,13 +18,6 @@
*/
package org.apache.syncope.common.lib.patch;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "stringReplacePatchItem")
-@XmlType
-@XmlSeeAlso({ PasswordPatch.class })
public class StringReplacePatchItem extends AbstractReplacePatchItem<String> {
private static final long serialVersionUID = -5631052324901928363L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/UserPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/UserPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/UserPatch.java
index cb451df..c7c8cd5 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/UserPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/UserPatch.java
@@ -20,11 +20,7 @@ package org.apache.syncope.common.lib.patch;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "userPatch")
-@XmlType
public class UserPatch extends AnyPatch {
private static final long serialVersionUID = 2872795537911821448L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
deleted file mode 100644
index 5114723..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib.patch;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccountRuleConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccountRuleConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccountRuleConf.java
index 8820779..280a555 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccountRuleConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractAccountRuleConf.java
@@ -18,13 +18,9 @@
*/
package org.apache.syncope.common.lib.policy;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlType
-@XmlSeeAlso({ DefaultAccountRuleConf.class })
public abstract class AbstractAccountRuleConf extends AbstractBaseBean implements AccountRuleConf {
private static final long serialVersionUID = -4080475005967851092L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPasswordRuleConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPasswordRuleConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPasswordRuleConf.java
index 6d35abd..abc24ea 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPasswordRuleConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPasswordRuleConf.java
@@ -18,13 +18,9 @@
*/
package org.apache.syncope.common.lib.policy;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlType
-@XmlSeeAlso({ DefaultPasswordRuleConf.class })
public abstract class AbstractPasswordRuleConf extends AbstractBaseBean implements PasswordRuleConf {
private static final long serialVersionUID = -5814018872387142339L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPolicyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPolicyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPolicyTO.java
index 1e4e330..374001b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPolicyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AbstractPolicyTO.java
@@ -22,15 +22,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.to.EntityTO;
-@XmlRootElement(name = "abstractPolicy")
-@XmlType
-@XmlSeeAlso({ AccountPolicyTO.class, PasswordPolicyTO.class, PullPolicyTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AbstractPolicyTO extends AbstractBaseBean implements EntityTO {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AccountPolicyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AccountPolicyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AccountPolicyTO.java
index 104c80c..189f460 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AccountPolicyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/AccountPolicyTO.java
@@ -20,11 +20,7 @@ package org.apache.syncope.common.lib.policy;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "accountPolicy")
-@XmlType
public class AccountPolicyTO extends AbstractPolicyTO implements ComposablePolicy<AbstractAccountRuleConf> {
private static final long serialVersionUID = -1557150042828800134L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccountRuleConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccountRuleConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccountRuleConf.java
index 6baecc6..862fd6f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccountRuleConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAccountRuleConf.java
@@ -20,14 +20,10 @@ package org.apache.syncope.common.lib.policy;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.report.Schema;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.SchemaType;
-@XmlRootElement(name = "defaultAccountRuleConf")
-@XmlType
public class DefaultAccountRuleConf extends AbstractAccountRuleConf implements AccountRuleConf {
private static final long serialVersionUID = 3259256974414758406L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultPasswordRuleConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultPasswordRuleConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultPasswordRuleConf.java
index 2b8c93a..62dea8c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultPasswordRuleConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultPasswordRuleConf.java
@@ -20,14 +20,10 @@ package org.apache.syncope.common.lib.policy;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.report.Schema;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.SchemaType;
-@XmlRootElement(name = "defaultPasswordRuleConf")
-@XmlType
public class DefaultPasswordRuleConf extends AbstractPasswordRuleConf {
private static final long serialVersionUID = -7988778083915548547L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
index 9cc364e..342577e 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
@@ -20,11 +20,7 @@ package org.apache.syncope.common.lib.policy;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "passwordPolicy")
-@XmlType
public class PasswordPolicyTO extends AbstractPolicyTO implements ComposablePolicy<AbstractPasswordRuleConf> {
private static final long serialVersionUID = -5606086441294799690L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java
index 1c24a5a..71fcc1c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java
@@ -22,11 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.ConflictResolutionAction;
-@XmlType
public class PullPolicySpec extends AbstractBaseBean {
private static final long serialVersionUID = -3144027171719498127L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicyTO.java
index 2618e43..da0fd8d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicyTO.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.policy;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "pullPolicy")
-@XmlType
public class PullPolicyTO extends AbstractPolicyTO {
private static final long serialVersionUID = 993024634238024242L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PushPolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PushPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PushPolicySpec.java
index 7cfe621..d1b5f2b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PushPolicySpec.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PushPolicySpec.java
@@ -18,10 +18,8 @@
*/
package org.apache.syncope.common.lib.policy;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlType
public class PushPolicySpec extends AbstractBaseBean {
private static final long serialVersionUID = 3641030189482617497L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
deleted file mode 100644
index 82c6761..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib.policy;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractAnyReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractAnyReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractAnyReportletConf.java
index 5e95102..11026aa 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractAnyReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractAnyReportletConf.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.common.lib.report;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlType
public abstract class AbstractAnyReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = -5388597116592877789L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
index f590067..6bcd297 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
@@ -18,15 +18,9 @@
*/
package org.apache.syncope.common.lib.report;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlType
-@XmlSeeAlso({
- StaticReportletConf.class, UserReportletConf.class, GroupReportletConf.class,
- AuditReportletConf.class, ReconciliationReportletConf.class })
public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf {
private static final long serialVersionUID = -6130008602014516608L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/AuditReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AuditReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AuditReportletConf.java
index 96e49d0..a764705 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AuditReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AuditReportletConf.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.report;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "auditReportletConf")
-@XmlType
public class AuditReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = -4814950086361753689L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
index d863c45..88ce96d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/GroupReportletConf.java
@@ -20,20 +20,13 @@ package org.apache.syncope.common.lib.report;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.SchemaType;
-@XmlRootElement(name = "groupReportletConf")
-@XmlType
public class GroupReportletConf extends AbstractAnyReportletConf {
private static final long serialVersionUID = -8488503068032439699L;
- @XmlEnum
- @XmlType(name = "groupReportletConfFeature")
public enum Feature {
key,
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/ReconciliationReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/ReconciliationReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/ReconciliationReportletConf.java
index 192d339..ee641a0 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/ReconciliationReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/ReconciliationReportletConf.java
@@ -20,18 +20,11 @@ package org.apache.syncope.common.lib.report;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "reconciliationReportletConf")
-@XmlType
public class ReconciliationReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = 6602717600064602764L;
- @XmlEnum
- @XmlType(name = "reconciliationReportletConfFeature")
public enum Feature {
key,
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/StaticReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/StaticReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/StaticReportletConf.java
index 82208f7..6059ff2 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/StaticReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/StaticReportletConf.java
@@ -21,12 +21,8 @@ package org.apache.syncope.common.lib.report;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.TraceLevel;
-@XmlRootElement(name = "staticReportletConf")
-@XmlType
public class StaticReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = -4814950086361753689L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/UserReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/UserReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/UserReportletConf.java
index 727f972..e9c13b3 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/UserReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/UserReportletConf.java
@@ -20,14 +20,9 @@ package org.apache.syncope.common.lib.report;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.SchemaType;
-@XmlRootElement(name = "userReportletConf")
-@XmlType
public class UserReportletConf extends AbstractAnyReportletConf {
private static final long serialVersionUID = 6602717600064602764L;
@@ -41,8 +36,6 @@ public class UserReportletConf extends AbstractAnyReportletConf {
@Schema(anyTypeKind = AnyTypeKind.USER, type = { SchemaType.VIRTUAL })
private final List<String> virAttrs = new ArrayList<>();
- @XmlEnum
- @XmlType(name = "userReportletConfFeature")
public enum Feature {
key,
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
deleted file mode 100644
index 32b0dcc..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib.report;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
deleted file mode 100644
index 64ca1e7..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NAMESPACE_PREFIX, namespaceURI = SyncopeConstants.NAMESPACE) }
-)
-package org.apache.syncope.common.lib.search;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractAnnotatedBean.java
----------------------------------------------------------------------
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 c0f7155..ce0a990 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
@@ -21,13 +21,11 @@ package org.apache.syncope.common.lib.to;
import org.apache.syncope.common.lib.AbstractBaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.StringUtils;
/**
* Abstract wrapper for common system information.
*/
-@XmlType
public class AbstractAnnotatedBean extends AbstractBaseBean {
private static final long serialVersionUID = -930797879027642457L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractProvisioningTaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractProvisioningTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractProvisioningTaskTO.java
index 32af2ba..b94c250 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractProvisioningTaskTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractProvisioningTaskTO.java
@@ -20,15 +20,9 @@ package org.apache.syncope.common.lib.to;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.MatchingRule;
import org.apache.syncope.common.lib.types.UnmatchingRule;
-@XmlRootElement(name = "abstractProvisioningTask")
-@XmlType
-@XmlSeeAlso({ PushTaskTO.class, PullTaskTO.class })
public class AbstractProvisioningTaskTO extends SchedTaskTO {
private static final long serialVersionUID = -2143537546915809016L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractSchemaTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractSchemaTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractSchemaTO.java
index 2917c98..6976415 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractSchemaTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractSchemaTO.java
@@ -20,14 +20,8 @@ package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "abstractSchema")
-@XmlType
-@XmlSeeAlso({ PlainSchemaTO.class, DerSchemaTO.class, VirSchemaTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AbstractSchemaTO extends AbstractBaseBean implements EntityTO {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractStartEndBean.java
----------------------------------------------------------------------
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 88962c5..ae6e3ec 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,10 +19,8 @@
package org.apache.syncope.common.lib.to;
import java.util.Date;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlType
public class AbstractStartEndBean extends AbstractBaseBean {
private static final long serialVersionUID = 2399577415544539917L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractTaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractTaskTO.java
index c5c30d9..ec624b3 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractTaskTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AbstractTaskTO.java
@@ -22,13 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-@XmlRootElement(name = "abstractTask")
-@XmlType
-@XmlSeeAlso({ PropagationTaskTO.class, SchedTaskTO.class, NotificationTaskTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AbstractTaskTO extends AbstractStartEndBean implements EntityTO {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
index a02cc1d..f90396d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
@@ -24,12 +24,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.tuple.Pair;
-@XmlRootElement(name = "anyObject")
-@XmlType
public class AnyObjectTO extends AnyTO implements GroupableRelatableTO {
private static final long serialVersionUID = 8841697496476959639L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
index ec8fec6..8b3998c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTO.java
@@ -27,11 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-@XmlType
-@XmlSeeAlso({ UserTO.class, GroupTO.class, AnyObjectTO.class })
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public abstract class AnyTO extends AbstractAnnotatedBean implements EntityTO, AttributableTO {
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeClassTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeClassTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeClassTO.java
index 2c941e7..e4cccc5 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeClassTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeClassTO.java
@@ -21,12 +21,8 @@ package org.apache.syncope.common.lib.to;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "anyTypeClass")
-@XmlType
public class AnyTypeClassTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = -591757688607551266L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
index 1245cab..d61898c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
@@ -21,13 +21,9 @@ package org.apache.syncope.common.lib.to;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-@XmlRootElement(name = "anyType")
-@XmlType
public class AnyTypeTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = 6771657557616874373L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/AttrTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AttrTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AttrTO.java
index 9df13cd..86513c3 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AttrTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AttrTO.java
@@ -23,12 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.CollectionUtils;
-@XmlRootElement(name = "attribute")
-@XmlType
public class AttrTO extends AbstractBaseBean {
private static final long serialVersionUID = 4941691338796323623L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/0fad00ab/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkAction.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkAction.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkAction.java
index 670fc30..768b51a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkAction.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkAction.java
@@ -20,19 +20,12 @@ package org.apache.syncope.common.lib.to;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "bulkAction")
-@XmlType
public class BulkAction extends AbstractBaseBean {
private static final long serialVersionUID = 1395353278878758961L;
- @XmlEnum
- @XmlType(name = "bulkActionType")
public enum Type {
MUSTCHANGEPASSWORD,