You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/08/21 10:22:46 UTC
[syncope] branch 2_1_X updated (8d41424 -> 75d2064)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 8d41424 Upgrading Mockito
new e12e3bf Upgrading Elasticsearch, Mockito and Swagger UI
new 75d2064 [SYNCOPE-1575] For suspend / reactivate, pass PropagationByResource instance from workflow execution back to ProvisioningManager
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../flowable/impl/FlowableUserWorkflowAdapter.java | 28 ++++++++++++++++++++--
pom.xml | 6 ++---
2 files changed, 29 insertions(+), 5 deletions(-)
[syncope] 02/02: [SYNCOPE-1575] For suspend / reactivate,
pass PropagationByResource instance from workflow execution back to
ProvisioningManager
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 75d206485b57795d9dbf08f82a5523a9b70a4ac0
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Aug 21 12:02:58 2020 +0200
[SYNCOPE-1575] For suspend / reactivate, pass PropagationByResource instance from workflow execution back to ProvisioningManager
---
.../flowable/impl/FlowableUserWorkflowAdapter.java | 28 ++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
index ec1bb4d..fa8dd58 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
@@ -307,11 +307,23 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter imp
FlowableRuntimeUtils.updateStatus(engine, procInstID, user);
User updated = userDAO.save(user);
+ @SuppressWarnings("unchecked")
+ PropagationByResource<String> propByRes = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+
+ @SuppressWarnings("unchecked")
+ PropagationByResource<Pair<String, String>> propByLinkedAccount = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
+
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.TASK);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.USER);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.WF_EXECUTOR);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
- return new UserWorkflowResult<>(updated.getKey(), null, null, performedTasks);
+ return new UserWorkflowResult<>(updated.getKey(), propByRes, propByLinkedAccount, performedTasks);
}
@Override
@@ -324,11 +336,23 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter imp
User updated = userDAO.save(user);
+ @SuppressWarnings("unchecked")
+ PropagationByResource<String> propByRes = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+
+ @SuppressWarnings("unchecked")
+ PropagationByResource<Pair<String, String>> propByLinkedAccount = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
+
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.TASK);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.USER);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.WF_EXECUTOR);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
- return new UserWorkflowResult<>(updated.getKey(), null, null, performedTasks);
+ return new UserWorkflowResult<>(updated.getKey(), propByRes, propByLinkedAccount, performedTasks);
}
@Override
[syncope] 01/02: Upgrading Elasticsearch, Mockito and Swagger UI
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit e12e3bf96d0d93d7dd9040ad82cb89bc63605c5d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Aug 19 17:54:17 2020 +0200
Upgrading Elasticsearch, Mockito and Swagger UI
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a13c60a..f848cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@ under the License.
<slf4j.version>1.7.30</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>6.8.11</elasticsearch.version>
+ <elasticsearch.version>6.8.12</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
@@ -450,7 +450,7 @@ under the License.
<h2.version>1.4.200</h2.version>
<junit.version>5.6.2</junit.version>
- <mockito.version>3.5.0</mockito.version>
+ <mockito.version>3.5.2</mockito.version>
<conf.directory>${project.build.directory}/test-classes</conf.directory>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
@@ -458,7 +458,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<swagger-core.version>2.0.10</swagger-core.version>
- <swagger-ui.version>3.31.1</swagger-ui.version>
+ <swagger-ui.version>3.32.1</swagger-ui.version>
<guava.version>29.0-jre</guava.version>
<jquery.version>3.4.1</jquery.version>