syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [5/8] syncope git commit: White noise
Date Mon, 08 May 2017 11:40:20 GMT
White noise


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9e09aa12
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9e09aa12
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9e09aa12

Branch: refs/heads/master
Commit: 9e09aa1288e78b68cd48c60f26af93d7c427b136
Parents: 2e7e2ce
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue May 2 17:37:55 2017 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon May 8 13:32:48 2017 +0200

----------------------------------------------------------------------
 .../core/provisioning/camel/component/PropagateComponent.java | 1 +
 .../core/provisioning/camel/producer/CreateProducer.java      | 7 +------
 .../core/provisioning/camel/producer/UpdateProducer.java      | 7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/9e09aa12/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateComponent.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateComponent.java
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateComponent.java
index b8a118a..f443c1d 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateComponent.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/component/PropagateComponent.java
@@ -58,6 +58,7 @@ public class PropagateComponent extends UriEndpointComponent {
         super(PropagateEndpoint.class);
     }
 
+    @Override
     protected Endpoint createEndpoint(final String uri, final String remaining,
             final Map<String, Object> parameters) throws Exception {
         PropagateType type = PropagateType.valueOf(remaining);

http://git-wip-us.apache.org/repos/asf/syncope/blob/9e09aa12/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 54ff11b..8193e3e 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
@@ -70,11 +70,6 @@ public class CreateProducer extends AbstractProducer {
             } else if (actual instanceof AnyTO) {
                 WorkflowResult<String> created = (WorkflowResult<String>) exchange.getIn().getBody();
 
-                AnyTypeKind anyTypeKind = AnyTypeKind.GROUP;
-                if (actual instanceof AnyObjectTO) {
-                    anyTypeKind = AnyTypeKind.ANY_OBJECT;
-                }
-
                 if (actual instanceof GroupTO && isPull()) {
                     Map<String, String> groupOwnerMap = exchange.getProperty("groupOwnerMap",
Map.class);
                     AttrTO groupOwner = ((GroupTO) actual).getPlainAttrMap().get(StringUtils.EMPTY);
@@ -93,7 +88,7 @@ public class CreateProducer extends AbstractProducer {
                     exchange.getOut().setBody(new ImmutablePair<>(created.getResult(),
null));
                 } else {
                     List<PropagationTask> tasks = getPropagationManager().getCreateTasks(
-                            anyTypeKind,
+                            actual instanceof AnyObjectTO ? AnyTypeKind.ANY_OBJECT : AnyTypeKind.GROUP,
                             created.getResult(),
                             created.getPropByRes(),
                             ((AnyTO) actual).getVirAttrs(),

http://git-wip-us.apache.org/repos/asf/syncope/blob/9e09aa12/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 7c3761e..68fbd0e 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
@@ -66,13 +66,8 @@ public class UpdateProducer extends AbstractProducer {
             } else if (actual instanceof AnyPatch) {
                 WorkflowResult<String> updated = (WorkflowResult<String>) exchange.getIn().getBody();
 
-                AnyTypeKind anyTypeKind = AnyTypeKind.GROUP;
-                if (actual instanceof AnyObjectPatch) {
-                    anyTypeKind = AnyTypeKind.ANY_OBJECT;
-                }
-
                 List<PropagationTask> tasks = getPropagationManager().getUpdateTasks(
-                        anyTypeKind,
+                        actual instanceof AnyObjectPatch ? AnyTypeKind.ANY_OBJECT : AnyTypeKind.GROUP,
                         updated.getResult(),
                         false,
                         null,


Mime
View raw message