Merge branch 'support-3.7' of github.com:Evolveum/midpoint into suppo…

…rt-3.7
Evolveum · Aug 22, 2018 · fe39b31 · fe39b31
2 parents 9bb717c + c9c52df
commit fe39b31
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
@@ -1145,4 +1145,9 @@ Object executeAdHocProvisioningScript(String resourceOid, String language, Strin
 	 */
 	@NotNull
 	Collection<PrismValue> collectAssignedFocusMappingsResults(@NotNull ItemPath path) throws SchemaException;
+
+    <F extends ObjectType> ModelContext<F> previewChanges(Collection<ObjectDelta<? extends ObjectType>> deltas,
+			ModelExecuteOptions options)
+			throws CommunicationException, ObjectNotFoundException, ObjectAlreadyExistsException, ConfigurationException,
+			SchemaException, SecurityViolationException, PolicyViolationException, ExpressionEvaluationException;
 }
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
@@ -1741,4 +1741,11 @@ public Collection<PrismValue> collectAssignedFocusMappingsResults(@NotNull ItemP
 		}
 		return rv;
 	}
+	@Override
+	public <F extends ObjectType> ModelContext<F> previewChanges(Collection<ObjectDelta<? extends ObjectType>> deltas,
+			ModelExecuteOptions options)
+			throws CommunicationException, ObjectNotFoundException, ObjectAlreadyExistsException, ConfigurationException,
+			SchemaException, SecurityViolationException, PolicyViolationException, ExpressionEvaluationException {
+		return modelInteractionService.previewChanges(deltas, options, getCurrentTask(), getCurrentResult());
+	}
 }