Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Nov 22, 2021 · 8005e86 · 8005e86
2 parents d88b23b + 735b961
commit 8005e86
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 54 deletions.
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
@@ -1992,28 +1992,28 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="insertBefore" type="tns:ActivityBeforeType" minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        Not implemented yet.
-                    </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:experimental>true</a:experimental>
-                        <a:displayName>ActivitiesTailoringType.insertBefore</a:displayName>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="insertAfter" type="tns:ActivityAfterType" minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        Not implemented yet.
-                    </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:experimental>true</a:experimental>
-                        <a:displayName>ActivitiesTailoringType.insertAfter</a:displayName>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
+            <!--<xsd:element name="insertBefore" type="tns:ActivityBeforeType" minOccurs="0" maxOccurs="unbounded">-->
+            <!--    <xsd:annotation>-->
+            <!--        <xsd:documentation>-->
+            <!--            Not implemented yet.-->
+            <!--        </xsd:documentation>-->
+            <!--        <xsd:appinfo>-->
+            <!--            <a:experimental>true</a:experimental>-->
+            <!--            <a:displayName>ActivitiesTailoringType.insertBefore</a:displayName>-->
+            <!--        </xsd:appinfo>-->
+            <!--    </xsd:annotation>-->
+            <!--</xsd:element>-->
+            <!--<xsd:element name="insertAfter" type="tns:ActivityAfterType" minOccurs="0" maxOccurs="unbounded">-->
+            <!--    <xsd:annotation>-->
+            <!--        <xsd:documentation>-->
+            <!--            Not implemented yet.-->
+            <!--        </xsd:documentation>-->
+            <!--        <xsd:appinfo>-->
+            <!--            <a:experimental>true</a:experimental>-->
+            <!--            <a:displayName>ActivitiesTailoringType.insertAfter</a:displayName>-->
+            <!--        </xsd:appinfo>-->
+            <!--    </xsd:annotation>-->
+            <!--</xsd:element>-->
             <xsd:element name="change" type="tns:ActivityTailoringType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>

diff --git a/...l/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityRun.java b/...l/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityRun.java
@@ -33,6 +33,8 @@
 import static com.evolveum.midpoint.repo.common.activity.run.ErrorHandlingStrategyExecutor.FollowUpAction.CONTINUE;
 import static com.evolveum.midpoint.repo.common.activity.run.ErrorHandlingStrategyExecutor.FollowUpAction.STOP;
 
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.ActivityEventLoggingOptionType.NONE;
+
 import static org.apache.commons.lang3.BooleanUtils.isNotFalse;
 
 public final class LiveSyncActivityRun
@@ -65,6 +67,7 @@ public LiveSyncActivityRun(
     public @NotNull ActivityReportingCharacteristics createReportingCharacteristics() {
         return new ActivityReportingCharacteristics()
                 .determineOverallSizeDefault(ActivityOverallItemCountingOptionType.NEVER)
+                .bucketCompletionLoggingDefault(NONE) // To avoid log noise.
                 .actionsExecutedStatisticsSupported(true)
                 .synchronizationStatisticsSupported(true)
                 .progressCommitPointsSupported(true); // This is to be rethought.

diff --git a/...ain/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java b/...ain/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandlerRegistry.java
@@ -82,19 +82,21 @@ private void registerArchetypeOid(String legacyHandlerUri, String archetypeOid)
      * Unregisters work definition factory and activity handler.
      */
     public void unregister(QName typeName, String legacyHandlerUri, Class<? extends WorkDefinition> definitionClass) {
-        workDefinitionFactory.unregisterSupplier(typeName, legacyHandlerUri);
-        unregisterHandler(definitionClass);
-        if (legacyHandlerUri != null) {
-            unregisterArchetypeOid(legacyHandlerUri);
-        }
+        // Temporarily disabled - as a workaround for MID-7328 and MID-7331
+//        workDefinitionFactory.unregisterSupplier(typeName, legacyHandlerUri);
+//        unregisterHandler(definitionClass);
+//        if (legacyHandlerUri != null) {
+//            unregisterArchetypeOid(legacyHandlerUri);
+//        }
     }
 
     /**
      * Unregisters the activity handler.
      */
     public void unregisterHandler(Class<? extends WorkDefinition> definitionClass) {
-        LOGGER.trace("Unregistering activity handler for {}", definitionClass);
-        handlersMap.remove(definitionClass);
+        // Temporarily disabled - as a workaround for MID-7328 and MID-7331
+//        LOGGER.trace("Unregistering activity handler for {}", definitionClass);
+//        handlersMap.remove(definitionClass);
     }
 
     private void unregisterArchetypeOid(String legacyHandlerUri) {

diff --git a/...in/java/com/evolveum/midpoint/repo/common/activity/run/task/ActivityBasedTaskHandler.java b/...in/java/com/evolveum/midpoint/repo/common/activity/run/task/ActivityBasedTaskHandler.java
@@ -59,8 +59,9 @@ public void initialize() {
 
     @PreDestroy
     public void destroy() {
-        taskManager.unregisterHandler(HANDLER_URI);
-        taskManager.setDefaultHandlerUri(null);
+        // Temporarily disabled - as a workaround for MID-7328 and MID-7331
+//        taskManager.unregisterHandler(HANDLER_URI);
+//        taskManager.setDefaultHandlerUri(null);
     }
 
     public CommonTaskBeans getBeans() {

diff --git a/...-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskHandlerRegistry.java b/...-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskHandlerRegistry.java
@@ -32,12 +32,6 @@ public class TaskHandlerRegistry {
     /** Task handlers mapped from their URIs. */
     private final Map<String, TaskHandler> handlers = new ConcurrentHashMap<>();
 
-    /**
-     * Primary handlers URIs.
-     * These will be taken into account when searching for handler matching a given task category.
-     */
-    private final Map<String, TaskHandler> primaryHandlersUris = new ConcurrentHashMap<>();
-
     /** All non-deprecated handlers URIs. */
     private final Map<String, TaskHandler> nonDeprecatedHandlersUris = new ConcurrentHashMap<>();
 
@@ -50,24 +44,12 @@ public void registerHandler(@NotNull String uri, @NotNull TaskHandler handler) {
         LOGGER.trace("Registering task handler for URI {}", uri);
         handlers.put(uri, handler);
         nonDeprecatedHandlersUris.put(uri, handler);
-        primaryHandlersUris.put(uri, handler);
     }
 
     void unregisterHandler(@NotNull String uri) {
+        LOGGER.trace("Unregistering task handler for {}", uri);
         handlers.remove(uri);
         nonDeprecatedHandlersUris.remove(uri);
-        primaryHandlersUris.remove(uri);
-    }
-
-    void registerAdditionalHandlerUri(@NotNull String uri, @NotNull TaskHandler handler) {
-        LOGGER.trace("Registering additional URI for a task handler: {}", uri);
-        nonDeprecatedHandlersUris.put(uri, handler);
-        handlers.put(uri, handler);
-    }
-
-    void registerDeprecatedHandlerUri(@NotNull String uri, @NotNull TaskHandler handler) {
-        LOGGER.trace("Registering additional (deprecated) URI for a task handler: {}", uri);
-        handlers.put(uri, handler);
     }
 
     public TaskHandler getHandler(String uri) {
@@ -94,10 +76,6 @@ Collection<String> getHandlerUrisForArchetype(String archetypeOid, boolean nonDe
                 .collect(Collectors.toSet());
     }
 
-    public String getDefaultHandlerUri() {
-        return defaultHandlerUri;
-    }
-
     void setDefaultHandlerUri(String defaultHandlerUri) {
         this.defaultHandlerUri = defaultHandlerUri;
     }