Merge remote-tracking branch 'origin/master' into feature/reports

Evolveum · May 27, 2020 · ab0647b · ab0647b
2 parents 3db7153 + b92f258
commit ab0647b
Show file tree

Hide file tree

Showing 158 changed files with 2,386 additions and 1,962 deletions.
diff --git a/INSTALL b/INSTALL
@@ -5,20 +5,20 @@ This file contains quick install guide. For Full commented installation manual g
 
 https://wiki.evolveum.com/display/midPoint/midPoint+Development+Snapshot
 
-1. Pre-requisities:
+1. Prerequisites:
 
     1. Java (JDK) 11
     2. Apache Maven 3
     3. midPoint source code retrieved via Git
 
 2. Compile sources
- 
+
 2.1 Building sources with tests
 
 Execute the following maven command:
 
    mvn install
-   
+
 Note: building midPoint with the tests takes considerably long time (approx. 1 hour)
 
 2.2 Building sources without tests
@@ -31,7 +31,7 @@ After the build is complete the distribution archives are available in:
 
    dist/target/
 
-2.4 Insall the distribution
+2.4 Install the distribution
 
 Unpack the distribution package to a convenient place (e.g. /opt/midpoint)
 

diff --git a/INSTALL-dist b/INSTALL-dist
@@ -1,12 +1,12 @@
 INSTALLING MIDPOINT FROM BINARY DISTRIBUTION
 --------------------------------------------
 
-This file contains quick installation guide. Full installation guide 
+This file contains quick installation guide. Full installation guide
 and release notes can be found at:
 
     https://wiki.evolveum.com/display/midPoint/midPoint+Releases
 
-1. Pre-requisities:
+1. Prerequisites:
 
     Java (JRE) 11
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -2757,4 +2757,8 @@ public Clock getClock() {
     private SideBarMenuPanel getSideBarMenuPanel(){
         return (SideBarMenuPanel) get(ID_SIDEBAR_MENU);
     }
+
+    public ModelExecuteOptions executeOptions() {
+        return ModelExecuteOptions.create(getPrismContext());
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -644,7 +644,7 @@ public static TaskType createSingleRecurrenceTask(String taskName, QName applica
         }
 
         if (options != null) {
-            prismTask.findOrCreateProperty(SchemaConstants.PATH_MODEL_EXTENSION_EXECUTE_OPTIONS)
+            prismTask.findOrCreateContainer(SchemaConstants.PATH_MODEL_EXTENSION_EXECUTE_OPTIONS)
                     .setRealValue(options.toModelExecutionOptionsType());
         }
         return task;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
@@ -133,7 +133,7 @@ private <O extends ObjectType> Boolean importObject(PrismObject<O> object, File
         ObjectDelta delta = DeltaFactory.Object.createAddDelta(object);
         try {
             LOGGER.info("Starting initial import of file {}.", file.getName());
-            model.executeChanges(MiscUtil.createCollection(delta), ModelExecuteOptions.createIsImport(), task, result);
+            model.executeChanges(MiscUtil.createCollection(delta), ModelExecuteOptions.create(prismContext).setIsImport(), task, result);
             result.recordSuccess();
             LOGGER.info("Created {} as part of initial import", object);
             return true;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/PostInitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/PostInitialDataImport.java
@@ -127,7 +127,7 @@ private boolean importObject(File file, Task task, OperationResult mainResult) {
             LOGGER.info("Starting post-initial import of file {}.", file.getName());
             ImportOptionsType options = new ImportOptionsType();
             options.overwrite(true);
-            options.setModelExecutionOptions(new ModelExecuteOptionsType().raw(false));
+            options.setModelExecutionOptions(new ModelExecuteOptionsType(prismContext).raw(false));
             model.importObjectsFromFile(file, options, task, result);
             result.recordSuccess();
             return true;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java
@@ -9,15 +9,12 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
 import com.evolveum.midpoint.model.api.ModelInteractionService;
 import com.evolveum.midpoint.model.api.ModelPublicConstants;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.api.context.ModelContext;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismProperty;
-import com.evolveum.midpoint.prism.PrismPropertyDefinition;
+import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.ObjectDeltaOperation;
@@ -449,11 +446,11 @@ public void executeChangesInBackground(Collection<ObjectDelta<? extends ObjectTy
             deltasProperty.setRealValues(deltasBeans.toArray(new ObjectDeltaType[0]));
             task.addExtensionProperty(deltasProperty);
             if (options != null) {
-                PrismPropertyDefinition<ModelExecuteOptionsType> optionsDefinition = page.getPrismContext().getSchemaRegistry()
-                        .findPropertyDefinitionByElementName(SchemaConstants.MODEL_EXTENSION_EXECUTE_OPTIONS);
-                PrismProperty<ModelExecuteOptionsType> optionsProperty = optionsDefinition.instantiate();
-                optionsProperty.setRealValue(options.toModelExecutionOptionsType());
-                task.addExtensionProperty(optionsProperty);
+                PrismContainerDefinition<ModelExecuteOptionsType> optionsDefinition = page.getPrismContext().getSchemaRegistry()
+                        .findContainerDefinitionByElementName(SchemaConstants.MODEL_EXTENSION_EXECUTE_OPTIONS);
+                PrismContainer<ModelExecuteOptionsType> optionsContainer = optionsDefinition.instantiate();
+                optionsContainer.setRealValue(options.toModelExecutionOptionsType());
+                task.setExtensionContainer(optionsContainer);
             }
             task.setChannel(SchemaConstants.CHANNEL_GUI_USER_URI);
             task.setHandlerUri(ModelPublicConstants.EXECUTE_DELTAS_TASK_HANDLER_URI);

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
@@ -303,7 +303,7 @@ private void reconcilePerformed(AjaxRequestTarget target, F selectedObject) {
                         .createEmptyModifyDelta(objectClass, object.getOid()
                         );
                 Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
-                parentPage.getModelService().executeChanges(deltas, ModelExecuteOptions.createReconcile(), task, opResult);
+                parentPage.getModelService().executeChanges(deltas, parentPage.executeOptions().reconcile(), task, opResult);
                 opResult.computeStatusIfUnknown();
             } catch (CommonException|RuntimeException ex) {
                 opResult.recomputeStatus();

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
@@ -477,7 +477,7 @@ public void applyState() {
             }
             if (!delta.isEmpty()) {
                 parentPage.logDelta(delta);
-                WebModelServiceUtils.save(delta, ModelExecuteOptions.createRaw(), result, null, parentPage);
+                WebModelServiceUtils.save(delta, ModelExecuteOptions.create(prismContext).raw(), result, null, parentPage);
                 parentPage.resetModels();
                 saved = true;
             }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
@@ -706,7 +706,7 @@ public List<AssignmentInfoDto> showAllAssignmentsPerformed(AjaxRequestTarget aja
 
             ModelContext<UserType> modelContext;
             try {
-                ModelExecuteOptions options = ModelExecuteOptions.createEvaluateAllAssignmentRelationsOnRecompute();
+                ModelExecuteOptions options = executeOptions().evaluateAllAssignmentRelationsOnRecompute();
                 modelContext = getModelInteractionService().previewChanges(Collections.singleton(delta), options, task, result);
             } catch (NoFocusNameSchemaException e) {
                 info(getString("pageAdminFocus.message.noUserName"));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -993,7 +993,7 @@ public void startProcessing(AjaxRequestTarget target, OperationResult result) {
 
     @NotNull
     protected ModelExecuteOptions getOptions(boolean previewOnly) {
-        ModelExecuteOptions options = mainPanel.getExecuteChangeOptionsDto().createOptions();
+        ModelExecuteOptions options = mainPanel.getExecuteChangeOptionsDto().createOptions(getPrismContext());
         if (previewOnly) {
             options.getOrCreatePartialProcessing().setApprovals(PartialProcessingTypeType.PROCESS);
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java
@@ -247,7 +247,7 @@ private void deleteCaseObjectsConfirmed(AjaxRequestTarget target, List<CaseType>
         OperationResult result = new OperationResult(OPERATION_DELETE_CASE_OBJECT);
         casesToDelete.forEach(caseObject -> {
             WebModelServiceUtils.deleteObject(CaseType.class, caseObject.getOid(),
-                    ExecuteChangeOptionsDto.createFromSystemConfiguration().createOptions(),
+                    ExecuteChangeOptionsDto.createFromSystemConfiguration().createOptions(getPrismContext()),
                     result, PageCases.this);
         });
         result.computeStatusComposite();

diff --git a/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java b/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
@@ -253,8 +253,8 @@ public void savePerformed(AjaxRequestTarget target) {
             delta.normalize();
             if (!delta.isEmpty()) {
                 getPrismContext().adopt(delta);
-                ModelExecuteOptions options = new ModelExecuteOptions();
-                options.setRaw(true);
+                ModelExecuteOptions options = new ModelExecuteOptions(getPrismContext());
+                options.raw(true);
                 getModelService().executeChanges(MiscUtil.createCollection(delta), options, task, result);
             }
             result.computeStatus();

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -867,7 +867,7 @@ private void deleteSelectedConfirmed(AjaxRequestTarget target, List<DebugObjectI
 
         OperationResult result = new OperationResult(OPERATION_DELETE_OBJECTS);
         for (DebugObjectItem bean : items) {
-            WebModelServiceUtils.deleteObject(dto.getType(), bean.getOid(), ModelExecuteOptions.createRaw(),
+            WebModelServiceUtils.deleteObject(dto.getType(), bean.getOid(), executeOptions().raw(),
                     result, this);
         }
         result.computeStatusIfUnknown();

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -25,15 +25,12 @@
 import com.evolveum.midpoint.gui.api.component.form.CheckBoxPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
 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.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
-import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
@@ -321,15 +318,15 @@ public void savePerformed(AjaxRequestTarget target) {
 //                }
 
                 Collection<ObjectDelta<? extends ObjectType>> deltas = (Collection) MiscUtil.createCollection(delta);
-                ModelExecuteOptions options = new ModelExecuteOptions();
+                ModelExecuteOptions options = ModelExecuteOptions.create(getPrismContext());
                 if (isTrue(DebugViewOptions.ID_SAVE_AS_RAW)) {
-                    options.setRaw(true);
+                    options.raw(true);
                 }
                 if (isTrue(DebugViewOptions.ID_REEVALUATE_SEARCH_FILTERS)) {
-                    options.setReevaluateSearchFilters(true);
+                    options.reevaluateSearchFilters(true);
                 }
                 if(!isTrue(DebugViewOptions.ID_ENCRYPT)) {
-                    options.setNoCrypt(true);
+                    options.noCrypt(true);
                 }
 
                 getModelService().executeChanges(deltas, options, task, result);