Fix conflicts from the last merge

Related to MID-7575. Also removed some unneeded org.bouncycastle.util.* imports (causing troubles with compilation in IntelliJ IDEA).
Evolveum · Mar 7, 2022 · f11acc1 · f11acc1
1 parent 91c68ea
commit f11acc1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 54 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
@@ -1302,8 +1302,8 @@ public static LensContext fromLensContextType(LensContextType lensContextType, P
             lensContext.rottenExecutedDeltas.add(objectDeltaOperation);
         }
 
-        if (bean.getSequences() != null) {
-            for (LensContextSequenceValueType seqValueBean : bean.getSequences().getSequenceValue()) {
+        if (lensContextType.getSequences() != null) {
+            for (LensContextSequenceValueType seqValueBean : lensContextType.getSequences().getSequenceValue()) {
                 String oid = seqValueBean.getSequenceRef() != null ? seqValueBean.getSequenceRef().getOid() : null;
                 if (oid != null) {
                     lensContext.setSequenceCounter(oid, seqValueBean.getValue());

diff --git a/model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java b/model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ApprovalUtils.java
@@ -141,14 +141,8 @@ public static boolean isApprovedFromUri(String uri) {
         return isApproved(fromUri(uri));
     }
 
-    @Deprecated
     public static AbstractWorkItemOutputType createApproveOutput(PrismContext prismContext) {
         return new AbstractWorkItemOutputType(prismContext)
                 .outcome(SchemaConstants.MODEL_APPROVAL_OUTCOME_APPROVE);
     }
-
-    public static AbstractWorkItemOutputType createApproveOutput() {
-        return new AbstractWorkItemOutputType()
-                .outcome(SchemaConstants.MODEL_APPROVAL_OUTCOME_APPROVE);
-    }
 }
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSequence.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSequence.java
@@ -11,14 +11,14 @@
 
 import java.io.File;
 
+import com.evolveum.midpoint.wf.util.ApprovalUtils;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.schema.util.WorkItemId;
-import com.evolveum.midpoint.schema.util.cases.ApprovalUtils;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.test.TestResource;
 import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
@@ -37,11 +37,11 @@ public class TestSequence extends AbstractWfTestPolicy {
 
     private static final File SYSTEM_CONFIGURATION_FILE = new File(TEST_DIR, "system-configuration.xml");
 
-    private static final TestResource<SequenceType> SEQUENCE_USER_NAME =
-            new TestResource<>(TEST_DIR, "sequence-user-name.xml", "84f9d763-bfd9-4edb-9f5b-a49158580e16");
+    private static final TestResource SEQUENCE_USER_NAME =
+            new TestResource(TEST_DIR, "sequence-user-name.xml", "84f9d763-bfd9-4edb-9f5b-a49158580e16");
 
-    private static final TestResource<ObjectTemplateType> TEMPLATE_USER =
-            new TestResource<>(TEST_DIR, "template-user.xml", "5e156e0f-5844-44d3-a7f7-78df11e3c98a");
+    private static final TestResource TEMPLATE_USER =
+            new TestResource(TEST_DIR, "template-user.xml", "5e156e0f-5844-44d3-a7f7-78df11e3c98a");
 
     private String rootCaseOid;
 
@@ -62,36 +62,32 @@ protected File getSystemConfigurationFile() {
      */
     @Test
     public void test100RequestUserCreation() throws Exception {
-        given();
-        Task task = getTestTask();
+        Task task = createTask("test100RequestUserCreation");
         OperationResult result = task.getResult();
         login(USER_ADMINISTRATOR_USERNAME);
 
-        when("user creation is requested");
-        UserType user = new UserType()
+        //when("user creation is requested");
+        UserType user = new UserType(prismContext)
                 .fullName("Joe Black");
 
         addObject(user.asPrismObject(), task, result);
 
-        then("an approval case should be created");
+        //then("an approval case should be created");
+
+        String caseOid = OperationResult.referenceToCaseOid(result.findAsynchronousOperationReference());
 
         // @formatter:off
-        CaseType rootCase = assertCase(result, "after")
+        CaseType rootCase = assertCase(caseOid, "after")
                 .display()
                 .displayXml()
-                .subcases()
-                    .single()
-                        .display()
-                    .end()
-                .end()
-                .getObjectable();
+                .getObject().asObjectable();
         // @formatter:on
 
         rootCaseOid = rootCase.getOid();
 
-        and("the user to be created should have a name of 100000 (start of sequence)");
+        //and("the user to be created should have a name of 100000 (start of sequence)");
         UserType userToCreate = (UserType) ObjectTypeUtil.getObjectFromReference(rootCase.getObjectRef());
-        assertUser(userToCreate, "user to create")
+        assertUser(userToCreate.asPrismObject(), "user to create")
                 .display()
                 .assertName("100000")
                 .assertFullName("Joe Black");
@@ -104,19 +100,18 @@ public void test100RequestUserCreation() throws Exception {
      */
     @Test
     public void test110ApproveUserCreation() throws Exception {
-        given();
-        Task task = getTestTask();
+        Task task = createTask("test110ApproveUserCreation");
         OperationResult result = task.getResult();
 
-        when("creation is approved");
+        //when("creation is approved");
         CaseWorkItemType workItem = getWorkItem(task, result);
-        caseService.completeWorkItem(
+        workflowService.completeWorkItem(
                 WorkItemId.of(workItem),
-                ApprovalUtils.createApproveOutput(),
+                ApprovalUtils.createApproveOutput(prismContext),
                 task,
                 result);
 
-        then("user is created with the same name");
+        //then("user is created with the same name");
         waitForCaseClose(getCase(rootCaseOid), 20000);
 
         assertUserAfterByUsername("100000")

diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/LinkFinder.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/LinkFinder.java
@@ -9,7 +9,6 @@
 import static org.testng.AssertJUnit.assertEquals;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.bouncycastle.util.Arrays;
 import org.testng.AssertJUnit;
 
 import com.evolveum.midpoint.prism.PrismObject;

diff --git a/...est-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAssociationAsserter.java b/...est-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAssociationAsserter.java
@@ -6,21 +6,12 @@
  */
 package com.evolveum.midpoint.test.asserter;
 
-import com.evolveum.midpoint.prism.PrismContainer;
-import com.evolveum.midpoint.prism.PrismContainerValue;
-import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.util.PrettyPrinter;
-import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowAssociationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import org.apache.commons.lang.ArrayUtils;
-import org.bouncycastle.util.Arrays;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 

diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TriggerFinder.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TriggerFinder.java
@@ -6,22 +6,14 @@
  */
 package com.evolveum.midpoint.test.asserter;
 
-import static org.testng.AssertJUnit.assertEquals;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.bouncycastle.util.Arrays;
-import org.testng.AssertJUnit;
-
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismReferenceValue;
-import com.evolveum.midpoint.schema.util.ShadowUtil;
 import com.evolveum.midpoint.test.asserter.prism.PrismObjectAsserter;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TriggerType;
+import org.testng.AssertJUnit;
+
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  *