Schema cleanup: InternalsConfigurationType.subresultStripThreshold

Evolveum · Oct 1, 2021 · e62a628 · e62a628
1 parent 1755002
commit e62a628
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
@@ -2437,11 +2437,9 @@ private static OperationResultImportanceType getPreserveDuringCleanup() {
     }
 
     public static void applyOperationResultHandlingStrategy(
-            @NotNull List<OperationResultHandlingStrategyType> configuredStrategies, Integer stripThresholdDeprecated) {
+            @NotNull List<OperationResultHandlingStrategyType> configuredStrategies) {
         if (!configuredStrategies.isEmpty()) {
             handlingStrategies = CloneUtil.cloneCollectionMembers(configuredStrategies);
-        } else if (stripThresholdDeprecated != null) {
-            handlingStrategies = singletonList(new OperationResultHandlingStrategyType().subresultStripThreshold(stripThresholdDeprecated));
         } else {
             handlingStrategies = singletonList(DEFAULT_HANDLING_STRATEGY);
         }

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
@@ -15387,6 +15387,11 @@
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container/>
+                <a:schemaMigration>
+                    <a:element>tns:subresultStripThreshold</a:element>
+                    <a:version>4.4</a:version>
+                    <a:operation>removed</a:operation>
+                </a:schemaMigration>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -15422,27 +15427,6 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="subresultStripThreshold" type="xsd:int" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        When aggregation of the same subresults (same operation and status) is to be applied,
-                        during operation result "summarize" operation.
-                        (Default: 10.)
-
-                        TEMPORARY/EXPERIMENTAL. We plan to provide more elaborate operation result aggregation strategies.
-                        This is just a quick way how to reduce large operation results for some deployments.
-
-                        DEPRECATED. Use operationResultHandlingStrategy instead.
-                    </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:experimental>true</a:experimental>
-                        <a:displayName>InternalsConfigurationType.subresultStripThreshold</a:displayName>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.0</a:deprecatedSince>
-                        <a:plannedRemoval>4.4</a:plannedRemoval>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
             <xsd:element name="operationResultHandlingStrategy" type="tns:OperationResultHandlingStrategyType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>

diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestOperationResult.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestOperationResult.java
@@ -74,7 +74,7 @@ public void testCleanup() throws Exception {
                         new OperationResultHandlingStrategyType(prismContext)
                                 .name(LOCAL_1)
                                 .preserveDuringCleanup(MAJOR)
-                ), null);
+                ));
         OperationResult.setThreadLocalHandlingStrategy(LOCAL_1);
 
         root.cleanupResultDeeply();

diff --git a/...main/java/com/evolveum/midpoint/repo/sqlbase/SystemConfigurationChangeDispatcherImpl.java b/...main/java/com/evolveum/midpoint/repo/sqlbase/SystemConfigurationChangeDispatcherImpl.java
@@ -202,10 +202,9 @@ private void applyOperationResultHandlingConfiguration(SystemConfigurationType c
         try {
             if (configuration != null && configuration.getInternals() != null) {
                 OperationResult.applyOperationResultHandlingStrategy(
-                        configuration.getInternals().getOperationResultHandlingStrategy(),
-                        configuration.getInternals().getSubresultStripThreshold());
+                        configuration.getInternals().getOperationResultHandlingStrategy());
             } else {
-                OperationResult.applyOperationResultHandlingStrategy(Collections.emptyList(), null);
+                OperationResult.applyOperationResultHandlingStrategy(Collections.emptyList());
             }
         } catch (Throwable t) {
             LoggingUtils.logUnexpectedException(LOGGER,