Merge remote-tracking branch 'origin/master'

Evolveum · Jun 6, 2017 · 6cd2419 · 6cd2419
2 parents 3e14395 + edede3f
commit 6cd2419
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -465,6 +465,7 @@ public TaskService getTaskService() {
 		return taskService;
 	}
 
+	@Override
 	public SecurityEnforcer getSecurityEnforcer() {
 		return securityEnforcer;
 	}

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.model.api.ModelInteractionService;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismContext;
+import com.evolveum.midpoint.security.api.SecurityEnforcer;
 import com.evolveum.midpoint.task.api.Task;
 
 /**
@@ -38,5 +39,7 @@ public interface ModelServiceLocator {
 	Task createSimpleTask(String operationName);
 
 	PrismContext getPrismContext();
+
+	SecurityEnforcer getSecurityEnforcer();
 
 }
diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
@@ -28,6 +28,7 @@
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.util.PrismAsserts;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.security.api.SecurityEnforcer;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -106,6 +107,11 @@ public Task createSimpleTask(String operationName) {
 			public PrismContext getPrismContext() {
 				return prismContext;
 			}
+
+			@Override
+			public SecurityEnforcer getSecurityEnforcer() {
+				return securityEnforcer;
+			}
 		};
 	}
 

diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiUnitTest.java
@@ -23,6 +23,7 @@
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
+import com.evolveum.midpoint.security.api.SecurityEnforcer;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.PrettyPrinter;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -69,6 +70,11 @@ public Task createSimpleTask(String operationName) {
 			public PrismContext getPrismContext() {
 				return PrismTestUtil.getPrismContext();
 			}
+
+			@Override
+			public SecurityEnforcer getSecurityEnforcer() {
+				return null;
+			}
 		};
 	}