cleanup. old search panels and related classes say bye bye

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java

@@ -243,38 +243,11 @@ public List<O> getSelectedRealObjects() {
                 return getPreselectedObjectList();
             }
 
-//            @Override
-//            protected Search createSearch(Class<O> type) {
-////                String collectionName = isCollectionViewPanelForCompiledView() ?
-////                        WebComponentUtil.getCollectionNameParameterValue(getPageBase()).toString() : null;
-////                //TODO special items
-//                Set<SearchItemType> specialItems = getSpecialItems();
-//                return SearchFactory.createSearch(type, getObjectCollectionView(), getPageBase());
-////                Search search = super.createSearch(type);
-////                getSpecialSearchItemWrappers()
-////                        .forEach(function -> search.addSpecialItem(function.apply(search)));
-////                return search;
-//            }
         };
         listPanel.setOutputMarkupId(true);
         return listPanel;
     }
 
-    protected Set<SearchItemType> getSpecialItems() {
-        return Collections.emptySet();
-    }
-
-//    private SearchConfigurationWrapper<O> createSearchConfigWrapper(Class<O> type, String collectionViewName) {
-//        SearchConfigurationWrapper searchConfigWrapper = SearchFactory.createDefaultSearchBoxConfigurationWrapper(type, getPageBase());
-//        searchConfigWrapper.setCollectionViewName(collectionViewName);
-//        searchConfigWrapper.getItemsList().addAll(new ArrayList(getSpecialSearchItemWrappers()));
-//        return searchConfigWrapper;
-//    }
-
-//    protected Set<SerializableSupplier<FilterableSearchItemWrapper>> getSpecialSearchItemWrappers() {
-//        return Collections.emptySet();
-//    }
-
     protected void addPerformed(AjaxRequestTarget target, QName type, List<O> selected) {
         parentPage.hideMainPopup(target);
     }

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

@@ -49,19 +49,6 @@ protected ObjectQuery getCustomizeContentQuery(){
         return null;
     }
 
-//    @Override
-//    protected Search createSearch(Class<O> type) {
-//        Search search = SearchFactory.createMemberSearch(type, getSupportedTypes(), getSupportedRelations(), getAbstractRoleType(),  getObjectCollectionView(), getPageBase());
-//        search.getAllowedTypeList()
-//                .addAll(Arrays.asList(
-//                        AbstractRoleType.class,
-//                        OrgType.class,
-//                        ArchetypeType.class,
-//                        RoleType.class,
-//                        ServiceType.class));
-//        return search;
-//    }
-
     @Override
     protected SearchBoxConfigurationType getDefaultSearchBoxConfiguration(Class<O> type) {
         SearchBoxConfigurationType searchBoxConfigurationType = super.getDefaultSearchBoxConfiguration(type);

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

@@ -9,7 +9,6 @@
 
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -36,7 +35,6 @@
 import com.evolveum.midpoint.util.exception.SystemException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchValue.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search;
 
 import java.io.Serializable;
 import java.util.Objects;

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

@@ -13,7 +13,7 @@
 
 import com.evolveum.midpoint.util.DisplayableValue;
 
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;

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

@@ -8,7 +8,7 @@
 package com.evolveum.midpoint.gui.impl.component.search.factory;
 
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.DeadShadowSearchItemWrapper;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 
 import java.util.Arrays;

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

@@ -26,7 +26,7 @@
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;

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

@@ -27,7 +27,7 @@ protected void onInitialize() {
 
     private void initLayout() {
         TextField<String> queryDslField = new TextField<>(ID_AXIOM_QUERY_FIELD,
-                new PropertyModel<>(getModel(), com.evolveum.midpoint.web.component.search.Search.F_DSL_QUERY));
+                new PropertyModel<>(getModel(), AxiomQueryWrapper.F_DSL_QUERY));
         queryDslField.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
         queryDslField.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertAxiomQuery")));
 //        queryDslField.add(createVisibleBehaviour(SearchBoxModeType.AXIOM_QUERY));

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/DateIntervalSearchPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/DateIntervalSearchPanel.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/DateIntervalSearchPopupPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/DateIntervalSearchPopupPanel.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;

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

@@ -7,7 +7,7 @@
 package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.DateSearchItemWrapper;
-import com.evolveum.midpoint.web.component.search.DateIntervalSearchPanel;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;

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

@@ -7,7 +7,6 @@
 package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.ItemPathSearchItemWrapper;
-import com.evolveum.midpoint.web.component.search.ItemPathSearchPanel;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ItemPathSearchPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ItemPathSearchPanel.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ItemPathSearchPopupPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ItemPathSearchPopupPanel.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.api.component.path.ItemPathDto;
 import com.evolveum.midpoint.gui.api.component.path.ItemPathPanel;

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

@@ -20,7 +20,7 @@
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/PopoverSearchPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/PopoverSearchPanel.java

@@ -4,11 +4,10 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.gui.impl.component.search.panel.Popover;
 import com.evolveum.midpoint.web.component.input.TextPanel;
 
 import org.apache.wicket.Component;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/PopoverSearchPopupPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/PopoverSearchPopupPanel.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;

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

@@ -16,7 +16,6 @@
 import org.apache.wicket.model.PropertyModel;
 
 import com.evolveum.midpoint.schema.constants.RelationTypes;
-import com.evolveum.midpoint.web.component.search.ReferenceValueSearchPanel;
 
 public class ProjectSearchItemPanel extends SingleSearchItemPanel<ProjectSearchItemWrapper> {
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ReferenceAutocomplete.java

@@ -4,7 +4,7 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -8,8 +8,7 @@
 
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.ReferenceSearchItemWrapper;
 import com.evolveum.midpoint.prism.Containerable;
-import com.evolveum.midpoint.web.component.search.ReferenceValueSearchPanel;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ReferenceValueSearchPanel.java

@@ -4,22 +4,19 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import java.util.Collections;
 import java.util.List;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.gui.api.component.ObjectBrowserPanel;
 import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.input.TextPanel;
-import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java → gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/ReferenceValueSearchPopupPanel.java

@@ -4,29 +4,22 @@
  * 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.web.component.search;
+package com.evolveum.midpoint.gui.impl.component.search.panel;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.component.ObjectBrowserPanel;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.util.PolyStringUtils;
-import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 
 import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
 
-import com.evolveum.midpoint.web.page.admin.reports.PageReports;
-
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
 import org.apache.wicket.markup.html.WebMarkupContainer;

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

@@ -34,7 +34,7 @@
 import com.evolveum.midpoint.web.component.dialog.Popupable;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.web.component.input.QNameObjectTypeChoiceRenderer;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 

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

@@ -32,7 +32,7 @@
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;

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

@@ -9,7 +9,6 @@
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.TenantSearchItemWrapper;
 import com.evolveum.midpoint.prism.PrismReferenceDefinition;
 import com.evolveum.midpoint.schema.constants.RelationTypes;
-import com.evolveum.midpoint.web.component.search.ReferenceValueSearchPanel;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -41,7 +40,7 @@ protected List<QName> getAllowedRelations() {
     }
 
     public PrismReferenceDefinition getTenantDefinition() {
-        return null; //this part is taken from ProjectSearchItem, it is not clear why we return null here
+        return null;
     }
 
 }

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

@@ -6,7 +6,6 @@
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.AdvancedQueryWrapper;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.search.SearchItem;
 import com.evolveum.midpoint.web.page.admin.configuration.PageRepositoryQuery;
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
 
@@ -18,7 +17,6 @@
 import org.apache.wicket.model.PropertyModel;
 
 import javax.xml.namespace.QName;
-import java.io.Serializable;
 
 public class XmlSearchPanel extends BasePanel<AdvancedQueryWrapper> {
 
@@ -38,7 +36,7 @@ protected void onInitialize() {
         initAdvancedSearchLayout();
     }
 
-    private <S extends SearchItem, T extends Serializable> void initAdvancedSearchLayout() {
+    private void initAdvancedSearchLayout() {
         AjaxButton debug = new AjaxButton(ID_DEBUG, createStringResource("SearchPanel.debug")) {
 
             private static final long serialVersionUID = 1L;
@@ -56,30 +54,14 @@ public void onClick(AjaxRequestTarget target) {
 //        advancedGroup.setOutputMarkupId(true);
 //        add(advancedGroup);
 
-        TextArea<?> advancedArea = new TextArea<>(ID_ADVANCED_AREA, new PropertyModel<>(getModel(), com.evolveum.midpoint.web.component.search.Search.F_ADVANCED_QUERY));
+        TextArea<?> advancedArea = new TextArea<>(ID_ADVANCED_AREA, new PropertyModel<>(getModel(), AdvancedQueryWrapper.F_ADVANCED_QUERY));
         advancedArea.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
         advancedArea.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertFilterXml")));
 //        advancedArea.add(createVisibleBehaviour(SearchBoxModeType.ADVANCED));
 //        advancedArea.add(AttributeAppender.append("class", createValidityStyle()));
         add(advancedArea);
 
 
-
-//        Label advancedError = new Label(ID_ADVANCED_ERROR,
-//                new PropertyModel<String>(getModel(), com.evolveum.midpoint.web.component.search.Search.F_ADVANCED_ERROR));
-//        advancedError.setOutputMarkupId(true);
-//        advancedError.add(AttributeAppender.append("class",
-//                () -> StringUtils.isEmpty(getModelObject().getAdvancedError()) ? "valid-feedback" : "invalid-feedback"));
-//        advancedError.add(new VisibleBehaviour(() -> {
-//            Search search = getModelObject();
-//
-//            if (!isAdvancedMode()) {
-//                return false;
-//            }
-//
-//            return StringUtils.isNotEmpty(search.getAdvancedError());
-//        }));
-//        add(advancedError);
     }
 
 //    private boolean isAdvancedMode() {

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

@@ -13,6 +13,7 @@
 
 public class AdvancedQueryWrapper implements Serializable {
 
+    public static final String F_ADVANCED_QUERY = "advancedQuery";
     private String advancedQuery;
     private Class<? extends Containerable> typeClass;
 

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

@@ -9,8 +9,7 @@
 import com.evolveum.midpoint.gui.impl.component.search.panel.AutoCompleteSearchItemPanel;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.web.component.search.SearchValue;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
+import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 
 public class AutoCompleteSearchItemWrapper extends PropertySearchItemWrapper<String> {