Skip to content

Commit

Permalink
PrimaryChangeProcessor.java: code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Nov 18, 2021
1 parent fe44fe6 commit 37f6781
Showing 1 changed file with 31 additions and 36 deletions.
67 changes: 31 additions & 36 deletions ...rc/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
/*
* Copyright (c) 2010-2017 Evolveum and contributors
* Copyright (C) 2010-2021 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
*/

package com.evolveum.midpoint.wf.impl.processors.primary;

import static com.evolveum.midpoint.audit.api.AuditEventStage.REQUEST;
import static com.evolveum.midpoint.model.api.context.ModelState.PRIMARY;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;

import org.apache.commons.collections4.CollectionUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;

import com.evolveum.midpoint.audit.api.AuditEventRecord;
import com.evolveum.midpoint.audit.api.AuditEventStage;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.model.api.context.ModelProjectionContext;
import com.evolveum.midpoint.model.api.hooks.HookOperationMode;
import com.evolveum.midpoint.model.impl.lens.LensContext;
import com.evolveum.midpoint.model.impl.lens.LensProjectionContext;
Expand All @@ -20,14 +34,13 @@
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.repo.api.PreconditionViolationException;
import com.evolveum.midpoint.repo.api.RepositoryService;
import com.evolveum.midpoint.schema.expression.VariablesMap;
import com.evolveum.midpoint.schema.ObjectDeltaOperation;
import com.evolveum.midpoint.schema.ObjectTreeDeltas;
import com.evolveum.midpoint.schema.SearchResultList;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.expression.VariablesMap;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.CaseTypeUtil;
import com.evolveum.midpoint.task.api.TaskManager;
import com.evolveum.midpoint.util.DebugUtil;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.*;
Expand All @@ -45,25 +58,7 @@
import com.evolveum.midpoint.wf.impl.util.MiscHelper;
import com.evolveum.midpoint.wf.util.ApprovalUtils;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.apache.commons.collections4.CollectionUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;

import static com.evolveum.midpoint.audit.api.AuditEventStage.REQUEST;
import static com.evolveum.midpoint.model.api.context.ModelState.PRIMARY;

/**
* @author mederly
*/
@Component
public class PrimaryChangeProcessor extends BaseChangeProcessor {

Expand All @@ -81,13 +76,13 @@ public class PrimaryChangeProcessor extends BaseChangeProcessor {
@Autowired private PcpGeneralHelper generalHelper;
@Autowired private MiscHelper miscHelper;
@Autowired private ExecutionHelper executionHelper;
@Autowired private TaskManager taskManager;

@Autowired
@Qualifier("cacheRepositoryService")
private RepositoryService repositoryService;
@Autowired private WorkflowEngine workflowEngine;

private List<PrimaryChangeAspect> allChangeAspects = new ArrayList<>();
private final List<PrimaryChangeAspect> allChangeAspects = new ArrayList<>();

//region Configuration
// =================================================================================== Configuration
Expand Down Expand Up @@ -171,7 +166,7 @@ private <O extends ObjectType> HookOperationMode previewOrProcessModelInvocation
}
}

private void removeEmptyProcesses(List<PcpStartInstruction> instructions, ModelInvocationContext ctx,
private void removeEmptyProcesses(List<PcpStartInstruction> instructions, ModelInvocationContext<?> ctx,
OperationResult result) throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException,
CommunicationException, ConfigurationException, SecurityViolationException {
for (Iterator<PcpStartInstruction> iterator = instructions.iterator(); iterator.hasNext(); ) {
Expand All @@ -186,8 +181,9 @@ private void removeEmptyProcesses(List<PcpStartInstruction> instructions, ModelI

// skippability because of no approvers was already tested; see ApprovalSchemaHelper.shouldBeSkipped
public boolean isEmpty(PcpStartInstruction instruction,
StageComputeHelper stageComputeHelper, ModelInvocationContext ctx, OperationResult result)
throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException {
StageComputeHelper stageComputeHelper, ModelInvocationContext<?> ctx, OperationResult result)
throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException,
CommunicationException, ConfigurationException, SecurityViolationException {
ApprovalContextType actx = instruction.getApprovalContext();
if (actx == null) {
return true;
Expand All @@ -212,13 +208,14 @@ public boolean isEmpty(PcpStartInstruction instruction,

private String evaluateAutoCompleteExpression(CaseType aCase,
ApprovalStageDefinitionType stageDef, PcpStartInstruction instruction,
StageComputeHelper stageComputeHelper, ModelInvocationContext ctx, OperationResult result)
throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException {
VariablesMap variables = stageComputeHelper.getDefaultVariables(aCase, instruction.getApprovalContext(), ctx.task.getChannel(), result);
StageComputeHelper stageComputeHelper, ModelInvocationContext<?> ctx, OperationResult result)
throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException,
CommunicationException, ConfigurationException, SecurityViolationException {
VariablesMap variables = stageComputeHelper.getDefaultVariables(
aCase, instruction.getApprovalContext(), ctx.task.getChannel(), result);
return stageComputeHelper.evaluateAutoCompleteExpression(stageDef, variables, ctx.task, result);
}


private <O extends ObjectType> List<PcpStartInstruction> gatherStartInstructions(
@NotNull ObjectTreeDeltas<O> changesBeingDecomposed, @NotNull ModelInvocationContext<O> ctx,
@NotNull OperationResult parentResult) throws SchemaException, ObjectNotFoundException {
Expand Down Expand Up @@ -254,7 +251,7 @@ private Collection<PrimaryChangeAspect> getActiveChangeAspects(PrimaryChangeProc
.collect(Collectors.toList());
}

private void logAspectResult(PrimaryChangeAspect aspect, List<? extends StartInstruction> instructions, ObjectTreeDeltas changesBeingDecomposed) {
private void logAspectResult(PrimaryChangeAspect aspect, List<? extends StartInstruction> instructions, ObjectTreeDeltas<?> changesBeingDecomposed) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("\n---[ Aspect {} returned the following process start instructions (count: {}) ]---",
aspect.getClass(), instructions == null ? "(null)" : instructions.size());
Expand Down Expand Up @@ -367,7 +364,7 @@ private PcpStartInstruction createInstruction0(ModelInvocationContext<?> ctx, Ob
}
}

private LensContext contextCopyWithNoDelta(ModelContext<?> context) {
private LensContext<?> contextCopyWithNoDelta(ModelContext<?> context) {
LensContext<?> contextCopy = ((LensContext<?>) context).clone();
contextCopy.getFocusContext().setPrimaryDeltaAfterStart(null);
Collection<LensProjectionContext> projectionContexts = contextCopy.getProjectionContexts();
Expand Down Expand Up @@ -466,7 +463,6 @@ private ObjectTreeDeltas<?> prepareDeltaOut(CaseType aCase) throws SchemaExcepti
}
}


//endregion

//region Auditing
Expand Down Expand Up @@ -517,7 +513,6 @@ public AuditEventRecord prepareWorkItemDeletedAuditRecord(CaseWorkItemType workI

//region Getters and setters


public void registerChangeAspect(PrimaryChangeAspect changeAspect, boolean first) {
LOGGER.trace("Registering aspect implemented by {}; first={}", changeAspect.getClass(), first);
if (first) {
Expand Down

0 comments on commit 37f6781

Please sign in to comment.