From 52fea107ef617d84101715ea99ddcd8a7079b29c Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Thu, 7 Sep 2017 13:51:54 +0200
Subject: [PATCH] After-merge fixes.

---
 .../midpoint/model/impl/lens/LensElementContext.java        | 6 ++++--
 .../evolveum/midpoint/model/impl/lens/TestPolicyRules.java  | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
index 3571a775193..c8988fad433 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
@@ -418,10 +418,12 @@ public Collection<EvaluatedPolicyRule> getPolicyRules() {
 	public void addPolicyRule(EvaluatedPolicyRule policyRule) {
 		this.policyRules.add(policyRule);
 	}
-public void clearPolicyRules() {
+
+	public void clearPolicyRules() {
     	policyRules.clear();
 	}
-	public void triggerConstraint( EvaluatedPolicyRule rule, EvaluatedPolicyRuleTriggertrigger) throws PolicyViolationException {
+
+	public void triggerConstraint( EvaluatedPolicyRule rule, EvaluatedPolicyRuleTrigger trigger) throws PolicyViolationException {
     	LensUtil.triggerConstraint(rule, trigger, policySituations);
 	}
 
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
index 799244ab5b5..eab3f34710c 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 
 import static org.testng.AssertJUnit.*;
 
@@ -208,7 +209,6 @@ public void test020JackUnassignRoleJudge() throws Exception {
 		TestUtil.assertSuccess(result);
 
 		dumpPolicyRules(context);
-		dumpPolicySituations(context);
 
 		assertEvaluatedRules(context, 4);
 		assertTriggeredRules(context, 2, PolicyConstraintKindType.ASSIGNMENT);
@@ -519,7 +519,6 @@ public void test210AssignRoleEmployeeToJack() throws Exception {
 		//display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
 
 		dumpPolicyRules(context);
-		dumpPolicySituations(context);
 
 		// Judge: criminal-exclusion, unassignment, all-assignment-operations
 		// Employee: approve-any-corp-role, notify-exclusion-violations, employee-excludes-contractor
@@ -565,7 +564,6 @@ public void test220AssignRoleEngineerToJack() throws Exception {
 		//display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
 
 		dumpPolicyRules(context);
-		dumpPolicySituations(context);
 
 		// Judge: L:criminal-exclusion, L:unassignment, L:all-assignment-operations
 		// Contractor: L:approve-any-corp-role, L:notify-exclusion-violations, L:contractor-excludes-employee