move initialize of provisioning(connectors) to separate init class

gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java

@@ -145,7 +145,7 @@ private ImportResult importObject(PrismObject<? extends ObjectType> object,
             LOGGER.info("Starting initial import of file {}.", fileName);
             model.executeChanges(
                     MiscUtil.createCollection(delta),
-                    ModelExecuteOptions.create().setIsImport().overwrite(overwrite),
+                    ModelExecuteOptions.create().setIsImport().preAuthorized().overwrite(overwrite),
                     task,
                     result);
             result.recordSuccess();

gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ProvisioningInitialSetup.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010-2020 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.init;
+
+import com.evolveum.midpoint.model.api.ModelService;
+import com.evolveum.midpoint.provisioning.api.ProvisioningService;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.util.logging.LoggingUtils;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+
+import org.apache.commons.lang3.Validate;
+
+/**
+ * @author lazyman
+ */
+public class ProvisioningInitialSetup {
+
+    private static final Trace LOGGER = TraceManager.getTrace(ProvisioningInitialSetup.class);
+
+    private ProvisioningService provisioning;
+
+    public void setProvisioning(ProvisioningService provisioning) {
+        Validate.notNull(provisioning, "Provisioning service must not be null.");
+        this.provisioning = provisioning;
+    }
+
+    public void init() {
+        LOGGER.info("Provisioning post initialization.");
+
+        OperationResult mainResult = new OperationResult("Provisioning Post Initialization");
+        try {
+            provisioning.postInit(mainResult);
+
+            if (mainResult.isUnknown()) {
+                mainResult.computeStatus();
+            }
+
+            LOGGER.info("Provisioning post initialization finished successfully.");
+        } catch (Exception ex) {
+            LoggingUtils.logUnexpectedException(LOGGER, "Provisioning post initialization failed", ex);
+            mainResult.recordFatalError("ProvisioningInitialSetup.message.init.fatalError", ex);
+        } finally {
+            mainResult.computeStatus("ProvisioningInitialSetup.message.init.fatalError");
+        }
+    }
+}

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java

@@ -21,6 +21,8 @@
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
 import com.evolveum.midpoint.gui.impl.page.login.PageLogin;
+import com.evolveum.midpoint.init.ProvisioningInitialSetup;
+import com.evolveum.midpoint.provisioning.api.ProvisioningService;
 import com.evolveum.midpoint.security.api.*;
 import com.evolveum.midpoint.authentication.api.util.AuthConstants;
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
@@ -137,6 +139,7 @@ public class PageAbout extends PageAdminConfiguration {
 
     @Autowired RepositoryCache repositoryCache;
     @Autowired protected SystemObjectCache systemObjectCache;
+    @Autowired ProvisioningService provisioningService;
 
     public PageAbout() {
         repoDiagModel = new LoadableModel<RepositoryDiag>(false) {
@@ -590,6 +593,8 @@ public Object run() {
                 }
             });
 
+            provisioningService.postInit(result);
+
             InitialDataImport initialDataImport = new InitialDataImport();
             initialDataImport.setModel(getModelService());
             initialDataImport.setTaskManager(getTaskManager());

gui/admin-gui/src/main/resources/ctx-init.xml

@@ -28,6 +28,12 @@
         <constructor-arg name="cacheRepositoryService" ref="cacheRepositoryService"/>
     </bean>
 
+    <bean id="provisioningInitialSetup"
+            class="com.evolveum.midpoint.init.ProvisioningInitialSetup"
+            init-method="init">
+        <property name="provisioning" ref="provisioningService"/>
+    </bean>
+
     <bean id="initialDataImport"
             class="com.evolveum.midpoint.init.InitialDataImport"
             init-method="init">

gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/MidScaleGuiTest.java

@@ -63,6 +63,7 @@ public class MidScaleGuiTest extends AbstractGuiIntegrationTest implements Perfo
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         userAdministrator = repositoryService.getObject(UserType.class, USER_ADMINISTRATOR_OID, null, initResult);
 

gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java

@@ -56,6 +56,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         logger.trace("initSystem");
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         userAdministrator = repositoryService.getObject(UserType.class, USER_ADMINISTRATOR_OID, null, initResult);
         login(userAdministrator);

model/authentication-impl/src/test/java/com/evolveum/midpoint/authentication/TestIntegrationSecurity.java

@@ -76,6 +76,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         logger.trace("initSystem");
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         repoAddObjectFromFile(ROLE_SUPERUSER_FILE, true, initResult);
         userAdministrator = repoAddObjectFromFile(USER_ADMINISTRATOR_FILE, true, initResult);

model/authentication-impl/src/test/java/com/evolveum/midpoint/authentication/evaluator/TestAbstractAuthenticationEvaluator.java

@@ -105,6 +105,7 @@ public abstract class TestAbstractAuthenticationEvaluator<V, AC extends Abstract
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractUninitializedCertificationTest.java

@@ -45,6 +45,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         logger.trace("initSystem");
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

@@ -1754,9 +1754,6 @@ public void postInit(OperationResult parentResult) {
 
         securityContextManager.setUserProfileService(focusProfileService);
 
-        // Initialize provisioning
-        provisioning.postInit(result);
-
         if (result.isUnknown()) {
             result.computeStatus();
         }

model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java

@@ -128,6 +128,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         mockClockworkHook = new MockClockworkHook();
         hookRegistry.registerChangeHook(MOCK_CLOCKWORK_HOOK_URL, mockClockworkHook);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractEmptyModelIntegrationTest.java

@@ -61,6 +61,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         InternalsConfig.setAvoidLoggingChange(isAvoidLoggingChange());
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         ManualConnectorInstance.setRandomDelayRange(0);
 

model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java

@@ -58,6 +58,7 @@ public class TestConnectorDummyFake extends AbstractConfiguredModelIntegrationTe
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         // Make sure that the connectors are discovered
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // Make sure to call postInit first. This add system config to repo.

model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java

@@ -121,6 +121,7 @@ public void test002InitialConfiguration() throws Exception {
 
         // WHEN
         repositoryService.postInit(result);
+        provisioningService.postInit(result);
         modelService.postInit(result);
 
         // THEN

model/report-impl/src/test/java/com/evolveum/midpoint/report/EmptyReportIntegrationTest.java

@@ -161,6 +161,7 @@ void commonInitialization(OperationResult initResult)
             throws CommonException, EncryptionException, IOException {
         repoAddObjectFromFile(ROLE_SUPERUSER_FILE, RepoAddOptions.createOverwrite(), false, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         try {
             repoAddObjectFromFile(SYSTEM_CONFIGURATION_FILE, RepoAddOptions.createOverwrite(), false, initResult);

model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java

@@ -92,6 +92,7 @@ public abstract class AbstractWfTest extends AbstractModelImplementationIntegrat
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         PrismObject<SystemConfigurationType> sysconfig = prismContext.parseObject(getSystemConfigurationFile());

testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

@@ -294,6 +294,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                     "looks like the previous test haven't cleaned it up", e);
         }
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // TODO what now? config is unused

testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/AbstractLongTest.java

@@ -71,6 +71,7 @@ public abstract class AbstractLongTest extends AbstractModelIntegrationTest {
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java

@@ -99,6 +99,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 
         loadOpenDJWithData();
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration and administrator

testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java

@@ -81,6 +81,7 @@ public static void stopResources() {
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java

@@ -60,6 +60,7 @@ public class TestOrgHierarchy extends AbstractModelIntegrationTest {
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration and administrator

testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java

@@ -68,6 +68,7 @@ public class TestRunAs extends AbstractLongTest {
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // Users

testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java

@@ -46,6 +46,7 @@ public void initSystem(Task initTask, OperationResult result) throws Exception {
 
         InternalMonitor.reset();
 
+        provisioningService.postInit(result);
         getModelService().postInit(result);
 
         result.computeStatus();

testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java

@@ -48,6 +48,7 @@ public void initSystem(Task initTask, OperationResult result) throws Exception {
 
         InternalMonitor.reset();
 
+        provisioningService.postInit(result);
         getModelService().postInit(result);
 
         result.computeStatus();

testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java

@@ -91,6 +91,7 @@ public class AbstractStoryTest extends AbstractModelIntegrationTest {
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // System Configuration

testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNormalizers.java

@@ -58,6 +58,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                     "looks like the previous test haven't cleaned it up", e);
         }
 
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
 
         // User administrator

testing/story/src/test/java/com/evolveum/midpoint/testing/story/consistency/TestConsistencyMechanism.java

@@ -245,6 +245,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 
         // This should discover the connectors
         logger.trace("initSystem: trying modelService.postInit()");
+        provisioningService.postInit(initResult);
         modelService.postInit(initResult);
         logger.trace("initSystem: modelService.postInit() done");