[SYNCOPE-1374] Ensuring Spring can correctly inject the actual Domain

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

Branch: refs/heads/2_1_X
Commit: 50e4b14c316ca416edfa3e26954bc539a966c03b
Parents: 196d3d2
Author: Francesco Chicchiriccò <[email protected]>
Authored: Thu Sep 20 10:20:53 2018 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Thu Sep 20 10:23:33 2018 +0200

----------------------------------------------------------------------
 .../propagation/PropagationTaskCallable.java    |  2 --
 .../propagation/PropagationTaskExecutor.java    |  9 +++++++
 .../AbstractPropagationTaskExecutor.java        | 13 +++++-----
 .../DefaultPropagationTaskCallable.java         | 16 ++++--------
 .../PriorityPropagationTaskExecutor.java        |  1 -
 .../syncope/fit/core/MultitenancyITCase.java    | 26 ++++++++++++++++++--
 6 files changed, 45 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskCallable.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskCallable.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskCallable.java
index d1e9c10..9c4f107 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskCallable.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskCallable.java
@@ -24,8 +24,6 @@ import 
org.apache.syncope.core.persistence.api.entity.task.TaskExec;
 
 public interface PropagationTaskCallable extends Callable<TaskExec> {
 
-    void setExecutor(PropagationTaskExecutor executor);
-
     void setTaskTO(PropagationTaskTO taskTO);
 
     void setReporter(PropagationReporter reporter);

http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
index af3bfc3..e331aa7 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
@@ -50,6 +50,15 @@ public interface PropagationTaskExecutor {
     TaskExec execute(PropagationTaskTO task);
 
     /**
+     * Execute the given PropagationTask and returns the generated {@link 
TaskExec}.
+     *
+     * @param task to be executed
+     * @param reporter to report propagation execution status
+     * @return the generated TaskExec
+     */
+    TaskExec execute(PropagationTaskTO task, PropagationReporter reporter);
+
+    /**
      * Execute a collection of PropagationTask objects.
      * The process is interrupted as soon as the result of the communication 
with a resource with non-null priority is
      * in error.

http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 6a9e4c3..805b772 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -164,11 +164,6 @@ public abstract class AbstractPropagationTaskExecutor 
implements PropagationTask
     @Autowired
     protected VirAttrCache virAttrCache;
 
-    @Override
-    public TaskExec execute(final PropagationTaskTO task) {
-        return execute(task, null);
-    }
-
     protected List<PropagationActions> getPropagationActions(final 
ExternalResource resource) {
         List<PropagationActions> result = new ArrayList<>();
 
@@ -350,7 +345,13 @@ public abstract class AbstractPropagationTaskExecutor 
implements PropagationTask
         return result;
     }
 
-    protected TaskExec execute(final PropagationTaskTO taskTO, final 
PropagationReporter reporter) {
+    @Override
+    public TaskExec execute(final PropagationTaskTO task) {
+        return execute(task, null);
+    }
+
+    @Override
+    public TaskExec execute(final PropagationTaskTO taskTO, final 
PropagationReporter reporter) {
         PropagationTask task;
         if (taskTO.getKey() == null) {
             task = entityFactory.newEntity(PropagationTask.class);

http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationTaskCallable.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationTaskCallable.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationTaskCallable.java
index e714a5f..9967549 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationTaskCallable.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationTaskCallable.java
@@ -28,6 +28,7 @@ import 
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskCalla
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import 
org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
@@ -40,14 +41,15 @@ public class DefaultPropagationTaskCallable implements 
PropagationTaskCallable {
 
     protected static final Logger LOG = 
LoggerFactory.getLogger(PropagationTaskCallable.class);
 
+    @Autowired
+    protected PropagationTaskExecutor taskExecutor;
+
     protected final String domain;
 
     protected final String username;
 
     protected final Collection<? extends GrantedAuthority> authorities;
 
-    protected AbstractPropagationTaskExecutor executor;
-
     protected PropagationTaskTO taskTO;
 
     protected PropagationReporter reporter;
@@ -60,13 +62,6 @@ public class DefaultPropagationTaskCallable implements 
PropagationTaskCallable {
     }
 
     @Override
-    public void setExecutor(final PropagationTaskExecutor executor) {
-        if (executor instanceof AbstractPropagationTaskExecutor) {
-            this.executor = (AbstractPropagationTaskExecutor) executor;
-        }
-    }
-
-    @Override
     public void setTaskTO(final PropagationTaskTO taskTO) {
         this.taskTO = taskTO;
     }
@@ -86,11 +81,10 @@ public class DefaultPropagationTaskCallable implements 
PropagationTaskCallable {
 
         LOG.debug("Execution started for {}", taskTO);
 
-        TaskExec execution = executor.execute(taskTO, reporter);
+        TaskExec execution = taskExecutor.execute(taskTO, reporter);
 
         LOG.debug("Execution completed for {}, {}", taskTO, execution);
 
         return execution;
     }
-
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
index adaa8f7..77581a9 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
@@ -71,7 +71,6 @@ public class PriorityPropagationTaskExecutor extends 
AbstractPropagationTaskExec
 
         PropagationTaskCallable callable = (PropagationTaskCallable) 
ApplicationContextProvider.getBeanFactory().
                 createBean(DefaultPropagationTaskCallable.class, 
AbstractBeanDefinition.AUTOWIRE_BY_TYPE, false);
-        callable.setExecutor(this);
         callable.setTaskTO(taskTO);
         callable.setReporter(reporter);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/50e4b14c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java
index 6480700..d257264 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java
@@ -42,20 +42,24 @@ import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.syncope.common.lib.to.PullTaskTO;
 import org.apache.syncope.common.lib.to.ExecTO;
+import org.apache.syncope.common.lib.to.PushTaskTO;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.LoggerType;
 import org.apache.syncope.common.lib.types.MappingPurpose;
 import org.apache.syncope.common.lib.types.ExecStatus;
-import org.apache.syncope.common.lib.types.SchemaType;
+import org.apache.syncope.common.lib.types.MatchingRule;
 import org.apache.syncope.common.lib.types.PullMode;
+import org.apache.syncope.common.lib.types.SchemaType;
 import org.apache.syncope.common.lib.types.TaskType;
 import org.apache.syncope.common.rest.api.beans.AnyQuery;
 import org.apache.syncope.common.rest.api.beans.SchemaQuery;
+import org.apache.syncope.common.rest.api.beans.TaskQuery;
 import org.apache.syncope.common.rest.api.service.ConnectorService;
 import org.apache.syncope.common.rest.api.service.DomainService;
 import org.apache.syncope.common.rest.api.service.LoggerService;
 import org.apache.syncope.common.rest.api.service.RealmService;
+import org.apache.syncope.common.rest.api.service.ReconciliationService;
 import org.apache.syncope.common.rest.api.service.ResourceService;
 import org.apache.syncope.common.rest.api.service.SchemaService;
 import org.apache.syncope.common.rest.api.service.TaskService;
@@ -101,7 +105,8 @@ public class MultitenancyITCase extends AbstractITCase {
 
     @Test
     public void readPlainSchemas() {
-        assertEquals(13, 
adminClient.getService(SchemaService.class).search(new 
SchemaQuery.Builder().type(SchemaType.PLAIN).build()).size());
+        assertEquals(13, 
adminClient.getService(SchemaService.class).search(new 
SchemaQuery.Builder().type(
+                SchemaType.PLAIN).build()).size());
     }
 
     @Test
@@ -215,6 +220,23 @@ public class MultitenancyITCase extends AbstractITCase {
                     build());
             assertNotNull(matchingUsers);
             assertEquals(1, matchingUsers.getResult().size());
+
+            // SYNCOPE-1374
+            String pullFromLDAPKey = matchingUsers.getResult().get(0).getKey();
+
+            assertEquals(0, adminClient.getService(TaskService.class).
+                    search(new TaskQuery.Builder(TaskType.PROPAGATION).
+                            
anyTypeKind(AnyTypeKind.USER).entityKey(pullFromLDAPKey).build()).getSize());
+
+            PushTaskTO pushTask = new PushTaskTO();
+            pushTask.setPerformUpdate(true);
+            pushTask.setMatchingRule(MatchingRule.UPDATE);
+            adminClient.getService(ReconciliationService.class).
+                    push(AnyTypeKind.USER, pullFromLDAPKey, resource.getKey(), 
pushTask);
+
+            assertEquals(1, adminClient.getService(TaskService.class).
+                    search(new TaskQuery.Builder(TaskType.PROPAGATION).
+                            
anyTypeKind(AnyTypeKind.USER).entityKey(pullFromLDAPKey).build()).getSize());
         } finally {
             
adminClient.getService(ResourceService.class).delete(resource.getKey());
         }

Reply via email to