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 2018/02/13 13:29:05 UTC
[03/10] syncope git commit: [SYNCOPE-1274] Using Swagger annotations
for TO hierarchies
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/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..656cd07 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
@@ -18,16 +18,21 @@
*/
package org.apache.syncope.common.lib.to;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
-
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@XmlRootElement(name = "schedTask")
@XmlType
-@XmlSeeAlso(AbstractProvisioningTaskTO.class)
-public class SchedTaskTO extends AbstractTaskTO {
+@XmlSeeAlso({ ProvisioningTaskTO.class })
+@ApiModel(parent = TaskTO.class, subTypes = { ProvisioningTaskTO.class }, discriminator = "@class")
+public class SchedTaskTO extends TaskTO {
private static final long serialVersionUID = -5722284116974636425L;
@@ -47,6 +52,14 @@ public class SchedTaskTO extends AbstractTaskTO {
private boolean active = true;
+ @XmlTransient
+ @JsonProperty("@class")
+ @ApiModelProperty(name = "@class", required = true, example = "org.apache.syncope.common.lib.to.SchedTaskTO")
+ @Override
+ public String getDiscriminator() {
+ return getClass().getName();
+ }
+
public Date getStartAt() {
return startAt == null ? null : new Date(startAt.getTime());
}
@@ -71,6 +84,7 @@ public class SchedTaskTO extends AbstractTaskTO {
this.jobDelegateClassName = jobDelegateClassName;
}
+ @ApiModelProperty(readOnly = true)
public Date getLastExec() {
return lastExec == null ? null : new Date(lastExec.getTime());
}
@@ -79,6 +93,7 @@ public class SchedTaskTO extends AbstractTaskTO {
this.lastExec = lastExec == null ? null : new Date(lastExec.getTime());
}
+ @ApiModelProperty(readOnly = true)
public Date getNextExec() {
return nextExec == null ? null : new Date(nextExec.getTime());
}
@@ -99,6 +114,8 @@ public class SchedTaskTO extends AbstractTaskTO {
return name;
}
+ @JsonProperty(required = true)
+ @XmlElement(required = true)
public void setName(final String name) {
this.name = name;
}
@@ -110,5 +127,4 @@ public class SchedTaskTO extends AbstractTaskTO {
public void setActive(final boolean active) {
this.active = active;
}
-
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchemaTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchemaTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchemaTO.java
new file mode 100644
index 0000000..b5ff3aa
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/SchemaTO.java
@@ -0,0 +1,77 @@
+/*
+ * 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.to;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.ws.rs.PathParam;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.lib.AbstractBaseBean;
+
+@XmlRootElement(name = "schema")
+@XmlType
+@XmlSeeAlso({ PlainSchemaTO.class, DerSchemaTO.class, VirSchemaTO.class })
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
+@JsonPropertyOrder(value = { "@class", "key" })
+@ApiModel(subTypes = { PlainSchemaTO.class, DerSchemaTO.class, VirSchemaTO.class }, discriminator = "@class")
+public abstract class SchemaTO extends AbstractBaseBean implements EntityTO {
+
+ private static final long serialVersionUID = 4088388951694301759L;
+
+ @XmlTransient
+ @JsonProperty("@class")
+ private String discriminator;
+
+ private String key;
+
+ private String anyTypeClass;
+
+ @ApiModelProperty(name = "@class", required = true, readOnly = false)
+ public abstract String getDiscriminator();
+
+ public void setDiscriminator(final String discriminator) {
+ // do nothing
+ }
+
+ @Override
+ public String getKey() {
+ return key;
+ }
+
+ @PathParam("key")
+ @Override
+ public void setKey(final String key) {
+ this.key = key;
+ }
+
+ public String getAnyTypeClass() {
+ return anyTypeClass;
+ }
+
+ public void setAnyTypeClass(final String anyTypeClass) {
+ this.anyTypeClass = anyTypeClass;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/lib/src/main/java/org/apache/syncope/common/lib/to/TaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/TaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/TaskTO.java
new file mode 100644
index 0000000..f7aab55
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/TaskTO.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.lib.to;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+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.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "task")
+@XmlType
+@XmlSeeAlso({ PropagationTaskTO.class, ProvisioningTaskTO.class, NotificationTaskTO.class })
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
+@JsonPropertyOrder(value = { "@class", "key" })
+@ApiModel(
+ subTypes = { PropagationTaskTO.class, ProvisioningTaskTO.class, NotificationTaskTO.class },
+ discriminator = "@class")
+public abstract class TaskTO extends AbstractStartEndBean implements EntityTO {
+
+ private static final long serialVersionUID = 386450127003321197L;
+
+ @XmlTransient
+ @JsonProperty("@class")
+ private String discriminator;
+
+ private String key;
+
+ private String latestExecStatus;
+
+ private final List<ExecTO> executions = new ArrayList<>();
+
+ @ApiModelProperty(name = "@class", required = true, readOnly = false)
+ public abstract String getDiscriminator();
+
+ public void setDiscriminator(final String discriminator) {
+ // do nothing
+ }
+
+ @ApiModelProperty(readOnly = true)
+ @Override
+ public String getKey() {
+ return key;
+ }
+
+ @PathParam("key")
+ @Override
+ public void setKey(final String key) {
+ this.key = key;
+ }
+
+ @ApiModelProperty(readOnly = true)
+ public String getLatestExecStatus() {
+ return latestExecStatus;
+ }
+
+ public void setLatestExecStatus(final String latestExecStatus) {
+ this.latestExecStatus = latestExecStatus;
+ }
+
+ @ApiModelProperty(readOnly = true)
+ @XmlElementWrapper(name = "executions")
+ @XmlElement(name = "execution")
+ @JsonProperty("executions")
+ public List<ExecTO> getExecutions() {
+ return executions;
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/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 5efe6a5..1f0fa4d 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
@@ -20,6 +20,8 @@ package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -34,6 +36,7 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
@XmlRootElement(name = "user")
@XmlType
+@ApiModel(parent = AnyTO.class)
public class UserTO extends AnyTO implements GroupableRelatableTO {
private static final long serialVersionUID = 7791304495192615740L;
@@ -71,6 +74,13 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
private final List<MembershipTO> dynMemberships = new ArrayList<>();
+ @JsonProperty("@class")
+ @ApiModelProperty(name = "@class", required = true, example = "org.apache.syncope.common.lib.to.UserTO")
+ @Override
+ public String getDiscriminator() {
+ return getClass().getName();
+ }
+
@Override
public String getType() {
return AnyTypeKind.USER.name();
@@ -96,6 +106,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
return roles;
}
+ @ApiModelProperty(readOnly = true)
@XmlElementWrapper(name = "dynRoles")
@XmlElement(name = "role")
@JsonProperty("dynRoles")
@@ -103,6 +114,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
return dynRoles;
}
+ @ApiModelProperty(readOnly = true)
public String getToken() {
return token;
}
@@ -111,6 +123,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
this.token = token;
}
+ @ApiModelProperty(readOnly = true)
public Date getTokenExpireTime() {
if (tokenExpireTime != null) {
return new Date(tokenExpireTime.getTime());
@@ -126,6 +139,8 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
}
}
+ @JsonProperty(required = true)
+ @XmlElement(required = true)
public String getUsername() {
return username;
}
@@ -134,6 +149,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
this.username = username;
}
+ @ApiModelProperty(readOnly = true)
public Date getChangePwdDate() {
if (changePwdDate != null) {
return new Date(changePwdDate.getTime());
@@ -141,10 +157,12 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
return null;
}
+ @ApiModelProperty(readOnly = true)
public Integer getFailedLogins() {
return failedLogins;
}
+ @ApiModelProperty(readOnly = true)
public Date getLastLoginDate() {
if (lastLoginDate != null) {
return new Date(lastLoginDate.getTime());
@@ -188,6 +206,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
this.securityAnswer = securityAnswer;
}
+ @ApiModelProperty(readOnly = true)
public boolean isSuspended() {
return suspended;
}
@@ -196,6 +215,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
this.suspended = suspended;
}
+ @ApiModelProperty(readOnly = true)
public boolean isMustChangePassword() {
return mustChangePassword;
}
@@ -244,6 +264,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
return memberships;
}
+ @ApiModelProperty(readOnly = true)
@XmlElementWrapper(name = "dynMemberships")
@XmlElement(name = "dynMembership")
@JsonProperty("dynMemberships")
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/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..54d5f8e 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,10 +18,15 @@
*/
package org.apache.syncope.common.lib.to;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
-@XmlRootElement(name = "virtualSchema")
-public class VirSchemaTO extends AbstractSchemaTO {
+@XmlRootElement(name = "virSchema")
+@ApiModel(parent = SchemaTO.class)
+public class VirSchemaTO extends SchemaTO {
private static final long serialVersionUID = -8198557479659701343L;
@@ -33,6 +38,14 @@ public class VirSchemaTO extends AbstractSchemaTO {
private String extAttrName;
+ @XmlTransient
+ @JsonProperty("@class")
+ @ApiModelProperty(name = "@class", required = true, example = "org.apache.syncope.common.lib.to.VirSchemaTO")
+ @Override
+ public String getDiscriminator() {
+ return getClass().getName();
+ }
+
public boolean isReadonly() {
return readonly;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/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..82f17ee 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
@@ -19,7 +19,7 @@
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.SchemaTO;
import org.apache.syncope.common.lib.to.DerSchemaTO;
import org.apache.syncope.common.lib.to.PlainSchemaTO;
import org.apache.syncope.common.lib.to.VirSchemaTO;
@@ -40,17 +40,17 @@ public enum SchemaType {
*/
VIRTUAL(VirSchemaTO.class);
- private final Class<? extends AbstractSchemaTO> toClass;
+ private final Class<? extends SchemaTO> toClass;
- SchemaType(final Class<? extends AbstractSchemaTO> toClass) {
+ SchemaType(final Class<? extends SchemaTO> toClass) {
this.toClass = toClass;
}
- public Class<? extends AbstractSchemaTO> getToClass() {
+ public Class<? extends SchemaTO> getToClass() {
return toClass;
}
- public static SchemaType fromToClass(final Class<? extends AbstractSchemaTO> toClass) {
+ public static SchemaType fromToClass(final Class<? extends SchemaTO> toClass) {
SchemaType schemaType = null;
if (PlainSchemaTO.class.equals(toClass)) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 4c7ed38..9847c53 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -47,11 +47,6 @@ under the License.
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.syncope.common</groupId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
index a8ca01c..e9f9b1a 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
@@ -33,7 +33,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
/**
@@ -55,7 +55,7 @@ public interface PolicyService extends JAXRSService {
@GET
@Path("{key}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractPolicyTO> T read(@NotNull @PathParam("key") String key);
+ <T extends PolicyTO> T read(@NotNull @PathParam("key") String key);
/**
* Returns a list of policies of the matching type.
@@ -66,7 +66,7 @@ public interface PolicyService extends JAXRSService {
*/
@GET
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractPolicyTO> List<T> list(@NotNull @MatrixParam("type") PolicyType type);
+ <T extends PolicyTO> List<T> list(@NotNull @MatrixParam("type") PolicyType type);
/**
* Create a new policy.
@@ -77,7 +77,7 @@ public interface PolicyService extends JAXRSService {
@POST
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- Response create(@NotNull AbstractPolicyTO policyTO);
+ Response create(@NotNull PolicyTO policyTO);
/**
* Updates policy matching the given key.
@@ -89,7 +89,7 @@ public interface PolicyService extends JAXRSService {
@Path("{key}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- Response update(@NotNull AbstractPolicyTO policyTO);
+ Response update(@NotNull PolicyTO policyTO);
/**
* Delete policy matching the given key.
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
index 578e403..afb84a5 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
@@ -33,7 +33,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.to.AbstractSchemaTO;
+import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
import org.apache.syncope.common.rest.api.beans.SchemaQuery;
@@ -56,7 +56,7 @@ public interface SchemaService extends JAXRSService {
@GET
@Path("{type}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractSchemaTO> List<T> list(@BeanParam SchemaQuery query);
+ <T extends SchemaTO> List<T> list(@BeanParam SchemaQuery query);
/**
* Returns schema matching the given type and key.
@@ -69,7 +69,7 @@ public interface SchemaService extends JAXRSService {
@GET
@Path("{type}/{key}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractSchemaTO> T read(
+ <T extends SchemaTO> T read(
@NotNull @PathParam("type") SchemaType type, @NotNull @PathParam("key") String key);
/**
@@ -83,7 +83,7 @@ public interface SchemaService extends JAXRSService {
@Path("{type}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- Response create(@NotNull @PathParam("type") SchemaType type, @NotNull AbstractSchemaTO schemaTO);
+ Response create(@NotNull @PathParam("type") SchemaType type, @NotNull SchemaTO schemaTO);
/**
* Updates the schema matching the given type and key.
@@ -96,7 +96,7 @@ public interface SchemaService extends JAXRSService {
@Path("{type}/{key}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- Response update(@NotNull @PathParam("type") SchemaType type, @NotNull AbstractSchemaTO schemaTO);
+ Response update(@NotNull @PathParam("type") SchemaType type, @NotNull SchemaTO schemaTO);
/**
* Deletes the schema matching the given type and key.
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 1e7bcd2..d23c654 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -34,7 +34,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.PagedResult;
@@ -61,7 +61,7 @@ public interface TaskService extends ExecutableService {
@GET
@Path("{key}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractTaskTO> T read(
+ <T extends TaskTO> T read(
@NotNull @PathParam("key") String key,
@QueryParam(JAXRSService.PARAM_DETAILS) @DefaultValue("true") boolean details);
@@ -74,7 +74,7 @@ public interface TaskService extends ExecutableService {
*/
@GET
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends AbstractTaskTO> PagedResult<T> list(@BeanParam TaskQuery query);
+ <T extends TaskTO> PagedResult<T> list(@BeanParam TaskQuery query);
/**
* Creates a new task.
@@ -95,7 +95,7 @@ public interface TaskService extends ExecutableService {
@PUT
@Path("{key}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- Response update(@NotNull AbstractTaskTO taskTO);
+ Response update(@NotNull TaskTO taskTO);
/**
* Deletes the task matching the provided key.
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/logic/src/main/java/org/apache/syncope/core/logic/PolicyLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/PolicyLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/PolicyLogic.java
index 0cffd0c..4d71d88 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/PolicyLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/PolicyLogic.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.lib.types.StandardEntitlement;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
@@ -40,7 +40,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@Component
-public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
+public class PolicyLogic extends AbstractTransactionalLogic<PolicyTO> {
@Autowired
private PolicyDAO policyDAO;
@@ -49,12 +49,12 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
private PolicyDataBinder binder;
@PreAuthorize("hasRole('" + StandardEntitlement.POLICY_CREATE + "')")
- public <T extends AbstractPolicyTO> T create(final T policyTO) {
+ public <T extends PolicyTO> T create(final T policyTO) {
return binder.getPolicyTO(policyDAO.save(binder.create(policyTO)));
}
@PreAuthorize("hasRole('" + StandardEntitlement.POLICY_UPDATE + "')")
- public AbstractPolicyTO update(final AbstractPolicyTO policyTO) {
+ public PolicyTO update(final PolicyTO policyTO) {
Policy policy = policyDAO.find(policyTO.getKey());
return binder.getPolicyTO(policyDAO.save(binder.update(policy, policyTO)));
}
@@ -77,7 +77,7 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.POLICY_LIST + "')")
- public <T extends AbstractPolicyTO> List<T> list(final PolicyType type) {
+ public <T extends PolicyTO> List<T> list(final PolicyType type) {
return CollectionUtils.collect(policyDAO.find(getPolicyClass(type)), new Transformer<Policy, T>() {
@Override
@@ -88,7 +88,7 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.POLICY_READ + "')")
- public <T extends AbstractPolicyTO> T read(final String key) {
+ public <T extends PolicyTO> T read(final String key) {
Policy policy = policyDAO.find(key);
if (policy == null) {
throw new NotFoundException("Policy " + key + " not found");
@@ -98,7 +98,7 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.POLICY_DELETE + "')")
- public <T extends AbstractPolicyTO> T delete(final String key) {
+ public <T extends PolicyTO> T delete(final String key) {
Policy policy = policyDAO.find(key);
if (policy == null) {
throw new NotFoundException("Policy " + key + " not found");
@@ -111,7 +111,7 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
}
@Override
- protected AbstractPolicyTO resolveReference(final Method method, final Object... args)
+ protected PolicyTO resolveReference(final Method method, final Object... args)
throws UnresolvedReferenceException {
String key = null;
@@ -120,8 +120,8 @@ public class PolicyLogic extends AbstractTransactionalLogic<AbstractPolicyTO> {
for (int i = 0; key == null && i < args.length; i++) {
if (args[i] instanceof String) {
key = (String) args[i];
- } else if (args[i] instanceof AbstractPolicyTO) {
- key = ((AbstractPolicyTO) args[i]).getKey();
+ } else if (args[i] instanceof PolicyTO) {
+ key = ((PolicyTO) args[i]).getKey();
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
index 97da0f6..b06c918 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections4.Transformer;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.to.AbstractSchemaTO;
+import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.to.DerSchemaTO;
import org.apache.syncope.common.lib.to.PlainSchemaTO;
import org.apache.syncope.common.lib.to.VirSchemaTO;
@@ -50,7 +50,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@Component
-public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
+public class SchemaLogic extends AbstractTransactionalLogic<SchemaTO> {
@Autowired
private PlainSchemaDAO plainSchemaDAO;
@@ -92,7 +92,7 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
@PreAuthorize("hasRole('" + StandardEntitlement.SCHEMA_CREATE + "')")
@SuppressWarnings("unchecked")
- public <T extends AbstractSchemaTO> T create(final SchemaType schemaType, final T schemaTO) {
+ public <T extends SchemaTO> T create(final SchemaType schemaType, final T schemaTO) {
if (StringUtils.isBlank(schemaTO.getKey())) {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.RequiredValuesMissing);
sce.getElements().add("Schema key");
@@ -146,7 +146,7 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
@PreAuthorize("isAuthenticated()")
@SuppressWarnings("unchecked")
- public <T extends AbstractSchemaTO> List<T> list(
+ public <T extends SchemaTO> List<T> list(
final SchemaType schemaType, final List<String> anyTypeClasses) {
List<AnyTypeClass> classes = new ArrayList<>(anyTypeClasses == null ? 0 : anyTypeClasses.size());
@@ -207,7 +207,7 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
@PreAuthorize("isAuthenticated()")
@SuppressWarnings("unchecked")
- public <T extends AbstractSchemaTO> T read(final SchemaType schemaType, final String schemaKey) {
+ public <T extends SchemaTO> T read(final SchemaType schemaType, final String schemaKey) {
T read;
switch (schemaType) {
case VIRTUAL:
@@ -242,7 +242,7 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.SCHEMA_UPDATE + "')")
- public <T extends AbstractSchemaTO> void update(final SchemaType schemaType, final T schemaTO) {
+ public <T extends SchemaTO> void update(final SchemaType schemaType, final T schemaTO) {
if (!doesSchemaExist(schemaType, schemaTO.getKey())) {
throw new NotFoundException(schemaType + "/" + schemaTO.getKey());
}
@@ -278,7 +278,7 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
}
@Override
- protected AbstractSchemaTO resolveReference(final Method method, final Object... args)
+ protected SchemaTO resolveReference(final Method method, final Object... args)
throws UnresolvedReferenceException {
String kind = null;
@@ -291,15 +291,15 @@ public class SchemaLogic extends AbstractTransactionalLogic<AbstractSchemaTO> {
} else {
key = (String) args[i];
}
- } else if (args[i] instanceof AbstractSchemaTO) {
- key = ((AbstractSchemaTO) args[i]).getKey();
+ } else if (args[i] instanceof SchemaTO) {
+ key = ((SchemaTO) args[i]).getKey();
}
}
}
if (key != null) {
try {
- AbstractSchemaTO result = null;
+ SchemaTO result = null;
PlainSchema plainSchema = plainSchemaDAO.find(key);
if (plainSchema == null) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/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 d1cc82c..e0aa42c 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
@@ -29,7 +29,7 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ExecTO;
import org.apache.syncope.common.lib.to.JobTO;
@@ -66,7 +66,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@Component
-public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
+public class TaskLogic extends AbstractExecutableLogic<TaskTO> {
@Autowired
private TaskDAO taskDAO;
@@ -148,7 +148,7 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
@PreAuthorize("hasRole('" + StandardEntitlement.TASK_LIST + "')")
@SuppressWarnings("unchecked")
- public <T extends AbstractTaskTO> Pair<Integer, List<T>> list(
+ public <T extends TaskTO> Pair<Integer, List<T>> list(
final TaskType type,
final String resource,
final String notification,
@@ -186,7 +186,7 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.TASK_READ + "')")
- public <T extends AbstractTaskTO> T read(final String key, final boolean details) {
+ public <T extends TaskTO> T read(final String key, final boolean details) {
Task task = taskDAO.find(key);
if (task == null) {
throw new NotFoundException("Task " + key);
@@ -267,7 +267,7 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
}
@PreAuthorize("hasRole('" + StandardEntitlement.TASK_DELETE + "')")
- public <T extends AbstractTaskTO> T delete(final String key) {
+ public <T extends TaskTO> T delete(final String key) {
Task task = taskDAO.find(key);
if (task == null) {
throw new NotFoundException("Task " + key);
@@ -390,7 +390,7 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
}
@Override
- protected AbstractTaskTO resolveReference(final Method method, final Object... args)
+ protected TaskTO resolveReference(final Method method, final Object... args)
throws UnresolvedReferenceException {
String key = null;
@@ -401,8 +401,8 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> {
for (int i = 0; key == null && i < args.length; i++) {
if (args[i] instanceof String) {
key = (String) args[i];
- } else if (args[i] instanceof AbstractTaskTO) {
- key = ((AbstractTaskTO) args[i]).getKey();
+ } else if (args[i] instanceof TaskTO) {
+ key = ((TaskTO) args[i]).getKey();
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtils.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtils.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtils.java
index 2e00784..96bde02 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtils.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.api.entity.task;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.types.TaskType;
public interface TaskUtils {
@@ -27,10 +27,10 @@ public interface TaskUtils {
<T extends Task> T newTask();
- <T extends AbstractTaskTO> T newTaskTO();
+ <T extends TaskTO> T newTaskTO();
<T extends Task> Class<T> taskClass();
- <T extends AbstractTaskTO> Class<T> taskTOClass();
+ <T extends TaskTO> Class<T> taskTOClass();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtilsFactory.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtilsFactory.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtilsFactory.java
index 6da4de9..78cbfcb 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtilsFactory.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/TaskUtilsFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.api.entity.task;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.types.TaskType;
public interface TaskUtilsFactory {
@@ -27,7 +27,7 @@ public interface TaskUtilsFactory {
TaskUtils getInstance(Task task);
- TaskUtils getInstance(Class<? extends AbstractTaskTO> taskClass);
+ TaskUtils getInstance(Class<? extends TaskTO> taskClass);
- TaskUtils getInstance(AbstractTaskTO taskTO);
+ TaskUtils getInstance(TaskTO taskTO);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtils.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtils.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtils.java
index 0905533..3f9c720 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtils.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.entity.task;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.NotificationTaskTO;
import org.apache.syncope.common.lib.to.PropagationTaskTO;
import org.apache.syncope.common.lib.to.PushTaskTO;
@@ -110,7 +110,7 @@ public final class JPATaskUtils implements TaskUtils {
}
@Override
- public <T extends AbstractTaskTO> Class<T> taskTOClass() {
+ public <T extends TaskTO> Class<T> taskTOClass() {
Class<T> result = null;
switch (type) {
@@ -141,7 +141,7 @@ public final class JPATaskUtils implements TaskUtils {
}
@Override
- public <T extends AbstractTaskTO> T newTaskTO() {
+ public <T extends TaskTO> T newTaskTO() {
final Class<T> taskClass = taskTOClass();
try {
return taskClass == null ? null : taskClass.newInstance();
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtilsFactory.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtilsFactory.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtilsFactory.java
index a26debd..be38e3a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtilsFactory.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPATaskUtilsFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.entity.task;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.NotificationTaskTO;
import org.apache.syncope.common.lib.to.PropagationTaskTO;
import org.apache.syncope.common.lib.to.PushTaskTO;
@@ -64,7 +64,7 @@ public class JPATaskUtilsFactory implements TaskUtilsFactory {
}
@Override
- public TaskUtils getInstance(final Class<? extends AbstractTaskTO> taskClass) {
+ public TaskUtils getInstance(final Class<? extends TaskTO> taskClass) {
TaskType type;
if (taskClass == PropagationTaskTO.class) {
type = TaskType.PROPAGATION;
@@ -84,7 +84,7 @@ public class JPATaskUtilsFactory implements TaskUtilsFactory {
}
@Override
- public TaskUtils getInstance(final AbstractTaskTO taskTO) {
+ public TaskUtils getInstance(final TaskTO taskTO) {
return getInstance(taskTO.getClass());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
index cea03df..3ff922d 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/PolicyDataBinder.java
@@ -18,15 +18,15 @@
*/
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.core.persistence.api.entity.Policy;
public interface PolicyDataBinder {
- <T extends Policy> T create(AbstractPolicyTO policyTO);
+ <T extends Policy> T create(PolicyTO policyTO);
- <T extends Policy> T update(T policy, AbstractPolicyTO policyTO);
+ <T extends Policy> T update(T policy, PolicyTO policyTO);
- <T extends AbstractPolicyTO> T getPolicyTO(Policy policy);
+ <T extends PolicyTO> T getPolicyTO(Policy policy);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/TaskDataBinder.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/TaskDataBinder.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/TaskDataBinder.java
index f5869d6..9746031 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/TaskDataBinder.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/TaskDataBinder.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.provisioning.api.data;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.ExecTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.core.persistence.api.entity.task.SchedTask;
@@ -36,6 +36,6 @@ public interface TaskDataBinder {
ExecTO getExecTO(TaskExec execution);
- <T extends AbstractTaskTO> T getTaskTO(Task task, TaskUtils taskUtil, boolean details);
+ <T extends TaskTO> T getTaskTO(Task task, TaskUtils taskUtil, boolean details);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
index 35eac98..b5b074f 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/PolicyDataBinderImpl.java
@@ -21,7 +21,7 @@ package org.apache.syncope.core.provisioning.java.data;
import org.apache.syncope.core.provisioning.api.data.PolicyDataBinder;
import org.apache.syncope.common.lib.policy.AbstractAccountRuleConf;
import org.apache.syncope.common.lib.policy.AbstractPasswordRuleConf;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
import org.apache.syncope.common.lib.policy.AccountRuleConf;
import org.apache.syncope.common.lib.policy.PasswordPolicyTO;
@@ -56,7 +56,7 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
private EntityFactory entityFactory;
@SuppressWarnings("unchecked")
- private <T extends Policy> T getPolicy(final T policy, final AbstractPolicyTO policyTO) {
+ private <T extends Policy> T getPolicy(final T policy, final PolicyTO policyTO) {
T result = policy;
if (policyTO instanceof PasswordPolicyTO) {
@@ -115,18 +115,18 @@ public class PolicyDataBinderImpl implements PolicyDataBinder {
}
@Override
- public <T extends Policy> T create(final AbstractPolicyTO policyTO) {
+ public <T extends Policy> T create(final PolicyTO policyTO) {
return getPolicy(null, policyTO);
}
@Override
- public <T extends Policy> T update(final T policy, final AbstractPolicyTO policyTO) {
+ public <T extends Policy> T update(final T policy, final PolicyTO policyTO) {
return getPolicy(policy, policyTO);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends AbstractPolicyTO> T getPolicyTO(final Policy policy) {
+ public <T extends PolicyTO> T getPolicyTO(final Policy policy) {
T policyTO = null;
if (policy instanceof PasswordPolicy) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
index c2e655d..83ba635 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
@@ -24,8 +24,8 @@ import org.apache.commons.collections4.Predicate;
import org.apache.syncope.core.provisioning.api.data.TaskDataBinder;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.ProvisioningTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.PropagationTaskTO;
import org.apache.syncope.common.lib.to.PushTaskTO;
@@ -109,7 +109,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
@Autowired
private TaskUtilsFactory taskUtilsFactory;
- private void fill(final ProvisioningTask task, final AbstractProvisioningTaskTO taskTO) {
+ private void fill(final ProvisioningTask task, final ProvisioningTaskTO taskTO) {
if (task instanceof PushTask && taskTO instanceof PushTaskTO) {
PushTask pushTask = (PushTask) task;
final PushTaskTO pushTaskTO = (PushTaskTO) taskTO;
@@ -205,7 +205,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
@Override
public SchedTask createSchedTask(final SchedTaskTO taskTO, final TaskUtils taskUtils) {
- Class<? extends AbstractTaskTO> taskTOClass = taskUtils.taskTOClass();
+ Class<? extends TaskTO> taskTOClass = taskUtils.taskTOClass();
if (taskTOClass == null || !taskTOClass.equals(taskTO.getClass())) {
throw new IllegalArgumentException(String.format("Expected %s, found %s", taskTOClass, taskTO.getClass()));
}
@@ -219,8 +219,8 @@ public class TaskDataBinderImpl implements TaskDataBinder {
if (taskUtils.getType() == TaskType.SCHEDULED) {
task.setJobDelegateClassName(taskTO.getJobDelegateClassName());
- } else if (taskTO instanceof AbstractProvisioningTaskTO) {
- AbstractProvisioningTaskTO provisioningTaskTO = (AbstractProvisioningTaskTO) taskTO;
+ } else if (taskTO instanceof ProvisioningTaskTO) {
+ ProvisioningTaskTO provisioningTaskTO = (ProvisioningTaskTO) taskTO;
ExternalResource resource = resourceDAO.find(provisioningTaskTO.getResource());
if (resource == null) {
@@ -236,7 +236,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
@Override
public void updateSchedTask(final SchedTask task, final SchedTaskTO taskTO, final TaskUtils taskUtils) {
- Class<? extends AbstractTaskTO> taskTOClass = taskUtils.taskTOClass();
+ Class<? extends TaskTO> taskTOClass = taskUtils.taskTOClass();
if (taskTOClass == null || !taskTOClass.equals(taskTO.getClass())) {
throw new IllegalArgumentException(String.format("Expected %s, found %s", taskTOClass, taskTO.getClass()));
}
@@ -252,7 +252,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
task.setActive(taskTO.isActive());
if (task instanceof ProvisioningTask) {
- fill((ProvisioningTask) task, (AbstractProvisioningTaskTO) taskTO);
+ fill((ProvisioningTask) task, (ProvisioningTaskTO) taskTO);
}
}
@@ -303,7 +303,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
}
@Override
- public <T extends AbstractTaskTO> T getTaskTO(final Task task, final TaskUtils taskUtils, final boolean details) {
+ public <T extends TaskTO> T getTaskTO(final Task task, final TaskUtils taskUtils, final boolean details) {
T taskTO = taskUtils.newTaskTO();
BeanUtils.copyProperties(task, taskTO, IGNORE_TASK_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/PolicyServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/PolicyServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/PolicyServiceImpl.java
index 64f765d..2925fc7 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/PolicyServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/PolicyServiceImpl.java
@@ -21,7 +21,7 @@ package org.apache.syncope.core.rest.cxf.service;
import java.net.URI;
import java.util.List;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.service.PolicyService;
@@ -36,8 +36,8 @@ public class PolicyServiceImpl extends AbstractServiceImpl implements PolicyServ
private PolicyLogic logic;
@Override
- public Response create(final AbstractPolicyTO policyTO) {
- AbstractPolicyTO policy = logic.create(policyTO);
+ public Response create(final PolicyTO policyTO) {
+ PolicyTO policy = logic.create(policyTO);
URI location = uriInfo.getAbsolutePathBuilder().path(policy.getKey()).build();
return Response.created(location).
header(RESTHeaders.RESOURCE_KEY, policy.getKey()).
@@ -51,17 +51,17 @@ public class PolicyServiceImpl extends AbstractServiceImpl implements PolicyServ
}
@Override
- public <T extends AbstractPolicyTO> List<T> list(final PolicyType type) {
+ public <T extends PolicyTO> List<T> list(final PolicyType type) {
return logic.list(type);
}
@Override
- public <T extends AbstractPolicyTO> T read(final String key) {
+ public <T extends PolicyTO> T read(final String key) {
return logic.read(key);
}
@Override
- public Response update(final AbstractPolicyTO policyTO) {
+ public Response update(final PolicyTO policyTO) {
logic.update(policyTO);
return Response.noContent().build();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
index b6c7397..f650839 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
@@ -21,7 +21,7 @@ package org.apache.syncope.core.rest.cxf.service;
import java.net.URI;
import java.util.List;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.to.AbstractSchemaTO;
+import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.beans.SchemaQuery;
@@ -37,8 +37,8 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ
private SchemaLogic logic;
@Override
- public Response create(final SchemaType schemaType, final AbstractSchemaTO schemaTO) {
- AbstractSchemaTO created = logic.create(schemaType, schemaTO);
+ public Response create(final SchemaType schemaType, final SchemaTO schemaTO) {
+ SchemaTO created = logic.create(schemaType, schemaTO);
URI location = uriInfo.getAbsolutePathBuilder().path(created.getKey()).build();
return Response.created(location).
@@ -53,17 +53,17 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ
}
@Override
- public <T extends AbstractSchemaTO> List<T> list(final SchemaQuery query) {
+ public <T extends SchemaTO> List<T> list(final SchemaQuery query) {
return logic.list(query.getType(), query.getAnyTypeClasses());
}
@Override
- public <T extends AbstractSchemaTO> T read(final SchemaType schemaType, final String key) {
+ public <T extends SchemaTO> T read(final SchemaType schemaType, final String key) {
return logic.read(schemaType, key);
}
@Override
- public Response update(final SchemaType schemaType, final AbstractSchemaTO schemaTO) {
+ public Response update(final SchemaType schemaType, final SchemaTO schemaTO) {
logic.update(schemaType, schemaTO);
return Response.noContent().build();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
index 47a860c..37067a3 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.PagedResult;
@@ -70,7 +70,7 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe
@SuppressWarnings("unchecked")
@Override
- public <T extends AbstractTaskTO> PagedResult<T> list(final TaskQuery query) {
+ public <T extends TaskTO> PagedResult<T> list(final TaskQuery query) {
Pair<Integer, List<T>> result = logic.list(
query.getType(),
query.getResource(),
@@ -85,12 +85,12 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe
}
@Override
- public <T extends AbstractTaskTO> T read(final String key, final boolean details) {
+ public <T extends TaskTO> T read(final String key, final boolean details) {
return logic.read(key, details);
}
@Override
- public Response update(final AbstractTaskTO taskTO) {
+ public Response update(final TaskTO taskTO) {
if (taskTO instanceof SchedTaskTO) {
logic.updateSchedTask((SchedTaskTO) taskTO);
return Response.noContent().build();
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/core/rest-cxf/src/main/resources/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml
index a3637c7..a31ec25 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -50,7 +50,7 @@ under the License.
<map>
<entry>
<key>
- <value>org.apache.syncope.common.lib.policy.AbstractPolicyTO</value>
+ <value>org.apache.syncope.common.lib.policy.PolicyTO</value>
</key>
<value>policies</value>
</entry>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
index ebeba58..d5181c7 100644
--- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
+++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
@@ -50,7 +50,7 @@ under the License.
<map>
<entry>
<key>
- <value>org.apache.syncope.common.lib.policy.AbstractPolicyTO</value>
+ <value>org.apache.syncope.common.lib.policy.PolicyTO</value>
</key>
<value>policies</value>
</entry>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 49b4cb2..c0d600d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -47,8 +47,8 @@ import org.apache.syncope.common.lib.patch.AnyObjectPatch;
import org.apache.syncope.common.lib.patch.AttrPatch;
import org.apache.syncope.common.lib.patch.GroupPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
-import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
-import org.apache.syncope.common.lib.to.AbstractSchemaTO;
+import org.apache.syncope.common.lib.policy.PolicyTO;
+import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
@@ -334,7 +334,7 @@ public abstract class AbstractITCase {
}
@SuppressWarnings("unchecked")
- protected <T extends AbstractSchemaTO> T createSchema(final SchemaType type, final T schemaTO) {
+ protected <T extends SchemaTO> T createSchema(final SchemaType type, final T schemaTO) {
Response response = schemaService.create(type, schemaTO);
if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) {
Exception ex = clientFactory.getExceptionMapper().fromResponse(response);
@@ -486,7 +486,7 @@ public abstract class AbstractITCase {
}
@SuppressWarnings("unchecked")
- protected <T extends AbstractPolicyTO> T createPolicy(final T policy) {
+ protected <T extends PolicyTO> T createPolicy(final T policy) {
Response response = policyService.create(policy);
if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) {
Exception ex = clientFactory.getExceptionMapper().fromResponse(response);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
index 9f882d3..4247eda 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.patch.DeassociationPatch;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.ExecTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.NotificationTaskTO;
@@ -126,7 +126,7 @@ public abstract class AbstractTaskITCase extends AbstractITCase {
protected static ExecTO execTask(final TaskService taskService, final String taskKey, final String initialStatus,
final int maxWaitSeconds, final boolean dryRun) {
- AbstractTaskTO taskTO = taskService.read(taskKey, true);
+ TaskTO taskTO = taskService.read(taskKey, true);
assertNotNull(taskTO);
assertNotNull(taskTO.getExecutions());
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
index fdb4865..a7e66be 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.SyncopeConstants;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.BulkAction;
@@ -426,7 +426,7 @@ public class MigrationITCase extends AbstractTaskITCase {
public void migrateFromSyncope12() throws InterruptedException {
// 1. cleanup
try {
- for (AbstractTaskTO task : taskService.list(
+ for (TaskTO task : taskService.list(
new TaskQuery.Builder(TaskType.PULL).resource(RESOURCE_KEY).build()).getResult()) {
if (PULL_TASK_NAME.equals(PullTaskTO.class.cast(task).getName())) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index f4aa9bf..d0daa6a 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.SerializationUtils;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -55,7 +55,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
assertNotNull(tasks);
assertEquals(2, tasks.getResult().size());
- for (AbstractTaskTO task : tasks.getResult()) {
+ for (TaskTO task : tasks.getResult()) {
assertNotNull(task);
}
@@ -65,7 +65,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
assertEquals(2, tasks.getPage());
assertEquals(2, tasks.getResult().size());
- for (AbstractTaskTO task : tasks.getResult()) {
+ for (TaskTO task : tasks.getResult()) {
assertNotNull(task);
}
@@ -167,15 +167,15 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
}
// check list
- PagedResult<AbstractTaskTO> tasks = taskService.list(
+ PagedResult<TaskTO> tasks = taskService.list(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(2).details(false).build());
- for (AbstractTaskTO item : tasks.getResult()) {
+ for (TaskTO item : tasks.getResult()) {
assertTrue(item.getExecutions().isEmpty());
}
tasks = taskService.list(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(2).details(true).build());
- for (AbstractTaskTO item : tasks.getResult()) {
+ for (TaskTO item : tasks.getResult()) {
assertFalse(item.getExecutions().isEmpty());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 3e1fa27..82e71a0 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -51,7 +51,7 @@ import org.apache.syncope.common.lib.patch.DeassociationPatch;
import org.apache.syncope.common.lib.patch.PasswordPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.policy.PullPolicyTO;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
@@ -121,7 +121,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
public void list() {
PagedResult<PullTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PULL).build());
assertFalse(tasks.getResult().isEmpty());
- for (AbstractTaskTO task : tasks.getResult()) {
+ for (TaskTO task : tasks.getResult()) {
if (!(task instanceof PullTaskTO)) {
fail();
}
@@ -1057,7 +1057,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, userDn.getValues().get(0)));
// ...and propagated
- PagedResult<AbstractTaskTO> propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ PagedResult<TaskTO> propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
resource(RESOURCE_NAME_DBPULL).
anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build());
assertEquals(1, propagationTasks.getSize());
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
index fe62261..751516d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
@@ -31,7 +31,7 @@ import javax.sql.DataSource;
import javax.ws.rs.core.Response;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.common.lib.SyncopeConstants;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.PushTaskTO;
@@ -90,7 +90,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
public void list() {
PagedResult<PushTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PUSH).build());
assertFalse(tasks.getResult().isEmpty());
- for (AbstractTaskTO task : tasks.getResult()) {
+ for (TaskTO task : tasks.getResult()) {
if (!(task instanceof PushTaskTO)) {
fail();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
index c155831..858a520 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
@@ -32,13 +32,13 @@ import javax.ws.rs.core.Response;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.time.DateUtils;
-import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.JobTO;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.PushTaskTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.common.lib.to.PullTaskTO;
import org.apache.syncope.common.lib.to.ExecTO;
+import org.apache.syncope.common.lib.to.TaskTO;
import org.apache.syncope.common.lib.types.JobAction;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
@@ -62,7 +62,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
PagedResult<SchedTaskTO> tasks =
taskService.list(new TaskQuery.Builder(TaskType.SCHEDULED).build());
assertFalse(tasks.getResult().isEmpty());
- for (AbstractTaskTO task : tasks.getResult()) {
+ for (TaskTO task : tasks.getResult()) {
if (!(task instanceof SchedTaskTO) || task instanceof PullTaskTO || task instanceof PushTaskTO) {
fail();
}