Skip to content

Commit

Permalink
Change work item name to PolyStringType (MID-5916)
Browse files Browse the repository at this point in the history 
Work item name was changed from xsd:string to t:PolyStringType in
schema and workflow-impl code. The GUI still has to be updated.

(cherry picked from commit 0754799)
  • Loading branch information
@mederly
mederly committed Feb 11, 2020
1 parent 7ab0750 commit a8bb141
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 13 deletions.
3 changes: 2 additions & 1 deletion ...ain/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemListWithDetailsPanel.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.evolveum.midpoint.gui.impl.session.ObjectTabStorage;
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.*;
Expand Down Expand Up @@ -261,7 +262,7 @@ private List<IColumn<PrismContainerValueWrapper<CaseWorkItemType>, String>> getW

@Override
protected IModel<String> createLinkModel(IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel) {
return Model.of(unwrapRowModel(rowModel).getName());
return Model.of(PolyString.getOrig(unwrapRowModel(rowModel).getName())); // todo MID-5916
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
View file
Expand Up @@ -14,6 +14,7 @@
import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
import com.evolveum.midpoint.prism.PrismConstants;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.GetOperationOptions;
Expand Down Expand Up @@ -158,7 +159,7 @@ protected DisplayType getIconDisplayType(IModel<PrismContainerValueWrapper<CaseW

@Override
protected IModel<String> createLinkModel(IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel) {
return Model.of(ColumnUtils.unwrapRowModel(rowModel).getName());
return Model.of(PolyString.getOrig(ColumnUtils.unwrapRowModel(rowModel).getName())); // todo MID-5916
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDto.java
View file
Expand Up @@ -8,6 +8,7 @@
package com.evolveum.midpoint.web.page.admin.cases.dto;

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.schema.util.CaseWorkItemUtil;
import com.evolveum.midpoint.schema.util.WorkItemTypeUtil;
import com.evolveum.midpoint.web.component.util.Selectable;
Expand Down Expand Up @@ -132,7 +133,7 @@ public String getOriginalAssignee() {
}

public String getName() {
return workItem.getName();
return PolyString.getOrig(workItem.getName()); // todo MID-5916
}

public AbstractWorkItemOutputType getOutput() {
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/com/evolveum/midpoint/web/page/admin/workflow/CaseWorkItemSummaryPanel.java
View file
Expand Up @@ -11,6 +11,7 @@
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.CaseTypeUtil;
import com.evolveum.midpoint.schema.util.CaseWorkItemUtil;
Expand Down Expand Up @@ -72,7 +73,7 @@ protected IModel<String> getDisplayNameModel() {
CaseType caseType = CaseTypeUtil.getCase(caseWorkItemType);
return defaultIfNull(
WfGuiUtil.getLocalizedProcessName(caseType != null ? caseType.getApprovalContext() : null, CaseWorkItemSummaryPanel.this),
caseWorkItemType != null ? caseWorkItemType.getName() : "");
caseWorkItemType != null ? PolyString.getOrig(caseWorkItemType.getName()) : ""); // todo MID-5916
});
}

Expand Down
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
View file
Expand Up @@ -148,7 +148,7 @@ public WorkItemId getWorkItemId() {
}

public String getName() {
return workItem.getName();
return PolyString.getOrig(workItem.getName()); // todo MID-5916
}

public String getCreatedFormatted() {
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd
View file
Expand Up @@ -224,7 +224,7 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name" type="xsd:string" minOccurs="0">
<xsd:element name="name" type="t:PolyStringType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Descriptive name of the work item. E.g. "Assign role1 to user1".
Expand Down
3 changes: 2 additions & 1 deletion ...tions-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
View file
Expand Up @@ -8,6 +8,7 @@
package com.evolveum.midpoint.notifications.api.events;

import com.evolveum.midpoint.prism.delta.ChangeType;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.schema.constants.ExpressionConstants;
import com.evolveum.midpoint.schema.expression.VariablesMap;
import com.evolveum.midpoint.schema.result.OperationResult;
Expand Down Expand Up @@ -58,7 +59,7 @@ public class WorkItemEvent extends WorkflowEvent {
}

public String getWorkItemName() {
return workItem.getName();
return PolyString.getOrig(workItem.getName()); // todo MID-5916
}

@NotNull
Expand Down
7 changes: 6 additions & 1 deletion ...flow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/EngineInvocationContext.java
View file
Expand Up @@ -34,6 +34,7 @@
import com.evolveum.midpoint.wf.impl.engine.helpers.DelayedNotification;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
Expand Down Expand Up @@ -127,10 +128,14 @@ public CaseWorkItemType findWorkItemById(long id) {
}
}

public String getProcessInstanceName() {
public String getProcessInstanceNameOrig() {
return currentCase.getName().getOrig();
}

public PolyStringType getProcessInstanceName() {
return currentCase.getName();
}

public void addAuditRecord(AuditEventRecord record) {
pendingAuditRecords.add(record);
}
Expand Down
2 changes: 1 addition & 1 deletion ...low-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/actions/CloseStageAction.java
View file
Expand Up @@ -104,7 +104,7 @@ public Action execute(OperationResult parentResult) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"Closing the stage for approval process instance {} (case oid {}), stage {}: result of this stage: {}",
ctx.getProcessInstanceName(),
ctx.getProcessInstanceNameOrig(),
ctx.getCaseOid(), ApprovalContextUtil.getStageDiagName(stageDef), approved);
}

Expand Down
2 changes: 1 addition & 1 deletion ...l/src/main/java/com/evolveum/midpoint/wf/impl/engine/actions/CompleteWorkItemsAction.java
View file
Expand Up @@ -85,7 +85,7 @@ public Action execute(OperationResult parentResult)

if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Recording decision for approval process instance {} (case oid {}), stage {}: decision: {}",
ctx.getProcessInstanceName(), ctx.getCaseOid(),
ctx.getProcessInstanceNameOrig(), ctx.getCaseOid(),
approvalCase ? ApprovalContextUtil.getStageDiagName(stageDef) : null,
output.getOutcome());
}
Expand Down
4 changes: 2 additions & 2 deletions ...flow-impl/src/main/java/com/evolveum/midpoint/wf/impl/engine/actions/OpenStageAction.java
View file
Expand Up @@ -201,10 +201,10 @@ private void logPreStageComputationResult(StageComputeHelper.ComputationResult p
if (preStageComputationResult.noApproversFound()) {
LOGGER.debug("No approvers at the stage '{}' for process {} (case oid {}) - outcome-if-no-approvers is {}",
stageDef.getName(),
ctx.getProcessInstanceName(), ctx.getCurrentCase().getOid(), stageDef.getOutcomeIfNoApprovers());
ctx.getProcessInstanceNameOrig(), ctx.getCurrentCase().getOid(), stageDef.getOutcomeIfNoApprovers());
}
LOGGER.debug("Approval process instance {} (case oid {}), stage {}: predetermined outcome: {}, approvers: {}",
ctx.getProcessInstanceName(), ctx.getCurrentCase().getOid(),
ctx.getProcessInstanceNameOrig(), ctx.getCurrentCase().getOid(),
ApprovalContextUtil.getStageDiagName(stageDef), predeterminedOutcome, approverRefs);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
View file
Expand Up @@ -281,7 +281,7 @@ private PrismObject<CaseType> addCase(String operation, String description, Stri
CaseWorkItemType workItem = new CaseWorkItemType(getPrismContext())
.originalAssigneeRef(operator.clone())
.assigneeRef(operator.clone())
.name(caseType.getName().getOrig())
.name(caseType.getName())
.createTimestamp(now)
.deadline(deadline);
caseType.getWorkItem().add(workItem);
Expand Down

0 comments on commit a8bb141

Please sign in to comment.