Fix merge-introduced compilation errors (MID-5366)

Evolveum · Jul 1, 2019 · 9586476 · 9586476
1 parent 1c9e2c1
commit 9586476
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java b/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
@@ -1292,7 +1292,7 @@ public PrismValueDeltaSetTriple<PrismPropertyValue<Boolean>> evaluateCondition(M
 				.addVariableDefinition(ExpressionConstants.VAR_USER, focusOdo)
 				.addVariableDefinition(ExpressionConstants.VAR_FOCUS, focusOdo)
 				.addVariableDefinition(ExpressionConstants.VAR_SOURCE, source)
-				.addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, this, AssignmentEvaluator.class)
+				.addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, this)
 				.rootNode(focusOdo);
         builder = LensUtil.addAssignmentPathVariables(builder, assignmentPathVariables);
 
@@ -1349,11 +1349,11 @@ private MemberOfInvocation findInvocation(String targetOid) {
 
 	private boolean computeIsMemberOfDuringEvaluation(String targetOid) {
 		// TODO Or should we consider evaluateOld?
-		PrismObject<AH> focus = focusOdo.getNewObject();
+		PrismObject<F> focus = focusOdo.getNewObject();
 		return focus != null && containsMember(focus.asObjectable().getRoleMembershipRef(), targetOid);
 	}
 
-	public boolean isMemberOfInvocationResultChanged(DeltaSetTriple<EvaluatedAssignmentImpl<AH>> evaluatedAssignmentTriple) {
+	public boolean isMemberOfInvocationResultChanged(DeltaSetTriple<EvaluatedAssignmentImpl<F>> evaluatedAssignmentTriple) {
 		if (!memberOfInvocations.isEmpty()) {
 			// Similar code is in AssignmentProcessor.processMembershipAndDelegatedRefs -- check that if changing the business logic
 			List<ObjectReferenceType> membership = evaluatedAssignmentTriple.getNonNegativeValues().stream()

diff --git a/...java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java b/...java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
@@ -628,7 +628,7 @@ private <F extends FocusType> PrismContainerDefinition<AssignmentType> getAssign
 		return focusContext.getObjectDefinition().findContainerDefinition(FocusType.F_ASSIGNMENT);
 	}
 
-	boolean isMemberOfInvocationResultChanged(DeltaSetTriple<EvaluatedAssignmentImpl<AH>> evaluatedAssignmentTriple) {
+	boolean isMemberOfInvocationResultChanged(DeltaSetTriple<EvaluatedAssignmentImpl<F>> evaluatedAssignmentTriple) {
 		return assignmentEvaluator.isMemberOfInvocationResultChanged(evaluatedAssignmentTriple);
 	}
 }