Repository: syncope Updated Branches: refs/heads/master 891122c2f -> 575f02b4a
SYNCOPE-910 - Switching to use AnyTypeKind as per Francesco's comments Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/575f02b4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/575f02b4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/575f02b4 Branch: refs/heads/master Commit: 575f02b4adc0cd868f13a328e195b68146f8d8d4 Parents: 891122c Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Jul 29 16:59:35 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Jul 29 16:59:35 2016 +0100 ---------------------------------------------------------------------- .../core/provisioning/camel/AnyType.java | 23 ---------------- .../camel/component/PropagateEndpoint.java | 28 ++++++++++---------- .../camel/producer/AbstractProducer.java | 12 ++++----- .../producer/ConfirmPasswordResetProducer.java | 8 +++--- .../camel/producer/CreateProducer.java | 5 ++-- .../camel/producer/DeleteProducer.java | 11 ++++---- .../camel/producer/DeprovisionProducer.java | 11 ++++---- .../camel/producer/ProvisionProducer.java | 13 +++++---- .../camel/producer/StatusProducer.java | 9 +++---- .../camel/producer/SuspendProducer.java | 8 +++--- .../camel/producer/UpdateProducer.java | 5 ++-- .../src/main/resources/anyObjectRoutes.xml | 10 +++---- .../src/main/resources/groupRoutes.xml | 12 ++++----- .../src/main/resources/userRoutes.xml | 20 +++++++------- .../syncope/fit/core/CamelRouteITCase.java | 4 +-- 15 files changed, 75 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AnyType.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AnyType.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AnyType.java deleted file mode 100644 index d1d9b9e..0000000 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AnyType.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.syncope.core.provisioning.camel; - -public enum AnyType { - - user, group, any - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateEndpoint.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateEndpoint.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateEndpoint.java index e619f91..1afb23c 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateEndpoint.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateEndpoint.java @@ -25,13 +25,13 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO; import org.apache.syncope.core.persistence.api.dao.GroupDAO; import org.apache.syncope.core.persistence.api.dao.UserDAO; import org.apache.syncope.core.provisioning.api.data.GroupDataBinder; import org.apache.syncope.core.provisioning.api.propagation.PropagationManager; import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor; -import org.apache.syncope.core.provisioning.camel.AnyType; import org.apache.syncope.core.provisioning.camel.producer.AbstractProducer; import org.apache.syncope.core.provisioning.camel.producer.ConfirmPasswordResetProducer; import org.apache.syncope.core.provisioning.camel.producer.CreateProducer; @@ -50,7 +50,7 @@ public class PropagateEndpoint extends DefaultEndpoint { private PropagateType propagateType; @UriParam - private AnyType anyType; + private AnyTypeKind anyTypeKind; @UriParam private boolean pull; @@ -77,21 +77,21 @@ public class PropagateEndpoint extends DefaultEndpoint { public Producer createProducer() throws Exception { AbstractProducer producer = null; if (PropagateType.create == propagateType) { - producer = new CreateProducer(this, anyType); + producer = new CreateProducer(this, anyTypeKind); } else if (PropagateType.update == propagateType) { - producer = new UpdateProducer(this, anyType); + producer = new UpdateProducer(this, anyTypeKind); } else if (PropagateType.delete == propagateType) { - producer = new DeleteProducer(this, anyType, userDAO, groupDataBinder); + producer = new DeleteProducer(this, anyTypeKind, userDAO, groupDataBinder); } else if (PropagateType.provision == propagateType) { - producer = new ProvisionProducer(this, anyType); + producer = new ProvisionProducer(this, anyTypeKind); } else if (PropagateType.deprovision == propagateType) { - producer = new DeprovisionProducer(this, anyType, userDAO, groupDAO, anyObjectDAO); + producer = new DeprovisionProducer(this, anyTypeKind, userDAO, groupDAO, anyObjectDAO); } else if (PropagateType.status == propagateType) { - producer = new StatusProducer(this, anyType, userDAO, uwfAdapter); + producer = new StatusProducer(this, anyTypeKind, userDAO, uwfAdapter); } else if (PropagateType.suspend == propagateType) { - producer = new SuspendProducer(this, anyType); + producer = new SuspendProducer(this, anyTypeKind); } else if (PropagateType.confirmPasswordReset == propagateType) { - producer = new ConfirmPasswordResetProducer(this, anyType); + producer = new ConfirmPasswordResetProducer(this, anyTypeKind); } if (producer != null) { @@ -128,12 +128,12 @@ public class PropagateEndpoint extends DefaultEndpoint { this.taskExecutor = taskExecutor; } - public AnyType getAnyType() { - return anyType; + public AnyTypeKind getAnyTypeKind() { + return anyTypeKind; } - public void setAnyType(final AnyType anyType) { - this.anyType = anyType; + public void setAnyTypeKind(final AnyTypeKind anyTypeKind) { + this.anyTypeKind = anyTypeKind; } public void setUserDAO(final UserDAO userDAO) { http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/AbstractProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/AbstractProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/AbstractProducer.java index a76620c..c781609 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/AbstractProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/AbstractProducer.java @@ -18,9 +18,9 @@ package org.apache.syncope.core.provisioning.camel.producer; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultProducer; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.provisioning.api.propagation.PropagationManager; import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor; -import org.apache.syncope.core.provisioning.camel.AnyType; public abstract class AbstractProducer extends DefaultProducer { @@ -28,13 +28,13 @@ public abstract class AbstractProducer extends DefaultProducer { private PropagationTaskExecutor taskExecutor; - private AnyType anyType; + private AnyTypeKind anyTypeKind; private boolean pull; - public AbstractProducer(final Endpoint endpoint, final AnyType anyType) { + public AbstractProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind) { super(endpoint); - this.anyType = anyType; + this.anyTypeKind = anyTypeKind; } public void setPropagationManager(final PropagationManager propagationManager) { @@ -53,8 +53,8 @@ public abstract class AbstractProducer extends DefaultProducer { return taskExecutor; } - public AnyType getAnyType() { - return anyType; + public AnyTypeKind getAnyTypeKind() { + return anyTypeKind; } public boolean isPull() { http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ConfirmPasswordResetProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ConfirmPasswordResetProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ConfirmPasswordResetProducer.java index 0769d3d..92b44f0 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ConfirmPasswordResetProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ConfirmPasswordResetProducer.java @@ -22,20 +22,20 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.commons.lang3.tuple.Pair; import org.apache.syncope.common.lib.patch.UserPatch; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.WorkflowResult; -import org.apache.syncope.core.provisioning.camel.AnyType; public class ConfirmPasswordResetProducer extends AbstractProducer { - public ConfirmPasswordResetProducer(final Endpoint endpoint, final AnyType anyType) { - super(endpoint, anyType); + public ConfirmPasswordResetProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind) { + super(endpoint, anyTypeKind); } @SuppressWarnings("unchecked") @Override public void process(final Exchange exchange) throws Exception { - if (getAnyType() == AnyType.user) { + if (getAnyTypeKind() == AnyTypeKind.USER) { WorkflowResult<Pair<UserPatch, Boolean>> updated = (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody(); http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/CreateProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/CreateProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/CreateProducer.java index 3c72c60..9482be1 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/CreateProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/CreateProducer.java @@ -34,12 +34,11 @@ import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; public class CreateProducer extends AbstractProducer { - public CreateProducer(final Endpoint endpoint, final AnyType anyType) { - super(endpoint, anyType); + public CreateProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind) { + super(endpoint, anyTypeKind); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeleteProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeleteProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeleteProducer.java index 5a3f8e0..ff02e4a 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeleteProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeleteProducer.java @@ -30,16 +30,15 @@ import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.core.provisioning.api.data.GroupDataBinder; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; public class DeleteProducer extends AbstractProducer { private UserDAO userDAO; private GroupDataBinder groupDataBinder; - public DeleteProducer(final Endpoint endpoint, final AnyType anyType, final UserDAO userDao, + public DeleteProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind, final UserDAO userDao, final GroupDataBinder groupDataBinder) { - super(endpoint, anyType); + super(endpoint, anyTypeKind); this.userDAO = userDao; this.groupDataBinder = groupDataBinder; } @@ -51,7 +50,7 @@ public class DeleteProducer extends AbstractProducer { Set<String> excludedResources = exchange.getProperty("excludedResources", Set.class); Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class); - if (getAnyType() == AnyType.user) { + if (getAnyTypeKind() == AnyTypeKind.USER) { PropagationByResource propByRes = new PropagationByResource(); propByRes.set(ResourceOperation.DELETE, userDAO.findAllResourceNames(key)); @@ -69,7 +68,7 @@ public class DeleteProducer extends AbstractProducer { PropagationReporter propagationReporter = getPropagationTaskExecutor().execute(tasks, nullPriorityAsync); exchange.setProperty("statuses", propagationReporter.getStatuses()); - } else if (getAnyType() == AnyType.group) { + } else if (getAnyTypeKind() == AnyTypeKind.GROUP) { List<PropagationTask> tasks = new ArrayList<>(); // Generate propagation tasks for deleting users from group resources, if they are on those resources only @@ -103,7 +102,7 @@ public class DeleteProducer extends AbstractProducer { PropagationReporter propagationReporter = getPropagationTaskExecutor().execute(tasks, nullPriorityAsync); exchange.setProperty("statuses", propagationReporter.getStatuses()); - } else if (getAnyType() == AnyType.any) { + } else if (getAnyTypeKind() == AnyTypeKind.ANY_OBJECT) { List<PropagationTask> tasks = getPropagationManager().getDeleteTasks( AnyTypeKind.ANY_OBJECT, key, http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeprovisionProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeprovisionProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeprovisionProducer.java index fb54aa9..01c3223 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeprovisionProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/DeprovisionProducer.java @@ -29,7 +29,6 @@ import org.apache.syncope.core.persistence.api.dao.UserDAO; import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; public class DeprovisionProducer extends AbstractProducer { @@ -37,9 +36,9 @@ public class DeprovisionProducer extends AbstractProducer { private GroupDAO groupDAO; private AnyObjectDAO anyObjectDAO; - public DeprovisionProducer(final Endpoint endpoint, final AnyType anyType, final UserDAO userDAO, + public DeprovisionProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind, final UserDAO userDAO, final GroupDAO groupDAO, final AnyObjectDAO anyObjectDAO) { - super(endpoint, anyType); + super(endpoint, anyTypeKind); this.userDAO = userDAO; this.groupDAO = groupDAO; this.anyObjectDAO = anyObjectDAO; @@ -52,7 +51,7 @@ public class DeprovisionProducer extends AbstractProducer { List<String> resources = exchange.getProperty("resources", List.class); Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class); - if (getAnyType() == AnyType.user) { + if (getAnyTypeKind() == AnyTypeKind.USER) { PropagationByResource propByRes = new PropagationByResource(); propByRes.set(ResourceOperation.DELETE, resources); @@ -64,7 +63,7 @@ public class DeprovisionProducer extends AbstractProducer { PropagationReporter propagationReporter = getPropagationTaskExecutor().execute(tasks, nullPriorityAsync); exchange.getOut().setBody(propagationReporter.getStatuses()); - } else if (getAnyType() == AnyType.group) { + } else if (getAnyTypeKind() == AnyTypeKind.GROUP) { PropagationByResource propByRes = new PropagationByResource(); propByRes.addAll(ResourceOperation.DELETE, resources); @@ -76,7 +75,7 @@ public class DeprovisionProducer extends AbstractProducer { PropagationReporter propagationReporter = getPropagationTaskExecutor().execute(tasks, nullPriorityAsync); exchange.getOut().setBody(propagationReporter.getStatuses()); - } else if (getAnyType() == AnyType.any) { + } else if (getAnyTypeKind() == AnyTypeKind.ANY_OBJECT) { PropagationByResource propByRes = new PropagationByResource(); propByRes.addAll(ResourceOperation.DELETE, resources); http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ProvisionProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ProvisionProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ProvisionProducer.java index e50366c..0b9047a 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ProvisionProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/ProvisionProducer.java @@ -34,11 +34,10 @@ import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; public class ProvisionProducer extends AbstractProducer { - public ProvisionProducer(final Endpoint endpoint, final AnyType anyType) { + public ProvisionProducer(final Endpoint endpoint, final AnyTypeKind anyType) { super(endpoint, anyType); } @@ -49,7 +48,7 @@ public class ProvisionProducer extends AbstractProducer { List<String> resources = exchange.getProperty("resources", List.class); Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class); - if (getAnyType() == AnyType.user) { + if (getAnyTypeKind() == AnyTypeKind.USER) { Boolean changePwd = exchange.getProperty("changePwd", Boolean.class); String password = exchange.getProperty("password", String.class); @@ -85,13 +84,13 @@ public class ProvisionProducer extends AbstractProducer { PropagationByResource propByRes = new PropagationByResource(); propByRes.addAll(ResourceOperation.UPDATE, resources); - AnyTypeKind anyType = AnyTypeKind.GROUP; - if (getAnyType() == AnyType.any) { - anyType = AnyTypeKind.ANY_OBJECT; + AnyTypeKind anyTypeKind = AnyTypeKind.GROUP; + if (getAnyTypeKind() != null) { + anyTypeKind = getAnyTypeKind(); } List<PropagationTask> tasks = getPropagationManager().getUpdateTasks( - anyType, + anyTypeKind, key, false, null, http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/StatusProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/StatusProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/StatusProducer.java index 01c4bd8..921a66d 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/StatusProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/StatusProducer.java @@ -34,7 +34,6 @@ import org.apache.syncope.core.persistence.api.entity.user.User; import org.apache.syncope.core.provisioning.api.PropagationByResource; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; import org.apache.syncope.core.workflow.api.UserWorkflowAdapter; public class StatusProducer extends AbstractProducer { @@ -42,9 +41,9 @@ public class StatusProducer extends AbstractProducer { private UserDAO userDAO; private UserWorkflowAdapter uwfAdapter; - public StatusProducer(final Endpoint endpoint, final AnyType anyType, final UserDAO userDAO, + public StatusProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind, final UserDAO userDAO, final UserWorkflowAdapter uwfAdapter) { - super(endpoint, anyType); + super(endpoint, anyTypeKind); this.userDAO = userDAO; this.uwfAdapter = uwfAdapter; } @@ -52,7 +51,7 @@ public class StatusProducer extends AbstractProducer { @SuppressWarnings("unchecked") @Override public void process(final Exchange exchange) throws Exception { - if (getAnyType() == AnyType.user && isPull()) { + if (getAnyTypeKind() == AnyTypeKind.USER && isPull()) { WorkflowResult<Map.Entry<UserPatch, Boolean>> updated = (WorkflowResult<Entry<UserPatch, Boolean>>) exchange.getIn().getBody(); @@ -79,7 +78,7 @@ public class StatusProducer extends AbstractProducer { updated.getPerformedTasks().addAll(enableUpdate.getPerformedTasks()); } } - } else if (getAnyType() == AnyType.user) { + } else if (getAnyTypeKind() == AnyTypeKind.USER) { WorkflowResult<Long> updated = (WorkflowResult<Long>) exchange.getIn().getBody(); StatusPatch statusPatch = exchange.getProperty("statusPatch", StatusPatch.class); Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class); http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/SuspendProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/SuspendProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/SuspendProducer.java index d8d2708..367ceb6 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/SuspendProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/SuspendProducer.java @@ -23,20 +23,20 @@ import org.apache.camel.Exchange; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.syncope.common.lib.patch.UserPatch; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.WorkflowResult; -import org.apache.syncope.core.provisioning.camel.AnyType; public class SuspendProducer extends AbstractProducer { - public SuspendProducer(final Endpoint endpoint, final AnyType anyType) { - super(endpoint, anyType); + public SuspendProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind) { + super(endpoint, anyTypeKind); } @SuppressWarnings("unchecked") @Override public void process(final Exchange exchange) throws Exception { - if (getAnyType() == AnyType.user) { + if (getAnyTypeKind() == AnyTypeKind.USER) { Pair<WorkflowResult<String>, Boolean> updated = (Pair<WorkflowResult<String>, Boolean>) exchange.getIn().getBody(); http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/UpdateProducer.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/UpdateProducer.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/UpdateProducer.java index 2f9183b..6a73712 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/UpdateProducer.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/producer/UpdateProducer.java @@ -30,12 +30,11 @@ import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.core.persistence.api.entity.task.PropagationTask; import org.apache.syncope.core.provisioning.api.WorkflowResult; import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter; -import org.apache.syncope.core.provisioning.camel.AnyType; public class UpdateProducer extends AbstractProducer { - public UpdateProducer(final Endpoint endpoint, final AnyType anyType) { - super(endpoint, anyType); + public UpdateProducer(final Endpoint endpoint, final AnyTypeKind anyTypeKind) { + super(endpoint, anyTypeKind); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/resources/anyObjectRoutes.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/anyObjectRoutes.xml b/ext/camel/provisioning-camel/src/main/resources/anyObjectRoutes.xml index 15c457c..872b09b 100644 --- a/ext/camel/provisioning-camel/src/main/resources/anyObjectRoutes.xml +++ b/ext/camel/provisioning-camel/src/main/resources/anyObjectRoutes.xml @@ -26,7 +26,7 @@ under the License. </setProperty> <doTry> <bean ref="awfAdapter" method="create(${body})"/> - <to uri="propagate:create?anyType=any"/> + <to uri="propagate:create?anyTypeKind=ANY_OBJECT"/> <to uri="direct:createAnyObjectPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -45,7 +45,7 @@ under the License. </setProperty> <doTry> <bean ref="awfAdapter" method="update(${body})"/> - <to uri="propagate:update?anyType=any"/> + <to uri="propagate:update?anyTypeKind=ANY_OBJECT"/> <to uri="direct:updateAnyObjectPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -60,7 +60,7 @@ under the License. <route id="deleteAnyObject"> <from uri="direct:deleteAnyObject"/> <doTry> - <to uri="propagate:delete?anyType=any"/> + <to uri="propagate:delete?anyTypeKind=ANY_OBJECT"/> <bean ref="awfAdapter" method="delete(${body})"/> <setBody> <simple>${property.statuses}</simple> @@ -114,13 +114,13 @@ under the License. <route id="provisionAnyObject"> <from uri="direct:provisionAnyObject"/> - <to uri="propagate:provision?anyType=any"/> + <to uri="propagate:provision?anyTypeKind=ANY_OBJECT"/> <to uri="direct:provisionAnyObjectPort"/> </route> <route id="deprovisionAnyObject"> <from uri="direct:deprovisionAnyObject"/> - <to uri="propagate:deprovision?anyType=any"/> + <to uri="propagate:deprovision?anyTypeKind=ANY_OBJECT"/> <to uri="direct:deprovisionAnyObjectPort"/> </route> http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml b/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml index 9c92f25..c595330 100644 --- a/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml +++ b/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml @@ -26,7 +26,7 @@ under the License. </setProperty> <doTry> <bean ref="gwfAdapter" method="create(${body})"/> - <to uri="propagate:create?anyType=group"/> + <to uri="propagate:create?anyTypeKind=GROUP"/> <to uri="direct:createGroupPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -45,7 +45,7 @@ under the License. </setProperty> <doTry> <bean ref="gwfAdapter" method="create(${body})"/> - <to uri="propagate:create?anyType=group&pull=true"/> + <to uri="propagate:create?anyTypeKind=GROUP&pull=true"/> <to uri="direct:createGroupInPullPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -64,7 +64,7 @@ under the License. </setProperty> <doTry> <bean ref="gwfAdapter" method="update(${body})"/> - <to uri="propagate:update?anyType=group"/> + <to uri="propagate:update?anyTypeKind=GROUP"/> <to uri="direct:updateGroupPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -79,7 +79,7 @@ under the License. <route id="deleteGroup"> <from uri="direct:deleteGroup"/> <doTry> - <to uri="propagate:delete?anyType=group"/> + <to uri="propagate:delete?anyTypeKind=GROUP"/> <bean ref="gwfAdapter" method="delete(${body})"/> <setBody> <simple>${property.statuses}</simple> @@ -133,13 +133,13 @@ under the License. <route id="provisionGroup"> <from uri="direct:provisionGroup"/> - <to uri="propagate:provision?anyType=group"/> + <to uri="propagate:provision?anyTypeKind=GROUP"/> <to uri="direct:provisionGroupPort"/> </route> <route id="deprovisionGroup"> <from uri="direct:deprovisionGroup"/> - <to uri="propagate:deprovision?anyType=group"/> + <to uri="propagate:deprovision?anyTypeKind=GROUP"/> <to uri="direct:deprovisionGroupPort"/> </route> http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml b/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml index 5d68d2a..05f581c 100644 --- a/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml +++ b/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml @@ -27,7 +27,7 @@ under the License. <doTry> <bean method="create(${body},${property.disablePwdPolicyCheck},${property.enabled},${property.storePassword})" ref="uwfAdapter" /> - <to uri="propagate:create?anyType=user"/> + <to uri="propagate:create?anyTypeKind=USER"/> <to uri="direct:createPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -46,7 +46,7 @@ under the License. </setProperty> <doTry> <bean ref="uwfAdapter" method="update(${body})"/> - <to uri="propagate:update?anyType=user"/> + <to uri="propagate:update?anyTypeKind=USER"/> <to uri="direct:updatePort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -75,15 +75,15 @@ under the License. <route id="userInPull"> <from uri="direct:userInPull"/> - <to uri="propagate:status?anyType=user&pull=true"/> - <to uri="propagate:update?anyType=user&pull=true"/> + <to uri="propagate:status?anyTypeKind=USER&pull=true"/> + <to uri="propagate:update?anyTypeKind=USER&pull=true"/> <to uri="direct:updateInPullPort"/> </route> <route id="deleteUser"> <from uri="direct:deleteUser"/> <doTry> - <to uri="propagate:delete?anyType=user"/> + <to uri="propagate:delete?anyTypeKind=USER"/> <bean ref="uwfAdapter" method="delete(${body})"/> <setBody> <simple>${property.statuses}</simple> @@ -182,19 +182,19 @@ under the License. <route id="userStatusPropagation"> <from uri="direct:userStatusPropagation"/> - <to uri="propagate:status?anyType=user"/> + <to uri="propagate:status?anyTypeKind=USER"/> <to uri="direct:statusPort"/> </route> <route id="provisionUser"> <from uri="direct:provisionUser"/> - <to uri="propagate:provision?anyType=user"/> + <to uri="propagate:provision?anyTypeKind=USER"/> <to uri="direct:provisionPort"/> </route> <route id="deprovisionUser"> <from uri="direct:deprovisionUser"/> - <to uri="propagate:deprovision?anyType=user"/> + <to uri="propagate:deprovision?anyTypeKind=USER"/> <to uri="direct:deprovisionPort"/> </route> @@ -202,7 +202,7 @@ under the License. <from uri="direct:internalSuspendUser"/> <doTry> <bean ref="uwfAdapter" method="internalSuspend(${body})"/> - <to uri="propagate:suspend?anyType=user"/> + <to uri="propagate:suspend?anyTypeKind=USER"/> <to uri="direct:internalSuspendUserPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> @@ -233,7 +233,7 @@ under the License. <from uri="direct:confirmPwdReset"/> <doTry> <bean ref="uwfAdapter" method="confirmPasswordReset(${property.key},${property.token},${property.password})"/> - <to uri="propagate:confirmPasswordReset?anyType=user"/> + <to uri="propagate:confirmPasswordReset?anyTypeKind=USER"/> <to uri="direct:confirmPwdResetPort"/> <doCatch> <exception>java.lang.RuntimeException</exception> http://git-wip-us.apache.org/repos/asf/syncope/blob/575f02b4/fit/core-reference/src/test/java/org/apache/syncope/fit/core/CamelRouteITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/CamelRouteITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/CamelRouteITCase.java index d545d2f..1f1ec32 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/CamelRouteITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/CamelRouteITCase.java @@ -87,7 +87,7 @@ public class CamelRouteITCase extends AbstractITCase { + " <doTry>\n" + " <bean ref=\"uwfAdapter\" method=\"create(${body},${property.disablePwdPolicyCheck},\n" + " ${property.enabled},${property.storePassword})\"/>\n" - + " <to uri=\"propagate:create?anyType=user\"/>\n" + + " <to uri=\"propagate:create?anyTypeKind=USER\"/>\n" + " <to uri=\"direct:createPort\"/>\n" + " <to uri=\"log:myLog\"/>\n" + " <doCatch> \n" @@ -129,7 +129,7 @@ public class CamelRouteITCase extends AbstractITCase { + " <doTry>\n" + " <bean ref=\"uwfAdapter\" method=\"create(${body},${property.disablePwdPolicyCheck},\n" + " ${property.enabled},${property.storePassword})\"/>\n" - + " <to uri=\"propagate:create?anyType=user\"/>\n" + + " <to uri=\"propagate:create?anyTypeKind=USER\"/>\n" + " <to uri=\"direct:createPort\"/>\n" + " <doCatch> \n" + " <exception>java.lang.RuntimeException</exception>\n"