Migrate cleanup task to the new framework

(Plus a couple of small fixes.)
Evolveum · Jun 23, 2021 · 7e8740b · 7e8740b
1 parent e71f085
commit 7e8740b
Show file tree

Hide file tree

Showing 20 changed files with 523 additions and 235 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
@@ -670,10 +670,10 @@ public abstract class SchemaConstants {
 
     public static final String TRACE_DICTIONARY_PREFIX = "#dictionary#";
 
-    public static final String AUDIT_RECORDS_CLEANUP_TASK_PART_URI = "auditRecords";
+    public static final String ID_AUDIT_RECORDS_CLEANUP = "auditRecords";
     public static final String ID_CLOSED_TASKS_CLEANUP = "closedTasks";
     public static final String ID_CLOSED_CASES_CLEANUP = "closedCases";
     public static final String ID_DEAD_NODES_CLEANUP = "deadNodes";
-    public static final String OUTPUT_REPORTS_CLEANUP_TASK_PART_URI = "outputReports";
-    public static final String CLOSED_CERTIFICATION_CAMPAIGNS_CLEANUP_TASK_PART_URI = "closedCertificationCampaigns";
+    public static final String ID_OUTPUT_REPORTS_CLEANUP = "outputReports";
+    public static final String ID_CLOSED_CERTIFICATION_CAMPAIGNS_CLEANUP = "closedCertificationCampaigns";
 }
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
@@ -1867,7 +1867,7 @@
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:element>
-                <xsd:element name="cleanup" type="tns:CleanupDefinitionType" minOccurs="0">
+                <xsd:element name="cleanup" type="tns:CleanupWorkDefinitionType" minOccurs="0">
                     <xsd:annotation>
                         <xsd:documentation>
                             TODO
@@ -6121,7 +6121,7 @@
     </xsd:complexType>
     <xsd:element name="liveSynchronization" type="tns:LiveSyncWorkDefinitionType"/>
 
-    <xsd:complexType name="CleanupDefinitionType">
+    <xsd:complexType name="CleanupWorkDefinitionType">
         <xsd:annotation>
             <xsd:documentation>
                 TODO
@@ -6146,7 +6146,7 @@
             </xsd:extension>
         </xsd:complexContent>
     </xsd:complexType>
-    <xsd:element name="cleanupDefinition" type="tns:CleanupDefinitionType"/>
+    <xsd:element name="cleanupDefinition" type="tns:CleanupWorkDefinitionType"/>
 
     <xsd:complexType name="ReportDefinitionType">
         <xsd:annotation>

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
diff --git a/...impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupActivityExecution.java b/...impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupActivityExecution.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2010-2021 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.model.impl.cleanup;
+
+import com.evolveum.midpoint.repo.common.activity.execution.AbstractCompositeActivityExecution;
+import com.evolveum.midpoint.repo.common.activity.execution.ExecutionInstantiationContext;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractActivityWorkStateType;
+
+class CleanupActivityExecution extends AbstractCompositeActivityExecution<
+        CleanupWorkDefinition,
+        CleanupActivityHandler,
+        AbstractActivityWorkStateType> {
+
+    CleanupActivityExecution(ExecutionInstantiationContext<CleanupWorkDefinition, CleanupActivityHandler> context) {
+        super(context);
+    }
+}