Fix object type determination for kind=null

Incorrect method was used. Now model-intest tests should pass.
Evolveum · May 30, 2022 · 57f24b3 · 57f24b3
1 parent a6a3310
commit 57f24b3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinitionResolver.java b/...rc/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinitionResolver.java
@@ -28,6 +28,7 @@
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import static com.evolveum.midpoint.util.MiscUtil.argCheck;
 
@@ -118,6 +119,21 @@ public class ResourceObjectDefinitionResolver {
         return getDefinitionForShadow(resourceSchema, shadow.asObjectable());
     }
 
+    /**
+     * Looks up appropriate definition for "bulk operation" i.e. operation that is executed for given kind/intent/objectclass
+     * on given resource.
+     *
+     * Currently, this is the same as {@link #getObjectDefinitionPrecisely(ResourceType, ShadowKindType, String, QName,
+     * Collection, boolean)} with no additional aux OCs and unknown values not supported.
+     */
+    public static @Nullable ResourceObjectDefinition getForBulkOperation(
+        @NotNull ResourceType resource,
+        @Nullable ShadowKindType kind,
+        @Nullable String intent,
+        @Nullable QName objectClassName) throws SchemaException, ConfigurationException {
+        return getObjectDefinitionPrecisely(resource, kind, intent, objectClassName, List.of(), false);
+    }
+
     /**
      * Determines object type/class definition in a precise way. The decision is based on kind/intent/objectclass triple,
      * and later enriched by aux object class names.

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ProcessingScope.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ProcessingScope.java
@@ -35,6 +35,7 @@
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.annotation.Experimental;
+import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -112,18 +113,24 @@ public static ProcessingScope of(
             @NotNull ResourceObjectSetType resourceObjectSet)
             throws ActivityRunException {
 
-        ResourceSchema resourceSchema = getCompleteSchema(resource);
-
         ShadowKindType kind = resourceObjectSet.getKind();
         String intent = resourceObjectSet.getIntent();
         QName objectClassName = resourceObjectSet.getObjectclass();
 
-        ResourceObjectDefinition objectDefinition = resourceSchema.findObjectDefinition(kind, intent, objectClassName);
-        if (objectDefinition == null) {
+        ResourceObjectDefinition definition;
+        try {
+            definition = ResourceObjectDefinitionResolver.getForBulkOperation(resource, kind, intent, objectClassName);
+        } catch (CommonException e) {
+            throw new ActivityRunException(
+                    "Couldn't determine object definition for " + kind + "/" + intent + "/" + objectClassName + " on " + resource,
+                    FATAL_ERROR, PERMANENT_ERROR, e);
+        }
+
+        if (definition == null) {
             LOGGER.debug("Processing all object classes");
         }
 
-        return new ProcessingScope(resource, objectDefinition, kind, intent, objectClassName);
+        return new ProcessingScope(resource, definition, kind, intent, objectClassName);
     }
 
     /** See the note in class-level javadoc. */

diff --git a/.../model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java b/.../model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java
@@ -173,7 +173,8 @@ public ProcessingScope createProcessingScopeForShadow(
         return resourceOid;
     }
 
-    private @NotNull ResourceType getResource(String resourceOid, Task task, OperationResult opResult) throws ActivityRunException {
+    private @NotNull ResourceType getResource(String resourceOid, Task task, OperationResult opResult)
+            throws ActivityRunException {
         try {
             return provisioningService
                     .getObject(ResourceType.class, resourceOid, createReadOnlyCollection(), task, opResult)

diff --git a/...mpl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContextFactory.java b/...mpl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContextFactory.java
@@ -131,13 +131,8 @@ private ScopedDefinition createScopedDefinitionForBulkOperation(ResourceShadowCo
         String intent = coords.getIntent();
         QName objectClassName = coords.getObjectClass();
 
-        ResourceObjectDefinition definition = ResourceObjectDefinitionResolver.getObjectDefinitionPrecisely(
-                resource,
-                kind,
-                intent,
-                objectClassName,
-                List.of(),
-                false);
+        ResourceObjectDefinition definition =
+                ResourceObjectDefinitionResolver.getForBulkOperation(resource, kind, intent, objectClassName);
 
         Boolean wholeClass;
         if (kind != null) {