http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java index 33e4c5d..3ad3cd2 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java @@ -18,18 +18,11 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.net.URI; import java.util.ArrayList; import java.util.List; -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.AbstractBaseBean; -@XmlRootElement(name = "pagedConnObjectResult") -@XmlType public class PagedConnObjectTOResult extends AbstractBaseBean { private static final long serialVersionUID = -2832908019064402976L; @@ -110,9 +103,6 @@ public class PagedConnObjectTOResult extends AbstractBaseBean { this.allResultsReturned = allResultsReturned; } - @XmlElementWrapper(name = "result") - @XmlElement(name = "item") - @JsonProperty("result") public List<ConnObjectTO> getResult() { return result; }
http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PagedResult.java index b17db6d..1892728 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 @@ -18,19 +18,12 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.net.URI; import java.util.ArrayList; import java.util.List; -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.AbstractBaseBean; -@XmlRootElement(name = "pagedResult") -@XmlType public class PagedResult<T extends AbstractBaseBean> extends AbstractBaseBean { private static final long serialVersionUID = 3472875885259250934L; @@ -63,9 +56,6 @@ public class PagedResult<T extends AbstractBaseBean> extends AbstractBaseBean { this.next = next; } - @XmlElementWrapper(name = "result") - @XmlElement(name = "item") - @JsonProperty("result") @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") public List<T> getResult() { return result; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PlainSchemaTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PlainSchemaTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PlainSchemaTO.java index 4568e36..546fb3c 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PlainSchemaTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PlainSchemaTO.java @@ -18,15 +18,10 @@ */ package org.apache.syncope.common.lib.to; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.commons.lang3.StringUtils; import org.apache.syncope.common.lib.types.AttrSchemaType; import org.apache.syncope.common.lib.types.CipherAlgorithm; -@XmlRootElement(name = "schema") -@XmlType public class PlainSchemaTO extends AbstractSchemaTO { private static final long serialVersionUID = -8133983392476990308L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationStatus.java index c2caa60..6656cb0 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationStatus.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationStatus.java @@ -19,15 +19,11 @@ package org.apache.syncope.common.lib.to; import org.apache.syncope.common.lib.AbstractBaseBean; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; /** * Single propagation status. */ -@XmlRootElement(name = "propagationStatus") -@XmlType public class PropagationStatus extends AbstractBaseBean { private static final long serialVersionUID = 3921498450222857690L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java index ab6c066..02917ad 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java @@ -18,13 +18,9 @@ */ package org.apache.syncope.common.lib.to; -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.ResourceOperation; -@XmlRootElement(name = "propagationTask") -@XmlType public class PropagationTaskTO extends AbstractTaskTO { private static final long serialVersionUID = 386450127003321197L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java index b7dae9c..4fb43b3 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java @@ -18,17 +18,10 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -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.AbstractBaseBean; -@XmlRootElement(name = "provision") -@XmlType public class ProvisionTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = 8298910216218007927L; @@ -73,9 +66,6 @@ public class ProvisionTO extends AbstractBaseBean implements EntityTO { this.objectClass = objectClass; } - @XmlElementWrapper(name = "auxClasses") - @XmlElement(name = "class") - @JsonProperty("auxClasses") public List<String> getAuxClasses() { return auxClasses; } @@ -96,9 +86,6 @@ public class ProvisionTO extends AbstractBaseBean implements EntityTO { this.mapping = mapping; } - @XmlElementWrapper(name = "virSchemas") - @XmlElement(name = "virSchema") - @JsonProperty("virSchemas") public List<String> getVirSchemas() { return virSchemas; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java index 3fe4790..d1e3bc0 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java @@ -23,28 +23,17 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.syncope.common.lib.AbstractBaseBean; -import org.apache.syncope.common.lib.jaxb.XmlEntityTOAdapter; -@XmlRootElement(name = "provisioningResult") -@XmlType public class ProvisioningResult<E extends EntityTO> extends AbstractBaseBean { private static final long serialVersionUID = 351317476398082746L; - @XmlJavaTypeAdapter(XmlEntityTOAdapter.class) @JsonIgnore private E entity; private final List<PropagationStatus> propagationStatuses = new ArrayList<>(); - @XmlTransient @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") @JsonProperty public E getEntity() { @@ -55,9 +44,6 @@ public class ProvisioningResult<E extends EntityTO> extends AbstractBaseBean { this.entity = any; } - @XmlElementWrapper(name = "propagationStatuses") - @XmlElement(name = "propagationStatus") - @JsonProperty("propagationStatuses") public List<PropagationStatus> getPropagationStatuses() { return propagationStatuses; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java index 9aaccf2..bab5aa1 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java @@ -18,21 +18,10 @@ */ package org.apache.syncope.common.lib.to; -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.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter; import org.apache.syncope.common.lib.types.PullMode; -@XmlRootElement(name = "pullTask") -@XmlType -@XmlAccessorType(XmlAccessType.FIELD) public class PullTaskTO extends AbstractProvisioningTaskTO implements TemplatableTO { private static final long serialVersionUID = -2143537546915809017L; @@ -43,8 +32,6 @@ public class PullTaskTO extends AbstractProvisioningTaskTO implements Templatabl private String destinationRealm; - @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, AnyTO> templates = new HashMap<>(); public PullMode getPullMode() { @@ -71,7 +58,6 @@ public class PullTaskTO extends AbstractProvisioningTaskTO implements Templatabl this.destinationRealm = destinationRealm; } - @JsonProperty @Override public Map<String, AnyTO> getTemplates() { return templates; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java index dd3347a..2b4cdbd 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java @@ -18,29 +18,15 @@ */ package org.apache.syncope.common.lib.to; -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.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter; -@XmlRootElement(name = "pushTask") -@XmlType -@XmlAccessorType(XmlAccessType.FIELD) public class PushTaskTO extends AbstractProvisioningTaskTO { private static final long serialVersionUID = -2143537546915809018L; - @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> filters = new HashMap<>(); - @JsonProperty public Map<String, String> getFilters() { return filters; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java index db770e7..bb044cb 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java @@ -25,16 +25,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.ws.rs.PathParam; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.syncope.common.lib.AbstractBaseBean; -import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter; -@XmlRootElement(name = "realm") -@XmlType public class RealmTO extends AbstractBaseBean implements EntityTO, TemplatableTO { private static final long serialVersionUID = 516330662956254391L; @@ -53,7 +45,6 @@ public class RealmTO extends AbstractBaseBean implements EntityTO, TemplatableTO private final Set<String> actionsClassNames = new HashSet<>(); - @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) @JsonIgnore private final Map<String, AnyTO> templates = new HashMap<>(); @@ -110,9 +101,6 @@ public class RealmTO extends AbstractBaseBean implements EntityTO, TemplatableTO this.passwordPolicy = passwordPolicy; } - @XmlElementWrapper(name = "actionsClassNames") - @XmlElement(name = "actionsClassName") - @JsonProperty("actionsClassNames") public Set<String> getActionsClassNames() { return actionsClassNames; } @@ -123,9 +111,6 @@ public class RealmTO extends AbstractBaseBean implements EntityTO, TemplatableTO return templates; } - @XmlElementWrapper(name = "resources") - @XmlElement(name = "resource") - @JsonProperty("resources") public Set<String> getResources() { return resources; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTO.java index fc5de4f..8a97c8b 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTO.java @@ -18,12 +18,8 @@ */ package org.apache.syncope.common.lib.to; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.AbstractBaseBean; -@XmlRootElement(name = "relationship") -@XmlType public class RelationshipTO extends AbstractBaseBean { private static final long serialVersionUID = 360672942026613929L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTypeTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTypeTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTypeTO.java index d5eba40..15c2a5c 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTypeTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RelationshipTypeTO.java @@ -19,12 +19,8 @@ package org.apache.syncope.common.lib.to; import javax.ws.rs.Path; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.AbstractBaseBean; -@XmlRootElement(name = "relationshipType") -@XmlType public class RelationshipTypeTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = -1884088415277925817L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTO.java index 73b16f7..1244e1e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTO.java @@ -18,19 +18,12 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.ws.rs.PathParam; -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.report.AbstractReportletConf; -@XmlRootElement(name = "report") -@XmlType public class ReportTO extends AbstractStartEndBean implements EntityTO { private static final long serialVersionUID = 5274568072084814410L; @@ -74,9 +67,6 @@ public class ReportTO extends AbstractStartEndBean implements EntityTO { this.name = name; } - @XmlElementWrapper(name = "reportletConfs") - @XmlElement(name = "reportletConf") - @JsonProperty("reportletConfs") public List<AbstractReportletConf> getReportletConfs() { return reportletConfs; } @@ -89,9 +79,6 @@ public class ReportTO extends AbstractStartEndBean implements EntityTO { this.cronExpression = cronExpression; } - @XmlElementWrapper(name = "executions") - @XmlElement(name = "execution") - @JsonProperty("executions") public List<ExecTO> getExecutions() { return executions; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTemplateTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTemplateTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTemplateTO.java index 1731d4c..9819f96 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTemplateTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ReportTemplateTO.java @@ -19,12 +19,8 @@ package org.apache.syncope.common.lib.to; 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 = "reportTemplate") -@XmlType public class ReportTemplateTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = 7776679004906244896L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java index 9ea0029..1743687 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java @@ -19,17 +19,12 @@ package org.apache.syncope.common.lib.to; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; import javax.ws.rs.PathParam; -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.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; import org.apache.syncope.common.lib.AbstractBaseBean; @@ -37,8 +32,6 @@ import org.apache.syncope.common.lib.types.ConnConfProperty; import org.apache.syncope.common.lib.types.ConnectorCapability; import org.apache.syncope.common.lib.types.TraceLevel; -@XmlRootElement(name = "resource") -@XmlType public class ResourceTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = -9193551354041698963L; @@ -197,9 +190,6 @@ public class ResourceTO extends AbstractBaseBean implements EntityTO { }); } - @XmlElementWrapper(name = "provisions") - @XmlElement(name = "provision") - @JsonProperty("provisions") public List<ProvisionTO> getProvisions() { return provisions; } @@ -212,9 +202,6 @@ public class ResourceTO extends AbstractBaseBean implements EntityTO { this.orgUnit = orgUnit; } - @XmlElementWrapper(name = "confOverride") - @XmlElement(name = "property") - @JsonProperty("confOverride") public Set<ConnConfProperty> getConfOverride() { return confOverride; } @@ -227,9 +214,6 @@ public class ResourceTO extends AbstractBaseBean implements EntityTO { this.overrideCapabilities = overrideCapabilities; } - @XmlElementWrapper(name = "capabilitiesOverride") - @XmlElement(name = "capability") - @JsonProperty("capabilitiesOverride") public Set<ConnectorCapability> getCapabilitiesOverride() { return capabilitiesOverride; } @@ -242,9 +226,6 @@ public class ResourceTO extends AbstractBaseBean implements EntityTO { this.provisioningTraceLevel = provisioningTraceLevel; } - @XmlElementWrapper(name = "propagationActionsClassNames") - @XmlElement(name = "propagationActionsClassName") - @JsonProperty("propagationActionsClassNames") public List<String> getPropagationActionsClassNames() { return propagationActionsClassNames; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java index cbb8784..432513a 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java @@ -18,20 +18,13 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import javax.ws.rs.PathParam; -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.AbstractBaseBean; -@XmlRootElement(name = "role") -@XmlType public class RoleTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = 4560822655754800031L; @@ -55,16 +48,10 @@ public class RoleTO extends AbstractBaseBean implements EntityTO { this.key = key; } - @XmlElementWrapper(name = "entitlements") - @XmlElement(name = "entitlement") - @JsonProperty("entitlements") public Set<String> getEntitlements() { return entitlements; } - @XmlElementWrapper(name = "realms") - @XmlElement(name = "realm") - @JsonProperty("realms") public List<String> getRealms() { return realms; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchedTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchedTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchedTaskTO.java index 90748ec..1370380 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchedTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchedTaskTO.java @@ -20,13 +20,6 @@ package org.apache.syncope.common.lib.to; import java.util.Date; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "schedTask") -@XmlType -@XmlSeeAlso(AbstractProvisioningTaskTO.class) public class SchedTaskTO extends AbstractTaskTO { private static final long serialVersionUID = -5722284116974636425L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/SecurityQuestionTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/SecurityQuestionTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SecurityQuestionTO.java index bf3d221..efa38dc 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/SecurityQuestionTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SecurityQuestionTO.java @@ -19,12 +19,8 @@ package org.apache.syncope.common.lib.to; 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 = "securityQuestion") -@XmlType public class SecurityQuestionTO extends AbstractBaseBean implements EntityTO { private static final long serialVersionUID = 5969810939993556530L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/TypeExtensionTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/TypeExtensionTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/TypeExtensionTO.java index f8dea41..3fe4276 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/TypeExtensionTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/TypeExtensionTO.java @@ -18,17 +18,10 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -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.AbstractBaseBean; -@XmlRootElement(name = "typeExtension") -@XmlType public class TypeExtensionTO extends AbstractBaseBean { private static final long serialVersionUID = -5422809645030924811L; @@ -45,9 +38,6 @@ public class TypeExtensionTO extends AbstractBaseBean { this.anyType = anyType; } - @XmlElementWrapper(name = "auxClasses") - @XmlElement(name = "class") - @JsonProperty("auxClasses") public List<String> getAuxClasses() { return auxClasses; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java index 4ec8181..aecbd20 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java @@ -19,7 +19,6 @@ package org.apache.syncope.common.lib.to; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -27,17 +26,11 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -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.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.tuple.Pair; import org.apache.syncope.common.lib.types.AnyTypeKind; -@XmlRootElement(name = "user") -@XmlType public class UserTO extends AnyTO implements GroupableRelatableTO { private static final long serialVersionUID = 7791304495192615740L; @@ -90,16 +83,10 @@ public class UserTO extends AnyTO implements GroupableRelatableTO { this.password = password; } - @XmlElementWrapper(name = "roles") - @XmlElement(name = "role") - @JsonProperty("roles") public List<String> getRoles() { return roles; } - @XmlElementWrapper(name = "dynRoles") - @XmlElement(name = "role") - @JsonProperty("dynRoles") public List<String> getDynRoles() { return dynRoles; } @@ -180,9 +167,6 @@ public class UserTO extends AnyTO implements GroupableRelatableTO { this.mustChangePassword = mustChangePassword; } - @XmlElementWrapper(name = "relationships") - @XmlElement(name = "relationship") - @JsonProperty("relationships") @Override public List<RelationshipTO> getRelationships() { return relationships; @@ -198,9 +182,6 @@ public class UserTO extends AnyTO implements GroupableRelatableTO { return Collections.unmodifiableMap(result); } - @XmlElementWrapper(name = "memberships") - @XmlElement(name = "membership") - @JsonProperty("memberships") @Override public List<MembershipTO> getMemberships() { return memberships; @@ -218,9 +199,6 @@ public class UserTO extends AnyTO implements GroupableRelatableTO { return result; } - @XmlElementWrapper(name = "dynGroups") - @XmlElement(name = "role") - @JsonProperty("dynGroups") @Override public List<String> getDynGroups() { return dynGroups; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/VirSchemaTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/VirSchemaTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/VirSchemaTO.java index 1f10e6b..4aa6ec2 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/VirSchemaTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/VirSchemaTO.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "virtualSchema") public class VirSchemaTO extends AbstractSchemaTO { private static final long serialVersionUID = -8198557479659701343L; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java index 9fa5928..22e3ecc 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java @@ -18,19 +18,11 @@ */ package org.apache.syncope.common.lib.to; -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.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.syncope.common.lib.AbstractBaseBean; -import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter; import org.apache.syncope.common.lib.types.WorkflowFormPropertyType; -@XmlRootElement(name = "workflowFormProperty") -@XmlType public class WorkflowFormPropertyTO extends AbstractBaseBean { private static final long serialVersionUID = 9139969592634304261L; @@ -51,8 +43,6 @@ public class WorkflowFormPropertyTO extends AbstractBaseBean { private String datePattern; - @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> enumValues = new HashMap<>(); public String getId() { @@ -119,7 +109,6 @@ public class WorkflowFormPropertyTO extends AbstractBaseBean { this.datePattern = datePattern; } - @JsonProperty public Map<String, String> getEnumValues() { return enumValues; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormTO.java index e6027f1..c1d1241 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormTO.java @@ -19,21 +19,14 @@ package org.apache.syncope.common.lib.to; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -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.AbstractBaseBean; -@XmlRootElement(name = "workflowForm") -@XmlType public class WorkflowFormTO extends AbstractBaseBean { private static final long serialVersionUID = -7044543391316529128L; @@ -100,9 +93,6 @@ public class WorkflowFormTO extends AbstractBaseBean { this.owner = owner; } - @XmlElementWrapper(name = "workflowFormProperties") - @XmlElement(name = "workflowFormProperty") - @JsonProperty("workflowFormProperties") public List<WorkflowFormPropertyTO> getProperties() { return properties; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java deleted file mode 100644 index b02ed8f..0000000 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java +++ /dev/null @@ -1,23 +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) -package org.apache.syncope.common.lib.to; - -import javax.xml.bind.annotation.XmlSchema; -import org.apache.syncope.common.lib.SyncopeConstants; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java index 12fbf59..d0092f0 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java @@ -18,13 +18,11 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AnyTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.UserTO; -@XmlEnum public enum AnyTypeKind { USER(UserTO.class), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/AttrSchemaType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AttrSchemaType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AttrSchemaType.java index be78979..b8e162d 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AttrSchemaType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AttrSchemaType.java @@ -19,9 +19,7 @@ package org.apache.syncope.common.lib.types; import java.util.Date; -import javax.xml.bind.annotation.XmlEnum; -@XmlEnum public enum AttrSchemaType { String(String.class), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/AuditElements.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AuditElements.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AuditElements.java index 16f6d69..9ea5f99 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AuditElements.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AuditElements.java @@ -19,7 +19,6 @@ package org.apache.syncope.common.lib.types; import java.io.Serializable; -import javax.xml.bind.annotation.XmlEnum; import org.apache.commons.lang3.StringUtils; public final class AuditElements implements Serializable { @@ -30,7 +29,6 @@ public final class AuditElements implements Serializable { public static final String LOGIN_EVENT = "login"; - @XmlEnum public enum EventCategoryType { LOGIC(StringUtils.EMPTY), @@ -52,7 +50,6 @@ public final class AuditElements implements Serializable { } } - @XmlEnum public enum Result { SUCCESS, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java index c86559a..4a4faf6 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum BulkMembersActionType { PROVISION, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/CipherAlgorithm.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/CipherAlgorithm.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/CipherAlgorithm.java index d7be1bc..e346298 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/CipherAlgorithm.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/CipherAlgorithm.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum CipherAlgorithm { SHA("SHA-1", false), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConflictResolutionAction.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConflictResolutionAction.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConflictResolutionAction.java index 37308e1..4b38f98 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConflictResolutionAction.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConflictResolutionAction.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ConflictResolutionAction { // ignore sync @@ -31,4 +28,5 @@ public enum ConflictResolutionAction { LASTMATCH, // sync all ALL; + } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfPropSchema.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfPropSchema.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfPropSchema.java index 8b0dbe6..acfa7f4 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfPropSchema.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfPropSchema.java @@ -18,17 +18,10 @@ */ package org.apache.syncope.common.lib.types; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -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.AbstractBaseBean; -@XmlRootElement -@XmlType public class ConnConfPropSchema extends AbstractBaseBean implements Comparable<ConnConfPropSchema> { private static final long serialVersionUID = -1976365781005801296L; @@ -105,9 +98,6 @@ public class ConnConfPropSchema extends AbstractBaseBean implements Comparable<C this.confidential = confidential; } - @XmlElementWrapper(name = "defaultValues") - @XmlElement(name = "defaultValue") - @JsonProperty("defaultValues") public List<Object> getDefaultValues() { return defaultValues; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfProperty.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfProperty.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfProperty.java index f4d321b..eeeacd3 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfProperty.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnConfProperty.java @@ -18,18 +18,11 @@ */ package org.apache.syncope.common.lib.types; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -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.commons.lang3.ObjectUtils; import org.apache.syncope.common.lib.AbstractBaseBean; -@XmlRootElement -@XmlType public class ConnConfProperty extends AbstractBaseBean implements Comparable<ConnConfProperty> { private static final long serialVersionUID = -8391413960221862238L; @@ -48,9 +41,6 @@ public class ConnConfProperty extends AbstractBaseBean implements Comparable<Con this.schema = schema; } - @XmlElementWrapper(name = "values") - @XmlElement(name = "value") - @JsonProperty("values") public List<Object> getValues() { return values; } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java index 41b1e4a..1abf35f 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java @@ -18,12 +18,9 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - /** * Enum of all possible capabilities that a connector instance can expose. */ -@XmlEnum public enum ConnectorCapability { AUTHENTICATE, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java index cbfc0c6..0eab704 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum EntityViolationType { Standard(""), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobAction.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobAction.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobAction.java index 920393b..6056a02 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobAction.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobAction.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum JobAction { START, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobType.java index b480848..1f37aa6 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/JobType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum JobType { NOTIFICATION, REPORT, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerLevel.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerLevel.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerLevel.java index 01f7d2e..dd54348 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerLevel.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerLevel.java @@ -18,10 +18,8 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; import org.apache.logging.log4j.Level; -@XmlEnum public enum LoggerLevel { OFF(Level.OFF), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerType.java index f129a7d..c696d6e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/LoggerType.java @@ -18,10 +18,8 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; import org.apache.commons.lang3.StringUtils; -@XmlEnum public enum LoggerType { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/MailTemplateFormat.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/MailTemplateFormat.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/MailTemplateFormat.java index fdf8429..f301145 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/MailTemplateFormat.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/MailTemplateFormat.java @@ -19,9 +19,7 @@ package org.apache.syncope.common.lib.types; import javax.ws.rs.core.MediaType; -import javax.xml.bind.annotation.XmlEnum; -@XmlEnum public enum MailTemplateFormat { HTML(MediaType.TEXT_HTML_TYPE), http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/MatchingRule.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/MatchingRule.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/MatchingRule.java index 4b3ad53..3d91b66 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/MatchingRule.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/MatchingRule.java @@ -18,12 +18,9 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - /** - * Sync/Push task matching rule. + * Pull/Push task matching rule. */ -@XmlEnum public enum MatchingRule { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/PatchOperation.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PatchOperation.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PatchOperation.java index 9872cbf..19c7752 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PatchOperation.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PatchOperation.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum PatchOperation { ADD_REPLACE, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicyType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicyType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicyType.java index ea429c2..79e78d5 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicyType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicyType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum PolicyType { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java index 6ae4a36..9996d21 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java @@ -18,12 +18,9 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - /** * Status of a propagation task execution. */ -@XmlEnum public enum PropagationTaskExecStatus { CREATED, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/PullMode.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PullMode.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PullMode.java index 522c30d..26933f9 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PullMode.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PullMode.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum PullMode { FULL_RECONCILIATION, FILTERED_RECONCILIATION, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecExportFormat.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecExportFormat.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecExportFormat.java index fdac43d..9b95af2 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecExportFormat.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecExportFormat.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ReportExecExportFormat { XML, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecStatus.java index 2fe42ed..2e0e7fc 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecStatus.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportExecStatus.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ReportExecStatus { STARTED, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportTemplateFormat.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportTemplateFormat.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportTemplateFormat.java index 17ebf91..cd91e07 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportTemplateFormat.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ReportTemplateFormat.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ReportTemplateFormat { FO, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceAssociationAction.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceAssociationAction.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceAssociationAction.java index efbe0ef..f17b6ec 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceAssociationAction.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceAssociationAction.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ResourceAssociationAction { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceDeassociationAction.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceDeassociationAction.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceDeassociationAction.java index c8d78ec..cabedcf 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceDeassociationAction.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceDeassociationAction.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ResourceDeassociationAction { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceOperation.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceOperation.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceOperation.java index b399b17..dee3d71 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceOperation.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ResourceOperation.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum ResourceOperation { CREATE, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/SchemaType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/SchemaType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/SchemaType.java index 673666d..3bb9ab9 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/SchemaType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/SchemaType.java @@ -18,13 +18,11 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; import org.apache.syncope.common.lib.to.AbstractSchemaTO; import org.apache.syncope.common.lib.to.DerSchemaTO; import org.apache.syncope.common.lib.to.PlainSchemaTO; import org.apache.syncope.common.lib.to.VirSchemaTO; -@XmlEnum public enum SchemaType { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/StatusPatchType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/StatusPatchType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/StatusPatchType.java index 00b88c5..628d617 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/StatusPatchType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/StatusPatchType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum StatusPatchType { ACTIVATE, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/TaskType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/TaskType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/TaskType.java index fcebb1c..679ff3c 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/TaskType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/TaskType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum TaskType { PROPAGATION, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/TraceLevel.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/TraceLevel.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/TraceLevel.java index e8232b8..2de1500 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/TraceLevel.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/TraceLevel.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum TraceLevel { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java index 3387137..86fb72c 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java @@ -18,12 +18,9 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - /** * Pull/Push task un-matching rule. */ -@XmlEnum public enum UnmatchingRule { /** http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowFormPropertyType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowFormPropertyType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowFormPropertyType.java index ec2db4a..847283e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowFormPropertyType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowFormPropertyType.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.common.lib.types; -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum public enum WorkflowFormPropertyType { String, http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowTasks.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowTasks.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowTasks.java index d23b1bc..92fd7d8 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowTasks.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/WorkflowTasks.java @@ -21,9 +21,7 @@ package org.apache.syncope.common.lib.types; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement public class WorkflowTasks { private List<String> tasks; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java deleted file mode 100644 index 80cb87f..0000000 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java +++ /dev/null @@ -1,23 +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) -package org.apache.syncope.common.lib.types; - -import javax.xml.bind.annotation.XmlSchema; -import org.apache.syncope.common.lib.SyncopeConstants; http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/test/java/org/apache/syncope/common/lib/AbstractTest.java ---------------------------------------------------------------------- diff --git a/common/lib/src/test/java/org/apache/syncope/common/lib/AbstractTest.java b/common/lib/src/test/java/org/apache/syncope/common/lib/AbstractTest.java new file mode 100644 index 0000000..ab017c6 --- /dev/null +++ b/common/lib/src/test/java/org/apache/syncope/common/lib/AbstractTest.java @@ -0,0 +1,144 @@ +/* + * 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 static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.io.StringWriter; +import java.util.UUID; +import org.apache.syncope.common.lib.patch.PasswordPatch; +import org.apache.syncope.common.lib.patch.StringPatchItem; +import org.apache.syncope.common.lib.patch.StringReplacePatchItem; +import org.apache.syncope.common.lib.patch.UserPatch; +import org.apache.syncope.common.lib.report.UserReportletConf; +import org.apache.syncope.common.lib.to.AttrTO; +import org.apache.syncope.common.lib.to.BulkActionResult; +import org.apache.syncope.common.lib.to.ConnObjectTO; +import org.apache.syncope.common.lib.to.GroupTO; +import org.apache.syncope.common.lib.to.PropagationStatus; +import org.apache.syncope.common.lib.to.ProvisioningResult; +import org.apache.syncope.common.lib.to.ReportTO; +import org.apache.syncope.common.lib.to.WorkflowFormPropertyTO; +import org.apache.syncope.common.lib.types.PatchOperation; +import org.junit.Test; + +public abstract class AbstractTest { + + protected abstract ObjectMapper getObjectMapper(); + + protected void map() throws IOException { + BulkActionResult result = new BulkActionResult(); + result.add("1", BulkActionResult.Status.SUCCESS); + result.add("2", BulkActionResult.Status.SUCCESS); + + ObjectMapper mapper = getObjectMapper(); + + StringWriter writer = new StringWriter(); + mapper.writerWithDefaultPrettyPrinter().writeValue(writer, result); + + BulkActionResult actual = mapper.readValue(writer.toString(), BulkActionResult.class); + assertEquals(result, actual); + } + + protected void nativeMap() throws IOException { + WorkflowFormPropertyTO prop = new WorkflowFormPropertyTO(); + prop.getEnumValues().put("key1", "value1"); + prop.getEnumValues().put("key2", "value2"); + + ObjectMapper mapper = getObjectMapper(); + + StringWriter writer = new StringWriter(); + mapper.writeValue(writer, prop); + + WorkflowFormPropertyTO unserializedProp = mapper.readValue(writer.toString(), WorkflowFormPropertyTO.class); + assertEquals(prop, unserializedProp); + } + + @Test + public void reportletConfImplementations() throws IOException { + ReportTO report = new ReportTO(); + report.setName("testReportForCreate"); + report.getReportletConfs().add(new UserReportletConf("first")); + report.getReportletConfs().add(new UserReportletConf("second")); + + ObjectMapper mapper = getObjectMapper(); + + StringWriter writer = new StringWriter(); + mapper.writeValue(writer, report); + + ReportTO actual = mapper.readValue(writer.toString(), ReportTO.class); + assertEquals(report, actual); + } + + @Test + public void patch() throws IOException { + UserPatch patch = new UserPatch(); + patch.setKey(UUID.randomUUID().toString()); + patch.setUsername(new StringReplacePatchItem.Builder().value("newusername").build()); + assertNotNull(patch.getUsername().getValue()); + patch.setPassword(new PasswordPatch.Builder(). + onSyncope(false). + resource("ext1").resource("ext2"). + value("newpassword"). + build()); + assertNotNull(patch.getPassword().getValue()); + patch.getRoles().add(new StringPatchItem.Builder().operation(PatchOperation.DELETE).value("role").build()); + + ObjectMapper mapper = getObjectMapper(); + + StringWriter writer = new StringWriter(); + mapper.writeValue(writer, patch); + + UserPatch actual = mapper.readValue(writer.toString(), UserPatch.class); + assertEquals(patch, actual); + } + + @Test + public void provisioningResult() throws IOException { + GroupTO group = new GroupTO(); + group.setName(UUID.randomUUID().toString()); + group.setRealm(SyncopeConstants.ROOT_REALM); + group.getVirAttrs().add(new AttrTO.Builder().schema("rvirtualdata").value("rvirtualvalue").build()); + group.getADynMembershipConds().put("USER", "username==a*"); + + ProvisioningResult<GroupTO> original = new ProvisioningResult<>(); + original.setEntity(group); + + PropagationStatus status = new PropagationStatus(); + status.setFailureReason("failed"); + ConnObjectTO before = new ConnObjectTO(); + before.getAttrs().add(new AttrTO.Builder().schema("key").value("value").build()); + status.setBeforeObj(before); + original.getPropagationStatuses().add(status); + + ObjectMapper mapper = getObjectMapper(); + + StringWriter writer = new StringWriter(); + mapper.writeValue(writer, original); + + ProvisioningResult<GroupTO> actual = mapper.readValue( + writer.toString(), new TypeReference<ProvisioningResult<GroupTO>>() { + }); + assertEquals(original, actual); + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/test/java/org/apache/syncope/common/lib/JAXBTest.java ---------------------------------------------------------------------- diff --git a/common/lib/src/test/java/org/apache/syncope/common/lib/JAXBTest.java b/common/lib/src/test/java/org/apache/syncope/common/lib/JAXBTest.java deleted file mode 100644 index a14b878..0000000 --- a/common/lib/src/test/java/org/apache/syncope/common/lib/JAXBTest.java +++ /dev/null @@ -1,82 +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. - */ -package org.apache.syncope.common.lib; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.StringReader; -import java.io.StringWriter; -import java.util.UUID; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.syncope.common.lib.patch.UserPatch; -import org.apache.syncope.common.lib.report.UserReportletConf; -import org.apache.syncope.common.lib.to.AttrTO; -import org.apache.syncope.common.lib.to.ConnObjectTO; -import org.apache.syncope.common.lib.to.GroupTO; -import org.apache.syncope.common.lib.to.PropagationStatus; -import org.apache.syncope.common.lib.to.ProvisioningResult; -import org.apache.syncope.common.lib.to.UserTO; -import org.junit.Test; - -public class JAXBTest { - - @Test - public void marshal() { - try { - JAXBContext context = JAXBContext.newInstance(UserTO.class, UserPatch.class, UserReportletConf.class); - Marshaller marshaller = context.createMarshaller(); - marshaller.marshal(new UserTO(), new StringWriter()); - marshaller.marshal(new UserPatch(), new StringWriter()); - } catch (Exception e) { - fail(ExceptionUtils.getStackTrace(e)); - } - } - - @Test - public void provisioningResult() throws JAXBException { - JAXBContext context = JAXBContext.newInstance(ProvisioningResult.class); - Marshaller marshaller = context.createMarshaller(); - Unmarshaller unmarshaller = context.createUnmarshaller(); - - GroupTO group = new GroupTO(); - group.setName(UUID.randomUUID().toString()); - group.setRealm(SyncopeConstants.ROOT_REALM); - group.getVirAttrs().add(new AttrTO.Builder().schema("rvirtualdata").value("rvirtualvalue").build()); - group.getADynMembershipConds().put("USER", "username==a*"); - - ProvisioningResult<GroupTO> original = new ProvisioningResult<>(); - original.setEntity(group); - - PropagationStatus status = new PropagationStatus(); - status.setFailureReason("failed"); - status.setBeforeObj(new ConnObjectTO()); - original.getPropagationStatuses().add(status); - - StringWriter writer = new StringWriter(); - marshaller.marshal(original, writer); - - Object actual = unmarshaller.unmarshal(new StringReader(writer.toString())); - assertEquals(original, actual); - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/test/java/org/apache/syncope/common/lib/JSONTest.java ---------------------------------------------------------------------- diff --git a/common/lib/src/test/java/org/apache/syncope/common/lib/JSONTest.java b/common/lib/src/test/java/org/apache/syncope/common/lib/JSONTest.java index 9c5c777..03fc045 100644 --- a/common/lib/src/test/java/org/apache/syncope/common/lib/JSONTest.java +++ b/common/lib/src/test/java/org/apache/syncope/common/lib/JSONTest.java @@ -18,109 +18,13 @@ */ package org.apache.syncope.common.lib; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.IOException; -import java.io.StringWriter; -import java.util.UUID; -import org.apache.syncope.common.lib.patch.PasswordPatch; -import org.apache.syncope.common.lib.patch.StringPatchItem; -import org.apache.syncope.common.lib.patch.StringReplacePatchItem; -import org.apache.syncope.common.lib.patch.UserPatch; -import org.apache.syncope.common.lib.report.UserReportletConf; -import org.apache.syncope.common.lib.to.AttrTO; -import org.apache.syncope.common.lib.to.ConnObjectTO; -import org.apache.syncope.common.lib.to.GroupTO; -import org.apache.syncope.common.lib.to.PropagationStatus; -import org.apache.syncope.common.lib.to.ProvisioningResult; -import org.apache.syncope.common.lib.to.ReportTO; -import org.apache.syncope.common.lib.to.WorkflowFormPropertyTO; -import org.apache.syncope.common.lib.types.PatchOperation; -import org.junit.Test; - -public class JSONTest { - - @Test - public void map() throws IOException { - WorkflowFormPropertyTO prop = new WorkflowFormPropertyTO(); - prop.getEnumValues().put("key1", "value1"); - prop.getEnumValues().put("key2", "value2"); - - ObjectMapper mapper = new ObjectMapper(); - - StringWriter writer = new StringWriter(); - mapper.writeValue(writer, prop); - - WorkflowFormPropertyTO unserializedProp = mapper.readValue(writer.toString(), WorkflowFormPropertyTO.class); - assertEquals(prop, unserializedProp); - } - - @Test - public void reportletConfImplementations() throws IOException { - ReportTO report = new ReportTO(); - report.setName("testReportForCreate"); - report.getReportletConfs().add(new UserReportletConf("first")); - report.getReportletConfs().add(new UserReportletConf("second")); - - ObjectMapper mapper = new ObjectMapper(); - - StringWriter writer = new StringWriter(); - mapper.writeValue(writer, report); - - ReportTO actual = mapper.readValue(writer.toString(), ReportTO.class); - assertEquals(report, actual); - } - - @Test - public void patch() throws IOException { - UserPatch patch = new UserPatch(); - patch.setKey(UUID.randomUUID().toString()); - patch.setUsername(new StringReplacePatchItem.Builder().value("newusername").build()); - assertNotNull(patch.getUsername().getValue()); - patch.setPassword(new PasswordPatch.Builder(). - onSyncope(false). - resource("ext1").resource("ext2"). - value("newpassword"). - build()); - assertNotNull(patch.getPassword().getValue()); - patch.getRoles().add(new StringPatchItem.Builder().operation(PatchOperation.DELETE).value("role").build()); - - ObjectMapper mapper = new ObjectMapper(); - - StringWriter writer = new StringWriter(); - mapper.writeValue(writer, patch); - - UserPatch actual = mapper.readValue(writer.toString(), UserPatch.class); - assertEquals(patch, actual); - } - - @Test - public void provisioningResult() throws IOException { - GroupTO group = new GroupTO(); - group.setName(UUID.randomUUID().toString()); - group.setRealm(SyncopeConstants.ROOT_REALM); - group.getVirAttrs().add(new AttrTO.Builder().schema("rvirtualdata").value("rvirtualvalue").build()); - group.getADynMembershipConds().put("USER", "username==a*"); - - ProvisioningResult<GroupTO> original = new ProvisioningResult<>(); - original.setEntity(group); - - PropagationStatus status = new PropagationStatus(); - status.setFailureReason("failed"); - status.setBeforeObj(new ConnObjectTO()); - original.getPropagationStatuses().add(status); - - ObjectMapper mapper = new ObjectMapper(); +import org.apache.syncope.common.lib.jackson.UnwrappedObjectMapper; - StringWriter writer = new StringWriter(); - mapper.writeValue(writer, original); +public class JSONTest extends AbstractTest { - ProvisioningResult<GroupTO> actual = mapper.readValue( - writer.toString(), new TypeReference<ProvisioningResult<GroupTO>>() { - }); - assertEquals(original, actual); + @Override + protected ObjectMapper getObjectMapper() { + return new UnwrappedObjectMapper(); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/common/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java ---------------------------------------------------------------------- diff --git a/common/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java b/common/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java new file mode 100644 index 0000000..416ec93 --- /dev/null +++ b/common/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java @@ -0,0 +1,31 @@ +/* + * 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 com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.syncope.common.lib.jackson.UnwrappedXmlMapper; + +public class XMLTest extends AbstractTest { + + @Override + protected ObjectMapper getObjectMapper() { + return new UnwrappedXmlMapper(); + } + +} http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java index 3fd8ccf..513ebe1 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java @@ -366,10 +366,10 @@ public class ReportLogic extends AbstractExecutableLogic<ReportTO> { for (ReportExec exec : reportExecDAO.findAll(report, startedBefore, startedAfter, endedBefore, endedAfter)) { try { reportExecDAO.delete(exec); - result.getResults().put(String.valueOf(exec.getKey()), BulkActionResult.Status.SUCCESS); + result.add(exec.getKey(), BulkActionResult.Status.SUCCESS); } catch (Exception e) { LOG.error("Error deleting execution {} of report {}", exec.getKey(), key, e); - result.getResults().put(String.valueOf(exec.getKey()), BulkActionResult.Status.FAILURE); + result.add(exec.getKey(), BulkActionResult.Status.FAILURE); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/480387d6/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java index 9a83fe7..69787f5 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java @@ -343,10 +343,10 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> { for (TaskExec exec : taskExecDAO.findAll(task, startedBefore, startedAfter, endedBefore, endedAfter)) { try { taskExecDAO.delete(exec); - result.getResults().put(String.valueOf(exec.getKey()), BulkActionResult.Status.SUCCESS); + result.add(exec.getKey(), BulkActionResult.Status.SUCCESS); } catch (Exception e) { LOG.error("Error deleting execution {} of task {}", exec.getKey(), key, e); - result.getResults().put(String.valueOf(exec.getKey()), BulkActionResult.Status.FAILURE); + result.add(exec.getKey(), BulkActionResult.Status.FAILURE); } }
