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:53:41 UTC
[4/5] syncope git commit: Removing JAXB in favor of
jackson-dataformat-xml: currently the only missing part is XSD in WADL
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 5dc50f1..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
@@ -18,16 +18,9 @@
*/
package org.apache.syncope.common.lib.patch;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-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;
@@ -88,23 +81,14 @@ public class UserPatch extends AnyPatch {
this.mustChangePassword = mustChangePassword;
}
- @XmlElementWrapper(name = "relationships")
- @XmlElement(name = "relationship")
- @JsonProperty("relationships")
public Set<RelationshipPatch> getRelationships() {
return relationships;
}
- @XmlElementWrapper(name = "memberships")
- @XmlElement(name = "membership")
- @JsonProperty("memberships")
public Set<MembershipPatch> getMemberships() {
return memberships;
}
- @XmlElementWrapper(name = "roles")
- @XmlElement(name = "role")
- @JsonProperty("roles")
public Set<StringPatchItem> getRoles() {
return roles;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 426ac6d..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/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.patch;
-
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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/f283ebc0/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/f283ebc0/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 bc41628..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
@@ -18,22 +18,13 @@
*/
package org.apache.syncope.common.lib.policy;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
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.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 {
@@ -66,16 +57,10 @@ public abstract class AbstractPolicyTO extends AbstractBaseBean implements Entit
this.description = description;
}
- @XmlElementWrapper(name = "usedByResources")
- @XmlElement(name = "resource")
- @JsonProperty("usedByResources")
public List<String> getUsedByResources() {
return usedByResources;
}
- @XmlElementWrapper(name = "usedByRealms")
- @XmlElement(name = "group")
- @JsonProperty("usedByRealms")
public List<String> getUsedByRealms() {
return usedByRealms;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 caf2506..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
@@ -18,16 +18,9 @@
*/
package org.apache.syncope.common.lib.policy;
-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;
-@XmlRootElement(name = "accountPolicy")
-@XmlType
public class AccountPolicyTO extends AbstractPolicyTO implements ComposablePolicy<AbstractAccountRuleConf> {
private static final long serialVersionUID = -1557150042828800134L;
@@ -56,17 +49,11 @@ public class AccountPolicyTO extends AbstractPolicyTO implements ComposablePolic
this.maxAuthenticationAttempts = maxAuthenticationAttempts;
}
- @XmlElementWrapper(name = "ruleConfs")
- @XmlElement(name = "ruleConf")
- @JsonProperty("ruleConfs")
@Override
public List<AbstractAccountRuleConf> getRuleConfs() {
return ruleConfs;
}
- @XmlElementWrapper(name = "passthroughResources")
- @XmlElement(name = "passthroughResource")
- @JsonProperty("passthroughResources")
public List<String> getPassthroughResources() {
return passthroughResources;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 2788a4a..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
@@ -18,19 +18,12 @@
*/
package org.apache.syncope.common.lib.policy;
-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.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;
@@ -122,30 +115,18 @@ public class DefaultAccountRuleConf extends AbstractAccountRuleConf implements A
this.pattern = pattern;
}
- @XmlElementWrapper(name = "wordsNotPermitted")
- @XmlElement(name = "word")
- @JsonProperty("wordsNotPermitted")
public List<String> getWordsNotPermitted() {
return wordsNotPermitted;
}
- @XmlElementWrapper(name = "prefixesNotPermitted")
- @XmlElement(name = "prefix")
- @JsonProperty("prefixesNotPermitted")
public List<String> getPrefixesNotPermitted() {
return prefixesNotPermitted;
}
- @XmlElementWrapper(name = "schemasNotPermitted")
- @XmlElement(name = "schema")
- @JsonProperty("schemasNotPermitted")
public List<String> getSchemasNotPermitted() {
return schemasNotPermitted;
}
- @XmlElementWrapper(name = "suffixesNotPermitted")
- @XmlElement(name = "suffix")
- @JsonProperty("suffixesNotPermitted")
public List<String> getSuffixesNotPermitted() {
return suffixesNotPermitted;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 b622546..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
@@ -18,19 +18,12 @@
*/
package org.apache.syncope.common.lib.policy;
-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.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;
@@ -317,30 +310,18 @@ public class DefaultPasswordRuleConf extends AbstractPasswordRuleConf {
this.usernameAllowed = usernameAllowed;
}
- @XmlElementWrapper(name = "wordsNotPermitted")
- @XmlElement(name = "word")
- @JsonProperty("wordsNotPermitted")
public List<String> getWordsNotPermitted() {
return wordsNotPermitted;
}
- @XmlElementWrapper(name = "prefixesNotPermitted")
- @XmlElement(name = "prefix")
- @JsonProperty("prefixesNotPermitted")
public List<String> getPrefixesNotPermitted() {
return prefixesNotPermitted;
}
- @XmlElementWrapper(name = "schemasNotPermitted")
- @XmlElement(name = "schema")
- @JsonProperty("schemasNotPermitted")
public List<String> getSchemasNotPermitted() {
return schemasNotPermitted;
}
- @XmlElementWrapper(name = "suffixesNotPermitted")
- @XmlElement(name = "suffix")
- @JsonProperty("suffixesNotPermitted")
public List<String> getSuffixesNotPermitted() {
return suffixesNotPermitted;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 b9d6d3e..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
@@ -18,16 +18,9 @@
*/
package org.apache.syncope.common.lib.policy;
-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;
-@XmlRootElement(name = "passwordPolicy")
-@XmlType
public class PasswordPolicyTO extends AbstractPolicyTO implements ComposablePolicy<AbstractPasswordRuleConf> {
private static final long serialVersionUID = -5606086441294799690L;
@@ -54,9 +47,6 @@ public class PasswordPolicyTO extends AbstractPolicyTO implements ComposablePoli
this.historyLength = historyLength;
}
- @XmlElementWrapper(name = "ruleConfs")
- @XmlElement(name = "ruleConf")
- @JsonProperty("ruleConfs")
@Override
public List<AbstractPasswordRuleConf> getRuleConfs() {
return ruleConfs;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 a6b5338..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,13 +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 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.ConflictResolutionAction;
-@XmlType
public class PullPolicySpec extends AbstractBaseBean {
private static final long serialVersionUID = -3144027171719498127L;
@@ -43,7 +39,6 @@ public class PullPolicySpec extends AbstractBaseBean {
* {@code PlainAttrsPullCorrelationRule}</li>
* </ol>
*/
- @XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
@JsonIgnore
private final Map<String, String> correlationRules = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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/f283ebc0/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/f283ebc0/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 bb26628..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/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.policy;
-
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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/f283ebc0/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/f283ebc0/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/f283ebc0/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 6f3800a..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
@@ -18,25 +18,15 @@
*/
package org.apache.syncope.common.lib.report;
-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.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,
@@ -70,23 +60,14 @@ public class GroupReportletConf extends AbstractAnyReportletConf {
this.matchingCond = matchingCond;
}
- @XmlElementWrapper(name = "plainAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("plainAttrs")
public List<String> getPlainAttrs() {
return plainAttrs;
}
- @XmlElementWrapper(name = "derAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("derAttrs")
public List<String> getDerAttrs() {
return derAttrs;
}
- @XmlElementWrapper(name = "virAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("virAttrs")
public List<String> getVirAttrs() {
return virAttrs;
}
@@ -99,9 +80,6 @@ public class GroupReportletConf extends AbstractAnyReportletConf {
super(name);
}
- @XmlElementWrapper(name = "features")
- @XmlElement(name = "feature")
- @JsonProperty("features")
public List<Feature> getFeatures() {
return features;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 ce67f46..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
@@ -18,24 +18,13 @@
*/
package org.apache.syncope.common.lib.report;
-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.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,
@@ -94,9 +83,6 @@ public class ReconciliationReportletConf extends AbstractReportletConf {
this.anyObjectMatchingCond = anyObjectMatchingCond;
}
- @XmlElementWrapper(name = "features")
- @XmlElement(name = "feature")
- @JsonProperty("features")
public List<Feature> getFeatures() {
return features;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 2514c16..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
@@ -18,18 +18,11 @@
*/
package org.apache.syncope.common.lib.report;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
import java.util.Date;
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.types.TraceLevel;
-@XmlRootElement(name = "staticReportletConf")
-@XmlType
public class StaticReportletConf extends AbstractReportletConf {
private static final long serialVersionUID = -4814950086361753689L;
@@ -74,9 +67,6 @@ public class StaticReportletConf extends AbstractReportletConf {
this.doubleField = doubleField;
}
- @XmlElementWrapper(name = "listField")
- @XmlElement(name = "field")
- @JsonProperty("listField")
public List<String> getListField() {
return listField;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 0a5455d..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
@@ -18,19 +18,11 @@
*/
package org.apache.syncope.common.lib.report;
-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.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;
@@ -44,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,
@@ -69,23 +59,14 @@ public class UserReportletConf extends AbstractAnyReportletConf {
@SearchCondition(type = "USER")
protected String matchingCond;
- @XmlElementWrapper(name = "plainAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("plainAttrs")
public List<String> getPlainAttrs() {
return plainAttrs;
}
- @XmlElementWrapper(name = "derAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("derAttrs")
public List<String> getDerAttrs() {
return derAttrs;
}
- @XmlElementWrapper(name = "virAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("virAttrs")
public List<String> getVirAttrs() {
return virAttrs;
}
@@ -108,9 +89,6 @@ public class UserReportletConf extends AbstractAnyReportletConf {
this.matchingCond = matchingCond;
}
- @XmlElementWrapper(name = "features")
- @XmlElement(name = "feature")
- @JsonProperty("features")
public List<Feature> getFeatures() {
return features;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 bc452c1..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/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.report;
-
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 ff6b5e7..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/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.search;
-
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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/f283ebc0/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 cd7a5ae..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
@@ -18,20 +18,11 @@
*/
package org.apache.syncope.common.lib.to;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-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;
@@ -92,9 +83,6 @@ public class AbstractProvisioningTaskTO extends SchedTaskTO {
this.syncStatus = syncStatus;
}
- @XmlElementWrapper(name = "actionsClassNames")
- @XmlElement(name = "actionsClassName")
- @JsonProperty("actionsClassNames")
public Set<String> getActionsClassNames() {
return actionsClassNames;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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/f283ebc0/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/f283ebc0/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 65603f7..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
@@ -18,21 +18,11 @@
*/
package org.apache.syncope.common.lib.to;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
import java.util.ArrayList;
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.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 {
@@ -63,9 +53,6 @@ public abstract class AbstractTaskTO extends AbstractStartEndBean implements Ent
this.latestExecStatus = latestExecStatus;
}
- @XmlElementWrapper(name = "executions")
- @XmlElement(name = "execution")
- @JsonProperty("executions")
public List<ExecTO> getExecutions() {
return executions;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 81a445a..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
@@ -19,20 +19,13 @@
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.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.tuple.Pair;
-@XmlRootElement(name = "anyObject")
-@XmlType
public class AnyObjectTO extends AnyTO implements GroupableRelatableTO {
private static final long serialVersionUID = 8841697496476959639L;
@@ -53,9 +46,6 @@ public class AnyObjectTO extends AnyTO implements GroupableRelatableTO {
this.name = name;
}
- @XmlElementWrapper(name = "relationships")
- @XmlElement(name = "relationship")
- @JsonProperty("relationships")
@Override
public List<RelationshipTO> getRelationships() {
return relationships;
@@ -73,9 +63,6 @@ public class AnyObjectTO extends AnyTO implements GroupableRelatableTO {
return result;
}
- @XmlElementWrapper(name = "memberships")
- @XmlElement(name = "membership")
- @JsonProperty("memberships")
@Override
public List<MembershipTO> getMemberships() {
return memberships;
@@ -93,9 +80,6 @@ public class AnyObjectTO 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/f283ebc0/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 b63d4b0..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
@@ -19,7 +19,6 @@
package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.Collections;
@@ -28,13 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-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 {
@@ -92,16 +85,10 @@ public abstract class AnyTO extends AbstractAnnotatedBean implements EntityTO, A
this.status = status;
}
- @XmlElementWrapper(name = "auxClasses")
- @XmlElement(name = "class")
- @JsonProperty("auxClasses")
public List<String> getAuxClasses() {
return auxClasses;
}
- @XmlElementWrapper(name = "plainAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("plainAttrs")
@Override
public Set<AttrTO> getPlainAttrs() {
return plainAttrs;
@@ -118,9 +105,6 @@ public abstract class AnyTO extends AbstractAnnotatedBean implements EntityTO, A
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "derAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("derAttrs")
@Override
public Set<AttrTO> getDerAttrs() {
return derAttrs;
@@ -137,9 +121,6 @@ public abstract class AnyTO extends AbstractAnnotatedBean implements EntityTO, A
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "virAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("virAttrs")
@Override
public Set<AttrTO> getVirAttrs() {
return virAttrs;
@@ -156,9 +137,6 @@ public abstract class AnyTO extends AbstractAnnotatedBean implements EntityTO, A
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "resources")
- @XmlElement(name = "resource")
- @JsonProperty("resources")
public Set<String> getResources() {
return resources;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 d68a7fe..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
@@ -18,18 +18,11 @@
*/
package org.apache.syncope.common.lib.to;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
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.AbstractBaseBean;
-@XmlRootElement(name = "anyTypeClass")
-@XmlType
public class AnyTypeClassTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = -591757688607551266L;
@@ -55,30 +48,18 @@ public class AnyTypeClassTO extends AbstractBaseBean implements EntityTO {
this.key = key;
}
- @XmlElementWrapper(name = "plainSchemas")
- @XmlElement(name = "schema")
- @JsonProperty("plainSchemas")
public List<String> getPlainSchemas() {
return plainSchemas;
}
- @XmlElementWrapper(name = "derSchemas")
- @XmlElement(name = "schema")
- @JsonProperty("derSchemas")
public List<String> getDerSchemas() {
return derSchemas;
}
- @XmlElementWrapper(name = "virSchemas")
- @XmlElement(name = "schema")
- @JsonProperty("virSchemas")
public List<String> getVirSchemas() {
return virSchemas;
}
- @XmlElementWrapper(name = "inUseByTypes")
- @XmlElement(name = "anyTypeClass")
- @JsonProperty("inUseByTypes")
public List<String> getInUseByTypes() {
return inUseByTypes;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 07827cb..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
@@ -18,19 +18,12 @@
*/
package org.apache.syncope.common.lib.to;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
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.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;
@@ -60,9 +53,6 @@ public class AnyTypeTO extends AbstractBaseBean implements EntityTO {
this.kind = kind;
}
- @XmlElementWrapper(name = "classes")
- @XmlElement(name = "class")
- @JsonProperty("classes")
public List<String> getClasses() {
return classes;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 65a6b51..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
@@ -19,19 +19,12 @@
package org.apache.syncope.common.lib.to;
import org.apache.syncope.common.lib.AbstractBaseBean;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
import java.util.Collection;
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.commons.collections4.CollectionUtils;
-@XmlRootElement(name = "attribute")
-@XmlType
public class AttrTO extends AbstractBaseBean {
private static final long serialVersionUID = 4941691338796323623L;
@@ -104,9 +97,6 @@ public class AttrTO extends AbstractBaseBean {
/**
* @return attribute values as strings
*/
- @XmlElementWrapper(name = "values")
- @XmlElement(name = "value")
- @JsonProperty("values")
public List<String> getValues() {
return values;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/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 c3edf7c..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
@@ -18,24 +18,14 @@
*/
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.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,
@@ -59,9 +49,6 @@ public class BulkAction extends AbstractBaseBean {
this.type = type;
}
- @XmlElementWrapper(name = "targets")
- @XmlElement(name = "target")
- @JsonProperty("targets")
public List<String> getTargets() {
return targets;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java
index c2e67f4..c74f3af 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.common.lib.to;
+import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
@@ -25,26 +26,12 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-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 = "bulkActionResult")
-@XmlType
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlSeeAlso(BulkActionResult.Status.class)
public class BulkActionResult extends AbstractBaseBean {
private static final long serialVersionUID = 2868894178821778133L;
- @XmlEnum
- @XmlType(name = "bulkActionStatus")
public enum Status {
// general bulk action result statuses
@@ -56,25 +43,48 @@ public class BulkActionResult extends AbstractBaseBean {
}
- @XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
+ public static class Single extends AbstractBaseBean {
+
+ private static final long serialVersionUID = -2677679977955844506L;
+
+ private final String key;
+
+ private final Status status;
+
+ @JsonCreator
+ public Single(@JsonProperty("key") final String key, @JsonProperty("status") final Status status) {
+ this.key = key;
+ this.status = status;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+ }
+
+ private final List<Single> results = new ArrayList<>();
+
@JsonIgnore
- private final Map<String, Status> results = new HashMap<>();
+ public boolean add(final String key, final Status status) {
+ Single single = new Single(key, status);
+ return results.contains(single) || results.add(single);
+ }
- @JsonProperty
- public Map<String, Status> getResults() {
+ public List<Single> getResults() {
return results;
}
@JsonIgnore
- public List<String> getResultByStatus(final Status status) {
- final List<String> result = new ArrayList<>();
-
- for (Map.Entry<String, Status> entry : results.entrySet()) {
- if (entry.getValue() == status) {
- result.add(entry.getKey());
- }
+ public Map<String, Status> getResultMap() {
+ Map<String, Status> result = new HashMap<>(results.size());
+ for (Single single : results) {
+ result.put(single.getKey(), single.getStatus());
}
- return Collections.unmodifiableList(result);
+ return Collections.unmodifiableMap(result);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnBundleTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnBundleTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnBundleTO.java
index b62c353..3687b6a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnBundleTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnBundleTO.java
@@ -18,18 +18,11 @@
*/
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;
import org.apache.syncope.common.lib.types.ConnConfPropSchema;
-@XmlRootElement(name = "connectorBundle")
-@XmlType
public class ConnBundleTO extends AbstractBaseBean {
private static final long serialVersionUID = 7215115961910138005L;
@@ -78,9 +71,6 @@ public class ConnBundleTO extends AbstractBaseBean {
this.connectorName = connectorName;
}
- @XmlElementWrapper(name = "properties")
- @XmlElement(name = "connConfPropSchema")
- @JsonProperty("properties")
public List<ConnConfPropSchema> getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnIdObjectClassTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnIdObjectClassTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnIdObjectClassTO.java
index be1b6d6..a5529db 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnIdObjectClassTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnIdObjectClassTO.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.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;
/**
* Metadata description of ConnId ObjectClass.
*/
-@XmlRootElement(name = "connIdObjectClass")
-@XmlType
public class ConnIdObjectClassTO extends AbstractBaseBean {
private static final long serialVersionUID = -3719658595689434648L;
@@ -68,9 +61,6 @@ public class ConnIdObjectClassTO extends AbstractBaseBean {
this.auxiliary = auxiliary;
}
- @XmlElementWrapper(name = "attributes")
- @XmlElement(name = "attribute")
- @JsonProperty("attributes")
public List<String> getAttributes() {
return attributes;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
index 4f91355..633365d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.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.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
@@ -27,16 +26,10 @@ 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 org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.ConnConfProperty;
import org.apache.syncope.common.lib.types.ConnectorCapability;
-@XmlRootElement(name = "connInstance")
-@XmlType
public class ConnInstanceTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = 2707778645445168671L;
@@ -104,9 +97,6 @@ public class ConnInstanceTO extends AbstractBaseBean implements EntityTO {
this.version = version;
}
- @XmlElementWrapper(name = "conf")
- @XmlElement(name = "property")
- @JsonProperty("conf")
public Set<ConnConfProperty> getConf() {
return this.conf;
}
@@ -123,9 +113,6 @@ public class ConnInstanceTO extends AbstractBaseBean implements EntityTO {
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "capabilities")
- @XmlElement(name = "capability")
- @JsonProperty("capabilities")
public Set<ConnectorCapability> getCapabilities() {
return capabilities;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnObjectTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnObjectTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnObjectTO.java
index 09784c8..d1ba0e6 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnObjectTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnObjectTO.java
@@ -19,29 +19,19 @@
package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-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 = "connObject")
-@XmlType
public class ConnObjectTO extends AbstractBaseBean {
private static final long serialVersionUID = 5139554911265442497L;
private final Set<AttrTO> attrs = new LinkedHashSet<>();
- @XmlElementWrapper(name = "attrs")
- @XmlElement(name = "attribute")
- @JsonProperty("attrs")
public Set<AttrTO> getAttrs() {
return attrs;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
index 9f455dc..38c950a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
@@ -19,11 +19,7 @@
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;
-@XmlRootElement(name = "connPoolConf")
-@XmlType
public class ConnPoolConfTO extends AbstractBaseBean {
private static final long serialVersionUID = -214360178113476623L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/DerSchemaTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DerSchemaTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DerSchemaTO.java
index dc84864..0b3d42f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DerSchemaTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DerSchemaTO.java
@@ -18,11 +18,6 @@
*/
package org.apache.syncope.common.lib.to;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "derivedSchema")
-@XmlType
public class DerSchemaTO extends AbstractSchemaTO {
private static final long serialVersionUID = -6747399803792103108L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/DomainTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DomainTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DomainTO.java
index 8994cf8..1fce4de 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DomainTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DomainTO.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.AbstractBaseBean;
import org.apache.syncope.common.lib.types.CipherAlgorithm;
-@XmlRootElement(name = "domain")
-@XmlType
public class DomainTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = -7938075259986084934L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ErrorTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ErrorTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ErrorTO.java
index f643b88..a688c8e 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ErrorTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ErrorTO.java
@@ -18,18 +18,11 @@
*/
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;
import org.apache.syncope.common.lib.types.ClientExceptionType;
-@XmlRootElement(name = "error")
-@XmlType
public class ErrorTO extends AbstractBaseBean {
private static final long serialVersionUID = 2435764161719225927L;
@@ -56,9 +49,6 @@ public class ErrorTO extends AbstractBaseBean {
this.type = type;
}
- @XmlElementWrapper(name = "elements")
- @XmlElement(name = "element")
- @JsonProperty("elements")
public List<String> getElements() {
return elements;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/EventCategoryTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/EventCategoryTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/EventCategoryTO.java
index 544e204..5dd4b77 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/EventCategoryTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/EventCategoryTO.java
@@ -18,18 +18,11 @@
*/
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;
import org.apache.syncope.common.lib.types.AuditElements;
-@XmlRootElement(name = "eventCategory")
-@XmlType
public class EventCategoryTO extends AbstractBaseBean {
private static final long serialVersionUID = -4340060002701633401L;
@@ -83,9 +76,6 @@ public class EventCategoryTO extends AbstractBaseBean {
this.subcategory = subcategory;
}
- @XmlElementWrapper(name = "events")
- @XmlElement(name = "event")
- @JsonProperty("events")
public List<String> getEvents() {
return events;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/ExecTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ExecTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ExecTO.java
index 323658e..34b8977 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ExecTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ExecTO.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.types.JobType;
-@XmlRootElement(name = "exec")
-@XmlType()
public class ExecTO extends AbstractStartEndBean implements EntityTO {
private static final long serialVersionUID = -4621191979198357081L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
index 0ae0885..7f1f721 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
@@ -19,23 +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.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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
-import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-@XmlRootElement(name = "group")
-@XmlType
public class GroupTO extends AnyTO {
private static final long serialVersionUID = -7785920258290147542L;
@@ -48,8 +39,6 @@ public class GroupTO extends AnyTO {
private String udynMembershipCond;
- @XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
- @JsonIgnore
private final Map<String, String> adynMembershipConds = new HashMap<>();
private final List<TypeExtensionTO> typeExtensions = new ArrayList<>();
@@ -96,7 +85,6 @@ public class GroupTO extends AnyTO {
this.udynMembershipCond = uDynMembershipCond;
}
- @JsonProperty
public Map<String, String> getADynMembershipConds() {
return adynMembershipConds;
}
@@ -112,9 +100,6 @@ public class GroupTO extends AnyTO {
});
}
- @XmlElementWrapper(name = "typeExtensions")
- @XmlElement(name = "typeExtension")
- @JsonProperty("typeExtensions")
public List<TypeExtensionTO> getTypeExtensions() {
return typeExtensions;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
index 69a339c..bb82ad3 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
@@ -19,13 +19,9 @@
package org.apache.syncope.common.lib.to;
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.JobType;
-@XmlRootElement(name = "job")
-@XmlType
public class JobTO extends AbstractBaseBean {
private static final long serialVersionUID = -7254450981751326711L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/LoggerTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/LoggerTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/LoggerTO.java
index 0dfa8b5..a37cd1a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/LoggerTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/LoggerTO.java
@@ -19,13 +19,9 @@
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;
import org.apache.syncope.common.lib.types.LoggerLevel;
-@XmlRootElement(name = "logger")
-@XmlType
public class LoggerTO extends AbstractBaseBean {
private static final long serialVersionUID = -7794833835668648505L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
index bf25867..b949f75 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.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 = "mailTemplate")
-@XmlType
public class MailTemplateTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = 8389755049666062735L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
index c078950..5ac943d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
@@ -18,18 +18,11 @@
*/
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;
import org.apache.syncope.common.lib.types.MappingPurpose;
-@XmlRootElement(name = "mappingItem")
-@XmlType
public class MappingItemTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = 2983498836767176862L;
@@ -153,9 +146,6 @@ public class MappingItemTO extends AbstractBaseBean implements EntityTO {
this.pullJEXLTransformer = pullJEXLTransformer;
}
- @XmlElementWrapper(name = "mappingItemTransformerClassNames")
- @XmlElement(name = "className")
- @JsonProperty("mappingItemTransformerClassNames")
public List<String> getMappingItemTransformerClassNames() {
return mappingItemTransformerClassNames;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
index a9048c7..cc7aa8c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.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.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.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.common.lib.AbstractBaseBean;
-@XmlRootElement(name = "mapping")
-@XmlType
public class MappingTO extends AbstractBaseBean {
private static final long serialVersionUID = 8447688036282611118L;
@@ -72,9 +65,6 @@ public class MappingTO extends AbstractBaseBean {
: addConnObjectKeyItem(connObjectKeyItem);
}
- @XmlElementWrapper(name = "items")
- @XmlElement(name = "item")
- @JsonProperty("items")
public List<MappingItemTO> getItems() {
return items;
}
@@ -87,9 +77,6 @@ public class MappingTO extends AbstractBaseBean {
return this.items.remove(item);
}
- @XmlElementWrapper(name = "linkingItems")
- @XmlElement(name = "item")
- @JsonProperty("linkingItems")
public List<MappingItemTO> getLinkingItems() {
return linkingItems;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
index a970dec..be758ed 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
@@ -19,20 +19,13 @@
package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-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.types.AnyTypeKind;
-@XmlRootElement(name = "membership")
-@XmlType
public class MembershipTO extends RelationshipTO implements AttributableTO {
private static final long serialVersionUID = 5992828670273935861L;
@@ -102,9 +95,6 @@ public class MembershipTO extends RelationshipTO implements AttributableTO {
this.groupName = groupName;
}
- @XmlElementWrapper(name = "plainAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("plainAttrs")
@Override
public Set<AttrTO> getPlainAttrs() {
return plainAttrs;
@@ -121,9 +111,6 @@ public class MembershipTO extends RelationshipTO implements AttributableTO {
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "derAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("derAttrs")
@Override
public Set<AttrTO> getDerAttrs() {
return derAttrs;
@@ -140,9 +127,6 @@ public class MembershipTO extends RelationshipTO implements AttributableTO {
return Collections.unmodifiableMap(result);
}
- @XmlElementWrapper(name = "virAttrs")
- @XmlElement(name = "attribute")
- @JsonProperty("virAttrs")
@Override
public Set<AttrTO> getVirAttrs() {
return virAttrs;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java
index 428efde..9cec2cf 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java
@@ -25,17 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
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;
import org.apache.syncope.common.lib.types.TraceLevel;
-@XmlRootElement(name = "notification")
-@XmlType
public class NotificationTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = -6145117115632592612L;
@@ -44,7 +36,6 @@ public class NotificationTO extends AbstractBaseBean implements EntityTO {
private final List<String> events = new ArrayList<>();
- @XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
@JsonIgnore
private final Map<String, String> abouts = new HashMap<>();
@@ -73,16 +64,10 @@ public class NotificationTO extends AbstractBaseBean implements EntityTO {
return abouts;
}
- @XmlElementWrapper(name = "events")
- @XmlElement(name = "event")
- @JsonProperty("events")
public List<String> getEvents() {
return events;
}
- @XmlElementWrapper(name = "staticRecipients")
- @XmlElement(name = "staticRecipient")
- @JsonProperty("staticRecipients")
public List<String> getStaticRecipients() {
return staticRecipients;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java
index ce74be2..a217f39 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java
@@ -18,18 +18,11 @@
*/
package org.apache.syncope.common.lib.to;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashSet;
import java.util.Set;
-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.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.TraceLevel;
-@XmlRootElement(name = "notificationTask")
-@XmlType
public class NotificationTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = 371671242591093846L;
@@ -78,9 +71,6 @@ public class NotificationTaskTO extends AbstractTaskTO {
this.anyKey = anyKey;
}
- @XmlElementWrapper(name = "recipients")
- @XmlElement(name = "recipient")
- @JsonProperty("recipients")
public Set<String> getRecipients() {
return recipients;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f283ebc0/common/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
index 80743c0..7c962e5 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.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 = "orgUnit")
-@XmlType
public class OrgUnitTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = -1868877794174953177L;