Merge remote-tracking branch 'origin/master'

Author: tchrapovic

docs/concepts/mark/index.adoc

@@ -355,6 +355,15 @@ Used in the same way as "Protected" when you have different reasons than for the
 |Shadow object that has bad data and should be ignored by synchronization. Used in the same way as "Protected" but with a different semantic meaning.
 |===
 
+If reconciliation repeatedly fails on a subset of resource objects due to invalid or corrupted data, you can quarantine the failing shadows by applying a shadow policy mark such as _Invalid data_.
+Once applied, the mark disables synchronization (inbound/outbound) and provisioning operations for those shadows.
+Subsequent reconciliation runs can then skip the marked shadows (until unmarked) instead of repeatedly processing them.
+
+This can be automated using a composite task containing two activities.
+While the first activity runs a reconciliation, the second activity immediately processes only the failed objects (using `failedObjectsSelector`) and applies a mark.
+After you fix the source data, remove the mark from the shadows (in Accounts/Entitlements list of a resource in GUI), and then reconcile the objects manually.
+See a link:https://github.com/Evolveum/midpoint-samples/blob/master/samples/tasks/recon-task-csv-mark-invalid.xml[composite task example].
+
 == Best practices
 
 * Use clear and descriptive names for marks, such as "inactive", "requires-approval", or "archived".

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java

@@ -814,10 +814,6 @@ protected PageStorage getPageStorage(String storageKey) {
     }
 
     public PageStorage getPageStorage() {
-        if (isCollectionViewPanelForWidget()) {
-            return null;
-        }
-
         String storageKey = getStorageKey();
         if (StringUtils.isNotEmpty(storageKey)) {
             return getPageStorage(storageKey);
@@ -1298,7 +1294,6 @@ private boolean isExportDataLinkVisible() {
     }
 
     protected String getStorageKey() {
-
         CompiledObjectCollectionView compiledView = getCompiledCollectionViewFromPanelConfiguration();
         if (compiledView != null) {
             return WebComponentUtil.getObjectListPageStorageKey(compiledView.getViewIdentifier());
@@ -1440,7 +1435,7 @@ protected boolean isCollectionViewPanelForWidget() {
         return false;
     }
 
-    private String getWidgetNameOfCollection() {
+    protected String getWidgetNameOfCollection() {
         PageParameters parameters = getPageBase().getPageParameters();
         return parameters == null ? null : parameters.get(PageBase.PARAMETER_DASHBOARD_WIDGET_NAME).toString();
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java

@@ -176,7 +176,7 @@ public String getDslQuery() {
     }
 
     public void setDslQuery(String dslQuery) {
-        axiomQueryWrapper = new AxiomQueryWrapper(null);
+        axiomQueryWrapper = new AxiomQueryWrapper(null, getTypeClass());
         axiomQueryWrapper.setDslQuery(dslQuery);
     }
 
@@ -279,20 +279,13 @@ private boolean isSearchTypeAvailable() {
 
     private QueryWrapper determineQueryWrapper() {
         SearchBoxModeType searchMode = getSearchMode();
-
-        switch (searchMode) {
-            case OID:
-                return oidSearchItemWrapper;
-            case ADVANCED:
-                return advancedQueryWrapper;
-            case AXIOM_QUERY:
-                return axiomQueryWrapper;
-            case FULLTEXT:
-                return fulltextQueryWrapper;
-            case BASIC:
-                return basicQueryWrapper;
-        }
-        return null;
+        return switch (searchMode) {
+            case OID -> oidSearchItemWrapper;
+            case ADVANCED -> advancedQueryWrapper;
+            case AXIOM_QUERY -> axiomQueryWrapper;
+            case FULLTEXT -> fulltextQueryWrapper;
+            case BASIC -> basicQueryWrapper;
+        };
     }
 
 //    private ObjectQuery createObjectQueryAdvanced(PageBase pageBase) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java

@@ -251,7 +251,7 @@ public ItemDefinition<?> getDefinitionOverride() {
     }
 
     private Search<C> createSearch(SearchBoxConfigurationType mergedConfig, BasicQueryWrapper basicSearchWrapper) {
-        AxiomQueryWrapper axiomWrapper = new AxiomQueryWrapper(getDefinitionOverride());
+        AxiomQueryWrapper axiomWrapper = new AxiomQueryWrapper(getDefinitionOverride(), type);
         AdvancedQueryWrapper advancedQueryWrapper = new AdvancedQueryWrapper(null);
         FulltextQueryWrapper fulltextQueryWrapper = new FulltextQueryWrapper(null);
         if (AssignmentType.class.equals(type)) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/AxiomSearchPanel.java

@@ -9,29 +9,18 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.AdvancedQueryWrapper;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.AxiomQueryWrapper;
-import com.evolveum.midpoint.prism.Containerable;
 
 import com.evolveum.midpoint.prism.ItemDefinition;
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.impl.query.lang.AxiomQueryContentAssistImpl;
-import com.evolveum.midpoint.prism.query.AxiomQueryContentAssist;
-import com.evolveum.midpoint.prism.query.ContentAssist;
 import com.evolveum.midpoint.prism.query.Suggestion;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
 
 import com.evolveum.midpoint.web.page.admin.configuration.component.QueryPlaygroundPanel;
-import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
-import com.evolveum.midpoint.web.session.SessionStorage;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxModeType;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.attributes.ThrottlingSettings;
@@ -40,22 +29,22 @@
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.IRequestParameters;
 import org.apache.wicket.request.cycle.RequestCycle;
 
 import javax.xml.namespace.QName;
+import java.io.Serial;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
 public class AxiomSearchPanel extends BasePanel<AxiomQueryWrapper> {
 
+    @Serial private static final long serialVersionUID = 1L;
+
     private static final Trace LOGGER = TraceManager.getTrace(QueryPlaygroundPanel.class);
     private static final String ID_AXIOM_QUERY_FIELD = "axiomQueryField";
     private static final String ID_ADVANCED_ERROR = "advancedError";
@@ -74,6 +63,8 @@ protected void onInitialize() {
     private void initLayout() {
         TextField<String> queryDslField = new TextField<>(ID_AXIOM_QUERY_FIELD,
                 new PropertyModel<>(getModel(), AxiomQueryWrapper.F_DSL_QUERY)) {
+            @Serial private static final long serialVersionUID = 1L;
+
             @Override
             protected boolean shouldTrimInput() {
                 return false;
@@ -107,6 +98,8 @@ protected boolean shouldTrimInput() {
         ObjectMapper mapper = new ObjectMapper();
 
         queryDslField.add(new AjaxFormComponentUpdatingBehavior("keydown") {
+            @Serial private static final long serialVersionUID = 1L;
+
             @Override
             protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
                 super.updateAjaxAttributes(attributes);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ObjectCollectionSearchItemPanel.java

@@ -17,7 +17,10 @@
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;
 
+import java.io.Serial;
+
 public class ObjectCollectionSearchItemPanel extends SingleSearchItemPanel<ObjectCollectionSearchItemWrapper> {
+    @Serial private static final long serialVersionUID = 1L;
 
     public ObjectCollectionSearchItemPanel(String id, IModel<ObjectCollectionSearchItemWrapper> searchItemModel) {
         super(id, searchItemModel);
@@ -34,7 +37,7 @@ protected Component initSearchItemField(String id) {
         }
         String finalOid = oid;
         AjaxLinkPanel ajaxLinkPanel = new AjaxLinkPanel(id, nameModel) {
-            private static final long serialVersionUID = 1L;
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             public void onClick(AjaxRequestTarget target) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/SearchPanel.java

@@ -174,7 +174,6 @@ public void initSpecificSearchPanel(String panelId, Form form) {
                 break;
             case AXIOM_QUERY:
                 PropertyModel<AxiomQueryWrapper> propModel = new PropertyModel<>(getModel(), Search.F_AXIOM_SEARCH);
-                propModel.getObject().setTypeClass(getModel().getObject().getTypeClass());
                 AxiomSearchPanel axiomSearchPanel = new AxiomSearchPanel(panelId, propModel);
                 axiomSearchPanel.setOutputMarkupId(true);
                 form.addOrReplace(axiomSearchPanel);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/SingleSearchItemPanel.java

@@ -6,6 +6,7 @@
 
 package com.evolveum.midpoint.gui.impl.component.search.panel;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -41,7 +42,7 @@
 
 public abstract class SingleSearchItemPanel<S extends AbstractSearchItemWrapper> extends AbstractSearchItemPanel<S> {
 
-    private static final long serialVersionUID = 1L;
+    @Serial private static final long serialVersionUID = 1L;
 
     private static final String ID_SEARCH_ITEM_CONTAINER = "searchItemContainer";
     private static final String ID_SEARCH_ITEM_FIELD = "searchItemField";
@@ -122,7 +123,7 @@ public String getDataPlacement() {
 
         CheckPanel checkPanel = new CheckPanel(ID_CHECK_DISABLE_FIELD, new PropertyModel<>(getModel(), FilterableSearchItemWrapper.F_APPLY_FILTER));
         (checkPanel).getBaseFormComponent().add(new OnChangeAjaxBehavior() {
-            private static final long serialVersionUID = 1L;
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {
@@ -136,14 +137,14 @@ protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {
         searchItemContainer.add(checkPanel);
 
         AjaxSubmitButton removeButton = new AjaxSubmitButton(ID_REMOVE_BUTTON) {
-            private static final long serialVersionUID = 1L;
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             public void onSubmit(AjaxRequestTarget target) {
                 deletePerformed(target);
             }
         };
-        removeButton.add(new VisibleBehaviour(() -> canRemoveSearchItem()));
+        removeButton.add(new VisibleBehaviour(this::canRemoveSearchItem));
         removeButton.setOutputMarkupId(true);
         removeButton.add(AttributeModifier.replace("title",
                 getParentPage().createStringResource("SingleSearchItemPanel.removeProperty", createLabelModel().getObject())));
@@ -154,10 +155,6 @@ protected boolean isFieldEnabled() {
         return getModelObject().isEnabled();
     }
 
-    protected WebMarkupContainer getSearchItemContainer() {
-        return (WebMarkupContainer) get(ID_SEARCH_ITEM_CONTAINER);
-    }
-
     private IModel<String> createHelpModel() {
         if (getModelObject() == null) {
             return () -> "";
@@ -214,7 +211,7 @@ protected AutoCompleteTextPanel createAutoCompetePanel(String id, IModel<String>
         AutoCompleteTextPanel<String> autoCompletePanel = new AutoCompleteTextPanel<>(id, model, String.class,
                 true, lookupTableOid) {
 
-            private static final long serialVersionUID = 1L;
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             public Iterator<String> getIterator(String input) {
@@ -224,7 +221,7 @@ public Iterator<String> getIterator(String input) {
 
         (autoCompletePanel).getBaseFormComponent().add(new Behavior() {
 
-            private static final long serialVersionUID = 1L;
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             public void bind(Component component) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java

@@ -26,6 +26,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.jetbrains.annotations.NotNull;
 
 import javax.xml.namespace.QName;
 import java.util.List;
@@ -179,7 +180,7 @@ public Class<? extends AbstractSearchItemPanel> getSearchItemPanelClass() {
     }
 
     @Override
-    public IModel<String> getName() {
+    public @NotNull IModel<String> getName() {
         return StringUtils.isNotEmpty(name.getObject()) ? name : Model.of();
     }
 
@@ -188,12 +189,12 @@ public void setName(IModel<String> name) {
     }
 
     @Override
-    public IModel<String> getHelp() {
+    public @NotNull IModel<String> getHelp() {
         return StringUtils.isNotEmpty(help.getObject()) ? help : Model.of();
     }
 
     @Override
-    public IModel<String> getTitle() {
+    public @NotNull IModel<String> getTitle() {
         return Model.of();
     }
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/wrapper/AssociationSearchItemWrapper.java

@@ -19,6 +19,7 @@
 import com.evolveum.midpoint.util.DisplayableValue;
 
 import org.apache.wicket.model.IModel;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +57,7 @@ public DisplayableValue<ItemName> getDefaultValue() {
     }
 
     @Override
-    public IModel<String> getName() {
+    public @NotNull IModel<String> getName() {
         return PageBase.createStringResourceStatic("ConstructionType.association");
     }