Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ProcessInstanceInfo set start date when constructed #1705

Merged
merged 7 commits into from
Aug 4, 2020
Merged

ProcessInstanceInfo set start date when constructed #1705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5971786
ProcessInstanceInfo set start date when constructed
hmatt1 Jul 22, 2020
2d6d719
twoProcessInstanceInfoSameStartDateTest
hmatt1 Jul 28, 2020
fcd6655
Using this.startDate consistently
hmatt1 Jul 28, 2020
fdcc0d9
Revert "Using this.startDate consistently"
hmatt1 Jul 31, 2020
e100dbb
Revert "twoProcessInstanceInfoSameStartDateTest"
hmatt1 Jul 31, 2020
b12f888
Revert "ProcessInstanceInfo set start date when constructed"
hmatt1 Jul 31, 2020
dccf21b
Set startDate in WorkflowProcessInstanceImpl
hmatt1 Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...rsistence-jpa/src/main/java/org/jbpm/persistence/processinstance/ProcessInstanceInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.jbpm.marshalling.impl.ProtobufRuleFlowProcessInstanceMarshaller;
import org.jbpm.persistence.api.PersistentProcessInstance;
import org.jbpm.process.instance.impl.ProcessInstanceImpl;
import org.jbpm.workflow.instance.WorkflowProcessInstance;
import org.jbpm.workflow.instance.impl.WorkflowProcessInstanceImpl;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.process.ProcessInstance;
Expand Down Expand Up @@ -103,6 +104,16 @@ public ProcessInstanceInfo(ProcessInstance processInstance) {
this.processInstance = processInstance;
this.processId = processInstance.getProcessId();
startDate = new Date();

// If we are creating a second Process Instance Info for the same process instance,
// it should not generate a new start date
if (this.processInstance != null) {
if (((WorkflowProcessInstanceImpl) this.processInstance).getStartDate() == null) {
((WorkflowProcessInstanceImpl) processInstance).internalSetStartDate(this.startDate);
} else {
startDate = ((WorkflowProcessInstanceImpl) this.processInstance).getStartDate();
}
}
}

public ProcessInstanceInfo(ProcessInstance processInstance,
Expand Down
7 changes: 5 additions & 2 deletions .../jbpm-persistence-jpa/src/test/java/org/jbpm/persistence/map/impl/MapPersistenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,18 @@ public void processWithNotNullStartDateTest() {
KieBase kbase = createKieBase(process);
StatefulKnowledgeSession crmPersistentSession = createSession(kbase);

RuleFlowProcessInstance processInstance = (RuleFlowProcessInstance) crmPersistentSession.startProcess( processId );
RuleFlowProcessInstance processInstance = (RuleFlowProcessInstance) crmPersistentSession.startProcess( processId );

// Ensure the Process Instance Start Date is set immediately when the processInstanceInfo is created
Assert.assertNotNull(processInstance.getStartDate());

InternalKnowledgeRuntime kruntime = processInstance.getKnowledgeRuntime();
Assert.assertEquals( ProcessInstance.STATE_ACTIVE,
processInstance.getState() );

ProcessInstanceInfo processInstanceInfo = new ProcessInstanceInfo(processInstance);
processInstance = (RuleFlowProcessInstance) processInstanceInfo.getProcessInstance(kruntime, crmPersistentSession.getEnvironment());

Assert.assertNotNull(processInstance.getStartDate());
Assert.assertEquals(processInstance.getStartDate(), processInstanceInfo.getStartDate());
}

Expand Down