[SYNCOPE-1274] Using Swagger annotations for TO hierarchies
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8038b056 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8038b056 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8038b056 Branch: refs/heads/2_0_X Commit: 8038b056f7a2870bdd0c2c177856de50f49b52b9 Parents: ffa19a6 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Feb 12 17:29:13 2018 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Feb 12 17:29:13 2018 +0100 ---------------------------------------------------------------------- .../client/cli/commands/policy/PolicyRead.java | 4 +- .../commands/policy/PolicyResultManager.java | 16 +-- .../policy/PolicySyncopeOperations.java | 6 +- .../client/cli/commands/schema/SchemaRead.java | 4 +- .../commands/schema/SchemaResultManager.java | 20 +-- .../schema/SchemaSyncopeOperations.java | 12 +- .../cli/commands/task/TaskDeleteAllProp.java | 4 +- .../client/cli/commands/task/TaskDetails.java | 28 ++--- .../client/cli/commands/task/TaskRead.java | 4 +- .../cli/commands/task/TaskResultManager.java | 28 ++--- .../commands/task/TaskSyncopeOperations.java | 8 +- .../console/commons/TaskDataProvider.java | 4 +- .../panels/AbstractSchemaDetailsPanel.java | 8 +- .../client/console/panels/BeanPanel.java | 12 +- .../console/panels/PlainSchemaDetails.java | 4 +- .../client/console/panels/RealmDetails.java | 6 +- .../client/console/panels/SchemaModalPanel.java | 16 +-- .../client/console/panels/SchemaTypePanel.java | 44 +++---- .../client/console/panels/TogglePanel.java | 12 +- .../console/policies/PolicyDirectoryPanel.java | 12 +- .../policies/PolicyModalPanelBuilder.java | 4 +- .../policies/PolicyRuleDirectoryPanel.java | 4 +- .../policies/PolicyRuleWizardBuilder.java | 4 +- .../console/policies/PolicySpecModalPanel.java | 9 +- .../client/console/rest/PolicyRestClient.java | 14 +-- .../client/console/rest/SchemaRestClient.java | 14 +-- .../client/console/rest/TaskRestClient.java | 8 +- .../tasks/ProvisioningTaskDirectoryPanel.java | 6 +- .../console/tasks/SchedTaskWizardBuilder.java | 4 +- .../console/tasks/TaskDirectoryPanel.java | 6 +- .../console/tasks/TaskExecutionDetails.java | 4 +- .../html/form/ActionLinksTogglePanel.java | 12 +- .../client/console/widgets/JobWidget.java | 8 +- .../console/wizards/any/AbstractAttrs.java | 4 +- .../resources/ResourceSecurityPanel.java | 8 +- .../client/enduser/model/SchemaResponse.java | 26 ++-- .../enduser/resources/SchemaResource.java | 36 +++--- .../client/lib/SyncopeClientFactoryBean.java | 4 +- common/lib/pom.xml | 5 + .../syncope/common/lib/AbstractBaseBean.java | 4 +- .../common/lib/patch/AbstractPatchItem.java | 4 + .../common/lib/patch/AnyObjectPatch.java | 10 ++ .../syncope/common/lib/patch/AnyPatch.java | 23 ++++ .../syncope/common/lib/patch/GroupPatch.java | 10 ++ .../syncope/common/lib/patch/UserPatch.java | 10 ++ .../common/lib/policy/AbstractPolicyTO.java | 83 ------------- .../common/lib/policy/AccountPolicyTO.java | 15 ++- .../common/lib/policy/PasswordPolicyTO.java | 15 ++- .../syncope/common/lib/policy/PolicyTO.java | 105 ++++++++++++++++ .../syncope/common/lib/policy/PullPolicyTO.java | 19 ++- .../common/lib/to/AbstractAnnotatedBean.java | 5 + .../lib/to/AbstractProvisioningTaskTO.java | 117 ------------------ .../syncope/common/lib/to/AbstractSchemaTO.java | 59 --------- .../common/lib/to/AbstractStartEndBean.java | 3 + .../syncope/common/lib/to/AbstractTaskTO.java | 72 ----------- .../syncope/common/lib/to/AnyObjectTO.java | 13 ++ .../org/apache/syncope/common/lib/to/AnyTO.java | 23 +++- .../apache/syncope/common/lib/to/AttrTO.java | 20 +-- .../syncope/common/lib/to/DerSchemaTO.java | 17 ++- .../apache/syncope/common/lib/to/GroupTO.java | 16 +++ .../common/lib/to/NotificationTaskTO.java | 24 +++- .../syncope/common/lib/to/PlainSchemaTO.java | 17 ++- .../common/lib/to/PropagationTaskTO.java | 32 ++++- .../common/lib/to/ProvisioningTaskTO.java | 122 +++++++++++++++++++ .../syncope/common/lib/to/PullTaskTO.java | 19 ++- .../syncope/common/lib/to/PushTaskTO.java | 17 ++- .../syncope/common/lib/to/SchedTaskTO.java | 24 +++- .../apache/syncope/common/lib/to/SchemaTO.java | 77 ++++++++++++ .../apache/syncope/common/lib/to/TaskTO.java | 94 ++++++++++++++ .../apache/syncope/common/lib/to/UserTO.java | 21 ++++ .../syncope/common/lib/to/VirSchemaTO.java | 17 ++- .../syncope/common/lib/types/SchemaType.java | 10 +- common/rest-api/pom.xml | 5 - .../common/rest/api/service/PolicyService.java | 10 +- .../common/rest/api/service/SchemaService.java | 10 +- .../common/rest/api/service/TaskService.java | 8 +- .../apache/syncope/core/logic/PolicyLogic.java | 20 +-- .../apache/syncope/core/logic/SchemaLogic.java | 20 +-- .../apache/syncope/core/logic/TaskLogic.java | 16 +-- .../persistence/api/entity/task/TaskUtils.java | 6 +- .../api/entity/task/TaskUtilsFactory.java | 6 +- .../jpa/entity/task/JPATaskUtils.java | 6 +- .../jpa/entity/task/JPATaskUtilsFactory.java | 6 +- .../provisioning/api/data/PolicyDataBinder.java | 8 +- .../provisioning/api/data/TaskDataBinder.java | 4 +- .../java/data/PolicyDataBinderImpl.java | 10 +- .../java/data/TaskDataBinderImpl.java | 18 +-- .../rest/cxf/service/PolicyServiceImpl.java | 12 +- .../rest/cxf/service/SchemaServiceImpl.java | 12 +- .../core/rest/cxf/service/TaskServiceImpl.java | 8 +- .../src/main/resources/restCXFContext.xml | 2 +- .../src/main/resources/jboss/restCXFContext.xml | 2 +- .../org/apache/syncope/fit/AbstractITCase.java | 8 +- .../syncope/fit/core/AbstractTaskITCase.java | 4 +- .../syncope/fit/core/MigrationITCase.java | 4 +- .../syncope/fit/core/PropagationTaskITCase.java | 12 +- .../apache/syncope/fit/core/PullTaskITCase.java | 6 +- .../apache/syncope/fit/core/PushTaskITCase.java | 4 +- .../syncope/fit/core/SchedTaskITCase.java | 4 +- 99 files changed, 1084 insertions(+), 696 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java index c33cba8..5b50a69 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java @@ -23,7 +23,7 @@ import java.util.List; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; -import org.apache.syncope.common.lib.policy.AbstractPolicyTO; +import org.apache.syncope.common.lib.policy.PolicyTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public class PolicyRead extends AbstractPolicyCommand { public void read() { if (input.parameterNumber() >= 1) { - final List<AbstractPolicyTO> policyTOs = new ArrayList<>(); + final List<PolicyTO> policyTOs = new ArrayList<>(); for (final String parameter : input.getParameters()) { try { policyTOs.add(policySyncopeOperations.read(parameter)); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java index baf9378..97742d3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java @@ -21,7 +21,7 @@ package org.apache.syncope.client.cli.commands.policy; import java.util.List; import java.util.Map; import org.apache.syncope.client.cli.commands.CommonsResultManager; -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.PasswordPolicyTO; import org.apache.syncope.common.lib.policy.PullPolicyTO; @@ -29,9 +29,9 @@ import org.apache.syncope.common.lib.types.PolicyType; public class PolicyResultManager extends CommonsResultManager { - public void printPolicies(final List<AbstractPolicyTO> policyTOs) { + public void printPolicies(final List<PolicyTO> policyTOs) { System.out.println(""); - for (AbstractPolicyTO policyTO : policyTOs) { + for (PolicyTO policyTO : policyTOs) { if (policyTO instanceof AccountPolicyTO) { printAccountPolicy((AccountPolicyTO) policyTO); } else if (policyTO instanceof PasswordPolicyTO) { @@ -42,27 +42,27 @@ public class PolicyResultManager extends CommonsResultManager { } } - public void printPoliciesByType(final String policyTypeString, final List<AbstractPolicyTO> policyTOs) { + public void printPoliciesByType(final String policyTypeString, final List<PolicyTO> policyTOs) { System.out.println(""); final PolicyType policyType = PolicyType.valueOf(policyTypeString); switch (policyType) { case ACCOUNT: - for (final AbstractPolicyTO policyTO : policyTOs) { + for (final PolicyTO policyTO : policyTOs) { printAccountPolicy((AccountPolicyTO) policyTO); } break; case PASSWORD: - for (final AbstractPolicyTO policyTO : policyTOs) { + for (final PolicyTO policyTO : policyTOs) { printPasswordPolicy((PasswordPolicyTO) policyTO); } break; case PUSH: - for (final AbstractPolicyTO policyTO : policyTOs) { + for (final PolicyTO policyTO : policyTOs) { System.out.println(policyTO); } break; case PULL: - for (final AbstractPolicyTO policyTO : policyTOs) { + for (final PolicyTO policyTO : policyTOs) { printPullPolicy((PullPolicyTO) policyTO); } break; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicySyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicySyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicySyncopeOperations.java index 127818b..9bfad75 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicySyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicySyncopeOperations.java @@ -20,7 +20,7 @@ package org.apache.syncope.client.cli.commands.policy; import java.util.List; import org.apache.syncope.client.cli.SyncopeServices; -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.service.PolicyService; @@ -28,11 +28,11 @@ public class PolicySyncopeOperations { private final PolicyService policyService = SyncopeServices.get(PolicyService.class); - public <T extends AbstractPolicyTO> T read(final String policyKey) { + public <T extends PolicyTO> T read(final String policyKey) { return policyService.read(policyKey); } - public <T extends AbstractPolicyTO> List<T> list(final String policyType) { + public <T extends PolicyTO> List<T> list(final String policyType) { return policyService.list(PolicyType.valueOf(policyType)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java index 0f99ed7..96cd5cc 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java @@ -25,7 +25,7 @@ import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; import org.apache.syncope.client.cli.util.CommandUtils; 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.types.SchemaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,7 @@ public class SchemaRead extends AbstractSchemaCommand { if (input.parameterNumber() >= 2) { final String[] parameters = Arrays.copyOfRange(input.getParameters(), 1, input.parameterNumber()); try { - final List<AbstractSchemaTO> schemaTOs = new ArrayList<>(); + final List<SchemaTO> schemaTOs = new ArrayList<>(); for (final String parameter : parameters) { schemaTOs.add(schemaSyncopeOperations.read(input.firstParameter(), parameter)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java index cb87fe0..58ce32d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.syncope.client.cli.commands.CommonsResultManager; import org.apache.syncope.client.cli.view.Table; -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; @@ -31,7 +31,7 @@ import org.apache.syncope.common.lib.types.SchemaType; public class SchemaResultManager extends CommonsResultManager { - public void toView(final String schemaTypeString, final List<? extends AbstractSchemaTO> schemaTOs) { + public void toView(final String schemaTypeString, final List<? extends SchemaTO> schemaTOs) { switch (SchemaType.valueOf(schemaTypeString)) { case PLAIN: printPlainSchemasDetailed(schemaTOs); @@ -47,9 +47,9 @@ public class SchemaResultManager extends CommonsResultManager { } } - private void printPlainSchemasDetailed(final List<? extends AbstractSchemaTO> schemaTOs) { + private void printPlainSchemasDetailed(final List<? extends SchemaTO> schemaTOs) { System.out.println(""); - for (final AbstractSchemaTO schemaTO : schemaTOs) { + for (final SchemaTO schemaTO : schemaTOs) { printPlanSchemaDetailed((PlainSchemaTO) schemaTO); } } @@ -67,10 +67,10 @@ public class SchemaResultManager extends CommonsResultManager { System.out.println(""); } - public void printPlainSchemas(final List<? extends AbstractSchemaTO> schemaTOs) { + public void printPlainSchemas(final List<? extends SchemaTO> schemaTOs) { final Table.TableBuilder tableBuilder = new Table.TableBuilder("plain schemas").header("schema key").header("type").header("mandatory"); - for (final AbstractSchemaTO schemaTO : schemaTOs) { + for (final SchemaTO schemaTO : schemaTOs) { tableBuilder.rowValues(Arrays.asList( ((PlainSchemaTO) schemaTO).getKey(), ((PlainSchemaTO) schemaTO).getType().toString(), @@ -79,10 +79,10 @@ public class SchemaResultManager extends CommonsResultManager { tableBuilder.build().print(); } - public void fromListDerived(final List<? extends AbstractSchemaTO> schemaTOs) { + public void fromListDerived(final List<? extends SchemaTO> schemaTOs) { final Table.TableBuilder tableBuilder = new Table.TableBuilder("derived schemas").header("schema key").header("expression"); - for (final AbstractSchemaTO schemaTO : schemaTOs) { + for (final SchemaTO schemaTO : schemaTOs) { tableBuilder.rowValues(Arrays.asList( ((DerSchemaTO) schemaTO).getKey(), ((DerSchemaTO) schemaTO).getExpression())); @@ -90,10 +90,10 @@ public class SchemaResultManager extends CommonsResultManager { tableBuilder.build().print(); } - public void fromListVirtual(final List<? extends AbstractSchemaTO> schemaTOs) { + public void fromListVirtual(final List<? extends SchemaTO> schemaTOs) { final Table.TableBuilder tableBuilder = new Table.TableBuilder("virtual schemas").header("schema key").header("readonly"); - for (final AbstractSchemaTO schemaTO : schemaTOs) { + for (final SchemaTO schemaTO : schemaTOs) { tableBuilder.rowValues(Arrays.asList( ((VirSchemaTO) schemaTO).getKey(), String.valueOf(((VirSchemaTO) schemaTO).isReadonly()))); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java index 92f9bf3..79cb89a 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java @@ -20,7 +20,7 @@ package org.apache.syncope.client.cli.commands.schema; import java.util.List; import org.apache.syncope.client.cli.SyncopeServices; -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; import org.apache.syncope.common.rest.api.service.SchemaService; @@ -29,23 +29,23 @@ public class SchemaSyncopeOperations { private final SchemaService schemaService = SyncopeServices.get(SchemaService.class); - public <T extends AbstractSchemaTO> T read(final String schemaTypeString, final String schemaName) { + public <T extends SchemaTO> T read(final String schemaTypeString, final String schemaName) { return schemaService.read(SchemaType.valueOf(schemaTypeString), schemaName); } - public <T extends AbstractSchemaTO> List<T> list(final String schemaTypeString) { + public <T extends SchemaTO> List<T> list(final String schemaTypeString) { return schemaService.list(new SchemaQuery.Builder().type(SchemaType.valueOf(schemaTypeString)).build()); } - public <T extends AbstractSchemaTO> List<T> listPlain() { + public <T extends SchemaTO> List<T> listPlain() { return schemaService.list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build()); } - public <T extends AbstractSchemaTO> List<T> listDerived() { + public <T extends SchemaTO> List<T> listDerived() { return schemaService.list(new SchemaQuery.Builder().type(SchemaType.DERIVED).build()); } - public <T extends AbstractSchemaTO> List<T> listVirtual() { + public <T extends SchemaTO> List<T> listVirtual() { return schemaService.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDeleteAllProp.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDeleteAllProp.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDeleteAllProp.java index 4f41428..7d1660b 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDeleteAllProp.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDeleteAllProp.java @@ -21,7 +21,7 @@ package org.apache.syncope.client.cli.commands.task; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public class TaskDeleteAllProp extends AbstractTaskCommand { public void delete() { if (input.parameterNumber() == 0) { - for (final AbstractTaskTO taskTO : taskSyncopeOperations.listPropagationTask()) { + for (final TaskTO taskTO : taskSyncopeOperations.listPropagationTask()) { final String taskId = String.valueOf(taskTO.getKey()); try { taskSyncopeOperations.delete(taskId); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java index bb00255..71132fc 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java @@ -24,12 +24,12 @@ import org.apache.commons.collections4.map.LinkedMap; import org.apache.syncope.client.cli.Input; import org.apache.syncope.client.cli.util.CommandUtils; 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.JobTO; import org.apache.syncope.common.lib.to.NotificationTaskTO; import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.SchedTaskTO; +import org.apache.syncope.common.lib.to.ProvisioningTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.types.PullMode; import org.apache.syncope.common.lib.types.TaskType; @@ -52,12 +52,12 @@ public class TaskDetails extends AbstractTaskCommand { if (input.parameterNumber() == 0) { try { final Map<String, String> details = new LinkedMap<>(); - final List<AbstractTaskTO> notificationTaskTOs = + final List<TaskTO> notificationTaskTOs = taskSyncopeOperations.list(TaskType.NOTIFICATION.name()); - final List<AbstractTaskTO> propagationTaskTOs = taskSyncopeOperations.list(TaskType.PROPAGATION.name()); - final List<AbstractTaskTO> pushTaskTOs = taskSyncopeOperations.list(TaskType.PUSH.name()); - final List<AbstractTaskTO> scheduledTaskTOs = taskSyncopeOperations.list(TaskType.SCHEDULED.name()); - final List<AbstractTaskTO> pullTaskTOs = taskSyncopeOperations.list(TaskType.PULL.name()); + final List<TaskTO> propagationTaskTOs = taskSyncopeOperations.list(TaskType.PROPAGATION.name()); + final List<TaskTO> pushTaskTOs = taskSyncopeOperations.list(TaskType.PUSH.name()); + final List<TaskTO> scheduledTaskTOs = taskSyncopeOperations.list(TaskType.SCHEDULED.name()); + final List<TaskTO> pullTaskTOs = taskSyncopeOperations.list(TaskType.PULL.name()); final List<JobTO> jobTOs = taskSyncopeOperations.listJobs(); final int notificationTaskSize = notificationTaskTOs.size(); final int propagationTaskSize = propagationTaskTOs.size(); @@ -68,14 +68,14 @@ public class TaskDetails extends AbstractTaskCommand { final int jobsSize = jobTOs.size(); int notificationNotExecuted = 0; - for (final AbstractTaskTO notificationTaskTO : notificationTaskTOs) { + for (final TaskTO notificationTaskTO : notificationTaskTOs) { if (!((NotificationTaskTO) notificationTaskTO).isExecuted()) { notificationNotExecuted++; } } int propagationNotExecuted = 0; - for (final AbstractTaskTO propagationTaskTO : propagationTaskTOs) { + for (final TaskTO propagationTaskTO : propagationTaskTOs) { if (((PropagationTaskTO) propagationTaskTO).getExecutions() == null || ((PropagationTaskTO) propagationTaskTO).getExecutions().isEmpty()) { propagationNotExecuted++; @@ -83,23 +83,23 @@ public class TaskDetails extends AbstractTaskCommand { } int pushNotExecuted = 0; - for (final AbstractTaskTO pushTaskTO : pushTaskTOs) { + for (final TaskTO pushTaskTO : pushTaskTOs) { if (((PushTaskTO) pushTaskTO).getExecutions() == null || ((PushTaskTO) pushTaskTO).getExecutions().isEmpty()) { pushNotExecuted++; } } - for (final AbstractTaskTO scheduledTaskTO : scheduledTaskTOs) { - if (((SchedTaskTO) scheduledTaskTO).getExecutions() == null - || ((SchedTaskTO) scheduledTaskTO).getExecutions().isEmpty()) { + for (final TaskTO scheduledTaskTO : scheduledTaskTOs) { + if (((ProvisioningTaskTO) scheduledTaskTO).getExecutions() == null + || ((ProvisioningTaskTO) scheduledTaskTO).getExecutions().isEmpty()) { scheduledNotExecuted++; } } int pullNotExecuted = 0; int pullFull = 0; - for (final AbstractTaskTO pullTaskTO : pullTaskTOs) { + for (final TaskTO pullTaskTO : pullTaskTOs) { if (((PullTaskTO) pullTaskTO).getExecutions() == null || ((PullTaskTO) pullTaskTO).getExecutions().isEmpty()) { pullNotExecuted++; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java index 14ebc30..0c05681 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java @@ -23,7 +23,7 @@ import java.util.List; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public class TaskRead extends AbstractTaskCommand { public void read() { if (input.parameterNumber() >= 1) { - final List<AbstractTaskTO> taskTOs = new ArrayList<>(); + final List<TaskTO> taskTOs = new ArrayList<>(); for (final String parameter : input.getParameters()) { try { taskTOs.add(taskSyncopeOperations.read(parameter)); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java index 5516440..b5263d3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java @@ -21,61 +21,61 @@ package org.apache.syncope.client.cli.commands.task; import java.util.List; import java.util.Map; import org.apache.syncope.client.cli.commands.CommonsResultManager; -import org.apache.syncope.common.lib.to.AbstractTaskTO; +import org.apache.syncope.common.lib.to.TaskTO; import org.apache.syncope.common.lib.to.AnyTO; import org.apache.syncope.common.lib.to.JobTO; import org.apache.syncope.common.lib.to.NotificationTaskTO; import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.SchedTaskTO; +import org.apache.syncope.common.lib.to.ProvisioningTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.types.TaskType; public class TaskResultManager extends CommonsResultManager { - public void printTasks(final List<AbstractTaskTO> taskTOs) { + public void printTasks(final List<TaskTO> taskTOs) { System.out.println(""); - for (final AbstractTaskTO taskTO : taskTOs) { + for (final TaskTO taskTO : taskTOs) { if (taskTO instanceof NotificationTaskTO) { printNotificationTask((NotificationTaskTO) taskTO); } else if (taskTO instanceof PropagationTaskTO) { printPropagationTask((PropagationTaskTO) taskTO); } else if (taskTO instanceof PushTaskTO) { printPushTask((PushTaskTO) taskTO); - } else if (taskTO instanceof SchedTaskTO) { - printScheduledTask((SchedTaskTO) taskTO); + } else if (taskTO instanceof ProvisioningTaskTO) { + printScheduledTask((ProvisioningTaskTO) taskTO); } else if (taskTO instanceof PullTaskTO) { printPullTask((PullTaskTO) taskTO); } } } - public void printTasksType(final String taskTypeString, final List<AbstractTaskTO> taskTOs) { + public void printTasksType(final String taskTypeString, final List<TaskTO> taskTOs) { System.out.println(""); switch (TaskType.valueOf(taskTypeString)) { case NOTIFICATION: - for (final AbstractTaskTO taskTO : taskTOs) { + for (final TaskTO taskTO : taskTOs) { printNotificationTask(((NotificationTaskTO) taskTO)); } break; case PROPAGATION: - for (final AbstractTaskTO taskTO : taskTOs) { + for (final TaskTO taskTO : taskTOs) { printPropagationTask((PropagationTaskTO) taskTO); } break; case PUSH: - for (final AbstractTaskTO taskTO : taskTOs) { + for (final TaskTO taskTO : taskTOs) { printPushTask((PushTaskTO) taskTO); } break; case SCHEDULED: - for (final AbstractTaskTO taskTO : taskTOs) { - printScheduledTask((SchedTaskTO) taskTO); + for (final TaskTO taskTO : taskTOs) { + printScheduledTask((ProvisioningTaskTO) taskTO); } break; case PULL: - for (final AbstractTaskTO taskTO : taskTOs) { + for (final TaskTO taskTO : taskTOs) { printPullTask((PullTaskTO) taskTO); } break; @@ -141,7 +141,7 @@ public class TaskResultManager extends CommonsResultManager { System.out.println(""); } - private void printScheduledTask(final SchedTaskTO schedTaskTO) { + private void printScheduledTask(final ProvisioningTaskTO schedTaskTO) { System.out.println(" - Scheduled task key: " + schedTaskTO.getKey()); System.out.println(" name: " + schedTaskTO.getName()); System.out.println(" cron expression: " + schedTaskTO.getCronExpression()); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java index 7ac8593..ad94a4f 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java @@ -20,7 +20,7 @@ package org.apache.syncope.client.cli.commands.task; import java.util.List; import org.apache.syncope.client.cli.SyncopeServices; -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.JobTO; import org.apache.syncope.common.lib.types.TaskType; @@ -36,7 +36,7 @@ public class TaskSyncopeOperations { return taskService.listJobs(); } - public <T extends AbstractTaskTO> T read(final String taskKey) { + public <T extends TaskTO> T read(final String taskKey) { return taskService.read(taskKey, true); } @@ -44,11 +44,11 @@ public class TaskSyncopeOperations { taskService.delete(taskKey); } - public List<AbstractTaskTO> list(final String type) { + public List<TaskTO> list(final String type) { return taskService.list(new TaskQuery.Builder(TaskType.valueOf(type)).build()).getResult(); } - public List<AbstractTaskTO> listPropagationTask() { + public List<TaskTO> listPropagationTask() { return taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).build()).getResult(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java index 46312cb..50f6fe7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java @@ -18,13 +18,13 @@ */ package org.apache.syncope.client.console.commons; -import org.apache.syncope.common.lib.to.AbstractTaskTO; +import org.apache.syncope.common.lib.to.TaskTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; -public abstract class TaskDataProvider<T extends AbstractTaskTO> extends DirectoryDataProvider<T> { +public abstract class TaskDataProvider<T extends TaskTO> extends DirectoryDataProvider<T> { private static final long serialVersionUID = -20112718133295756L; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java index ebddc5b..03729e9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java @@ -19,7 +19,7 @@ package org.apache.syncope.client.console.panels; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.common.lib.to.AbstractSchemaTO; +import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.wicket.PageReference; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; @@ -36,14 +36,14 @@ public abstract class AbstractSchemaDetailsPanel extends Panel { protected static final String FORM = "form"; - protected final Form<AbstractSchemaTO> schemaForm; + protected final Form<SchemaTO> schemaForm; - protected final AbstractSchemaTO schemaTO; + protected final SchemaTO schemaTO; public AbstractSchemaDetailsPanel( final String id, final PageReference pageReference, - final AbstractSchemaTO schemaTO) { + final SchemaTO schemaTO) { super(id); this.schemaTO = schemaTO; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java index 56c897d..8b606af 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java @@ -49,7 +49,7 @@ import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.report.Schema; import org.apache.syncope.common.lib.report.SearchCondition; import org.apache.syncope.common.lib.search.AbstractFiqlSearchConditionBuilder; -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.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; @@ -191,7 +191,7 @@ public class BeanPanel<T extends Serializable> extends Panel { if (listItemType.equals(String.class) && schemaAnnot != null) { SchemaRestClient schemaRestClient = new SchemaRestClient(); - final List<AbstractSchemaTO> choices = new ArrayList<>(); + final List<SchemaTO> choices = new ArrayList<>(); for (SchemaType type : schemaAnnot.type()) { switch (type) { @@ -214,15 +214,13 @@ public class BeanPanel<T extends Serializable> extends Panel { } } - panel = new AjaxPalettePanel.Builder<String>().setName(fieldName).build( - "value", + panel = new AjaxPalettePanel.Builder<String>().setName(fieldName).build("value", new PropertyModel<List<String>>(bean.getObject(), fieldName), new ListModel<>( - CollectionUtils.collect( - choices, new Transformer<AbstractSchemaTO, String>() { + CollectionUtils.collect(choices, new Transformer<SchemaTO, String>() { @Override - public String transform(final AbstractSchemaTO input) { + public String transform(final SchemaTO input) { return input.getKey(); } }, new ArrayList<String>()))).hideLabel(); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java index 443703b..3788b64 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java @@ -36,7 +36,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxCheckBoxPan import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.MultiFieldPanel; -import org.apache.syncope.common.lib.to.AbstractSchemaTO; +import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.syncope.common.lib.to.PlainSchemaTO; import org.apache.syncope.common.lib.types.AttrSchemaType; import org.apache.syncope.common.lib.types.CipherAlgorithm; @@ -294,7 +294,7 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { } - private void showHide(final AbstractSchemaTO schema, final AjaxDropDownChoicePanel<AttrSchemaType> type, + private void showHide(final SchemaTO schema, final AjaxDropDownChoicePanel<AttrSchemaType> type, final WebMarkupContainer conversionParams, final AjaxTextFieldPanel conversionPattern, final WebMarkupContainer enumParams, final AjaxTextFieldPanel enumerationValuesPanel, final MultiFieldPanel<String> enumerationValues, final MultiFieldPanel<String> enumerationKeys, http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmDetails.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmDetails.java index 4f48c3c..6ab447d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmDetails.java @@ -34,7 +34,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.PolicyRenderer; import org.apache.syncope.common.lib.EntityTOUtils; import org.apache.syncope.common.lib.SyncopeConstants; -import org.apache.syncope.common.lib.policy.AbstractPolicyTO; +import org.apache.syncope.common.lib.policy.PolicyTO; import org.apache.syncope.common.lib.to.RealmTO; import org.apache.syncope.common.lib.to.ResourceTO; import org.apache.syncope.common.lib.types.PolicyType; @@ -65,7 +65,7 @@ public class RealmDetails extends Panel { @Override protected Map<String, String> load() { Map<String, String> res = new LinkedHashMap<>(); - for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT)) { + for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT)) { res.put(policyTO.getKey(), policyTO.getDescription()); } return res; @@ -79,7 +79,7 @@ public class RealmDetails extends Panel { @Override protected Map<String, String> load() { Map<String, String> res = new LinkedHashMap<>(); - for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD)) { + for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD)) { res.put(policyTO.getKey(), policyTO.getDescription()); } return res; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java index 4b191b5..e149c05 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java @@ -21,7 +21,7 @@ package org.apache.syncope.client.console.panels; import java.util.Arrays; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -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; @@ -30,17 +30,17 @@ import org.apache.wicket.PageReference; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.Model; -public class SchemaModalPanel extends AbstractModalPanel<AbstractSchemaTO> { +public class SchemaModalPanel extends AbstractModalPanel<SchemaTO> { private static final long serialVersionUID = -4681998932778822125L; private final AbstractSchemaDetailsPanel schemaPanel; - private final AbstractSchemaTO schemaTO; + private final SchemaTO schemaTO; public SchemaModalPanel( - final BaseModal<AbstractSchemaTO> modal, - final AbstractSchemaTO schemaTO, + final BaseModal<SchemaTO> modal, + final SchemaTO schemaTO, final PageReference pageRef) { super(modal, pageRef); @@ -64,13 +64,13 @@ public class SchemaModalPanel extends AbstractModalPanel<AbstractSchemaTO> { } private AbstractSchemaDetailsPanel getSchemaPanel(final String id, - final SchemaType schemaType, final BaseModal<AbstractSchemaTO> modal) { + final SchemaType schemaType, final BaseModal<SchemaTO> modal) { final AbstractSchemaDetailsPanel panel; if (schemaTO.getKey() != null) { try { - final Class<? extends AbstractSchemaTO> schemaTOClass = schemaType.getToClass(); - modal.setFormModel((AbstractSchemaTO) schemaTOClass.newInstance()); + final Class<? extends SchemaTO> schemaTOClass = schemaType.getToClass(); + modal.setFormModel((SchemaTO) schemaTOClass.newInstance()); } catch (InstantiationException | IllegalAccessException ex) { LOG.error("SchemaType not found", ex); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java index af1b84c..30c5050 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java @@ -43,7 +43,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink; import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; import org.apache.syncope.client.console.wizards.AbstractModalPanelBuilder; import org.apache.syncope.client.console.wizards.AjaxWizard; -import org.apache.syncope.common.lib.to.AbstractSchemaTO; +import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.lib.types.StandardEntitlement; @@ -60,7 +60,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; import org.springframework.util.ReflectionUtils; -public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, SchemaProvider, SchemaRestClient> { +public class SchemaTypePanel extends TypesDirectoryPanel<SchemaTO, SchemaProvider, SchemaRestClient> { private static final long serialVersionUID = 3905038169553185171L; @@ -89,15 +89,15 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem try { this.addNewItemPanelBuilder( - new AbstractModalPanelBuilder<AbstractSchemaTO>(schemaType.getToClass().newInstance(), pageRef) { + new AbstractModalPanelBuilder<SchemaTO>(schemaType.getToClass().newInstance(), pageRef) { private static final long serialVersionUID = -6388405037134399367L; @Override - public WizardModalPanel<AbstractSchemaTO> build( + public WizardModalPanel<SchemaTO> build( final String id, final int index, final AjaxWizard.Mode mode) { - final AbstractSchemaTO modelObject = newModelObject(); + final SchemaTO modelObject = newModelObject(); return new SchemaModalPanel(modal, modelObject, pageRef) { private static final long serialVersionUID = -6227956682141146095L; @@ -148,17 +148,17 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem } @Override - protected List<IColumn<AbstractSchemaTO, String>> getColumns() { - final List<IColumn<AbstractSchemaTO, String>> columns = new ArrayList<>(); + protected List<IColumn<SchemaTO, String>> getColumns() { + final List<IColumn<SchemaTO, String>> columns = new ArrayList<>(); for (final String field : COL_NAMES.get(schemaType)) { final Field clazzField = ReflectionUtils.findField(schemaType.getToClass(), field); if (clazzField != null) { if (clazzField.getType().equals(Boolean.class) || clazzField.getType().equals(boolean.class)) { - columns.add(new BooleanPropertyColumn<AbstractSchemaTO>(new ResourceModel(field), field, field)); + columns.add(new BooleanPropertyColumn<SchemaTO>(new ResourceModel(field), field, field)); } else { - final IColumn<AbstractSchemaTO, String> column = new PropertyColumn<AbstractSchemaTO, String>( + final IColumn<SchemaTO, String> column = new PropertyColumn<SchemaTO, String>( new ResourceModel(field), field, field) { private static final long serialVersionUID = 3282547854226892169L; @@ -183,24 +183,24 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem } @Override - public ActionsPanel<AbstractSchemaTO> getActions(final IModel<AbstractSchemaTO> model) { - final ActionsPanel<AbstractSchemaTO> panel = super.getActions(model); - panel.add(new ActionLink<AbstractSchemaTO>() { + public ActionsPanel<SchemaTO> getActions(final IModel<SchemaTO> model) { + final ActionsPanel<SchemaTO> panel = super.getActions(model); + panel.add(new ActionLink<SchemaTO>() { private static final long serialVersionUID = -3722207913631435501L; @Override - public void onClick(final AjaxRequestTarget target, final AbstractSchemaTO ignore) { + public void onClick(final AjaxRequestTarget target, final SchemaTO ignore) { send(SchemaTypePanel.this, Broadcast.EXACT, new AjaxWizard.EditItemActionEvent<>(model.getObject(), target)); } }, ActionLink.ActionType.EDIT, StandardEntitlement.SCHEMA_UPDATE); - panel.add(new ActionLink<AbstractSchemaTO>() { + panel.add(new ActionLink<SchemaTO>() { private static final long serialVersionUID = -3722207913631435501L; @Override - public void onClick(final AjaxRequestTarget target, final AbstractSchemaTO ignore) { + public void onClick(final AjaxRequestTarget target, final SchemaTO ignore) { try { switch (schemaType) { case DERIVED: @@ -230,11 +230,11 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem return panel; } - protected final class SchemaProvider extends DirectoryDataProvider<AbstractSchemaTO> { + protected final class SchemaProvider extends DirectoryDataProvider<SchemaTO> { private static final long serialVersionUID = -185944053385660794L; - private final SortableDataProviderComparator<AbstractSchemaTO> comparator; + private final SortableDataProviderComparator<SchemaTO> comparator; private final SchemaType schemaType; @@ -249,8 +249,8 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem } @Override - public Iterator<AbstractSchemaTO> iterator(final long first, final long count) { - final List<AbstractSchemaTO> list = restClient.getSchemas(this.schemaType); + public Iterator<SchemaTO> iterator(final long first, final long count) { + final List<SchemaTO> list = restClient.getSchemas(this.schemaType); Collections.sort(list, comparator); if (SchemaType.PLAIN == this.schemaType) { @@ -264,8 +264,8 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem } }, configurations); - final List<AbstractSchemaTO> res = new ArrayList<>(); - for (AbstractSchemaTO item : list) { + final List<SchemaTO> res = new ArrayList<>(); + for (SchemaTO item : list) { if (!configurations.contains(item.getKey())) { res.add(item); } @@ -285,7 +285,7 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem } @Override - public IModel<AbstractSchemaTO> model(final AbstractSchemaTO object) { + public IModel<SchemaTO> model(final SchemaTO object) { return new CompoundPropertyModel<>(object); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java index 6db536b..edf934f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java @@ -30,7 +30,7 @@ import org.apache.syncope.client.console.wizards.any.AnyWrapper; import org.apache.syncope.client.console.wizards.any.GroupWrapper; import org.apache.syncope.client.console.wizards.any.UserWrapper; import org.apache.syncope.client.console.wizards.resources.ResourceProvision; -import org.apache.syncope.common.lib.policy.AbstractPolicyTO; +import org.apache.syncope.common.lib.policy.PolicyTO; import org.apache.syncope.common.lib.to.AccessTokenTO; import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AttrTO; @@ -39,7 +39,7 @@ import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.JobTO; import org.apache.syncope.common.lib.to.ReportTO; -import org.apache.syncope.common.lib.to.SchedTaskTO; +import org.apache.syncope.common.lib.to.ProvisioningTaskTO; import org.apache.syncope.common.lib.to.SecurityQuestionTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.to.WorkflowDefinitionTO; @@ -194,8 +194,8 @@ public abstract class TogglePanel<T extends Serializable> extends WizardMgtPanel key = ((ReportTO) modelObject).getKey(); } else if (modelObject instanceof AttrTO) { key = ((AttrTO) modelObject).getSchemaInfo().getKey(); - } else if (modelObject instanceof AbstractPolicyTO) { - key = ((AbstractPolicyTO) modelObject).getKey(); + } else if (modelObject instanceof PolicyTO) { + key = ((PolicyTO) modelObject).getKey(); } else if (modelObject instanceof SecurityQuestionTO) { key = ((SecurityQuestionTO) modelObject).getKey(); } else if (modelObject instanceof AccessTokenTO) { @@ -204,8 +204,8 @@ public abstract class TogglePanel<T extends Serializable> extends WizardMgtPanel key = ((ExecTO) modelObject).getKey(); } else if (modelObject instanceof WorkflowDefinitionTO) { key = ((WorkflowDefinitionTO) modelObject).getKey(); - } else if (modelObject instanceof SchedTaskTO) { - key = ((SchedTaskTO) modelObject).getKey(); + } else if (modelObject instanceof ProvisioningTaskTO) { + key = ((ProvisioningTaskTO) modelObject).getKey(); } else if (modelObject instanceof WorkflowFormTO) { key = ((WorkflowFormTO) modelObject).getKey(); } else if (modelObject instanceof EntityTO) { http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java index 166b9e2..e54af9d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java @@ -42,7 +42,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; import org.apache.syncope.client.console.wizards.AjaxWizard; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.common.lib.SyncopeClientException; -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.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -60,7 +60,7 @@ import org.apache.wicket.model.StringResourceModel; * * @param <T> policy type. */ -public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> +public abstract class PolicyDirectoryPanel<T extends PolicyTO> extends DirectoryPanel<T, T, DirectoryDataProvider<T>, PolicyRestClient> { private static final long serialVersionUID = 4984337552918213290L; @@ -140,7 +140,7 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> private static final long serialVersionUID = -3722207913631435501L; @Override - public void onClick(final AjaxRequestTarget target, final AbstractPolicyTO ignore) { + public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) { send(PolicyDirectoryPanel.this, Broadcast.EXACT, new AjaxWizard.EditItemActionEvent<>( restClient.getPolicy(model.getObject().getKey()), target)); @@ -152,8 +152,8 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> private static final long serialVersionUID = -3722207913631435501L; @Override - public void onClick(final AjaxRequestTarget target, final AbstractPolicyTO ignore) { - final AbstractPolicyTO clone = SerializationUtils.clone(model.getObject()); + public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) { + final PolicyTO clone = SerializationUtils.clone(model.getObject()); clone.setKey(null); send(PolicyDirectoryPanel.this, Broadcast.EXACT, new AjaxWizard.EditItemActionEvent<>(clone, target)); @@ -167,7 +167,7 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> private static final long serialVersionUID = -3722207913631435501L; @Override - public void onClick(final AjaxRequestTarget target, final AbstractPolicyTO ignore) { + public void onClick(final AjaxRequestTarget target, final PolicyTO ignore) { final T policyTO = model.getObject(); try { restClient.delete(policyTO.getKey()); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java index 7507d04..bec070a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java @@ -38,7 +38,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPa import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel; import org.apache.syncope.client.console.wizards.AbstractModalPanelBuilder; import org.apache.syncope.client.console.wizards.AjaxWizard; -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.PasswordPolicyTO; import org.apache.syncope.common.lib.to.ResourceTO; @@ -52,7 +52,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.util.ListModel; -public class PolicyModalPanelBuilder<T extends AbstractPolicyTO> extends AbstractModalPanelBuilder<T> { +public class PolicyModalPanelBuilder<T extends PolicyTO> extends AbstractModalPanelBuilder<T> { private static final long serialVersionUID = 5945391813567245081L; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java index fd3c72e..aa98ea5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java @@ -45,7 +45,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; import org.apache.syncope.client.console.wizards.AjaxWizard; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.common.lib.SyncopeClientException; -import org.apache.syncope.common.lib.policy.AbstractPolicyTO; +import org.apache.syncope.common.lib.policy.PolicyTO; import org.apache.syncope.common.lib.policy.RuleConf; import org.apache.syncope.common.lib.types.PolicyType; import org.apache.wicket.PageReference; @@ -70,7 +70,7 @@ import org.apache.wicket.model.StringResourceModel; * * @param <T> policy type. */ -public class PolicyRuleDirectoryPanel<T extends AbstractPolicyTO> extends DirectoryPanel< +public class PolicyRuleDirectoryPanel<T extends PolicyTO> extends DirectoryPanel< PolicyRuleWrapper, PolicyRuleWrapper, DirectoryDataProvider<PolicyRuleWrapper>, PolicyRestClient> implements ModalPanel { http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java index 698c3f5..6148994 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java @@ -30,7 +30,7 @@ import org.apache.syncope.client.console.rest.PolicyRestClient; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.console.wizards.AjaxWizardBuilder; -import org.apache.syncope.common.lib.policy.AbstractPolicyTO; +import org.apache.syncope.common.lib.policy.PolicyTO; import org.apache.syncope.common.lib.policy.ComposablePolicy; import org.apache.syncope.common.lib.policy.RuleConf; import org.apache.syncope.common.lib.types.PolicyType; @@ -68,7 +68,7 @@ public class PolicyRuleWizardBuilder BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(modelObject.getConf()); wrapper.setPropertyValue("name", modelObject.getName()); - AbstractPolicyTO policyTO = restClient.getPolicy(policy); + PolicyTO policyTO = restClient.getPolicy(policy); final ComposablePolicy<RuleConf> composable; if (policyTO instanceof ComposablePolicy) { http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java index 57b3616..6cdf72c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java @@ -42,7 +42,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownCho import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel; import org.apache.syncope.client.console.wicket.markup.html.form.MultiPanel; import org.apache.syncope.common.lib.policy.PullPolicyTO; -import org.apache.syncope.common.lib.to.AbstractSchemaTO; +import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.ConflictResolutionAction; import org.apache.syncope.common.lib.types.SchemaType; @@ -277,16 +277,15 @@ public class PolicySpecModalPanel extends AbstractModalPanel<PullPolicyTO> { private static List<String> getPlainSchemas(final CorrelationRule rule) { final List<String> choices = StringUtils.isEmpty(rule.getAny()) ? new ArrayList<String>() - : CollectionUtils.collect( - new SchemaRestClient().getSchemas(SchemaType.PLAIN, + : CollectionUtils.collect(new SchemaRestClient().getSchemas(SchemaType.PLAIN, rule.getAny().equals(AnyTypeKind.USER.name()) ? AnyTypeKind.USER : rule.getAny().equals(AnyTypeKind.GROUP.name()) ? AnyTypeKind.GROUP - : AnyTypeKind.ANY_OBJECT), new Transformer<AbstractSchemaTO, String>() { + : AnyTypeKind.ANY_OBJECT), new Transformer<SchemaTO, String>() { @Override - public String transform(final AbstractSchemaTO input) { + public String transform(final SchemaTO input) { return input.getKey(); } }, new ArrayList<String>()); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java index 759600e..6b0619e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -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.service.PolicyService; @@ -34,7 +34,7 @@ public class PolicyRestClient extends BaseRestClient { private static final long serialVersionUID = -1392090291817187902L; - public <T extends AbstractPolicyTO> T getPolicy(final String key) { + public <T extends PolicyTO> T getPolicy(final String key) { T policy = null; try { policy = getService(PolicyService.class).read(key); @@ -45,7 +45,7 @@ public class PolicyRestClient extends BaseRestClient { } @SuppressWarnings("unchecked") - public <T extends AbstractPolicyTO> List<T> getPolicies(final PolicyType type) { + public <T extends PolicyTO> List<T> getPolicies(final PolicyType type) { final List<T> res = new ArrayList<>(); try { @@ -58,11 +58,11 @@ public class PolicyRestClient extends BaseRestClient { return res; } - public <T extends AbstractPolicyTO> void createPolicy(final T policy) { + public <T extends PolicyTO> void createPolicy(final T policy) { getService(PolicyService.class).create(policy); } - public <T extends AbstractPolicyTO> void updatePolicy(final T policy) { + public <T extends PolicyTO> void updatePolicy(final T policy) { getService(PolicyService.class).update(policy); } @@ -70,12 +70,12 @@ public class PolicyRestClient extends BaseRestClient { getService(PolicyService.class).delete(key); } - private class PolicyComparator implements Comparator<AbstractPolicyTO>, Serializable { + private class PolicyComparator implements Comparator<PolicyTO>, Serializable { private static final long serialVersionUID = -4921433085213223115L; @Override - public int compare(final AbstractPolicyTO left, final AbstractPolicyTO right) { + public int compare(final PolicyTO left, final PolicyTO right) { return left == null ? -1 : right == null ? 1 : left.getDescription().compareTo(right.getDescription()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java index 600afb3..b902715 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.commons.collections4.CollectionUtils; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.EntityTOUtils; -import org.apache.syncope.common.lib.to.AbstractSchemaTO; +import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.syncope.common.lib.to.AnyTypeTO; import org.apache.syncope.common.lib.to.DerSchemaTO; import org.apache.syncope.common.lib.to.PlainSchemaTO; @@ -41,7 +41,7 @@ public class SchemaRestClient extends BaseRestClient { private static final long serialVersionUID = -2479730152700312373L; - public <T extends AbstractSchemaTO> List<T> getSchemas(final SchemaType schemaType, final AnyTypeKind kind) { + public <T extends SchemaTO> List<T> getSchemas(final SchemaType schemaType, final AnyTypeKind kind) { final AnyTypeService client = getService(AnyTypeService.class); final List<String> classes = new ArrayList<>(); @@ -65,7 +65,7 @@ public class SchemaRestClient extends BaseRestClient { return getSchemas(schemaType, classes.toArray(new String[] {})); } - public <T extends AbstractSchemaTO> List<T> getSchemas(final SchemaType schemaType, final String typeName) { + public <T extends SchemaTO> List<T> getSchemas(final SchemaType schemaType, final String typeName) { AnyTypeTO type = null; try { @@ -81,7 +81,7 @@ public class SchemaRestClient extends BaseRestClient { } } - public <T extends AbstractSchemaTO> List<T> getSchemas(final SchemaType schemaType, final String... kind) { + public <T extends SchemaTO> List<T> getSchemas(final SchemaType schemaType, final String... kind) { List<T> schemas = new ArrayList<>(); try { @@ -103,7 +103,7 @@ public class SchemaRestClient extends BaseRestClient { try { CollectionUtils.collect(getSchemas(schemaType), - EntityTOUtils.<AbstractSchemaTO>keyTransformer(), schemaNames); + EntityTOUtils.<SchemaTO>keyTransformer(), schemaNames); } catch (SyncopeClientException e) { LOG.error("While getting all user schema names", e); } @@ -128,11 +128,11 @@ public class SchemaRestClient extends BaseRestClient { } - public void create(final SchemaType schemaType, final AbstractSchemaTO modelObject) { + public void create(final SchemaType schemaType, final SchemaTO modelObject) { getService(SchemaService.class).create(schemaType, modelObject); } - public void update(final SchemaType schemaType, final AbstractSchemaTO modelObject) { + public void update(final SchemaType schemaType, final SchemaTO modelObject) { getService(SchemaService.class).update(schemaType, modelObject); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java index be0929b..ced4689 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java @@ -20,7 +20,7 @@ package org.apache.syncope.client.console.rest; import java.util.Date; import java.util.List; -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.NotificationTaskTO; @@ -134,7 +134,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien } @SuppressWarnings("unchecked") - public <T extends AbstractTaskTO> List<T> list( + public <T extends TaskTO> List<T> list( final Class<T> reference, final int page, final int size, final SortParam<String> sort) { return (List<T>) getService(TaskService.class). @@ -144,7 +144,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien } @SuppressWarnings("unchecked") - public <T extends AbstractTaskTO> List<T> list( + public <T extends TaskTO> List<T> list( final String resource, final Class<T> reference, final int page, @@ -194,7 +194,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien return getService(TaskService.class).read(taskKey, false); } - public void delete(final String taskKey, final Class<? extends AbstractTaskTO> taskToClass) { + public void delete(final String taskKey, final Class<? extends TaskTO> taskToClass) { getService(TaskService.class).delete(taskKey); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java index 0fa0f7b..ff45a0a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java @@ -27,7 +27,7 @@ import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater. import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.KeyPropertyColumn; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; -import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO; +import org.apache.syncope.common.lib.to.ProvisioningTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.types.TaskType; @@ -41,7 +41,7 @@ import org.apache.wicket.model.StringResourceModel; * * @param <T> Sched task type. */ -public abstract class ProvisioningTaskDirectoryPanel<T extends AbstractProvisioningTaskTO> +public abstract class ProvisioningTaskDirectoryPanel<T extends ProvisioningTaskTO> extends SchedTaskDirectoryPanel<T> { private static final long serialVersionUID = 4984337552918213290L; @@ -104,7 +104,7 @@ public abstract class ProvisioningTaskDirectoryPanel<T extends AbstractProvision return columns; } - protected class ProvisioningTasksProvider<T extends AbstractProvisioningTaskTO> extends SchedTasksProvider<T> { + protected class ProvisioningTasksProvider<T extends ProvisioningTaskTO> extends SchedTasksProvider<T> { private static final long serialVersionUID = 4725679400450513556L; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java index dccc22a..9075ac5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java @@ -35,7 +35,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownCho import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.console.wizards.AjaxWizardBuilder; -import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO; +import org.apache.syncope.common.lib.to.ProvisioningTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; @@ -265,7 +265,7 @@ public class SchedTaskWizardBuilder<T extends SchedTaskTO> extends AjaxWizardBui WebMarkupContainer provisioningTaskSpecifics = new WebMarkupContainer("provisioningTaskSpecifics"); add(provisioningTaskSpecifics.setRenderBodyOnly(true)); - if (taskTO instanceof AbstractProvisioningTaskTO) { + if (taskTO instanceof ProvisioningTaskTO) { jobDelegateClassName.setEnabled(false).setVisible(false); } else { provisioningTaskSpecifics.setEnabled(false).setVisible(false); http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java index 956afd6..56a17a9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java @@ -27,7 +27,7 @@ import org.apache.syncope.client.console.panels.ModalPanel; import org.apache.syncope.client.console.panels.MultilevelPanel; import org.apache.syncope.client.console.rest.TaskRestClient; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; -import org.apache.syncope.common.lib.to.AbstractTaskTO; +import org.apache.syncope.common.lib.to.TaskTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -41,7 +41,7 @@ import org.apache.wicket.model.IModel; * * @param <T> task type. */ -public abstract class TaskDirectoryPanel<T extends AbstractTaskTO> +public abstract class TaskDirectoryPanel<T extends TaskTO> extends DirectoryPanel<T, T, TaskDataProvider<T>, TaskRestClient> implements ModalPanel { private static final long serialVersionUID = 4984337552918213290L; @@ -66,7 +66,7 @@ public abstract class TaskDirectoryPanel<T extends AbstractTaskTO> protected abstract void viewTask(T taskTO, AjaxRequestTarget target); - protected abstract class TasksProvider<T extends AbstractTaskTO> extends DirectoryDataProvider<T> { + protected abstract class TasksProvider<T extends TaskTO> extends DirectoryDataProvider<T> { private static final long serialVersionUID = -20112718133295756L; http://git-wip-us.apache.org/repos/asf/syncope/blob/8038b056/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java index 263eca3..ef243f3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java @@ -21,7 +21,7 @@ package org.apache.syncope.client.console.tasks; import org.apache.syncope.client.console.panels.MultilevelPanel; import org.apache.syncope.client.console.rest.TaskRestClient; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; -import org.apache.syncope.common.lib.to.AbstractTaskTO; +import org.apache.syncope.common.lib.to.TaskTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -30,7 +30,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; * * @param <T> actual type of task */ -public class TaskExecutionDetails<T extends AbstractTaskTO> extends MultilevelPanel.SecondLevel { +public class TaskExecutionDetails<T extends TaskTO> extends MultilevelPanel.SecondLevel { private static final long serialVersionUID = -4110576026663173545L;
