Merge remote-tracking branch 'origin/feature/simulations' into featur…

…e/simulations
Evolveum · Nov 12, 2022 · f924cce · f924cce
2 parents 8ee9b74 + 273cb5a
commit f924cce
Show file tree

Hide file tree

Showing 29 changed files with 231 additions and 234 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.api.component.delta;
 
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -18,8 +20,6 @@
 import com.evolveum.midpoint.gui.api.component.result.OperationResultPopupPanel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -164,7 +164,7 @@ private String getBoxCssClass() {
     }
 
     private SceneDto loadSceneForDelta() throws SchemaException, ExpressionEvaluationException {
-        Scene scene;
+        Visualization scene;
 
         ObjectDelta<? extends ObjectType> delta;
         ObjectDeltaType deltaType = getModel().getObject().getObjectDelta();

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
@@ -125,7 +125,7 @@
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 import com.evolveum.midpoint.model.api.util.ResourceUtils;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.crypto.EncryptionException;
 import com.evolveum.midpoint.prism.crypto.Protector;
@@ -4450,7 +4450,7 @@ public static SceneDto createSceneDto(CaseType caseObject, PageBase pageBase, St
         OperationResult result = new OperationResult(operation);
         Task task = pageBase.createSimpleTask(operation);
         try {
-            Scene deltasScene = SceneUtil.visualizeObjectTreeDeltas(caseObject.getApprovalContext().getDeltasToApprove(),
+            Visualization deltasScene = SceneUtil.visualizeObjectTreeDeltas(caseObject.getApprovalContext().getDeltasToApprove(),
                     CaseTypeUtil.isClosed(caseObject) ? "pageWorkItem.changesApplied" : "pageWorkItem.delta",
                     pageBase.getPrismContext(), pageBase.getModelInteractionService(), objectRef, task, result);
             return new SceneDto(deltasScene);
@@ -4469,7 +4469,7 @@ public static SceneDto createSceneDtoForManualCase(CaseType caseObject, PageBase
         OperationResult result = new OperationResult(operation);
         Task task = pageBase.createSimpleTask(operation);
         try {
-            Scene deltasScene = SceneUtil.visualizeObjectDeltaType(caseObject.getManualProvisioningContext().getPendingOperation().getDelta(),
+            Visualization deltasScene = SceneUtil.visualizeObjectDeltaType(caseObject.getManualProvisioningContext().getPendingOperation().getDelta(),
                     CaseTypeUtil.isClosed(caseObject) ? "pageWorkItem.changesApplied" : "pageWorkItem.changesToBeApplied", pageBase.getPrismContext(), pageBase.getModelInteractionService(), objectRef, task, result);
             return new SceneDto(deltasScene);
         } catch (SchemaException | ExpressionEvaluationException ex) {
@@ -4653,7 +4653,7 @@ public static List<SceneDto> computeChangesCategorizationList(ChangesByState cha
     private static SceneDto createTaskChangesDto(String titleKey, String boxClassOverride, ObjectTreeDeltas deltas, ModelInteractionService modelInteractionService,
             PrismContext prismContext, ObjectReferenceType objectRef, Task opTask, OperationResult result) throws SchemaException, ExpressionEvaluationException {
         ObjectTreeDeltasType deltasType = ObjectTreeDeltas.toObjectTreeDeltasType(deltas);
-        Scene scene = SceneUtil.visualizeObjectTreeDeltas(deltasType, titleKey, prismContext, modelInteractionService, objectRef, opTask, result);
+        Visualization scene = SceneUtil.visualizeObjectTreeDeltas(deltasType, titleKey, prismContext, modelInteractionService, objectRef, opTask, result);
         SceneDto sceneDto = new SceneDto(scene);
         sceneDto.setBoxClassOverride(boxClassOverride);
         return sceneDto;

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.java b/...a/com/evolveum/midpoint/gui/impl/page/admin/component/preview/PreviewChangesTabPanel.java
@@ -18,8 +18,8 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.focus.PageFocusPreviewChanges;
 import com.evolveum.midpoint.model.api.context.ModelContext;
-import com.evolveum.midpoint.model.api.visualizer.ModelScene;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
+import com.evolveum.midpoint.model.api.visualizer.ModelContextVisualization;
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
 import com.evolveum.midpoint.repo.common.ObjectResolver;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
@@ -73,7 +73,7 @@ protected void onInitialize() {
     }
 
     private void initModels() {
-        ModelScene modelScene;
+        ModelContextVisualization modelScene;
 
         ModelContext<O> modelContext = getModelObject();
         try {
@@ -85,8 +85,8 @@ private void initModels() {
             throw new SystemException(e);        // TODO
         }
 
-        final List<? extends Scene> primaryScenes = modelScene.getPrimaryScenes();
-        final List<? extends Scene> secondaryScenes = modelScene.getSecondaryScenes();
+        final List<? extends Visualization> primaryScenes = modelScene.getPrimary();
+        final List<? extends Visualization> secondaryScenes = modelScene.getSecondary();
 
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Creating context DTO for primary deltas:\n{}", DebugUtil.debugDump(primaryScenes));

diff --git a/...va/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusDto.java b/...va/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusDto.java
@@ -16,7 +16,7 @@
 import com.evolveum.midpoint.model.api.context.ModelContext;
 import com.evolveum.midpoint.model.api.context.ModelProjectionContext;
 import com.evolveum.midpoint.model.api.context.ModelState;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -60,7 +60,7 @@ public ModelOperationStatusDto(ModelContext<?> modelContext, ModelInteractionSer
             // primaryDelta
             final List<ObjectDelta<? extends ObjectType>> primaryDeltas = new ArrayList<>();
 //            final List<ObjectDelta<? extends ObjectType>> secondaryDeltas = new ArrayList<>();
-            final List<? extends Scene> primaryScenes;
+            final List<? extends Visualization> primaryScenes;
 //            final List<? extends Scene> secondaryScenes;
             try {
                 addIgnoreNull(primaryDeltas, modelContext.getFocusContext().getPrimaryDelta());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneDto.java
@@ -10,9 +10,9 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.model.api.visualizer.Name;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
-import com.evolveum.midpoint.model.api.visualizer.SceneDeltaItem;
-import com.evolveum.midpoint.model.api.visualizer.SceneItem;
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
+import com.evolveum.midpoint.model.api.visualizer.VisualizationDeltaItem;
+import com.evolveum.midpoint.model.api.visualizer.VisualizationItem;
 import com.evolveum.midpoint.prism.PrismObjectDefinition;
 import com.evolveum.midpoint.prism.delta.ChangeType;
 
@@ -34,7 +34,7 @@ public class SceneDto implements Serializable {
     public static final java.lang.String F_PARTIAL_SCENES = "partialScenes";
     public static final java.lang.String F_SORTED = "sorted";
 
-    @NotNull private final Scene scene;
+    @NotNull private final Visualization scene;
     private boolean minimized;
     private boolean sorted = false;
 
@@ -43,21 +43,21 @@ public class SceneDto implements Serializable {
     private final List<SceneItemDto> items = new ArrayList<>();
     private final List<SceneDto> partialScenes = new ArrayList<>();
 
-    public SceneDto(@NotNull Scene scene) {
+    public SceneDto(@NotNull Visualization scene) {
         this.scene = scene;
-        for (SceneItem item : scene.getItems()) {
+        for (VisualizationItem item : scene.getItems()) {
             if (item != null) {
                 items.add(new SceneItemDto(this, item));
             }
         }
-        for (Scene sub : scene.getPartialScenes()) {
+        for (Visualization sub : scene.getPartialVisualizations()) {
             if (sub != null) {
                 partialScenes.add(new SceneDto(sub));
             }
         }
     }
 
-    public Scene getScene() {
+    public Visualization getScene() {
         return scene;
     }
 
@@ -133,8 +133,8 @@ public ChangeType getChangeType() {
     }
 
     public boolean containsDeltaItems() {
-        for (SceneItem item : scene.getItems()) {
-            if (item instanceof SceneDeltaItem) {
+        for (VisualizationItem item : scene.getItems()) {
+            if (item instanceof VisualizationDeltaItem) {
                 return true;
             }
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemDto.java
@@ -13,13 +13,14 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.evolveum.midpoint.model.api.visualizer.VisualizationDeltaItem;
+import com.evolveum.midpoint.model.api.visualizer.VisualizationItemValue;
+
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.model.api.visualizer.Name;
-import com.evolveum.midpoint.model.api.visualizer.SceneDeltaItem;
-import com.evolveum.midpoint.model.api.visualizer.SceneItem;
-import com.evolveum.midpoint.model.api.visualizer.SceneItemValue;
+import com.evolveum.midpoint.model.api.visualizer.VisualizationItem;
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.web.util.PolyStringComparator;
 
@@ -28,11 +29,11 @@ public class SceneItemDto implements Serializable {
     public static final String F_NAME = "name";
     public static final String F_LINES  = "lines";
 
-    @NotNull private final SceneItem sceneItem;
+    @NotNull private final VisualizationItem sceneItem;
     @NotNull private final SceneDto sceneDto;
     @NotNull private List<SceneItemLineDto> lines;
 
-    public SceneItemDto(@NotNull SceneDto sceneDto, @NotNull SceneItem sceneItem) {
+    public SceneItemDto(@NotNull SceneDto sceneDto, @NotNull VisualizationItem sceneItem) {
         Validate.notNull(sceneDto);
         Validate.notNull(sceneItem);
         this.sceneDto = sceneDto;
@@ -59,17 +60,17 @@ public List<SceneItemLineDto> computeLines() {
         List<SceneItemLineDto> rv = new ArrayList<>();
 
         if (!isDelta()) {
-            for (SceneItemValue itemValue : sceneItem.getNewValues()) {
+            for (VisualizationItemValue itemValue : sceneItem.getNewValues()) {
                 rv.add(new SceneItemLineDto(this, null, itemValue, false));
             }
         } else {
-            SceneDeltaItem deltaItem = (SceneDeltaItem) sceneItem;
-            for (SceneItemValue itemValue : deltaItem.getUnchangedValues()) {
+            VisualizationDeltaItem deltaItem = (VisualizationDeltaItem) sceneItem;
+            for (VisualizationItemValue itemValue : deltaItem.getUnchangedValues()) {
                 rv.add(new SceneItemLineDto(this, null, itemValue, false));
             }
-            List<? extends SceneItemValue> deletedValues = deltaItem.getDeletedValues();
-            List<? extends SceneItemValue> addedValues = deltaItem.getAddedValues();
-            Comparator<? super SceneItemValue> comparator =
+            List<? extends VisualizationItemValue> deletedValues = deltaItem.getDeletedValues();
+            List<? extends VisualizationItemValue> addedValues = deltaItem.getAddedValues();
+            Comparator<? super VisualizationItemValue> comparator =
                     (s1, s2) -> {
                         PolyString value1 = s1 == null ? null : s1.getText();
                         PolyString value2 = s2 == null ? null : s2.getText();
@@ -79,11 +80,11 @@ public List<SceneItemLineDto> computeLines() {
             deletedValues.sort(comparator);
             addedValues.sort(comparator);
 
-            Iterator<? extends SceneItemValue> deletedValuesIter = deletedValues.iterator();
-            Iterator<? extends SceneItemValue> addedValuesIter = addedValues.iterator();
+            Iterator<? extends VisualizationItemValue> deletedValuesIter = deletedValues.iterator();
+            Iterator<? extends VisualizationItemValue> addedValuesIter = addedValues.iterator();
             while (deletedValuesIter.hasNext() || addedValuesIter.hasNext()) {
-                SceneItemValue deletedValue = deletedValuesIter.hasNext() ? deletedValuesIter.next() : null;
-                SceneItemValue addedValue = addedValuesIter.hasNext() ? addedValuesIter.next() : null;
+                VisualizationItemValue deletedValue = deletedValuesIter.hasNext() ? deletedValuesIter.next() : null;
+                VisualizationItemValue addedValue = addedValuesIter.hasNext() ? addedValuesIter.next() : null;
                 rv.add(new SceneItemLineDto(this, deletedValue, addedValue, true));
             }
         }
@@ -110,23 +111,23 @@ public List<SceneItemLineDto> getLines() {
     }
 
     public boolean isDelta() {
-        return sceneItem instanceof SceneDeltaItem;
+        return sceneItem instanceof VisualizationDeltaItem;
     }
 
     public boolean isNullEstimatedOldValues(){
-        return isDelta() && ((SceneDeltaItem)sceneItem).getSourceDelta() != null && ((SceneDeltaItem)sceneItem).getSourceDelta().getEstimatedOldValues() == null;
+        return isDelta() && ((VisualizationDeltaItem)sceneItem).getSourceDelta() != null && ((VisualizationDeltaItem)sceneItem).getSourceDelta().getEstimatedOldValues() == null;
     }
 
     public boolean isAdd(){
-        return isDelta() && ((SceneDeltaItem)sceneItem).getSourceDelta() != null && ((SceneDeltaItem)sceneItem).getSourceDelta().isAdd();
+        return isDelta() && ((VisualizationDeltaItem)sceneItem).getSourceDelta() != null && ((VisualizationDeltaItem)sceneItem).getSourceDelta().isAdd();
     }
 
     public boolean isDelete(){
-        return isDelta() && ((SceneDeltaItem)sceneItem).getSourceDelta() != null && ((SceneDeltaItem)sceneItem).getSourceDelta().isDelete();
+        return isDelta() && ((VisualizationDeltaItem)sceneItem).getSourceDelta() != null && ((VisualizationDeltaItem)sceneItem).getSourceDelta().isDelete();
     }
 
     public boolean isReplace(){
-        return isDelta() && ((SceneDeltaItem)sceneItem).getSourceDelta() != null && ((SceneDeltaItem)sceneItem).getSourceDelta().isReplace();
+        return isDelta() && ((VisualizationDeltaItem)sceneItem).getSourceDelta() != null && ((VisualizationDeltaItem)sceneItem).getSourceDelta().isReplace();
     }
 
     public boolean isDeltaScene() {

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLineDto.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLineDto.java
@@ -7,7 +7,7 @@
 
 package com.evolveum.midpoint.web.component.prism.show;
 
-import com.evolveum.midpoint.model.api.visualizer.SceneItemValue;
+import com.evolveum.midpoint.model.api.visualizer.VisualizationItemValue;
 
 import java.io.Serializable;
 
@@ -19,11 +19,11 @@ public class SceneItemLineDto implements Serializable {
     public static final String F_NUMBER_OF_LINES = "numberOfLines";
 
     private final SceneItemDto sceneItemDto;
-    private final SceneItemValue sceneItemOldValue;
-    private final SceneItemValue sceneItemNewValue;
+    private final VisualizationItemValue sceneItemOldValue;
+    private final VisualizationItemValue sceneItemNewValue;
     private final boolean isDelta;
 
-    public SceneItemLineDto(SceneItemDto sceneItemDto, SceneItemValue sceneItemOldValue, SceneItemValue sceneItemNewValue, boolean isDelta) {
+    public SceneItemLineDto(SceneItemDto sceneItemDto, VisualizationItemValue sceneItemOldValue, VisualizationItemValue sceneItemNewValue, boolean isDelta) {
         this.sceneItemDto = sceneItemDto;
         this.sceneItemOldValue = sceneItemOldValue;
         this.sceneItemNewValue = sceneItemNewValue;
@@ -34,11 +34,11 @@ public String getName() {
         return sceneItemDto.getName();
     }
 
-    public SceneItemValue getOldValue() {
+    public VisualizationItemValue getOldValue() {
         return sceneItemOldValue;
     }
 
-    public SceneItemValue getNewValue() {
+    public VisualizationItemValue getNewValue() {
         return sceneItemNewValue;
     }
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
@@ -9,7 +9,6 @@
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.model.api.visualizer.SceneItemValue;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.data.column.ImagePanel;

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java
@@ -9,6 +9,7 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.model.api.visualizer.VisualizationItemValue;
 import com.evolveum.midpoint.prism.polystring.PolyString;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -18,7 +19,6 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.model.api.visualizer.SceneItemValue;
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
@@ -33,14 +33,14 @@
 /**
  * TODO make this parametric (along with SceneItemValue)
  */
-public class SceneItemValuePanel extends BasePanel<SceneItemValue> {
+public class SceneItemValuePanel extends BasePanel<VisualizationItemValue> {
 
     private static final String ID_ICON = "icon";
     private static final String ID_LABEL = "label";
     private static final String ID_LINK = "link";
     private static final String ID_ADDITIONAL_TEXT = "additionalText";
 
-    public SceneItemValuePanel(String id, IModel<SceneItemValue> model) {
+    public SceneItemValuePanel(String id, IModel<VisualizationItemValue> model) {
         super(id, model);
     }
 
@@ -52,11 +52,11 @@ protected void onInitialize() {
 
     private void initLayout() {
         final VisibleBehaviour visibleIfReference = new VisibleBehaviour(() -> {
-            SceneItemValue object = getModelObject();
+            VisualizationItemValue object = getModelObject();
             return hasValidReferenceValue(object);
         });
         final VisibleBehaviour visibleIfNotReference = new VisibleBehaviour(() -> {
-            SceneItemValue object = getModelObject();
+            VisualizationItemValue object = getModelObject();
             return !hasValidReferenceValue(object);
         });
 
@@ -101,7 +101,7 @@ public void onClick(AjaxRequestTarget target) {
         add(additionalText);
     }
 
-    private boolean hasValidReferenceValue(SceneItemValue object) {
+    private boolean hasValidReferenceValue(VisualizationItemValue object) {
         PrismReferenceValue target = null;
         if (object != null && object.getSourceValue() != null
                 && object.getSourceValue() instanceof PrismReferenceValue
@@ -123,7 +123,7 @@ private boolean hasValidReferenceValue(SceneItemValue object) {
     }
 
     private ObjectTypeGuiDescriptor getObjectTypeDescriptor() {
-        SceneItemValue value = getModelObject();
+        VisualizationItemValue value = getModelObject();
         if (value != null && value.getSourceValue() != null && value.getSourceValue() instanceof PrismReferenceValue) {
             QName targetType = ((PrismReferenceValue) value.getSourceValue()).getTargetType();
             return ObjectTypeGuiDescriptor.getDescriptor(ObjectTypes.getObjectTypeFromTypeQName(targetType));
@@ -135,7 +135,7 @@ private ObjectTypeGuiDescriptor getObjectTypeDescriptor() {
     private class LabelModel implements IModel<String> {
         @Override
         public String getObject() {
-            SceneItemValue val = getModelObject();
+            VisualizationItemValue val = getModelObject();
             if (val == null) {
                 return null;
             }