Merge remote-tracking branch 'origin/master'

Evolveum · Mar 7, 2022 · e799953 · e799953
2 parents 5ed4c7b + 23b3bd8
commit e799953
Show file tree

Hide file tree

Showing 21 changed files with 387 additions and 388 deletions.
diff --git a/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/NotificationsTest.java b/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/NotificationsTest.java
diff --git a/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java b/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -15,38 +15,33 @@
 import java.util.List;
 import java.util.Locale;
 
-import com.evolveum.midpoint.notifications.impl.formatters.ValueFormatter;
-import com.evolveum.midpoint.prism.Objectable;
-import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
-import com.evolveum.midpoint.schema.constants.ObjectTypes;
-import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
 import com.evolveum.midpoint.notifications.impl.formatters.TextFormatter;
+import com.evolveum.midpoint.notifications.impl.formatters.ValueFormatter;
+import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
+import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.test.util.AbstractSpringTest;
 import com.evolveum.midpoint.util.PrettyPrinter;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectModificationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-/**
- *
- */
-@ContextConfiguration(locations = {"classpath:ctx-notifications-test.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-notifications-test.xml" })
 public class TestTextFormatter extends AbstractSpringTest {
 
     private static final String OBJECTS_DIR_NAME = "src/test/resources/objects";
@@ -309,7 +304,7 @@ public void test060FormatDeltaWithSingleOperationalItemContainer() throws Except
                     .replace(ActivationStatusType.ENABLED)
                 // see MID-5350
                 .item(UserType.F_ASSIGNMENT, 1, UserType.F_ACTIVATION)
-                    .replace(new ActivationType(prismContext).effectiveStatus(ActivationStatusType.ENABLED))
+                    .replace(new ActivationType().effectiveStatus(ActivationStatusType.ENABLED))
                 .asObjectDelta("some-user-oid");
         // @formatter:on
 
@@ -329,5 +324,4 @@ private ObjectDelta<UserType> parseDelta(String filename) throws SchemaException
         ObjectModificationType modElement = PrismTestUtil.parseAtomicValue(new File(filename), ObjectModificationType.COMPLEX_TYPE);
         return DeltaConvertor.createObjectDelta(modElement, UserType.class, prismContext);
     }
-
 }
diff --git a/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java b/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java
@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2010-2017 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.notifications.impl;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.io.IOException;
@@ -18,7 +19,6 @@
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
-import com.evolveum.midpoint.transport.impl.TransportUtil;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.test.util.AbstractSpringTest;
+import com.evolveum.midpoint.transport.impl.TransportUtil;
 import com.evolveum.midpoint.util.PrettyPrinter;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NotificationTransportConfigurationType;
@@ -48,7 +49,7 @@ public void setup() throws SchemaException, SAXException, IOException {
 
     @Test
     public void test010CheckVariablesWhiteList() {
-        // GIVEN
+        given();
         NotificationTransportConfigurationType config = new NotificationTransportConfigurationType();
 
         config.getWhiteList().add("*@evolveum.com");
@@ -68,25 +69,29 @@ public void test010CheckVariablesWhiteList() {
         recipients.add("jack@evodevel.sk");
         recipients.add("janko@evolveum.eu");
 
-        // WHEN
-        TransportUtil.validateRecipient(allowRecipient, forbiddenRecipient, recipients, config, task, task.getResult(), expressionFactory, MiscSchemaUtil.getExpressionProfile(), logger);
+        when();
+        TransportUtil.validateRecipient(allowRecipient, forbiddenRecipient, recipients, config, task,
+                task.getResult(), expressionFactory, MiscSchemaUtil.getExpressionProfile(), logger);
 
         then();
-
-        assertTrue("Expected <4> allowed recipient(s), but was <" + allowRecipient.size() + ">", allowRecipient.size() == 4);
+        assertThat(allowRecipient)
+                .withFailMessage("Expected <4> allowed recipient(s), but was <" + allowRecipient.size() + ">")
+                .hasSize(4);
         assertTrue("janko@evodevel.com should be allowed, but isn't.", allowRecipient.contains("janko@evodevel.com"));
         assertTrue("janko@evolveum.com should be allowed, but isn't.", allowRecipient.contains("janko@evolveum.com"));
         assertTrue("viliam@evodevel.com should be allowed, but isn't.", allowRecipient.contains("viliam@evodevel.com"));
         assertTrue("majka@evodevel.eu should be allowed, but isn't.", allowRecipient.contains("majka@evodevel.eu"));
 
-        assertTrue("Expected <2> forbidden recipient(s), but was <" + forbiddenRecipient.size() + ">", forbiddenRecipient.size() == 2);
+        assertThat(forbiddenRecipient)
+                .withFailMessage("Expected <2> forbidden recipient(s), but was <" + forbiddenRecipient.size() + ">")
+                .hasSize(2);
         assertTrue("jack@evodevel.sk should be forbidden, but isn't.", forbiddenRecipient.contains("jack@evodevel.sk"));
         assertTrue("janko@evolveum.eu should be forbidden, but isn't.", forbiddenRecipient.contains("janko@evolveum.eu"));
     }
 
     @Test
     public void test020CheckVariablesBlackList() {
-        // GIVEN
+        given();
         NotificationTransportConfigurationType config = new NotificationTransportConfigurationType();
 
         config.getBlackList().add("*@evolveum.com");
@@ -106,18 +111,22 @@ public void test020CheckVariablesBlackList() {
         recipients.add("jack@evodevel.sk");
         recipients.add("janko@evolveum.eu");
 
-        // WHEN
-        TransportUtil.validateRecipient(allowRecipient, forbiddenRecipient, recipients, config, task, task.getResult(), expressionFactory, MiscSchemaUtil.getExpressionProfile(), logger);
+        when();
+        TransportUtil.validateRecipient(allowRecipient, forbiddenRecipient, recipients, config, task,
+                task.getResult(), expressionFactory, MiscSchemaUtil.getExpressionProfile(), logger);
 
         then();
-
-        assertTrue("Expected <4> forbidden recipient(s), but was <" + forbiddenRecipient.size() + ">", forbiddenRecipient.size() == 4);
+        assertThat(forbiddenRecipient)
+                .withFailMessage("Expected <4> forbidden recipient(s), but was <" + forbiddenRecipient.size() + ">")
+                .hasSize(4);
         assertTrue("janko@evodevel.com should be forbidden, but isn't.", forbiddenRecipient.contains("janko@evodevel.com"));
         assertTrue("janko@evolveum.com should be forbidden, but isn't.", forbiddenRecipient.contains("janko@evolveum.com"));
         assertTrue("viliam@evodevel.com should be forbidden, but isn't.", forbiddenRecipient.contains("viliam@evodevel.com"));
         assertTrue("majka@evodevel.eu should be forbidden, but isn't.", forbiddenRecipient.contains("majka@evodevel.eu"));
 
-        assertTrue("Expected <2> allowed recipient(s), but was <" + allowRecipient.size() + ">", allowRecipient.size() == 2);
+        assertThat(allowRecipient)
+                .withFailMessage("Expected <2> allowed recipient(s), but was <" + allowRecipient.size() + ">")
+                .hasSize(2);
         assertTrue("jack@evodevel.sk should be allowed, but isn't.", allowRecipient.contains("jack@evodevel.sk"));
         assertTrue("janko@evolveum.eu should be allowed, but isn't.", allowRecipient.contains("janko@evolveum.eu"));
     }

diff --git a/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoCommonAddGetTest.java b/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoCommonAddGetTest.java
@@ -37,11 +37,11 @@ public void test200MessageTemplate() throws Exception {
 
         given("message template");
         String objectName = "messageTemplate" + getTestNumber();
-        var messageTemplate = new MessageTemplateType(prismContext)
+        var messageTemplate = new MessageTemplateType()
                 .name(objectName)
-                .defaultContent(new MessageTemplateContentType(prismContext)
+                .defaultContent(new MessageTemplateContentType()
                         .subjectExpression(velocityExpression("subject-prefix")))
-                .localizedContent(new LocalizedMessageTemplateContentType(prismContext)
+                .localizedContent(new LocalizedMessageTemplateContentType()
                         .language("sk_SK")
                         .subjectExpression(velocityExpression("Oné")));
 

diff --git a/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoConcurrencyTest.java b/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoConcurrencyTest.java
@@ -522,7 +522,7 @@ public void test100AddOperationExecution() throws Exception {
         int THREADS = 8;
         long DURATION = 30_000L;
 
-        UserType user = new UserType(prismContext).name("jack");
+        UserType user = new UserType().name("jack");
 
         OperationResult result = new OperationResult("test100AddOperationExecution");
         String oid = plainRepositoryService.addObject(user.asPrismObject(), null, result);
@@ -540,7 +540,7 @@ public void test100AddOperationExecution() throws Exception {
                 Collection<ItemDelta<?, ?>> getItemDeltas() throws Exception {
                     return prismContext.deltaFor(UserType.class)
                             .item(UserType.F_OPERATION_EXECUTION).add(
-                                    new OperationExecutionType(prismContext)
+                                    new OperationExecutionType()
                                             .channel(threadIndex + ":" + counter)
                                             .timestamp(XmlTypeConverter.createXMLGregorianCalendar(new Date())))
                             .asItemDeltas();
@@ -576,7 +576,7 @@ public void test110AddAssignments() throws Exception {
 
         AtomicInteger globalCounter = new AtomicInteger();
 
-        UserType user = new UserType(prismContext).name("alice");
+        UserType user = new UserType().name("alice");
 
         OperationResult result = new OperationResult("test110AddAssignments");
         String oid = plainRepositoryService.addObject(user.asPrismObject(), null, result);
@@ -595,7 +595,7 @@ public void test110AddAssignments() throws Exception {
                     globalCounter.incrementAndGet();
                     return prismContext.deltaFor(UserType.class)
                             .item(UserType.F_ASSIGNMENT).add(
-                                    new AssignmentType(prismContext).targetRef(
+                                    new AssignmentType().targetRef(
                                             String.format("000049f4-8d7a-4791-%04d-%012d", threadIndex, counter.get()),
                                             OrgType.COMPLEX_TYPE))
                             .asItemDeltas();
@@ -619,7 +619,7 @@ public void test120AddApproverRef() throws Exception {
         long DURATION = 30_000L;
         final String DELEGATED_REF_FORMAT = "bcce49f4-8d7a-4791-%04d-%012d";
 
-        RoleType role = new RoleType(prismContext).name("judge");
+        RoleType role = new RoleType().name("judge");
 
         OperationResult result = new OperationResult("test120AddApproverRef");
         String oid = plainRepositoryService.addObject(role.asPrismObject(), null, result);
@@ -702,7 +702,7 @@ public void test130AddDeleteObjects() throws Exception {
             AddObjectsThread<UserType> thread = new AddObjectsThread<>(i, "adder #" + i, OBJECTS_PER_THREAD) {
                 @Override
                 protected PrismObject<UserType> getObjectToAdd() {
-                    return new UserType(prismContext).name(String.format("user-%d-%06d", threadIndex, counter.intValue())).asPrismObject();
+                    return new UserType().name(String.format("user-%d-%06d", threadIndex, counter.intValue())).asPrismObject();
                 }
             };
             thread.start();
@@ -753,7 +753,7 @@ public void test140WorkBucketsAdd() throws Exception {
         int THREADS = 8;
         long DURATION = 30_000L;
 
-        TaskType task = new TaskType(prismContext)
+        TaskType task = new TaskType()
                 .name("test140")
                 .beginActivityState()
                 .beginActivity()
@@ -788,7 +788,7 @@ void runOnce(OperationResult result) throws Exception {
                 private WorkBucketType getNextBucket(TaskType task) {
                     int lastBucketNumber = task.getActivityState() != null ?
                             getLastBucketNumber(task.getActivityState().getActivity().getBucketing().getBucket()) : 0;
-                    return new WorkBucketType(prismContext)
+                    return new WorkBucketType()
                             .sequentialNumber(lastBucketNumber + 1)
                             .state(WorkBucketStateType.DELEGATED)
                             .workerRef(String.valueOf(threadIndex), TaskType.COMPLEX_TYPE);
@@ -840,7 +840,7 @@ public void test150WorkBucketsReplace() throws Exception {
         int THREADS = 8;
         long DURATION = 30_000L;
 
-        TaskType task = new TaskType(prismContext)
+        TaskType task = new TaskType()
                 .name("test150")
                 .beginActivityState()
                 .beginActivity()
@@ -880,7 +880,7 @@ private List<WorkBucketType> getBucketsToReplace(TaskType task) {
                 }
 
                 private WorkBucketType getNextBucket(List<WorkBucketType> currentBuckets) {
-                    return new WorkBucketType(prismContext)
+                    return new WorkBucketType()
                             .sequentialNumber(getLastBucketNumber(currentBuckets) + 1)
                             .state(WorkBucketStateType.DELEGATED)
                             .workerRef(String.valueOf(threadIndex), TaskType.COMPLEX_TYPE);

diff --git a/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestActivities.java b/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestActivities.java
@@ -129,7 +129,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 
     private void createRoles(OperationResult result) throws SchemaException, ObjectAlreadyExistsException {
         for (int i = 0; i < ROLES; i++) {
-            RoleType role = new RoleType(prismContext)
+            RoleType role = new RoleType()
                     .name(String.format(ROLE_NAME_PATTERN, i));
             repositoryService.addObject(role.asPrismObject(), null, result);
         }