Stop creating malformed cases for "add" manual op

When adding objects on manual resources, malformed targetRef's were present in cases being created. This is now fixed. This resolves MID-7986.
Evolveum · Jul 1, 2022 · 52e4e37 · 52e4e37
1 parent b2fcedf
commit 52e4e37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java b/...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
@@ -686,6 +686,12 @@ public void test099TestConnection() throws Exception {
 
     @Test
     public void test100AssignWillRoleOne() throws Exception {
+        final String TEST_NAME = "test100AssignWillRoleOne";
+        displayTestTitle(TEST_NAME);
+        // GIVEN
+        Task task = createTask(TEST_NAME);
+        OperationResult result = task.getResult();
+
         // The count will be checked only after propagation was run, so we can address both direct and grouping cases
         rememberCounter(InternalCounters.CONNECTOR_MODIFICATION_COUNT);
 
@@ -694,6 +700,11 @@ public void test100AssignWillRoleOne() throws Exception {
         assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 0, 1);
         assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_CONFIGURATION_COUNT, 0, 1);
         assertSteadyResources();
+
+        CaseType aCase = repositoryService
+                .getObject(CaseType.class, willLastCaseOid, null, result)
+                .asObjectable();
+        assertNull("Malformed targetRef is present in the manual provisioning case", aCase.getTargetRef());
     }
 
     @Test

diff --git a/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java b/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
@@ -257,7 +257,13 @@ private PrismObject<CaseType> addCase(String operation, String description, Stri
 
         caseType.setObjectRef(new ObjectReferenceType().oid(resourceOid).type(ResourceType.COMPLEX_TYPE));
 
-        caseType.setTargetRef(new ObjectReferenceType().oid(shadowOid).targetName(shadowName).type(ShadowType.COMPLEX_TYPE));
+        if (shadowOid != null) {
+            caseType.setTargetRef(
+                    new ObjectReferenceType()
+                            .oid(shadowOid)
+                            .targetName(shadowName)
+                            .type(ShadowType.COMPLEX_TYPE));
+        }
 
         if (task != null) {
             if (isCaseOperationTask(task)) {