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

model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java

@@ -85,7 +85,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                 ROLE_APPLICATION_1, ROLE_APPLICATION_2, ROLE_BUSINESS_1,
                 USER_1, USER_2);
 
-        if(isNativeRepository()){
+        if (isNativeRepository()) {
             initTestObjects(initTask, initResult, SESSION_ROLE_BASED, CLUSTER_ROLE_BASED);
         }
     }
@@ -648,12 +648,14 @@ public void test400RoleAnalysisClusteringBasic() throws Exception {
     }
 
     @Test
-    public void test410RoleAnalysisPatternDetectionBasic() throws CommonException {
+    public void test410RoleAnalysisPatternDetectionBasic() throws Exception {
         skipIfNotNativeRepository();
 
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
+        initTestObjects(task, result, CLUSTER_ROLE_BASED);
+
         when("task is run");
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.init(this, task, result);
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.rerun(result); // asserts success

model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml

@@ -7,7 +7,6 @@
     <roleAnalysisSessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"
             relation="org:default"
             type="c:RoleAnalysisSessionType">
-        <!-- role_based_analysis_session -->
     </roleAnalysisSessionRef>
     <detectionOption>
         <minRolesOccupancy>10</minRolesOccupancy>

model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml

@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisClustering>
-                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/> <!-- random OID for now -->
+                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/>
             </roleAnalysisClustering>
         </work>
     </activity>

model/model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml

@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisPatternDetection>
-                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/> <!-- random OID for now -->
+                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/>
             </roleAnalysisPatternDetection>
         </work>
     </activity>

tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyAction.java

@@ -6,6 +6,18 @@
  */
 package com.evolveum.midpoint.ninja.action;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+
+import org.apache.commons.io.FileUtils;
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.ninja.action.verify.VerificationReporter;
 import com.evolveum.midpoint.ninja.action.worker.VerifyConsumerWorker;
 import com.evolveum.midpoint.ninja.impl.NinjaApplicationContextLevel;
@@ -16,18 +28,6 @@
 import com.evolveum.midpoint.schema.validator.UpgradeValidationResult;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
-import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -96,10 +96,13 @@ public VerifyResult execute() throws Exception {
                 log.info("XML dump with delta for each item saved to '{}'", options.getOutput().getPath() + VerificationReporter.DELTA_FILE_NAME_SUFFIX);
             }
 
-            // todo this should not show when action is a part of complex action and next step is prepared automatically
             // FIXME: ADD links (do not display in batch mode)
             // FIXME: Could We could try to infer script name?
             if (context.isUserMode() && !partial) {
+                if (result.getCriticalCount() > 0) {
+                    log.info("");
+                    log.info("Critical issues should be fixed before upgrade as they could cause major problems after upgrade (e.g. prevent midpoint start).");
+                }
                 log.info("");
                 log.info("Please see documentation for use of verification report in upgrade process and modify it accordingly.");
                 log.info("After you've reviewed verification report and marked changes to skip you can continue upgrade process "

tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/InitialObjects.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2010-2023 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.ninja.action.upgrade.action;
+
+import com.evolveum.midpoint.ninja.action.Action;
+import com.evolveum.midpoint.ninja.action.ActionResult;
+
+public class InitialObjects extends Action<InitialObjectsOptions, ActionResult<InitialObjectsResult>> {
+
+    @Override
+    public String getOperationName() {
+        return "initial objects";
+    }
+
+    @Override
+    public ActionResult<InitialObjectsResult> execute() throws Exception {
+        // todo implement
+        return null;
+    }
+}

tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/InitialObjectsOptions.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2010-2023 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.ninja.action.upgrade.action;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+
+@Parameters(resourceBundle = "messages", commandDescriptionKey = "initialObjects")
+public class InitialObjectsOptions {
+
+    private static final String P_SKIP = "--skip";
+
+    @Parameter(names = {P_SKIP}, descriptionKey = "initialObjects.skip")
+    private boolean skip;
+
+    public boolean isSkip() {
+        return skip;
+    }
+
+    public void setSkip(boolean skip) {
+        this.skip = skip;
+    }
+}

tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/InitialObjectsResult.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2010-2023 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.ninja.action.upgrade.action;
+
+public class InitialObjectsResult {
+}

tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Command.java

@@ -58,7 +58,9 @@ public enum Command {
 
     HELP("help", HelpOptions.class, HelpAction.class),
 
-    UPGRADE("upgrade", UpgradeOptions.class, UpgradeAction.class);
+    UPGRADE("upgrade", UpgradeOptions.class, UpgradeAction.class),
+
+    INITIAL_OBJECTS("initial-objects", InitialObjectsOptions.class, InitialObjects.class);
 
     private final String commandName;
 

tools/ninja/src/main/resources/messages.properties

@@ -147,3 +147,5 @@ upgradeDistribution.distributionDirectory=Distribution directory where distribut
 help=Print this help, or prints help for specific command.
 help.command=[Command name]
 upgrade=Upgrade midPoint
+initialObjects=Initial objects
+initialObjects.skip=Skip initial objects