> deltas = new ArrayList<>();
- deltas.add(delta);
- ModelImplUtils.encrypt(deltas, protector, null, parentResult);
- eventDescription.setDelta(delta);
-
- eventDescription.setSourceChannel(changeDescription.getChannel());
-
- dispatcher.notifyEvent(eventDescription, task, parentResult);
- parentResult.computeStatus();
- task.setResult(parentResult);
- }
-
-
/**
*
* Add new object.
@@ -447,82 +339,4 @@ public void modifyObject(Class type, String oid,
RepositoryCache.exit();
}
}
-
- public PrismObject findShadowOwner(String accountOid, Task task, OperationResult parentResult)
- throws ObjectNotFoundException, SecurityViolationException, SchemaException, ConfigurationException, ExpressionEvaluationException, CommunicationException {
- return modelService.findShadowOwner(accountOid, task, parentResult);
- }
-
- public List> listResourceObjects(String resourceOid, QName objectClass,
- ObjectPaging paging, Task task, OperationResult parentResult) throws SchemaException,
- ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException {
- return modelService.listResourceObjects(resourceOid, objectClass, paging, task, parentResult);
- }
-
- public void importFromResource(String resourceOid, QName objectClass, Task task, OperationResult parentResult)
- throws ObjectNotFoundException, SchemaException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException {
- modelService.importFromResource(resourceOid, objectClass, task, parentResult);
- }
-
- public OperationResult testResource(String resourceOid, Task task) throws ObjectNotFoundException {
- return modelService.testResource(resourceOid, task);
- }
-
-
- //TASK AREA
- public boolean suspendTask(String taskOid, long waitForStop, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- return taskService.suspendTask(taskOid, waitForStop, operationTask, parentResult);
- }
-
- public void suspendAndDeleteTask(String taskOid, long waitForStop, boolean alsoSubtasks, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.suspendAndDeleteTask(taskOid, waitForStop, alsoSubtasks, operationTask, parentResult);
- }
-
- public void resumeTask(String taskOid, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.resumeTask(taskOid, operationTask, parentResult);
- }
-
- public void scheduleTaskNow(String taskOid, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.scheduleTaskNow(taskOid, operationTask, parentResult);
- }
-
- @SuppressWarnings("unused")
- public PrismObject getTaskByIdentifier(String identifier, Collection> options, Task operationTask, OperationResult parentResult) throws SchemaException, ObjectNotFoundException, SecurityViolationException, ConfigurationException, ExpressionEvaluationException, CommunicationException {
- return taskService.getTaskByIdentifier(identifier, options, operationTask, parentResult);
- }
-
- public boolean deactivateServiceThreads(long timeToWait, Task operationTask, OperationResult parentResult) throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- return taskService.deactivateServiceThreads(timeToWait, operationTask, parentResult);
- }
-
- public void reactivateServiceThreads(Task operationTask, OperationResult parentResult) throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.reactivateServiceThreads(operationTask, parentResult);
- }
-
- @SuppressWarnings("unused")
- public boolean getServiceThreadsActivationState() {
- return taskService.getServiceThreadsActivationState();
- }
-
- public void stopSchedulers(Collection nodeIdentifiers, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.stopSchedulers(nodeIdentifiers, operationTask, parentResult);
- }
-
- public boolean stopSchedulersAndTasks(Collection nodeIdentifiers, long waitTime, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- return taskService.stopSchedulersAndTasks(nodeIdentifiers, waitTime, operationTask, parentResult);
- }
-
- public void startSchedulers(Collection nodeIdentifiers, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.startSchedulers(nodeIdentifiers, operationTask, parentResult);
- }
-
- public void synchronizeTasks(Task operationTask, OperationResult parentResult) throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
- taskService.synchronizeTasks(operationTask, parentResult);
- }
-
- @SuppressWarnings("unused")
- public List getAllTaskCategories() {
- return taskService.getAllTaskCategories();
- }
-
}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
index b66899a8141..27a2c9c3094 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
@@ -575,7 +575,7 @@ public Response deleteObject(@PathParam("type") String type, @PathParam("id") St
Response response;
try {
if (clazz.isAssignableFrom(TaskType.class)) {
- model.suspendAndDeleteTask(id, WAIT_FOR_TASK_STOP, true, task, parentResult);
+ taskService.suspendAndDeleteTask(id, WAIT_FOR_TASK_STOP, true, task, parentResult);
parentResult.computeStatus();
finishRequest(task);
if (parentResult.isSuccess()) {
@@ -647,7 +647,7 @@ public Response notifyChange(ResourceObjectShadowChangeDescriptionType changeDes
Response response;
try {
- model.notifyChange(changeDescription, parentResult, task);
+ modelService.notifyChange(changeDescription, task, parentResult);
response = RestServiceUtil.createResponse(Response.Status.OK, parentResult);
// return Response.ok().build();
// String oldShadowOid = changeDescription.getOldShadowOid();
@@ -679,7 +679,7 @@ public Response findShadowOwner(@PathParam("oid") String shadowOid, @Context Mes
Response response;
try {
- PrismObject user = model.findShadowOwner(shadowOid, task, parentResult);
+ PrismObject user = modelService.findShadowOwner(shadowOid, task, parentResult);
// response = Response.ok().entity(user).build();
response = RestServiceUtil.createResponse(Response.Status.OK, user, parentResult);
} catch (Exception ex) {
@@ -769,7 +769,7 @@ public Response importFromResource(@PathParam("resourceOid") String resourceOid,
QName objClass = new QName(MidPointConstants.NS_RI, objectClass);
Response response;
try {
- model.importFromResource(resourceOid, objClass, task, parentResult);
+ modelService.importFromResource(resourceOid, objClass, task, parentResult);
response = RestServiceUtil.createResponse(Response.Status.SEE_OTHER, (uriInfo.getBaseUriBuilder().path(this.getClass(), "getObject")
.build(ObjectTypes.TASK.getRestType(), task.getOid())), parentResult);
// response = Response.seeOther((uriInfo.getBaseUriBuilder().path(this.getClass(), "getObject")
@@ -795,7 +795,7 @@ public Response testResource(@PathParam("resourceOid") String resourceOid, @Cont
Response response;
OperationResult testResult = null;
try {
- testResult = model.testResource(resourceOid, task);
+ testResult = modelService.testResource(resourceOid, task);
response = RestServiceUtil.createResponse(Response.Status.OK, testResult, parentResult);
// response = Response.ok(testResult).build();
} catch (Exception ex) {
@@ -819,7 +819,7 @@ public Response suspendTask(@PathParam("oid") String taskOid, @Context MessageCo
Response response;
try {
- model.suspendTask(taskOid, WAIT_FOR_TASK_STOP, task, parentResult);
+ taskService.suspendTask(taskOid, WAIT_FOR_TASK_STOP, task, parentResult);
parentResult.computeStatus();
response = RestServiceUtil.createResponse(Response.Status.NO_CONTENT, task, parentResult);
} catch (Exception ex) {
@@ -865,7 +865,7 @@ public Response resumeTask(@PathParam("oid") String taskOid, @Context MessageCon
Response response;
try {
- model.resumeTask(taskOid, task, parentResult);
+ taskService.resumeTask(taskOid, task, parentResult);
parentResult.computeStatus();
response = RestServiceUtil.createResponse(Response.Status.ACCEPTED, parentResult);
} catch (Exception ex) {
@@ -886,7 +886,7 @@ public Response scheduleTaskNow(@PathParam("oid") String taskOid, @Context Messa
Response response;
try {
- model.scheduleTaskNow(taskOid, task, parentResult);
+ taskService.scheduleTaskNow(taskOid, task, parentResult);
parentResult.computeStatus();
response = RestServiceUtil.createResponse(Response.Status.NO_CONTENT, parentResult);
} catch (Exception ex) {
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
index ca6ef979338..11bd24b1885 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
@@ -170,7 +170,7 @@ public void findShadowOwner(String accountOid, Holder userHolder, Hold
auditLogin(task);
OperationResult operationResult = task.getResult();
try {
- PrismObject user = model.findShadowOwner(accountOid, task, operationResult);
+ PrismObject user = modelService.findShadowOwner(accountOid, task, operationResult);
handleOperationResult(operationResult, result);
if (user != null) {
userHolder.value = user.asObjectable();
@@ -191,7 +191,7 @@ public OperationResultType testResource(String resourceOid) throws FaultMessage
Task task = createTaskInstance(TEST_RESOURCE);
auditLogin(task);
try {
- OperationResult testResult = model.testResource(resourceOid, task);
+ OperationResult testResult = modelService.testResource(resourceOid, task);
return handleOperationResult(testResult);
} catch (Exception ex) {
LoggingUtils.logException(LOGGER, "# MODEL testResource() failed", ex);
@@ -403,7 +403,7 @@ public TaskType importFromResource(String resourceOid, QName objectClass)
OperationResult operationResult = task.getResult();
try {
- model.importFromResource(resourceOid, objectClass, task, operationResult);
+ modelService.importFromResource(resourceOid, objectClass, task, operationResult);
operationResult.computeStatus();
return handleTaskResult(task);
} catch (Exception ex) {
@@ -426,12 +426,14 @@ public TaskType notifyChange(ResourceObjectShadowChangeDescriptionType changeDes
OperationResult parentResult = task.getResult();
try {
- model.notifyChange(changeDescription, parentResult, task);
- } catch (ObjectNotFoundException | SchemaException | CommunicationException | ConfigurationException | SecurityViolationException | ObjectAlreadyExistsException | ExpressionEvaluationException | RuntimeException | Error | PolicyViolationException | PreconditionViolationException ex) {
- LoggingUtils.logException(LOGGER, "# MODEL notifyChange() failed", ex);
- auditLogout(task);
- throwFault(ex, parentResult);
- }
+ modelService.notifyChange(changeDescription, task, parentResult);
+ } catch (ObjectNotFoundException | SchemaException | CommunicationException | ConfigurationException |
+ SecurityViolationException | ObjectAlreadyExistsException | ExpressionEvaluationException |
+ RuntimeException | Error | PolicyViolationException ex) {
+ LoggingUtils.logException(LOGGER, "# MODEL notifyChange() failed", ex);
+ auditLogout(task);
+ throwFault(ex, parentResult);
+ }
LOGGER.info("notify change ended.");
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
index c7f88a0fa95..55ceee82c64 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -29,22 +29,22 @@
import com.evolveum.midpoint.model.impl.importer.ImportAccountsFromResourceTaskHandler;
import com.evolveum.midpoint.model.impl.importer.ObjectImporter;
import com.evolveum.midpoint.model.impl.lens.*;
+import com.evolveum.midpoint.model.impl.messaging.MessageProcessor;
import com.evolveum.midpoint.model.impl.scripting.ExecutionContext;
import com.evolveum.midpoint.model.impl.scripting.ScriptingExpressionEvaluator;
-import com.evolveum.midpoint.model.impl.security.NodeAuthenticationToken;
import com.evolveum.midpoint.model.impl.util.ModelImplUtils;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.crypto.Protector;
import com.evolveum.midpoint.prism.delta.ChangeType;
import com.evolveum.midpoint.prism.delta.DiffUtil;
+import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.path.*;
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.*;
import com.evolveum.midpoint.prism.util.CloneUtil;
import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
-import com.evolveum.midpoint.provisioning.api.ProvisioningOperationOptions;
-import com.evolveum.midpoint.provisioning.api.ProvisioningService;
+import com.evolveum.midpoint.provisioning.api.*;
import com.evolveum.midpoint.repo.api.PreconditionViolationException;
import com.evolveum.midpoint.repo.api.RepoAddOptions;
import com.evolveum.midpoint.repo.api.RepositoryService;
@@ -80,13 +80,13 @@
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ExecuteScriptType;
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType;
import com.evolveum.prism.xml.ns._public.types_3.EvaluationTimeType;
+import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import javax.xml.datatype.XMLGregorianCalendar;
@@ -156,7 +156,8 @@ public class ModelController implements ModelService, TaskService, WorkflowServi
@Autowired private EmulatedSearchProvider emulatedSearchProvider;
@Autowired private CacheRegistry cacheRegistry;
@Autowired private ClockworkMedic clockworkMedic;
-
+ @Autowired private ChangeNotificationDispatcher dispatcher;
+ @Autowired private MessageProcessor messageProcessor;
@Autowired
@Qualifier("cacheRepositoryService")
private transient RepositoryService cacheRepositoryService;
@@ -2323,4 +2324,69 @@ public String getTaskThreadsDump(@NotNull String taskOid, @NotNull Task task, @N
//endregion
+ public void notifyChange(ResourceObjectShadowChangeDescriptionType changeDescription, Task task, OperationResult parentResult)
+ throws SchemaException, CommunicationException, ConfigurationException, SecurityViolationException,
+ ObjectNotFoundException, ObjectAlreadyExistsException, ExpressionEvaluationException, PolicyViolationException {
+
+ String oldShadowOid = changeDescription.getOldShadowOid();
+ ResourceEventDescription eventDescription = new ResourceEventDescription();
+
+ PrismObject oldShadow;
+ LOGGER.trace("resolving old object");
+ if (!StringUtils.isEmpty(oldShadowOid)) {
+ oldShadow = getObject(ShadowType.class, oldShadowOid, SelectorOptions.createCollection(GetOperationOptions.createDoNotDiscovery()), task, parentResult);
+ eventDescription.setOldShadow(oldShadow);
+ LOGGER.trace("old object resolved to: {}", oldShadow.debugDumpLazily());
+ } else {
+ LOGGER.trace("Old shadow null");
+ }
+
+ PrismObject currentShadow = null;
+ ShadowType currentShadowType = changeDescription.getCurrentShadow();
+ LOGGER.trace("resolving current shadow");
+ if (currentShadowType != null) {
+ prismContext.adopt(currentShadowType);
+ currentShadow = currentShadowType.asPrismObject();
+ LOGGER.trace("current shadow resolved to {}", currentShadow.debugDumpLazily());
+ }
+
+ eventDescription.setCurrentShadow(currentShadow);
+
+ ObjectDeltaType deltaType = changeDescription.getObjectDelta();
+
+ if (deltaType != null) {
+
+ PrismObject shadowToAdd;
+ ObjectDelta delta = prismContext.deltaFactory().object().createEmptyDelta(ShadowType.class, deltaType.getOid(),
+ ChangeType.toChangeType(deltaType.getChangeType()));
+
+ if (delta.getChangeType() == ChangeType.ADD) {
+ if (deltaType.getObjectToAdd() == null) {
+ LOGGER.trace("No object to add specified. Check your delta. Add delta must contain object to add");
+ throw new IllegalArgumentException("No object to add specified. Check your delta. Add delta must contain object to add");
+ }
+ Object objToAdd = deltaType.getObjectToAdd();
+ if (!(objToAdd instanceof ShadowType)) {
+ LOGGER.trace("Wrong object specified in change description. Expected on the the shadow type, but got " + objToAdd.getClass().getSimpleName());
+ throw new IllegalArgumentException("Wrong object specified in change description. Expected on the the shadow type, but got " + objToAdd.getClass().getSimpleName());
+ }
+ prismContext.adopt((ShadowType)objToAdd);
+
+ shadowToAdd = ((ShadowType) objToAdd).asPrismObject();
+ LOGGER.trace("object to add: {}", shadowToAdd.debugDump());
+ delta.setObjectToAdd(shadowToAdd);
+ } else {
+ Collection modifications = DeltaConvertor.toModifications(deltaType.getItemDelta(), prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(ShadowType.class));
+ delta.addModifications(modifications);
+ }
+ ModelImplUtils.encrypt(Collections.singletonList(delta), protector, null, parentResult);
+ eventDescription.setDelta(delta);
+ }
+
+ eventDescription.setSourceChannel(changeDescription.getChannel());
+
+ dispatcher.notifyEvent(eventDescription, task, parentResult);
+ parentResult.computeStatus();
+ task.setResult(parentResult);
+ }
}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
index 5538190966f..25ebdfb5978 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
@@ -36,6 +36,7 @@
import com.evolveum.midpoint.model.impl.lens.LensFocusContext;
import com.evolveum.midpoint.model.impl.lens.LensProjectionContext;
import com.evolveum.midpoint.model.impl.lens.SynchronizationIntent;
+import com.evolveum.midpoint.model.impl.messaging.MessageWrapper;
import com.evolveum.midpoint.model.impl.sync.CorrelationConfirmationEvaluator;
import com.evolveum.midpoint.model.impl.sync.SynchronizationContext;
import com.evolveum.midpoint.model.impl.sync.SynchronizationServiceUtils;
@@ -52,6 +53,10 @@
import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
import com.evolveum.midpoint.schema.*;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
+import com.evolveum.midpoint.schema.processor.ResourceAttribute;
+import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
+import com.evolveum.midpoint.schema.processor.ResourceSchema;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.result.OperationResultStatus;
import com.evolveum.midpoint.schema.util.*;
@@ -88,6 +93,7 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -1815,4 +1821,14 @@ public void applyDefinition(T object)
public S_ItemEntry deltaFor(Class objectClass) throws SchemaException {
return prismContext.deltaFor(objectClass);
}
+
+ // temporary
+ public MessageWrapper wrap(AsyncUpdateMessageType message) {
+ return new MessageWrapper(message);
+ }
+
+ // temporary
+ public Map getMessageBodyAsMap(AsyncUpdateMessageType message) throws IOException {
+ return wrap(message).getBodyAsMap();
+ }
}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java
new file mode 100644
index 00000000000..9c7884c4146
--- /dev/null
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/i2/MessageProcessingTaskHandler.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.impl.i2;
+
+import com.evolveum.midpoint.model.impl.ModelConstants;
+import com.evolveum.midpoint.task.api.*;
+import com.evolveum.midpoint.util.logging.LoggingUtils;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DeliverCallback;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ *
+ */
+@Component
+public class MessageProcessingTaskHandler implements TaskHandler {
+
+ private static final transient Trace LOGGER = TraceManager.getTrace(MessageProcessingTaskHandler.class);
+
+ public static final String HANDLER_URI = ModelConstants.NS_SYNCHRONIZATION_TASK_PREFIX + "/message-processing/handler-3";
+
+ @Autowired private TaskManager taskManager;
+
+ @PostConstruct
+ private void initialize() {
+ taskManager.registerHandler(HANDLER_URI, this);
+ System.out.println("URI = " + HANDLER_URI);
+ }
+
+ @Override
+ public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType partitionDefinition) {
+
+ ConnectionFactory connectionFactory = new ConnectionFactory();
+
+// connectionFactory.setU
+// connectionFactory.setHost("192.168.56.101");
+// factory.setUsername("guest");
+// factory.setPassword("guest");
+// factory.setVirtualHost("/");
+// String queueName = "sampleQueue";
+//
+// try (Connection connection = factory.newConnection();
+// Channel channel = connection.createChannel()) {
+//
+// DeliverCallback deliverCallback = (consumerTag, message) -> {
+// byte[] body = message.getBody();
+//
+// System.out.println("Body: " + new String(body));
+// channel.basicAck(message.getEnvelope().getDeliveryTag(), false);
+// task.incrementProgressAndStoreStatsIfNeeded();
+// };
+// channel.basicConsume(queueName, false, deliverCallback, consumerTag -> {});
+//
+// while (task.canRun()) {
+// Thread.sleep(1000L);
+// }
+// } catch (Throwable t) {
+// LoggingUtils.logUnexpectedException(LOGGER, "Exception on RabbitMQ", t);
+// }
+
+ TaskRunResult rv = new TaskRunResult();
+ rv.setRunResultStatus(TaskRunResult.TaskRunResultStatus.FINISHED);
+ rv.setOperationResult(task.getResult());
+ return rv;
+ }
+
+ @Override
+ public String getCategoryName(Task task) {
+ return TaskCategory.LIVE_SYNCHRONIZATION;
+ }
+}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
index 919feca1d65..cd6d51450f2 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
@@ -19,38 +19,26 @@
import static com.evolveum.midpoint.model.api.ProgressInformation.StateType.ENTERING;
import static com.evolveum.midpoint.schema.internals.InternalsConfig.consistencyChecks;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.xml.datatype.XMLGregorianCalendar;
-import com.evolveum.midpoint.model.api.ProgressInformation;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.evolveum.midpoint.common.Clock;
-import com.evolveum.midpoint.model.api.context.EvaluatedAssignment;
-import com.evolveum.midpoint.model.api.context.EvaluatedPolicyRule;
+import com.evolveum.midpoint.model.api.ProgressInformation;
import com.evolveum.midpoint.model.api.context.SynchronizationPolicyDecision;
import com.evolveum.midpoint.model.impl.lens.ClockworkMedic;
-import com.evolveum.midpoint.model.impl.lens.EvaluatedAssignmentImpl;
import com.evolveum.midpoint.model.impl.lens.LensContext;
import com.evolveum.midpoint.model.impl.lens.LensProjectionContext;
import com.evolveum.midpoint.model.impl.lens.LensUtil;
import com.evolveum.midpoint.model.impl.lens.projector.credentials.ProjectionCredentialsProcessor;
-import com.evolveum.midpoint.model.impl.lens.projector.focus.AssignmentProcessor;
-import com.evolveum.midpoint.model.impl.lens.projector.focus.AssignmentTripleEvaluator;
import com.evolveum.midpoint.model.impl.lens.projector.focus.AssignmentHolderProcessor;
+import com.evolveum.midpoint.model.impl.lens.projector.focus.AssignmentProcessor;
import com.evolveum.midpoint.model.impl.util.ModelImplUtils;
-import com.evolveum.midpoint.prism.PrismContext;
-import com.evolveum.midpoint.prism.delta.DeltaSetTriple;
import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
import com.evolveum.midpoint.repo.api.PreconditionViolationException;
-import com.evolveum.midpoint.repo.common.CounterManager;
import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
import com.evolveum.midpoint.schema.internals.InternalCounters;
import com.evolveum.midpoint.schema.internals.InternalMonitor;
@@ -67,6 +55,9 @@
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.PartialProcessingOptionsType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.PartialProcessingTypeType;
/**
* Projector recomputes the context. It takes the context with a few basic data as input. It uses all the policies
@@ -99,9 +90,7 @@ public class Projector {
@Autowired private Clock clock;
@Autowired private ClockworkMedic medic;
- @Autowired private CounterManager counterManager;
-
- private static final Trace LOGGER = TraceManager.getTrace(Projector.class);
+ private static final Trace LOGGER = TraceManager.getTrace(Projector.class);
/**
* Runs one projection wave, starting at current execution wave.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleSuspendTaskExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleSuspendTaskExecutor.java
index a29e8462733..d3ec4c2a4f7 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleSuspendTaskExecutor.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleSuspendTaskExecutor.java
@@ -22,8 +22,9 @@
import com.evolveum.midpoint.model.api.context.EvaluatedPolicyRule;
import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.model.api.context.ModelElementContext;
-import com.evolveum.midpoint.repo.common.CounterManager;
-import com.evolveum.midpoint.repo.common.CounterSepcification;
+import com.evolveum.midpoint.repo.api.CounterManager;
+import com.evolveum.midpoint.repo.api.CounterSepcification;
+import com.evolveum.midpoint.repo.cache.CacheCounterManager;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.DebugDumpable;
@@ -48,7 +49,6 @@ public class PolicyRuleSuspendTaskExecutor {
private static final Trace LOGGER = TraceManager.getTrace(PolicyRuleSuspendTaskExecutor.class);
@Autowired private CounterManager counterManager;
-// @Autowired private TaskManager taskManager;
public void execute(@NotNull ModelContext context, Task task, OperationResult result) throws ThresholdPolicyViolationException, ObjectNotFoundException, SchemaException {
ModelElementContext focusCtx = context.getFocusContext();
@@ -58,7 +58,7 @@ public void execute(@NotNull ModelContext context, Tas
}
for (EvaluatedPolicyRule policyRule : focusCtx.getPolicyRules()) {
- CounterSepcification counterSpec = counterManager.getCounterSpec(task, policyRule.getPolicyRuleIdentifier(), policyRule.getPolicyRule());
+ CounterSepcification counterSpec = counterManager.getCounterSpec(task.getTaskType(), policyRule.getPolicyRuleIdentifier(), policyRule.getPolicyRule());
LOGGER.trace("Found counter specification {} for {}", counterSpec, DebugUtil.debugDumpLazily(policyRule));
int counter = 1;
@@ -72,20 +72,7 @@ public void execute(@NotNull ModelContext context, Tas
counterSpec.setCount(counter);
}
}
-
- //TODO : not supported yet
-// Collection projectionCtxs = context.getProjectionContexts();
-// for (ModelProjectionContext projectionCtx : projectionCtxs) {
-// Collection evaluatedPolicyRules = projectionCtx.getPolicyRules();
-// for (EvaluatedPolicyRule policyRule : evaluatedPolicyRules) {
-// LOGGER.info("projction policy rules: {}", policyRule);
-// counter = checkEvaluatedPolicyRule(task, policyRule, counter, result);
-// }
-//
-// }
-
-
-
+
}
private synchronized int checkEvaluatedPolicyRule(Task task, EvaluatedPolicyRule policyRule, int counter, OperationResult result) throws ThresholdPolicyViolationException, ObjectNotFoundException, SchemaException {
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java
new file mode 100644
index 00000000000..f27b31f5b24
--- /dev/null
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageProcessor.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.impl.messaging;
+
+import com.evolveum.midpoint.model.api.ModelService;
+import com.evolveum.midpoint.model.impl.expr.ModelExpressionThreadLocalHolder;
+import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple;
+import com.evolveum.midpoint.repo.api.PreconditionViolationException;
+import com.evolveum.midpoint.repo.common.expression.*;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
+import com.evolveum.midpoint.schema.constants.ExpressionConstants;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.security.api.SecurityContextManager;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.exception.*;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ */
+@Component
+public class MessageProcessor {
+
+ private static final Trace LOGGER = TraceManager.getTrace(MessageProcessor.class);
+
+ public static final String DOT_CLASS = MessageProcessor.class.getName() + ".";
+
+ @Autowired ModelService modelService;
+ @Autowired ExpressionFactory expressionFactory;
+ @Autowired PrismContext prismContext;
+ @Autowired SecurityContextManager securityContextManager;
+
+// public void processMessage(DataMessageType message, MessageProcessingConfigurationType processing,
+// ResourceType resource, Task task, OperationResult parentResult)
+// throws CommunicationException, ObjectNotFoundException, SchemaException, SecurityViolationException,
+// ConfigurationException, ExpressionEvaluationException, PreconditionViolationException, PolicyViolationException,
+// ObjectAlreadyExistsException {
+// OperationResult result = parentResult.createSubresult(DOT_CLASS + "processMessage");
+// try {
+// ExpressionVariables variables = createVariables(message, resource);
+// if (processing.getConsumerExpression() != null && processing.getTransformerExpression() != null) {
+// throw new IllegalStateException("Both consumerExpression and transformerExpression cannot be specified at once");
+// }
+// if (processing.getConsumerExpression() != null) {
+// evaluateExpression(processing.getConsumerExpression(), variables, "consumer expression", task, result);
+// } else {
+// List descriptions = evaluateExpression(processing.getTransformerExpression(),
+// variables, "transformer expression", task, result);
+// LOGGER.trace("Change description computation returned {} description(s)", descriptions.size());
+// for (ResourceObjectShadowChangeDescriptionType description : descriptions) {
+// modelService.notifyChange(description, task, result);
+// }
+// }
+// result.computeStatusIfUnknown();
+// } catch (Throwable t) {
+// result.recordFatalError("Couldn't process message: " + t.getMessage(), t);
+// throw t;
+// }
+// }
+//
+// @NotNull
+// private List evaluateExpression(ExpressionType expressionBean, ExpressionVariables variables, String contextDescription,
+// Task task, OperationResult result)
+// throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException,
+// ConfigurationException, SecurityViolationException {
+// Expression, PrismPropertyDefinition> expression = expressionFactory.makePropertyExpression(expressionBean,
+// SchemaConstantsGenerated.C_RESOURCE_OBJECT_SHADOW_CHANGE_DESCRIPTION, contextDescription, task, result);
+// ExpressionEvaluationContext context = new ExpressionEvaluationContext(null, variables, contextDescription, task, result);
+// PrismValueDeltaSetTriple> exprResultTriple =
+// ModelExpressionThreadLocalHolder.evaluateExpressionInContext(expression, context, task, result);
+// List list = new ArrayList<>();
+// for (PrismPropertyValue pv : exprResultTriple.getZeroSet()) {
+// list.add(pv.getRealValue());
+// }
+// return list;
+// }
+//
+// @NotNull
+// private ExpressionVariables createVariables(DataMessageType message,
+// ResourceType resource) {
+// ExpressionVariables variables = new ExpressionVariables();
+// variables.addVariableDefinition(ExpressionConstants.VAR_MESSAGE, new MessageWrapper(message));
+// variables.addVariableDefinition(ExpressionConstants.VAR_RESOURCE, resource);
+// return variables;
+// }
+}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java
new file mode 100644
index 00000000000..755a20c38ca
--- /dev/null
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/messaging/MessageWrapper.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.impl.messaging;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.Amqp091MessageAttributesType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.Amqp091MessageType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AsyncUpdateMessageType;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ *
+ */
+public class MessageWrapper {
+
+ @NotNull private final AsyncUpdateMessageType message;
+
+ private static final TypeReference MAP_TYPE = new MapTypeReference();
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ private static class MapTypeReference extends TypeReference> {
+ }
+
+ public MessageWrapper(@NotNull AsyncUpdateMessageType message) {
+ this.message = message;
+ }
+
+ public Amqp091MessageAttributesType getAttributes() {
+ return ((Amqp091MessageType) message).getAttributes();
+ }
+
+ public byte[] getBody() {
+ return ((Amqp091MessageType) message).getBody();
+ }
+
+ public String getText() {
+ return new String(((Amqp091MessageType) message).getBody(), StandardCharsets.UTF_8);
+ }
+
+ public AsyncUpdateMessageType getOriginalMessage() {
+ return message;
+ }
+
+ public Map getBodyAsMap() throws IOException {
+ String json = getText();
+ return MAPPER.readValue(json, MAP_TYPE);
+ }
+}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
index f6aab4ea75a..224393156d6 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
@@ -280,9 +280,9 @@ private boolean matchUserCorrelationRule(Class focusTyp
public boolean matchFocusByCorrelationRule(SynchronizationContext syncCtx, PrismObject focus) {
- if (!syncCtx.hasApplicablePolicy()){
+ if (!syncCtx.hasApplicablePolicy()) {
LOGGER.warn(
- "Resource does not support synchronization. Skipping evaluation correlation/confirmation for {} and {}",
+ "Resource does not support synchronization. Skipping evaluation correlation/confirmation for {} and {}",
focus, syncCtx.getApplicableShadow());
return false;
}
@@ -294,7 +294,7 @@ public boolean matchFocusByCorrelationRule(Synchronization
//TODO: can we expect that systemConfig and resource are always present?
if (matchUserCorrelationRule(syncCtx.getFocusClass(), syncCtx.getApplicableShadow(), focus, syncCtx.getResource().asObjectable(),
- syncCtx.getSystemConfiguration().asObjectable(), conditionalFilter, syncCtx.getTask(), syncCtx.getResult())){
+ syncCtx.getSystemConfiguration().asObjectable(), conditionalFilter, syncCtx.getTask(), syncCtx.getResult())) {
LOGGER.debug("SYNCHRONIZATION: CORRELATION: expression for {} match user: {}", syncCtx.getApplicableShadow(), focus);
return true;
}
@@ -303,8 +303,7 @@ public boolean matchFocusByCorrelationRule(Synchronization
throw new SystemException("Failed to match user using correlation rule. " + ex.getMessage(), ex);
}
- LOGGER.debug("SYNCHRONIZATION: CORRELATION: expression for {} does not match user: {}", new Object[] {
- syncCtx.getApplicableShadow(), focus });
+ LOGGER.debug("SYNCHRONIZATION: CORRELATION: expression for {} does not match user: {}", syncCtx.getApplicableShadow(), focus);
return false;
}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
index d1f58e80fd0..28a963dfe8c 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
@@ -15,6 +15,12 @@
*/
package com.evolveum.midpoint.model.impl.sync;
+import javax.annotation.PostConstruct;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
import com.evolveum.midpoint.model.impl.ModelConstants;
@@ -22,8 +28,6 @@
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.provisioning.api.ProvisioningService;
import com.evolveum.midpoint.repo.api.PreconditionViolationException;
-import com.evolveum.midpoint.repo.common.CounterManager;
-import com.evolveum.midpoint.repo.common.util.RepoCommonUtils;
import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
@@ -31,7 +35,13 @@
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.result.OperationResultStatus;
import com.evolveum.midpoint.schema.util.ExceptionUtil;
-import com.evolveum.midpoint.task.api.*;
+import com.evolveum.midpoint.task.api.RunningTask;
+import com.evolveum.midpoint.task.api.StatisticsCollectionStrategy;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.task.api.TaskCategory;
+import com.evolveum.midpoint.task.api.TaskHandler;
+import com.evolveum.midpoint.task.api.TaskManager;
+import com.evolveum.midpoint.task.api.TaskRunResult;
import com.evolveum.midpoint.task.api.TaskRunResult.TaskRunResultStatus;
import com.evolveum.midpoint.util.exception.CommunicationException;
import com.evolveum.midpoint.util.exception.ConfigurationException;
@@ -43,17 +53,10 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CriticalityType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExecutionModeType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LayerType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskPartitionDefinitionType;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
/**
* The task handler for a live synchronization.
*
@@ -71,8 +74,7 @@ public class LiveSyncTaskHandler implements TaskHandler {
@Autowired private TaskManager taskManager;
@Autowired private ProvisioningService provisioningService;
@Autowired private PrismContext prismContext;
- @Autowired private CounterManager counterManager;
-
+
private static final transient Trace LOGGER = TraceManager.getTrace(LiveSyncTaskHandler.class);
@PostConstruct
@@ -94,8 +96,7 @@ public StatisticsCollectionStrategy getStatisticsCollectionStrategy() {
@Override
public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType partition) {
LOGGER.trace("LiveSyncTaskHandler.run starting");
-
-// counterManager.registerCounter(task, true);
+
OperationResult opResult = new OperationResult(OperationConstants.LIVE_SYNC);
TaskRunResult runResult = new TaskRunResult();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
index 6579936d052..cd497c61fa4 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
@@ -53,7 +53,6 @@
import com.evolveum.midpoint.provisioning.api.ResourceObjectShadowChangeDescription;
import com.evolveum.midpoint.repo.api.RepositoryService;
import com.evolveum.midpoint.repo.cache.RepositoryCache;
-import com.evolveum.midpoint.repo.common.CounterManager;
import com.evolveum.midpoint.repo.common.task.AbstractSearchIterativeTaskHandler;
import com.evolveum.midpoint.repo.common.task.TaskHandlerUtil;
import com.evolveum.midpoint.schema.GetOperationOptions;
@@ -134,7 +133,6 @@ public class ReconciliationTaskHandler implements WorkBucketAwareTaskHandler {
@Qualifier("cacheRepositoryService")
private RepositoryService repositoryService;
- @Autowired private CounterManager counterManager;
@Autowired private AssignmentCollector assignmentCollector;
@Autowired private SystemObjectCache systemObjectCache;
@@ -696,11 +694,10 @@ private void reactShadowGone(PrismObject shadow, PrismObject shadowDelta = shadow.getPrismContext().deltaFactory().object()
- .createDeleteDelta(ShadowType.class, shadow.getOid()
- );
+ .createDeleteDelta(ShadowType.class, shadow.getOid());
change.setObjectDelta(shadowDelta);
// Need to also set current shadow. This will get reflected in "old" object in lens context
- change.setCurrentShadow(shadow);
+ change.setCurrentShadow(shadow); // todo why current and not old [pmed]?
ModelImplUtils.clearRequestee(task);
changeNotificationDispatcher.notifyChange(change, task, result);
} catch (SchemaException | ObjectNotFoundException | CommunicationException | ConfigurationException | ExpressionEvaluationException e) {
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
index faaca478bd6..a603fdc5c08 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
@@ -38,8 +38,6 @@
import com.evolveum.midpoint.common.Clock;
import com.evolveum.midpoint.common.SynchronizationUtils;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
-import com.evolveum.midpoint.model.api.ModelInteractionService;
-import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.model.common.SystemObjectCache;
import com.evolveum.midpoint.model.impl.expr.ExpressionEnvironment;
import com.evolveum.midpoint.model.impl.expr.ModelExpressionThreadLocalHolder;
@@ -83,7 +81,6 @@
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.exception.SystemException;
-import com.evolveum.midpoint.util.exception.ThresholdPolicyViolationException;
import com.evolveum.midpoint.util.logging.LoggingUtils;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
@@ -95,7 +92,6 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectSynchronizationSorterType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectSynchronizationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationExecutionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
@@ -130,8 +126,6 @@ public class SynchronizationServiceImpl implements SynchronizationService {
@Autowired private PrismContext prismContext;
@Autowired private Clock clock;
- @Autowired private ModelInteractionService modelInteractionService;
-
@Autowired
@Qualifier("cacheRepositoryService")
private RepositoryService repositoryService;
@@ -143,7 +137,7 @@ public void notifyChange(ResourceObjectShadowChangeDescrip
boolean logDebug = isLogDebug(change);
if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("SYNCHRONIZATION: received change notification\n:{}", change.debugDump(1));
+ LOGGER.trace("SYNCHRONIZATION: received change notification:\n{}", change.debugDump(1));
} else {
if (logDebug) {
LOGGER.debug("SYNCHRONIZATION: received change notification {}", change);
@@ -163,9 +157,7 @@ public void notifyChange(ResourceObjectShadowChangeDescrip
SynchronizationEventInformation eventInfo = new SynchronizationEventInformation(applicableShadow,
change.getSourceChannel(), task);
- LensContext modelCtx = null;
try {
-
PrismObject configuration = systemObjectCache.getSystemConfiguration(subResult);
SynchronizationContext syncCtx = loadSynchronizationContext(applicableShadow, currentShadow, change.getResource(), change.getSourceChannel(), configuration, task, subResult);
syncCtx.setUnrelatedChange(change.isUnrelatedChange());
@@ -180,10 +172,8 @@ public void notifyChange(ResourceObjectShadowChangeDescrip
return;
}
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("Synchronization is enabled, focus class: {}, found applicable policy: {}",
- syncCtx.getFocusClass(), syncCtx.getPolicyName());
- }
+ LOGGER.trace("Synchronization is enabled, focus class: {}, found applicable policy: {}", syncCtx.getFocusClass(),
+ syncCtx.getPolicyName());
setupSituation(syncCtx, eventInfo, change);
@@ -198,8 +188,7 @@ public void notifyChange(ResourceObjectShadowChangeDescrip
change.setCurrentShadow(newCurrentShadow);
syncCtx.setCurrentShadow(newCurrentShadow);
}
- modelCtx = reactToChange(syncCtx, change,
- logDebug, eventInfo);
+ reactToChange(syncCtx, change, logDebug, eventInfo);
eventInfo.record(task);
subResult.computeStatus();
@@ -229,9 +218,8 @@ public SynchronizationContext loadSynchronizationContex
Task task, OperationResult result)
throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException {
- SynchronizationContext syncCtx = new SynchronizationContext(applicableShadow, currentShadow, resource, sourceChanel, task, result);
+ SynchronizationContext syncCtx = new SynchronizationContext<>(applicableShadow, currentShadow, resource, sourceChanel, task, result);
syncCtx.setSystemConfiguration(configuration);
-
SynchronizationType synchronization = resource.asObjectable().getSynchronization();
if (synchronization == null) {
@@ -243,12 +231,14 @@ public SynchronizationContext loadSynchronizationContex
syncCtx.setForceIntentChange(true);
LOGGER.trace("Setting synchronization situation to synchronization context: {}", synchronizationDiscriminator.getSynchronizationSituation());
syncCtx.setSituation(synchronizationDiscriminator.getSynchronizationSituation());
- F owner = (F) syncCtx.getCurrentOwner();
+ F owner = syncCtx.getCurrentOwner();
if (owner != null && alreadyLinked(owner, syncCtx.getApplicableShadow())) {
LOGGER.trace("Setting owner to synchronization context: {}", synchronizationDiscriminator.getOwner());
+ //noinspection unchecked
syncCtx.setCurrentOwner((F) synchronizationDiscriminator.getOwner());
}
LOGGER.trace("Setting correlated owner to synchronization context: {}", synchronizationDiscriminator.getOwner());
+ //noinspection unchecked
syncCtx.setCorrelatedOwner((F) synchronizationDiscriminator.getOwner());
}
@@ -292,12 +282,13 @@ private ObjectSynchronizationDiscriminatorType evaluateSyn
return null;
}
ExpressionType classificationExpression = synchronizationSorterType.getExpression();
- String desc = "syncrhonization divider type ";
+ String desc = "synchronization divider type ";
ExpressionVariables variables = ModelImplUtils.getDefaultExpressionVariables(null, syncCtx.getApplicableShadow(), null,
syncCtx.getResource(), syncCtx.getSystemConfiguration(), null);
variables.addVariableDefinition(ExpressionConstants.VAR_CHANNEL, syncCtx.getChanel());
try {
ModelExpressionThreadLocalHolder.pushExpressionEnvironment(new ExpressionEnvironment<>(task, result));
+ //noinspection unchecked
PrismPropertyDefinition discriminatorDef = prismContext.getSchemaRegistry()
.findPropertyDefinitionByElementName(new QName(SchemaConstants.NS_C, "objectSynchronizationDiscriminator"));
PrismPropertyValue evaluateDiscriminator = ExpressionUtil.evaluateExpression(variables, discriminatorDef,
@@ -340,7 +331,7 @@ private boolean checkSynchronizationPolicy(Synchronization
executeShadowModifications(syncCtx.getApplicableShadow(), modifications, task, subResult);
subResult.recordSuccess();
eventInfo.record(task);
- LOGGER.debug("SYNCHRONIZATION: UNRELATED CHNAGE for {}", syncCtx.getApplicableShadow());
+ LOGGER.debug("SYNCHRONIZATION: UNRELATED CHANGE for {}", syncCtx.getApplicableShadow());
return false;
}
@@ -381,7 +372,7 @@ private boolean checkProtected(SynchronizationContext s
subResult.recordSuccess();
eventInfo.setProtected();
eventInfo.record(task);
- LOGGER.debug("SYNCHRONIZATION: DONE (dry run) for protected shadow {}", syncCtx.getApplicableShadow());
+ LOGGER.debug("SYNCHRONIZATION: DONE for protected shadow {}", syncCtx.getApplicableShadow());
return false;
}
return true;
@@ -480,7 +471,7 @@ private void validate(ResourceObjectShadowChangeDescription change) {
// TODO TODO TODO TODO
// }
- /**
+ /**
* XXX: in situation when one account belongs to two different idm users
* (repository returns only first user, method
* {@link com.evolveum.midpoint.model.api.ModelService#findShadowOwner(String, Task, OperationResult)}
@@ -571,15 +562,7 @@ private void setupSituation(SynchronizationContext sync
}
private boolean isCorrelatedOwnerSameAsCurrentOwner(F expectedOwner, F currentOwnerType) {
- if (expectedOwner == null) {
- return true;
- }
-
- if (currentOwnerType == null) {
- return true;
- }
-
- return (expectedOwner.getOid().equals(currentOwnerType.getOid()));
+ return expectedOwner == null || currentOwnerType == null || expectedOwner.getOid().equals(currentOwnerType.getOid());
}
private String getOidFromChange(ResourceObjectShadowChangeDescription change) {
@@ -610,15 +593,6 @@ public boolean matchUserCorrelationRule(PrismObject synchronizationContext = loadSynchronizationContext(shadow, shadow, resourceType.asPrismObject(), task.getChannel(), configuration, task, result);
- Class focusClass;
- // TODO is this correct? The problem is that synchronizationPolicy can
- // be null...
- if (synchronizationContext.hasApplicablePolicy()) {
- focusClass = synchronizationContext.getFocusClass();
- } else {
- //noinspection unchecked
- focusClass = (Class) focus.asObjectable().getClass();
- }
return correlationConfirmationEvaluator.matchFocusByCorrelationRule(synchronizationContext, focus);
}
@@ -667,7 +641,7 @@ private void determineSituationWithCorrelation(Synchroniza
ResourceType resource = change.getResource().asObjectable();
validateResourceInShadow(resourceShadow.asObjectable(), resource);
- SynchronizationSituationType state = null;
+ SynchronizationSituationType state;
LOGGER.trace("SYNCHRONIZATION: CORRELATION: Looking for list of {} objects based on correlation rule.",
syncCtx.getFocusClass().getSimpleName());
List> users = correlationConfirmationEvaluator.findFocusesByCorrelationRule(syncCtx.getFocusClass(),
@@ -730,7 +704,6 @@ private void validateResourceInShadow(ShadowType shadow, ResourceType resource)
}
/**
- * @param change
* @return method checks change type in object delta if available, otherwise
* returns {@link ChangeType#ADD}
*/
@@ -742,35 +715,22 @@ private ChangeType getModificationType(ResourceObjectShadowChangeDescription cha
return ChangeType.ADD;
}
- private LensContext reactToChange(SynchronizationContext syncCtx,
+ private void reactToChange(SynchronizationContext syncCtx,
ResourceObjectShadowChangeDescription change, boolean logDebug, SynchronizationEventInformation eventInfo)
- throws ConfigurationException, ObjectNotFoundException, SchemaException,
- PolicyViolationException, ExpressionEvaluationException, ObjectAlreadyExistsException,
- CommunicationException, SecurityViolationException {
+ throws ConfigurationException, ObjectNotFoundException, SchemaException {
SynchronizationSituationType newSituation = syncCtx.getSituation();
- findReactionDefinition(syncCtx);
if (syncCtx.getReaction() == null) {
LOGGER.trace("No reaction is defined for situation {} in {}", syncCtx.getSituation(), syncCtx.getResource());
eventInfo.setNewSituation(newSituation);
- return null;
+ return;
}
- // seems to be unused so commented it out [med]
- // PrismObject shadow = null;
- // if (change.getCurrentShadow() != null) {
- // shadow = change.getCurrentShadow();
- // } else if (change.getOldShadow() != null) {
- // shadow = change.getOldShadow();
- // }
-
Boolean doReconciliation = syncCtx.isDoReconciliation();
if (doReconciliation == null) {
- // We have to do reconciliation if we have got a full shadow and no
- // delta.
- // There is no other good way how to reflect the changes from the
- // shadow.
+ // We have to do reconciliation if we have got a full shadow and no delta.
+ // There is no other good way how to reflect the changes from the shadow.
if (change.getObjectDelta() == null) {
doReconciliation = true;
}
@@ -786,7 +746,7 @@ private LensContext reactToChange(SynchronizationContex
OperationResult parentResult = syncCtx.getResult();
Task task = syncCtx.getTask();
if (willSynchronize) {
- lensContext = createLensContext(syncCtx, change, syncCtx.getReaction(), options, parentResult);
+ lensContext = createLensContext(syncCtx, change, options, parentResult);
}
if (LOGGER.isTraceEnabled() && lensContext != null) {
@@ -841,15 +801,12 @@ private LensContext reactToChange(SynchronizationContex
}
eventInfo.setNewSituation(newSituation);
- return lensContext;
-
}
@NotNull
private LensContext createLensContext(SynchronizationContext syncCtx,
- ResourceObjectShadowChangeDescription change, SynchronizationReactionType reactionDefinition,
- ModelExecuteOptions options,
- OperationResult parentResult) throws ObjectNotFoundException, SchemaException, ConfigurationException {
+ ResourceObjectShadowChangeDescription change, ModelExecuteOptions options,
+ OperationResult parentResult) throws ObjectNotFoundException, SchemaException {
LensContext context = contextFactory.createSyncContext(syncCtx.getFocusClass(), change);
context.setLazyAuditRequest(true);
@@ -863,38 +820,38 @@ private LensContext createLensContext(SynchronizationCo
context.rememberResource(resource);
PrismObject shadow = getShadowFromChange(change);
- if (InternalsConfig.consistencyChecks)
+ if (shadow == null) {
+ throw new IllegalStateException("No shadow in change: " + change);
+ }
+ if (InternalsConfig.consistencyChecks) {
shadow.checkConsistence();
+ }
// Projection context
-
ShadowKindType kind = getKind(shadow, syncCtx.getKind());
String intent = getIntent(shadow, syncCtx.getIntent());
- boolean thombstone = isThombstone(change);
- ResourceShadowDiscriminator descr = new ResourceShadowDiscriminator(resource.getOid(), kind, intent, thombstone);
- LensProjectionContext projectionContext = context.createProjectionContext(descr);
+ boolean tombstone = isThombstone(change);
+ ResourceShadowDiscriminator discriminator = new ResourceShadowDiscriminator(resource.getOid(), kind, intent, tombstone);
+ LensProjectionContext projectionContext = context.createProjectionContext(discriminator);
projectionContext.setResource(resource);
projectionContext.setOid(getOidFromChange(change));
projectionContext.setSynchronizationSituationDetected(syncCtx.getSituation());
projectionContext.setShadowExistsInRepo(syncCtx.isShadowExistsInRepo());
// insert object delta if available in change
- ObjectDelta delta = change.getObjectDelta();
+ ObjectDelta delta = change.getObjectDelta();
if (delta != null) {
- projectionContext.setSyncDelta((ObjectDelta) delta);
+ projectionContext.setSyncDelta(delta);
} else {
projectionContext.setSyncAbsoluteTrigger(true);
}
// we insert account if available in change
- PrismObject currentAccount = shadow;
- if (currentAccount != null) {
- projectionContext.setLoadedObject(currentAccount);
- if (!thombstone) {
- projectionContext.setFullShadow(true);
- }
- projectionContext.setFresh(true);
+ projectionContext.setLoadedObject(shadow);
+ if (!tombstone) {
+ projectionContext.setFullShadow(true);
}
+ projectionContext.setFresh(true);
if (delta != null && delta.isDelete()) {
projectionContext.setExists(false);
@@ -908,12 +865,12 @@ private LensContext createLensContext(SynchronizationCo
if (syncCtx.getCurrentOwner() != null) {
F focusType = syncCtx.getCurrentOwner();
LensFocusContext focusContext = context.createFocusContext();
+ //noinspection unchecked
PrismObject focusOld = (PrismObject) focusType.asPrismObject();
focusContext.setLoadedObject(focusOld);
}
// Global stuff
-
if (syncCtx.getObjectTemplateRef() != null) {
ObjectTemplateType objectTemplate = repositoryService
.getObject(ObjectTemplateType.class, syncCtx.getObjectTemplateRef().getOid(), null, parentResult)
@@ -934,8 +891,7 @@ private PrismObject getShadowFromChange(ResourceObjectShadowChangeDe
return null;
}
- private ShadowKindType getKind(PrismObject shadow,
- ShadowKindType objectSynchronizationKind) {
+ private ShadowKindType getKind(PrismObject shadow, ShadowKindType objectSynchronizationKind) {
ShadowKindType shadowKind = shadow.asObjectable().getKind();
if (shadowKind != null) {
return shadowKind;
@@ -975,10 +931,6 @@ private boolean isSynchronize(SynchronizationReactionType reactionDefinition) {
return !reactionDefinition.getAction().isEmpty();
}
- private void findReactionDefinition(SynchronizationContext syncCtx) throws ConfigurationException {
-
- }
-
/**
* Saves situation, timestamps, kind and intent (if needed)
*/
@@ -1055,6 +1007,7 @@ private boolean shouldSaveIntent(SynchronizationContext
if (syncCtx.isForceIntentChange()) {
String objectSyncIntent = syncCtx.getIntent();
+ //noinspection RedundantIfStatement
if (!MiscSchemaUtil.equalsIntent(shadow.getIntent(), objectSyncIntent)) {
return true;
}
@@ -1063,10 +1016,9 @@ private boolean shouldSaveIntent(SynchronizationContext
return false;
}
- private void executeActions(SynchronizationContext syncCtx,
- LensContext context, BeforeAfterType order,
- boolean logDebug, Task task, OperationResult parentResult)
- throws ConfigurationException, SchemaException {
+ private void executeActions(SynchronizationContext syncCtx, LensContext context,
+ BeforeAfterType order, boolean logDebug, Task task, OperationResult parentResult)
+ throws ConfigurationException, SchemaException {
for (SynchronizationActionType actionDef : syncCtx.getReaction().getAction()) {
if ((actionDef.getOrder() == null && order == BeforeAfterType.BEFORE)
@@ -1084,13 +1036,14 @@ private void executeActions(SynchronizationContext sync
Action action = actionManager.getActionInstance(handlerUri);
if (action == null) {
- LOGGER.warn("Couldn't create action with uri '{}' in resource {}, skipping action.",
- new Object[] { handlerUri, syncCtx.getResource() });
+ LOGGER.warn("Couldn't create action with uri '{}' in resource {}, skipping action.", handlerUri,
+ syncCtx.getResource());
continue;
}
// TODO: legacy userTemplate
+ // todo parameters are not really used; consider removing [pmed]
Map parameters = null;
if (actionDef.getParameters() != null) {
// TODO: process parameters
@@ -1102,7 +1055,7 @@ private void executeActions(SynchronizationContext sync
} else {
LOGGER.trace("SYNCHRONIZATION: ACTION: Executing: {}.", action.getClass());
}
- SynchronizationSituation situation = new SynchronizationSituation(syncCtx.getCurrentOwner(), syncCtx.getCorrelatedOwner(), syncCtx.getSituation());
+ SynchronizationSituation situation = new SynchronizationSituation<>(syncCtx.getCurrentOwner(), syncCtx.getCorrelatedOwner(), syncCtx.getSituation());
action.handle(context, situation, parameters, task, parentResult);
}
}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
index 4bcb7da44ca..980ea3db28a 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
@@ -165,7 +165,7 @@ protected boolean handleObjectInternal(PrismObject accountShadow, Ru
}
// We are going to pretend that all of the objects were just created.
- // That will efficiently import them to the IDM repository
+ // That will effectively import them to the IDM repository
ResourceObjectShadowChangeDescription change = new ResourceObjectShadowChangeDescription();
change.setSourceChannel(QNameUtil.qNameToUri(sourceChannel));
@@ -176,18 +176,14 @@ protected boolean handleObjectInternal(PrismObject accountShadow, Ru
if (forceAdd) {
// We should provide shadow in the state before the change. But we are
- // pretending that it has
- // not existed before, so we will not provide it.
- ObjectDelta shadowDelta = accountShadow.getPrismContext().deltaFactory().object().create(
- ShadowType.class, ChangeType.ADD);
- //PrismObject shadowToAdd = refinedAccountDefinition.getObjectDefinition().parseObjectType(newShadowType);
- PrismObject shadowToAdd = newShadowType.asPrismObject();
- shadowDelta.setObjectToAdd(shadowToAdd);
- shadowDelta.setOid(newShadowType.getOid());
+ // pretending that it has not existed before, so we will not provide it.
+ ObjectDelta shadowDelta = accountShadow.getPrismContext().deltaFactory().object()
+ .create(ShadowType.class, ChangeType.ADD);
+ shadowDelta.setObjectToAdd(accountShadow);
+ shadowDelta.setOid(accountShadow.getOid());
change.setObjectDelta(shadowDelta);
// Need to also set current shadow. This will get reflected in "old" object in lens context
change.setCurrentShadow(accountShadow);
-
} else {
// No change, therefore the delta stays null. But we will set the current
change.setCurrentShadow(accountShadow);
@@ -196,9 +192,7 @@ protected boolean handleObjectInternal(PrismObject accountShadow, Ru
try {
change.checkConsistence();
} catch (RuntimeException ex) {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("Check consistence failed: {}\nChange:\n{}", ex, change.debugDump());
- }
+ LOGGER.trace("Check consistence failed: {}\nChange:\n{}", ex, change.debugDumpLazily());
throw ex;
}
@@ -206,7 +200,7 @@ protected boolean handleObjectInternal(PrismObject accountShadow, Ru
ModelImplUtils.clearRequestee(workerTask);
objectChangeListener.notifyChange(change, workerTask, result);
- LOGGER.info("#### notify chnage finished.");
+ LOGGER.debug("#### notify change finished");
// No exception thrown here. The error is indicated in the result. Will be processed by superclass.
return workerTask.canRun();
diff --git a/model/model-impl/src/main/resources/ctx-model.xml b/model/model-impl/src/main/resources/ctx-model.xml
index 33ed2f5a58d..97cc399362f 100644
--- a/model/model-impl/src/main/resources/ctx-model.xml
+++ b/model/model-impl/src/main/resources/ctx-model.xml
@@ -41,6 +41,9 @@
+
+
@@ -78,9 +81,8 @@
-
-
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
index 947bc4f76ec..88716160acd 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
@@ -109,7 +109,7 @@ public void test010ListConnectors() throws Exception {
result.computeStatus();
TestUtil.assertSuccess("getObject result", result);
- assertEquals("Unexpected number of connectors", 10, connectors.size());
+ assertEquals("Unexpected number of connectors", 11, connectors.size());
for(PrismObject connector: connectors) {
display("Connector", connector);
ConnectorType connectorType = connector.asObjectable();
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java
new file mode 100644
index 00000000000..ee22000a567
--- /dev/null
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/MockAsyncUpdateSource.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.intest.async;
+
+import com.evolveum.midpoint.provisioning.ucf.api.AsyncUpdateMessageListener;
+import com.evolveum.midpoint.provisioning.ucf.api.AsyncUpdateSource;
+import com.evolveum.midpoint.provisioning.ucf.api.ListeningActivity;
+import com.evolveum.midpoint.provisioning.ucf.impl.builtin.async.AsyncUpdateConnectorInstance;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AnyDataAsyncUpdateMessageType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AsyncUpdateMessageType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AsyncUpdateSourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UcfChangeType;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+/**
+ * See also MockAsyncUpdateSource in provisioning-impl.
+ */
+@SuppressWarnings("unused")
+public class MockAsyncUpdateSource implements AsyncUpdateSource {
+
+ private static final Trace LOGGER = TraceManager.getTrace(MockAsyncUpdateSource.class);
+
+ private final Queue messages = new LinkedList<>();
+
+ public static final MockAsyncUpdateSource INSTANCE = new MockAsyncUpdateSource();
+
+ private static class DummyListeningActivityImpl implements ListeningActivity {
+ @Override
+ public void stop() {
+ // no-op
+ }
+ }
+
+ public static MockAsyncUpdateSource create(AsyncUpdateSourceType configuration, AsyncUpdateConnectorInstance connectorInstance) {
+ LOGGER.info("create() method called");
+ return INSTANCE;
+ }
+
+ @Override
+ public ListeningActivity startListening(AsyncUpdateMessageListener listener) throws SchemaException {
+ LOGGER.info("startListening() method called");
+ for (AsyncUpdateMessageType message : messages) {
+ listener.onMessage(message);
+ }
+ return new DummyListeningActivityImpl();
+ }
+
+ @Override
+ public void test(OperationResult parentResult) {
+ LOGGER.info("test() method called");
+ }
+
+ public void prepareMessage(UcfChangeType changeDescription) {
+ AnyDataAsyncUpdateMessageType message = new AnyDataAsyncUpdateMessageType();
+ message.setData(changeDescription);
+ prepareMessage(message);
+ }
+
+ public void prepareMessage(AsyncUpdateMessageType message) {
+ messages.offer(message);
+ }
+
+ public void reset() {
+ messages.clear();
+ }
+
+ @Override
+ public String toString() {
+ return "MockAsyncUpdateSource{" +
+ "messages:" + messages.size() +
+ '}';
+ }
+}
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateGrouperJson.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateGrouperJson.java
new file mode 100644
index 00000000000..a71d2ada676
--- /dev/null
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateGrouperJson.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.intest.async;
+
+import com.evolveum.midpoint.model.intest.AbstractInitializedModelIntegrationTest;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.test.util.MidPointTestConstants;
+import com.evolveum.midpoint.test.util.TestUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import org.apache.commons.io.IOUtils;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Tests async updates using Grouper JSON messages.
+ *
+ * Currently uses caching.
+ */
+@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"})
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class TestAsyncUpdateGrouperJson extends AbstractInitializedModelIntegrationTest {
+
+ public static final File TEST_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, "async/grouper-amqp091");
+
+ protected static final File RESOURCE_GROUPER_FILE = new File(TEST_DIR, "resource-grouper-amqp091.xml");
+ protected static final String RESOURCE_GROUPER_ID = "Grouper";
+ protected static final String RESOURCE_GROUPER_OID = "bbb9900a-b53d-4453-b60b-908725e3950e";
+
+ public static final String BANDERSON_USERNAME = "banderson";
+ public static final String JLEWIS685_USERNAME = "jlewis685";
+ public static final String ALUMNI_NAME = "ref:alumni";
+ public static final String STAFF_NAME = "ref:staff";
+
+ public static final String GROUPER_USER_INTENT = "subject";
+ public static final String GROUPER_GROUP_INTENT = "group";
+
+ protected PrismObject resourceGrouper;
+
+ private static final File CHANGE_100 = new File(TEST_DIR, "change-100-banderson-add-supergroup.json");
+ private static final File CHANGE_110 = new File(TEST_DIR, "change-110-alumni-add.json");
+ private static final File CHANGE_110a = new File(TEST_DIR, "change-110a-staff-add.json");
+ private static final File CHANGE_200 = new File(TEST_DIR, "change-200-banderson-add-alumni.json");
+ private static final File CHANGE_210 = new File(TEST_DIR, "change-210-banderson-add-staff.json");
+ private static final File CHANGE_220 = new File(TEST_DIR, "change-220-jlewis685-add-alumni.json");
+ private static final File CHANGE_230 = new File(TEST_DIR, "change-230-jlewis685-add-supergroup.json");
+ private static final File CHANGE_240 = new File(TEST_DIR, "change-240-banderson-add-staff.json");
+ private static final File CHANGE_250 = new File(TEST_DIR, "change-250-banderson-delete-alumni.json");
+ private static final File CHANGE_310 = new File(TEST_DIR, "change-310-staff-delete.json");
+
+ @Override
+ public void initSystem(Task initTask, OperationResult initResult) throws Exception {
+ super.initSystem(initTask, initResult);
+
+ resourceGrouper = importAndGetObjectFromFile(ResourceType.class, RESOURCE_GROUPER_FILE, RESOURCE_GROUPER_OID,
+ initTask, initResult);
+ }
+
+ @Test
+ public void test000Sanity() throws Exception {
+ final String TEST_NAME = "test000Sanity";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+
+ OperationResult testResultGrouper = modelService.testResource(RESOURCE_GROUPER_OID, task);
+ TestUtil.assertSuccess(testResultGrouper);
+ }
+
+ private Task createTestTask(String TEST_NAME) {
+ return taskManager.createTaskInstance(TestAsyncUpdateGrouperJson.class.getName() + "." + TEST_NAME);
+ }
+
+ /**
+ * The first MEMBERSHIP_ADD event for banderson (supergroup)
+ */
+ @Test
+ public void test100AddAnderson() throws Exception {
+ final String TEST_NAME = "test100AddAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_100));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits();
+ }
+
+ private AsyncUpdateMessageType getAmqp091Message(File file) throws IOException {
+ Amqp091MessageType rv = new Amqp091MessageType();
+ String json = String.join("\n", IOUtils.readLines(new FileReader(file)));
+ rv.setBody(json.getBytes(StandardCharsets.UTF_8));
+ return rv;
+ }
+
+ /**
+ * GROUP_ADD event for ref:alumni and ref:staff.
+ */
+ @Test
+ public void test110AddAlumniAndStaff() throws Exception {
+ final String TEST_NAME = "test110AddAlumniAndStaff";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_110));
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_110a));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertOrgByName(ALUMNI_NAME, "after")
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ENTITLEMENT)
+// .assertIntent(GROUPER_GROUP_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID);
+
+ assertOrgByName(STAFF_NAME, "after")
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ENTITLEMENT)
+// .assertIntent(GROUPER_GROUP_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID);
+ }
+
+ /**
+ * Adding ref:alumni membership for banderson.
+ */
+ @Test
+ public void test200AddAlumniForAnderson() throws Exception {
+ final String TEST_NAME = "test200AddAlumniForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_200));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .display("shadow after")
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Adding ref:staff membership for banderson.
+ */
+ @Test
+ public void test210AddStaffForAnderson() throws Exception {
+ final String TEST_NAME = "test210AddStaffForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_210));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME, STAFF_NAME);
+ }
+
+ /**
+ * Adding ref:alumni membership for jlewis685. But this is the first occurrence of jlewis685!
+ */
+ @Test
+ public void test220AddAlumniForLewis() throws Exception {
+ final String TEST_NAME = "test220AddAlumniForLewis";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_220));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(JLEWIS685_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Adding supergroup to jlewis (notification-only change). Should be idempotent.
+ */
+ @Test
+ public void test230AddLewis() throws Exception {
+ final String TEST_NAME = "test230AddLewis";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_230));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(JLEWIS685_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Adding ref:staff membership for banderson (again). Should be idempotent.
+ */
+ @Test
+ public void test240AddStaffForAnderson() throws Exception {
+ final String TEST_NAME = "test240AddStaffForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_240));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME, STAFF_NAME);
+ }
+
+ /**
+ * Deleting ref:alumni membership for banderson.
+ */
+ @Test
+ public void test250DeleteAlumniForAnderson() throws Exception {
+ final String TEST_NAME = "test250DeleteAlumniForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_250));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(STAFF_NAME);
+ }
+
+ /**
+ * Deleting etc:staff.
+ */
+ @Test
+ public void test310DeleteStaff() throws Exception {
+ final String TEST_NAME = "test310DeleteStaff";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ assertObjectByName(OrgType.class, STAFF_NAME, task, result);
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(getAmqp091Message(CHANGE_310));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertNoObjectByName(OrgType.class, STAFF_NAME, task, result);
+ }
+}
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateUcf.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateUcf.java
new file mode 100644
index 00000000000..ca598ec9622
--- /dev/null
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestAsyncUpdateUcf.java
@@ -0,0 +1,454 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.intest.async;
+
+import com.evolveum.midpoint.model.intest.AbstractInitializedModelIntegrationTest;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.test.util.MidPointTestConstants;
+import com.evolveum.midpoint.test.util.TestUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UcfChangeType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+/**
+ * Tests model.notifyChange using real AMQP messages.
+ *
+ * Currently uses caching. And plain messages (no transformation).
+ */
+@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"})
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class TestAsyncUpdateUcf extends AbstractInitializedModelIntegrationTest {
+
+ public static final File TEST_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, "async/ucf");
+
+ protected static final File RESOURCE_GROUPER_FILE = new File(TEST_DIR, "resource-grouper-ucf-internal.xml");
+ protected static final String RESOURCE_GROUPER_ID = "Grouper";
+ protected static final String RESOURCE_GROUPER_OID = "bbb9900a-b53d-4453-b60b-908725e3950e";
+
+ public static final String BANDERSON_USERNAME = "banderson";
+ public static final String JLEWIS685_USERNAME = "jlewis685";
+ public static final String KWHITE_USERNAME = "kwhite";
+ public static final String ALUMNI_NAME = "ref:alumni";
+ public static final String STAFF_NAME = "ref:staff";
+
+ public static final String GROUPER_USER_INTENT = "subject";
+ public static final String GROUPER_GROUP_INTENT = "group";
+
+ protected PrismObject resourceGrouper;
+
+ private static final File CHANGE_100 = new File(TEST_DIR, "change-100-banderson-add.xml");
+ private static final File CHANGE_110 = new File(TEST_DIR, "change-110-alumni-add.xml");
+ private static final File CHANGE_110a = new File(TEST_DIR, "change-110a-staff-add.xml");
+ private static final File CHANGE_120 = new File(TEST_DIR, "change-120-kwhite-identifiers-only.xml");
+ private static final File CHANGE_200 = new File(TEST_DIR, "change-200-banderson-add-alumni-full-shadow.xml");
+ private static final File CHANGE_210 = new File(TEST_DIR, "change-210-banderson-add-staff.xml");
+ private static final File CHANGE_220 = new File(TEST_DIR, "change-220-jlewis685-add-alumni.xml");
+ private static final File CHANGE_230 = new File(TEST_DIR, "change-230-jlewis685-identifiers-only.xml");
+ private static final File CHANGE_300 = new File(TEST_DIR, "change-300-banderson-delete.xml");
+ private static final File CHANGE_310 = new File(TEST_DIR, "change-310-staff-delete.xml");
+
+ @Override
+ public void initSystem(Task initTask, OperationResult initResult) throws Exception {
+ super.initSystem(initTask, initResult);
+
+ resourceGrouper = importAndGetObjectFromFile(ResourceType.class, RESOURCE_GROUPER_FILE, RESOURCE_GROUPER_OID,
+ initTask, initResult);
+ }
+
+ @Test
+ public void test000Sanity() throws Exception {
+ final String TEST_NAME = "test000Sanity";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+
+ OperationResult testResultGrouper = modelService.testResource(RESOURCE_GROUPER_OID, task);
+ TestUtil.assertSuccess(testResultGrouper);
+ }
+
+ private Task createTestTask(String TEST_NAME) {
+ return taskManager.createTaskInstance(TestAsyncUpdateUcf.class.getName() + "." + TEST_NAME);
+ }
+
+ /**
+ * Shadow ADD delta for banderson.
+ */
+ @Test
+ public void test100AddAnderson() throws Exception {
+ final String TEST_NAME = "test100AddAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_100).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits();
+ }
+
+ /**
+ * Shadow ADD deltas for ref:alumni and ref:staff.
+ */
+ @Test
+ public void test110AddAlumniAndStaff() throws Exception {
+ final String TEST_NAME = "test110AddAlumni";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_110).parseRealValue(UcfChangeType.class));
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_110a).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertOrgByName(ALUMNI_NAME, "after")
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ENTITLEMENT)
+// .assertIntent(GROUPER_GROUP_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID);
+
+ assertOrgByName(STAFF_NAME, "after")
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ENTITLEMENT)
+// .assertIntent(GROUPER_GROUP_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID);
+ }
+
+ /**
+ * Identifiers-only message for kwhite.
+ */
+ @Test
+ public void test120AddWhite() throws Exception {
+ final String TEST_NAME = "test120AddWhite";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_120).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(KWHITE_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display()
+ .assertKind(ShadowKindType.ACCOUNT)
+ // .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits();
+ }
+
+ /**
+ * Adding ref:alumni membership for banderson "the old way" (i.e. by providing full current shadow).
+ */
+ @Test
+ public void test200AddAlumniForAnderson() throws Exception {
+ final String TEST_NAME = "test200AddAlumniForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_200).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .assertKind(ShadowKindType.ACCOUNT)
+// .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .display("shadow after")
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Adding ref:staff membership for banderson using delta.
+ */
+ @Test
+ public void test210AddStaffForAnderson() throws Exception {
+ final String TEST_NAME = "test210AddStaffForAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_210).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+// .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME, STAFF_NAME);
+ }
+
+ /**
+ * Adding ref:alumni membership for jlewis685 "the new way" (i.e. by a delta). But this is the first occurrence of jlewis685!
+ */
+ @Test
+ public void test220AddAlumniForLewis() throws Exception {
+ final String TEST_NAME = "test220AddAlumniForLewis";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_220).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(JLEWIS685_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+// .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Mentions jlewis again (notification-only change). Should be idempotent.
+ */
+ @Test
+ public void test230MentionLewis() throws Exception {
+ final String TEST_NAME = "test230MentionLewis";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_230).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(JLEWIS685_USERNAME)
+ .displayWithProjections()
+ .links()
+ .single()
+ .resolveTarget()
+ .display("shadow after")
+ .assertKind(ShadowKindType.ACCOUNT)
+// .assertIntent(GROUPER_USER_INTENT)
+ .assertResource(RESOURCE_GROUPER_OID)
+ .end()
+ .end()
+ .end()
+ .assertOrganizationalUnits(ALUMNI_NAME);
+ }
+
+ /**
+ * Deleting banderson.
+ */
+ @Test
+ public void test300DeleteAnderson() throws Exception {
+ final String TEST_NAME = "test300DeleteAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_300).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertUserAfterByUsername(BANDERSON_USERNAME)
+ .displayWithProjections()
+ //.assertOrganizationalUnits(ALUMNI_NAME)
+ .links()
+ .assertNone();
+ }
+
+ /**
+ * Deleting etc:staff.
+ */
+ @Test
+ public void test310DeleteStaff() throws Exception {
+ final String TEST_NAME = "test310DeleteStaff";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = createTestTask(TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ assertObjectByName(OrgType.class, STAFF_NAME, task, result);
+
+ MockAsyncUpdateSource.INSTANCE.reset();
+ MockAsyncUpdateSource.INSTANCE.prepareMessage(prismContext.parserFor(CHANGE_310).parseRealValue(UcfChangeType.class));
+
+ // WHEN
+
+ ResourceShadowDiscriminator coords = new ResourceShadowDiscriminator(RESOURCE_GROUPER_OID);
+ String handle = provisioningService.startListeningForAsyncUpdates(coords, task, result);
+ provisioningService.stopListeningForAsyncUpdates(handle, task, result);
+
+ // THEN
+
+ result.computeStatus();
+ TestUtil.assertSuccess(result);
+
+ assertNoObjectByName(OrgType.class, STAFF_NAME, task, result);
+ }
+}
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestNotifyChange.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestNotifyChange.java
new file mode 100644
index 00000000000..92da9d14da1
--- /dev/null
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestNotifyChange.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.model.intest.async;
+
+import com.evolveum.icf.dummy.resource.DummyResource;
+import com.evolveum.icf.dummy.resource.DummySyncStyle;
+import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
+import com.evolveum.midpoint.model.intest.AbstractInitializedModelIntegrationTest;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.delta.DeltaFactory;
+import com.evolveum.midpoint.prism.delta.ObjectDelta;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.schema.DeltaConvertor;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
+import com.evolveum.midpoint.schema.processor.ResourceSchema;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.test.DummyResourceContoller;
+import com.evolveum.midpoint.test.util.MidPointTestConstants;
+import com.evolveum.midpoint.test.util.TestUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectShadowChangeDescriptionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+/**
+ * Tests model.notifyChange using manually constructed ResourceObjectShadowChangeDescriptionType objects.
+ */
+@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"})
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class TestNotifyChange extends AbstractInitializedModelIntegrationTest {
+
+ public static final File TEST_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, "async/notify-change");
+
+ protected static final File RESOURCE_GROUPER_FILE = new File(TEST_DIR, "resource-grouper.xml");
+ protected static final String RESOURCE_GROUPER_ID = "Grouper";
+ protected static final String RESOURCE_GROUPER_OID = "bbb9900a-b53d-4453-b60b-908725e3950e";
+
+ public static final String BANDERSON_USERNAME = "banderson";
+ public static final String JLEWIS685_USERNAME = "jlewis685";
+ public static final String ALUMNI_NAME = "ref:alumni";
+ public static final String STAFF_NAME = "ref:staff";
+
+ public static final String GROUPER_USER_INTENT = "subject";
+ public static final String GROUPER_GROUP_INTENT = "group";
+
+ protected static DummyResource dummyResourceGrouper;
+ protected static DummyResourceContoller dummyResourceCtlGrouper;
+ protected ResourceType resourceDummyGrouperType;
+ protected PrismObject resourceDummyGrouper;
+
+ protected static final File SHADOW_BANDERSON_FILE = new File(TEST_DIR, "shadow-banderson.xml");
+ protected static final File SHADOW_BANDERSON_WITH_GROUPS_FILE = new File(TEST_DIR, "shadow-banderson-with-groups.xml");
+ protected static final File SHADOW_JLEWIS685_FILE = new File(TEST_DIR, "shadow-jlewis685.xml");
+ protected static final File SHADOW_ALUMNI_FILE = new File(TEST_DIR, "shadow-alumni.xml");
+ protected static final File SHADOW_STAFF_FILE = new File(TEST_DIR, "shadow-staff.xml");
+
+ private String lewisShadowOid;
+
+ @Override
+ public void initSystem(Task initTask, OperationResult initResult) throws Exception {
+ super.initSystem(initTask, initResult);
+
+ // Resources
+ dummyResourceCtlGrouper = DummyResourceContoller.create(RESOURCE_GROUPER_ID, resourceDummyGrouper);
+ dummyResourceGrouper = dummyResourceCtlGrouper.getDummyResource();
+ dummyResourceGrouper.setSyncStyle(DummySyncStyle.SMART);
+ dummyResourceGrouper.populateWithDefaultSchema();
+
+ resourceDummyGrouper = importAndGetObjectFromFile(ResourceType.class, RESOURCE_GROUPER_FILE, RESOURCE_GROUPER_OID, initTask, initResult);
+ resourceDummyGrouperType = resourceDummyGrouper.asObjectable();
+ dummyResourceCtlGrouper.setResource(resourceDummyGrouper);
+ }
+
+ @Test
+ public void test000Sanity() throws Exception {
+ final String TEST_NAME = "test000Sanity";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = taskManager.createTaskInstance(TestNotifyChange.class.getName() + "." + TEST_NAME);
+
+ OperationResult testResultGrouper = modelService.testResource(RESOURCE_GROUPER_OID, task);
+ TestUtil.assertSuccess(testResultGrouper);
+ }
+
+ /**
+ * MEMBER_ADD event for banderson.
+ */
+ @Test
+ public void test100AddAnderson() throws Exception {
+ final String TEST_NAME = "test100AddAnderson";
+ TestUtil.displayTestTitle(this, TEST_NAME);
+ Task task = taskManager.createTaskInstance(TestNotifyChange.class.getName() + "." + TEST_NAME);
+ OperationResult result = task.getResult();
+
+ // GIVEN
+
+ PrismObject bandersonShadow = prismContext.parseObject(SHADOW_BANDERSON_FILE);
+ ResourceObjectShadowChangeDescriptionType change = new ResourceObjectShadowChangeDescriptionType();
+ ObjectDelta