executorRef -> performerRef

Evolveum · Apr 6, 2017 · 1a6ca5a · 1a6ca5a
1 parent ae63a67
commit 1a6ca5a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
@@ -268,7 +268,7 @@ public static List<ObjectReferenceType> getReviewedBy(List<AccessCertificationWo
             if (hasNoResponse(workItem)) {
                 continue;
             }
-            rv.add(workItem.getExecutorRef());
+            rv.add(workItem.getPerformerRef());
         }
         return rv;
     }

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd
@@ -170,7 +170,7 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="executorRef" type="tns:ObjectReferenceType" minOccurs="0">
+            <xsd:element name="performerRef" type="tns:ObjectReferenceType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         User who actually executed (completed) this work item.

diff --git a/...l/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java b/...l/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
@@ -100,7 +100,7 @@ void recordDecision(String campaignOid, long caseId, long workItemId,
 				.item(workItemPath.subPath(AccessCertificationWorkItemType.F_OUTCOME)).replace(OutcomeUtils.toUri(response))
 				.item(workItemPath.subPath(AccessCertificationWorkItemType.F_COMMENT)).replace(comment)
 				.item(workItemPath.subPath(AccessCertificationWorkItemType.F_TIMESTAMP)).replace(now)
-				.item(workItemPath.subPath(AccessCertificationWorkItemType.F_EXECUTOR_REF)).replace(responderRef)
+				.item(workItemPath.subPath(AccessCertificationWorkItemType.F_PERFORMER_REF)).replace(responderRef)
 				.asItemDeltas();
 
 		ItemDelta.applyTo(deltaList, campaign.asPrismContainerValue());

diff --git a/...kflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java b/...kflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
@@ -456,7 +456,7 @@ public WorkItemType taskExtractToWorkItem(TaskExtract task, boolean resolveTask,
 			wi.setResult(pmi.extractWorkItemResult(variables));
 			String completedBy = ActivitiUtil.getVariable(variables, CommonProcessVariableNames.VARIABLE_WORK_ITEM_COMPLETED_BY, String.class, prismContext);
 			if (completedBy != null) {
-				wi.setExecutorRef(ObjectTypeUtil.createObjectRef(completedBy, ObjectTypes.USER));
+				wi.setPerformerRef(ObjectTypeUtil.createObjectRef(completedBy, ObjectTypes.USER));
 			}
 
 			wi.setStageNumber(pmi.getStageNumber(variables));

diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
@@ -341,7 +341,7 @@ public void onTaskEvent(WorkItemType workItem, TaskEvent taskEvent, OperationRes
 				throw new SystemException("Couldn't determine current user: " + e.getMessage(), e);
 			}
 
-			ObjectReferenceType userRef = user != null ? user.toObjectReference() : workItem.getExecutorRef();	// partial fallback
+			ObjectReferenceType userRef = user != null ? user.toObjectReference() : workItem.getPerformerRef();	// partial fallback
 
 			if (!genuinelyCompleted) {
 				TaskType task = wfTask.getTask().getTaskPrismObject().asObjectable();

diff --git a/...va/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationWorkItem.java b/...va/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationWorkItem.java
@@ -18,7 +18,6 @@
 
 import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference;
-import com.evolveum.midpoint.repo.sql.data.common.enums.RAccessCertificationResponse;
 import com.evolveum.midpoint.repo.sql.data.common.id.RCertWorkItemId;
 import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
 import com.evolveum.midpoint.repo.sql.query.definition.JaxbType;
@@ -69,7 +68,7 @@ public class RAccessCertificationWorkItem implements L2Container<RAccessCertific
 
     private Integer stageNumber;
     private Set<RCertWorkItemReference> assigneeRef = new HashSet<>();
-    private REmbeddedReference executorRef;
+    private REmbeddedReference performerRef;
     private String outcome;
     private XMLGregorianCalendar timestamp;
     private XMLGregorianCalendar closedTimestamp;
@@ -150,12 +149,12 @@ public void setAssigneeRef(Set<RCertWorkItemReference> assigneeRef) {
     }
 
     @Column
-	public REmbeddedReference getExecutorRef() {
-		return executorRef;
+	public REmbeddedReference getPerformerRef() {
+		return performerRef;
 	}
 
-	public void setExecutorRef(REmbeddedReference executorRef) {
-		this.executorRef = executorRef;
+	public void setPerformerRef(REmbeddedReference performerRef) {
+		this.performerRef = performerRef;
 	}
 
 	@Column
@@ -197,7 +196,7 @@ public boolean equals(Object o) {
 				Objects.equals(id, that.id) &&
 				Objects.equals(stageNumber, that.stageNumber) &&
 				Objects.equals(assigneeRef, that.assigneeRef) &&
-				Objects.equals(executorRef, that.executorRef) &&
+				Objects.equals(performerRef, that.performerRef) &&
 				outcome == that.outcome &&
 				Objects.equals(timestamp, that.timestamp) &&
 				Objects.equals(closedTimestamp, that.closedTimestamp);
@@ -206,7 +205,7 @@ public boolean equals(Object o) {
 	@Override
 	public int hashCode() {
 		return Objects
-				.hash(ownerOwnerOid, ownerId, id, stageNumber, assigneeRef, executorRef, outcome, timestamp, closedTimestamp);
+				.hash(ownerOwnerOid, ownerId, id, stageNumber, assigneeRef, performerRef, outcome, timestamp, closedTimestamp);
 	}
 
 	@Transient
@@ -245,7 +244,7 @@ private static void toRepo(RAccessCertificationWorkItem rWorkItem,
 		rWorkItem.setStageNumber(workItem.getStageNumber());
         rWorkItem.getAssigneeRef().addAll(RCertWorkItemReference.safeListReferenceToSet(
                 workItem.getAssigneeRef(), context.prismContext, rWorkItem));
-        rWorkItem.setExecutorRef(RUtil.jaxbRefToEmbeddedRepoRef(workItem.getExecutorRef(), context.prismContext));
+        rWorkItem.setPerformerRef(RUtil.jaxbRefToEmbeddedRepoRef(workItem.getPerformerRef(), context.prismContext));
         rWorkItem.setOutcome(workItem.getOutcome());
         rWorkItem.setTimestamp(workItem.getTimestamp());
         rWorkItem.setClosedTimestamp(workItem.getClosedTimestamp());