Add activity identifier generation

In order to do that we created binding Activity class (standalone or embedded) that holds activity definition, handler, and execution. It also contains the generated identifier.
Evolveum · Jun 2, 2021 · a23196c · a23196c
1 parent d6e724a
commit a23196c
Show file tree

Hide file tree

Showing 81 changed files with 1,260 additions and 888 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/TaskWorkStateUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/TaskWorkStateUtil.java
@@ -230,7 +230,7 @@ public static TaskPartWorkStateType getCurrentPartWorkState(TaskWorkStateType wo
     @Nullable
     public static TaskPartWorkStateType getPartWorkState(TaskWorkStateType workState, String partId) {
         if (workState != null) {
-            return getPartWorkState(workState.getPart(), partId);
+            return getPartWorkState(workState.getActivity(), partId);
         } else {
             return null;
         }
@@ -239,7 +239,7 @@ public static TaskPartWorkStateType getPartWorkState(TaskWorkStateType workState
     @Nullable
     private static TaskPartWorkStateType getPartWorkState(List<TaskPartWorkStateType> parts, String partId) {
         for (TaskPartWorkStateType partState : parts) {
-            if (Objects.equals(partState.getPartId(), partId)) {
+            if (Objects.equals(partState.getIdentifier(), partId)) {
                 return partState;
             }
             TaskPartWorkStateType inChildren = getPartWorkState(partState.getPart(), partId);

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
@@ -2378,7 +2378,7 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="part" type="tns:TaskPartWorkStateType" minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="activity" type="tns:TaskPartWorkStateType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>
                         Work state for individual parts.
@@ -2409,7 +2409,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="partId" type="xsd:string" minOccurs="0">
+            <xsd:element name="identifier" type="xsd:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Identifier of the task part.
@@ -5240,4 +5240,27 @@
     </xsd:complexType>
     <xsd:element name="propagationWorkDefinition" type="tns:PropagationWorkDefinitionType"/>
 
+    <xsd:complexType name="ActivityPathType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Path from the root of the activity tree to the specified activity.
+            </xsd:documentation>
+            <xsd:appinfo>
+                <a:experimental>true</a:experimental>
+                <!-- Intentionally not a container because of the need of path segment ordering -->
+                <a:since>4.4</a:since>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="identifier" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Identifier of the activity. Note that the identifier of the root activity is NOT included here.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="activityPath" type="tns:ActivityPathType"/>
+
 </xsd:schema>
diff --git a/infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml b/infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
@@ -940,8 +940,8 @@ Profiles: []</cachingConfiguration>
     <workState>
         <currentPartNumber>1</currentPartNumber>
         <expectedParts>1</expectedParts>
-        <part id="1">
-            <partId>resourceObjects:1</partId>
+        <activity id="1">
+            <identifier>resourceObjects:1</identifier>
             <progress>
                 <closed>
                     <outcome>
@@ -953,12 +953,12 @@ Profiles: []</cachingConfiguration>
             <complete>true</complete>
             <bucketsProcessingRole>worker</bucketsProcessingRole>
             <scavenger>true</scavenger>
-        </part>
-        <part id="100">
-            <partId>resourceObjects:1</partId> <!-- fake ID to check the aggregation -->
-        </part>
-        <part id="200">
-            <partId>resourceObjects:2</partId> <!-- fake ID to check the aggregation -->
+        </activity>
+        <activity id="100">
+            <identifier>resourceObjects:1</identifier> <!-- fake ID to check the aggregation -->
+        </activity>
+        <activity id="200">
+            <identifier>resourceObjects:2</identifier> <!-- fake ID to check the aggregation -->
             <progress>
                 <closed id="101"> <!-- intentionally the same as in child-2 -->
                     <outcome>
@@ -968,7 +968,7 @@ Profiles: []</cachingConfiguration>
                 </closed>
             </progress>
             <complete>true</complete>
-        </part>
+        </activity>
     </workState>
     <recurrence>single</recurrence>
     <binding>loose</binding>

diff --git a/...um/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java b/...um/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
@@ -220,28 +220,28 @@ private List<OrderConstraintsType> defaultOrderConstraints() {
         return Collections.singletonList(new OrderConstraintsType(prismContext).order(1));
     }
 
-    static boolean oidMatches(ObjectReferenceType targetRef, EvaluatedAssignmentTargetImpl assignmentTarget,
+    static boolean oidMatches(ObjectReferenceType constraintTargetRef, EvaluatedAssignmentTargetImpl assignmentTarget,
             PrismContext prismContext, MatchingRuleRegistry matchingRuleRegistry, String context) throws SchemaException {
-        if (targetRef == null) {
+        if (constraintTargetRef == null) {
             return true; // this means we rely on comparing relations
         }
         if (assignmentTarget.getOid() == null) {
-            return false;        // shouldn't occur
+            return false; // shouldn't occur
         }
-        if (targetRef.getOid() != null) {
-            return assignmentTarget.getOid().equals(targetRef.getOid());
+        if (constraintTargetRef.getOid() != null) {
+            return assignmentTarget.getOid().equals(constraintTargetRef.getOid());
         }
-        if (targetRef.getResolutionTime() == EvaluationTimeType.RUN) {
-            SearchFilterType filterType = targetRef.getFilter();
+        if (constraintTargetRef.getResolutionTime() == EvaluationTimeType.RUN) {
+            SearchFilterType filterType = constraintTargetRef.getFilter();
             if (filterType == null) {
                 throw new SchemaException("No filter in " + context);
             }
-            QName typeQName = targetRef.getType();
+            QName typeQName = constraintTargetRef.getType();
             @SuppressWarnings("rawtypes")
             PrismObjectDefinition objDef = prismContext.getSchemaRegistry().findObjectDefinitionByType(typeQName);
             ObjectFilter filter = prismContext.getQueryConverter().parseFilter(filterType, objDef);
             PrismObject<? extends AssignmentHolderType> target = assignmentTarget.getTarget();
-            return filter.match(target.getValue(), matchingRuleRegistry);
+            return filter.match(target.getValue(), matchingRuleRegistry); // TODO check the type
         } else {
             throw new SchemaException("No OID in " + context);
         }

diff --git a/...va/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationActivityExecution.java b/...va/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationActivityExecution.java
@@ -17,7 +17,7 @@
 import com.evolveum.midpoint.repo.common.task.ActivityReportingOptions;
 import com.evolveum.midpoint.repo.common.task.HandledObjectType;
 import com.evolveum.midpoint.repo.common.task.ItemProcessor;
-import com.evolveum.midpoint.repo.common.task.execution.ActivityInstantiationContext;
+import com.evolveum.midpoint.repo.common.activity.execution.ExecutionInstantiationContext;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.*;
@@ -31,17 +31,17 @@
 public class PropagationActivityExecution
         extends AbstractSearchIterativeActivityExecution
         <ShadowType,
-                        PropagationWorkDefinition,
-                        PropagationActivityHandler,
-                        PropagationActivityExecution> {
+                PropagationWorkDefinition,
+                PropagationActivityHandler,
+                PropagationActivityExecution> {
 
     private static final String SHORT_NAME = "Propagation";
 
     private PrismObject<ResourceType> resource;
 
-    PropagationActivityExecution(@NotNull ActivityInstantiationContext<PropagationWorkDefinition> context,
-            @NotNull PropagationActivityHandler activityHandler) {
-        super(context, activityHandler, SHORT_NAME);
+    PropagationActivityExecution(
+            @NotNull ExecutionInstantiationContext<PropagationWorkDefinition, PropagationActivityHandler> context) {
+        super(context, SHORT_NAME);
     }
 
     @Override
@@ -56,9 +56,9 @@ public class PropagationActivityExecution
     protected void initializeExecution(OperationResult opResult) throws SchemaException, ObjectNotFoundException,
             SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException {
         String resourceOid = MiscUtil.requireNonNull(
-                activityDefinition.getWorkDefinition().getResourceOid(),
+                activity.getWorkDefinition().getResourceOid(),
                 () -> "No resource specified");
-        resource = activityHandler.provisioningService
+        resource = activity.getHandler().provisioningService
                 .getObject(ResourceType.class, resourceOid, null, getTask(), opResult);
         setContextDescription("to " + resource);
     }
@@ -77,7 +77,7 @@ protected ObjectQuery createQuery(OperationResult opResult) {
         return createDefaultItemProcessor(
                 (shadow, request, workerTask, result) -> {
                     try {
-                        activityHandler.shadowsFacade.propagateOperations(resource, shadow, workerTask, result);
+                        activity.getHandler().shadowsFacade.propagateOperations(resource, shadow, workerTask, result);
                         return true;
                     } catch (GenericFrameworkException | EncryptionException e) {
                         throw new SystemException("Generic provisioning framework error: " + e.getMessage(), e);

diff --git a/...java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationActivityHandler.java b/...java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationActivityHandler.java
@@ -9,17 +9,17 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
+import com.evolveum.midpoint.repo.common.activity.execution.AbstractActivityExecution;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.provisioning.api.ProvisioningService;
 import com.evolveum.midpoint.provisioning.impl.shadows.ShadowsFacade;
-import com.evolveum.midpoint.repo.common.task.definition.WorkDefinitionFactory;
-import com.evolveum.midpoint.repo.common.task.execution.ActivityExecution;
-import com.evolveum.midpoint.repo.common.task.execution.ActivityInstantiationContext;
-import com.evolveum.midpoint.repo.common.task.handlers.ActivityHandler;
-import com.evolveum.midpoint.repo.common.task.handlers.ActivityHandlerRegistry;
+import com.evolveum.midpoint.repo.common.activity.definition.WorkDefinitionFactory;
+import com.evolveum.midpoint.repo.common.activity.execution.ExecutionInstantiationContext;
+import com.evolveum.midpoint.repo.common.activity.handlers.ActivityHandler;
+import com.evolveum.midpoint.repo.common.activity.handlers.ActivityHandlerRegistry;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PropagationWorkDefinitionType;
@@ -29,7 +29,7 @@
  * TODO
  */
 @Component
-public class PropagationActivityHandler implements ActivityHandler<PropagationWorkDefinition> {
+public class PropagationActivityHandler implements ActivityHandler<PropagationWorkDefinition, PropagationActivityHandler> {
 
     private static final String LEGACY_HANDLER_URI = SchemaConstants.NS_PROVISIONING_TASK + "/propagation/handler-3";
     private static final String ARCHETYPE_OID = SystemObjectsType.ARCHETYPE_SYSTEM_TASK.value(); // TODO
@@ -52,8 +52,14 @@ public void unregister() {
     }
 
     @Override
-    public @NotNull ActivityExecution createExecution(@NotNull ActivityInstantiationContext<PropagationWorkDefinition> context,
+    public @NotNull AbstractActivityExecution<PropagationWorkDefinition, PropagationActivityHandler> createExecution(
+            @NotNull ExecutionInstantiationContext<PropagationWorkDefinition, PropagationActivityHandler> context,
             @NotNull OperationResult result) {
-        return new PropagationActivityExecution(context, this);
+        return new PropagationActivityExecution(context);
+    }
+
+    @Override
+    public String getIdentifierPrefix() {
+        return "propagation";
     }
 }
diff --git a/.../java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java b/.../java/com/evolveum/midpoint/provisioning/impl/shadows/task/PropagationWorkDefinition.java
@@ -7,11 +7,7 @@
 
 package com.evolveum.midpoint.provisioning.impl.shadows.task;
 
-import javax.xml.namespace.QName;
-
-import org.jetbrains.annotations.NotNull;
-
-import com.evolveum.midpoint.repo.common.task.definition.AbstractWorkDefinition;
+import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.schema.util.task.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.WorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.WorkDefinitionWrapper;
@@ -44,8 +40,4 @@ protected void debugDumpContent(StringBuilder sb, int indent) {
         DebugUtil.debugDumpWithLabelLn(sb, "resourceOid", resourceOid, indent+1);
     }
 
-    @Override
-    public @NotNull QName getType() {
-        return PropagationWorkDefinitionType.COMPLEX_TYPE;
-    }
 }