Remove deprecated CleanupPoliciesType.objectResults

Evolveum · May 24, 2023 · df9d41d · df9d41d
1 parent 52ea165
commit df9d41d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -16162,6 +16162,11 @@
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container/>
+                <a:schemaMigration>
+                    <a:element>tns:objectResults</a:element>
+                    <a:version>4.8</a:version>
+                    <a:operation>removed</a:operation>
+                </a:schemaMigration>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -16200,15 +16205,6 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="objectResults" type="tns:CleanupPolicyType" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:appinfo>
-                        <a:displayName>CleanupPoliciesType.objectResults</a:displayName>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.3</a:deprecatedSince>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
             <xsd:element name="simpleOperationExecutions" type="tns:CleanupPolicyType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:appinfo>

diff --git a/...common/src/main/java/com/evolveum/midpoint/repo/common/util/OperationExecutionWriter.java b/...common/src/main/java/com/evolveum/midpoint/repo/common/util/OperationExecutionWriter.java
@@ -290,12 +290,6 @@ private void updateCleanupPolicies(@Nullable SystemConfigurationType value) {
         if (value != null && value.getCleanupPolicy() != null) {
             simpleExecsCleanupPolicy = value.getCleanupPolicy().getSimpleOperationExecutions();
             complexExecsCleanupPolicy = value.getCleanupPolicy().getComplexOperationExecutions();
-            if (simpleExecsCleanupPolicy == null) {
-                simpleExecsCleanupPolicy = value.getCleanupPolicy().getObjectResults();
-            }
-            if (complexExecsCleanupPolicy == null) {
-                complexExecsCleanupPolicy = value.getCleanupPolicy().getObjectResults();
-            }
         } else {
             simpleExecsCleanupPolicy = null;
             complexExecsCleanupPolicy = null;