Merge remote-tracking branch 'origin/master'

Evolveum · Mar 27, 2020 · 2aeda39 · 2aeda39
2 parents ec97183 + 3c1bec9
commit 2aeda39
Show file tree

Hide file tree

Showing 48 changed files with 4,297 additions and 4,176 deletions.
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
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismPropertyWrapperFactoryImpl.java b/...src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismPropertyWrapperFactoryImpl.java
@@ -83,9 +83,11 @@ protected PrismPropertyWrapper<T> createWrapper(PrismContainerValueWrapper<?> pa
             try {
                 PrismObject<LookupTableType> lookupTable = modelService.getObject(LookupTableType.class, valueEnumerationRef.getOid(), options, task, result);
                 propertyWrapper.setPredefinedValues(lookupTable.asObjectable());
+                result.computeStatusIfUnknown();
             } catch (ObjectNotFoundException | SchemaException | SecurityViolationException | CommunicationException
                     | ConfigurationException | ExpressionEvaluationException e) {
                 LOGGER.error("Cannot load lookup table for {} ", item);
+                result.recordFatalError("Cannot load lookupTable for " + item + ", Reason: " + e.getMessage(), e);
                 //TODO throw???
             }
         }

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
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ReportTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
@@ -132,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(WebComponentUtil.createDeltaCollection(delta), ModelExecuteOptions.createIsImport(), task, result);
+            model.executeChanges(MiscUtil.createCollection(delta), ModelExecuteOptions.createIsImport(), task, result);
             result.recordSuccess();
             LOGGER.info("Created {} as part of initial import", object);
             return true;

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.java
@@ -15,7 +15,9 @@
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.Referencable;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.web.component.data.column.ImagePanel;
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -111,10 +113,10 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         nameLink.setOutputMarkupId(true);
         add(nameLink);
 
-        ObjectType referencedObject= referencedObjectModel.getObject();
+        ObjectType referencedObject = referencedObjectModel.getObject();
         ObjectReferenceType referencedObjectRef = null;
         if (referencedObject != null) {
-            referencedObjectRef = WebComponentUtil.createObjectRef(referencedObject.getOid(), referencedObject.getName().getOrig(), WebComponentUtil.classToQName(getPageBase().getPrismContext(), referencedObject.getClass()));
+            referencedObjectRef = ObjectTypeUtil.createObjectRef(referencedObject.getOid(), referencedObject.getName(), ObjectTypes.getObjectType(referencedObject.getClass()));
             PrismReferenceValue referenceValue = getPageBase().getPrismContext().itemFactory().createReferenceValue(referencedObject.getOid(),
                     WebComponentUtil.classToQName(getPageBase().getPrismContext(), referencedObject.getClass()));
             referenceValue.setObject(referencedObject.asPrismObject());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -170,17 +170,17 @@ public static <T extends ObjectType> String getIconColumnValue(T object, Operati
         } else if (RoleType.class.equals(type)) {
             return WebComponentUtil.createRoleIcon(object.asPrismContainer());
         } else if (OrgType.class.equals(type)) {
-            return WebComponentUtil.createOrgIcon(object.asPrismContainer());
+            return WebComponentUtil.createOrgIcon();
         } else if (ServiceType.class.equals(type)) {
-            return WebComponentUtil.createServiceIcon(object.asPrismContainer());
+            return WebComponentUtil.createServiceIcon();
         } else if (ShadowType.class.equals(type)) {
             if (object == null) {
                 return WebComponentUtil.createErrorIcon(result);
             } else {
                 return WebComponentUtil.createShadowIcon(object.asPrismContainer());
             }
         } else if (type.equals(TaskType.class)) {
-            return WebComponentUtil.createTaskIcon(object.asPrismContainer());
+            return WebComponentUtil.createTaskIcon();
         } else if (type.equals(ResourceType.class)) {
             return WebComponentUtil.createResourceIcon(object.asPrismContainer());
         } else if (type.equals(AccessCertificationDefinitionType.class)) {

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
@@ -22,8 +22,10 @@
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.ObjectDeltaOperation;
 import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.security.api.HttpConnectionInformation;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.security.api.SecurityContextManager;
@@ -460,11 +462,11 @@ public void executeChangesInBackground(Collection<ObjectDelta<? extends ObjectTy
 
             PrismObject<TaskType> taskType = task.getUpdatedTaskObject();
             AssignmentType archetypeAssignment = new AssignmentType();
-            archetypeAssignment.setTargetRef(WebComponentUtil.createObjectRef(SystemObjectsType.ARCHETYPE_UTILITY_TASK.value(),
-                    null, ArchetypeType.COMPLEX_TYPE));
+            archetypeAssignment.setTargetRef(ObjectTypeUtil.createObjectRef(SystemObjectsType.ARCHETYPE_UTILITY_TASK.value(),
+                    ObjectTypes.ARCHETYPE));
             taskType.asObjectable().getAssignment().add(archetypeAssignment);
-            taskType.asObjectable().getArchetypeRef().add(WebComponentUtil.createObjectRef(SystemObjectsType.ARCHETYPE_UTILITY_TASK.value(),
-                    null, ArchetypeType.COMPLEX_TYPE));
+            taskType.asObjectable().getArchetypeRef().add(ObjectTypeUtil.createObjectRef(SystemObjectsType.ARCHETYPE_UTILITY_TASK.value(),
+                    ObjectTypes.ARCHETYPE));
 
             taskManager.switchToBackground(task, result);
             result.setBackgroundTaskOid(task.getOid());

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
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -242,7 +243,7 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enablin
 
                 ObjectDelta objectDelta = WebModelServiceUtils.createActivationAdminStatusDelta(
                         objectClass, object.getOid(), enabling, parentPage.getPrismContext());
-                parentPage.getModelService().executeChanges(WebComponentUtil.createDeltaCollection(objectDelta), null, task, subResult);
+                parentPage.getModelService().executeChanges(MiscUtil.createCollection(objectDelta), null, task, subResult);
                 subResult.recordSuccess();
             } catch (CommonException|RuntimeException ex) {
                 subResult.recomputeStatus();
@@ -277,7 +278,7 @@ private void reconcilePerformed(AjaxRequestTarget target, F selectedObject) {
                 ObjectDelta delta = parentPage.getPrismContext().deltaFactory().object()
                         .createEmptyModifyDelta(objectClass, object.getOid()
                         );
-                Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil.createDeltaCollection(delta);
+                Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
                 parentPage.getModelService().executeChanges(deltas, ModelExecuteOptions.createReconcile(), task, opResult);
                 opResult.computeStatusIfUnknown();
             } catch (CommonException|RuntimeException ex) {

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
@@ -23,6 +23,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.exception.SystemException;
@@ -391,8 +392,8 @@ private void savePerformed() {
                 ObjectDelta<ResourceType> delta = parentPage.computeDiff(oldResource, resourceObject);
                 if (!delta.isEmpty()) {
                     parentPage.logDelta(delta);
-                    @SuppressWarnings("unchecked") Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil
-                            .createDeltaCollection(delta);
+                    @SuppressWarnings("unchecked") Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil
+                            .createCollection(delta);
                     modelService.executeChanges(deltas, null, getPageBase().createSimpleTask(OPERATION_SAVE_CAPABILITIES), result);
                     parentPage.resetModels();
                     saved = true;

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -877,7 +878,7 @@ private void savePerformed() {
             if (!delta.isEmpty()) {
                 parentPage.logDelta(delta);
                 @SuppressWarnings("unchecked")
-                Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil.createDeltaCollection(delta);
+                Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
                 modelService.executeChanges(deltas, null, parentPage.createSimpleTask(OPERATION_SAVE_SCHEMA_HANDLING), result);
                 parentPage.resetModels();
                 saved = true;

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
@@ -17,6 +17,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -710,7 +711,7 @@ private void savePerformed() {
                 ObjectDelta<ResourceType> delta = parentPage.computeDiff(oldResource, newResource);
                 if (!delta.isEmpty()) {
                     parentPage.logDelta(delta);
-                    Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil.createDeltaCollection(delta);
+                    Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
                     modelService.executeChanges(deltas, null, getPageBase().createSimpleTask(OPERATION_SAVE_SYNC), result);
                     parentPage.resetModels();
                     syncDtoModel.reset();

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
@@ -8,6 +8,8 @@
 
 import java.util.*;
 
+import com.evolveum.midpoint.util.MiscUtil;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -423,7 +425,7 @@ protected boolean executeForceDelete(PrismObjectWrapper<F> userWrapper, Task tas
                 forceDeleteDelta.revive(getPrismContext());
 
                 if (forceDeleteDelta != null && !forceDeleteDelta.isEmpty()) {
-                    getModelService().executeChanges(WebComponentUtil.createDeltaCollection(forceDeleteDelta),
+                    getModelService().executeChanges(MiscUtil.createCollection(forceDeleteDelta),
                             options, task, result);
                 }
             } catch (Exception ex) {

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
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.schema.ObjectDeltaOperation;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
@@ -477,7 +478,7 @@ protected void addPerformed(AjaxRequestTarget target, List newAssignmentsList) {
                             ObjectDelta<O> archetypeDelta = getObjectWrapper().getObjectDelta();
                             if (!archetypeDelta.isEmpty()) {
                                 archetypeDelta.revive(getPrismContext());
-                                getModelService().executeChanges(WebComponentUtil.createDeltaCollection(archetypeDelta), null, task, result);
+                                getModelService().executeChanges(MiscUtil.createCollection(archetypeDelta), null, task, result);
                                 result.computeStatus();
                             }
                         } catch (Exception e) {
@@ -816,7 +817,7 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
                     if (!delta.isEmpty()) {
                         delta.revive(getPrismContext());
 
-                        final Collection<ObjectDelta<? extends ObjectType>> deltas = WebComponentUtil.createDeltaCollection(delta);
+                        final Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
                         final Collection<SimpleValidationError> validationErrors = performCustomValidation(objectToAdd, deltas);
                         if (checkValidationErrors(target, validationErrors)) {
                             return;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.schema.util.CertCampaignTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -1008,7 +1009,7 @@ private void deleteCampaignsPerformed(AjaxRequestTarget target,
                 Task task = createSimpleTask(OPERATION_DELETE_CAMPAIGNS);
                 ObjectDelta<AccessCertificationCampaignType> delta = getPrismContext().deltaFactory().object().createDeleteDelta(
                         AccessCertificationCampaignType.class, itemToDelete.getOid());
-                getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task,
+                getModelService().executeChanges(MiscUtil.createCollection(delta), null, task,
                         result);
             } catch (Exception ex) {
                 result.recordPartialError(createStringResource("PageCertCampaigns.message.deleteCampaignsPerformed.partialError").getString(), ex);

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
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.exception.SystemException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
@@ -254,7 +255,7 @@ public void savePerformed(AjaxRequestTarget target) {
                 getPrismContext().adopt(delta);
                 ModelExecuteOptions options = new ModelExecuteOptions();
                 options.setRaw(true);
-                getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), options, task, result);
+                getModelService().executeChanges(MiscUtil.createCollection(delta), options, task, result);
             }
             result.computeStatus();
         } catch (Exception ex) {

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
@@ -17,6 +17,7 @@
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.LocalizableMessageBuilder;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -246,7 +247,7 @@ private void deleteDefinitionPerformed(AjaxRequestTarget target, AccessCertifica
                     getPrismContext().deltaFactory().object()
                             .createDeleteDelta(AccessCertificationDefinitionType.class, definition.getOid()
                             );
-            getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result);
+            getModelService().executeChanges(MiscUtil.createCollection(delta), null, task, result);
         } catch (Exception ex) {
             result.recordPartialError(createStringResource("PageCertDefinitions.message.deleteDefinitionPerformed.partialError").getString(), ex);
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete campaign definition", ex);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import com.evolveum.midpoint.prism.delta.DeltaFactory;
+import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.web.page.admin.PageAdmin;
 
 import org.apache.wicket.RestartResponseException;
@@ -296,7 +297,7 @@ protected void onSavePerformed(AjaxRequestTarget target) {
             }
             if (delta != null) {
                             getPrismContext().adopt(delta);
-                            getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result);
+                            getModelService().executeChanges(MiscUtil.createCollection(delta), null, task, result);
             }
 
         } catch (Exception e) {