diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java index 5e3d1877f76..d4606068b60 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java @@ -233,5 +233,6 @@ public class GuiStyleConstants { public static final String CLASS_ICON_PERFORMANCE = "fa fa-area-chart"; public static final String CLASS_ICON_TASK_RESULTS = "fa fa-list-alt"; + public static final String CLASS_ICON_SEARCH = "fa fa-search flip-icon"; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java index e4da52b702e..4e526aab4f5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java @@ -6,9 +6,6 @@ */ package com.evolveum.midpoint.gui.api.component; -import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.task.api.TaskManager; - import org.apache.commons.lang3.StringUtils; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -19,7 +16,7 @@ import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.polystring.PolyString; -import com.evolveum.midpoint.schema.SchemaHelper; +import com.evolveum.midpoint.schema.SchemaService; import com.evolveum.midpoint.web.security.MidPointApplication; import com.evolveum.midpoint.web.security.MidPointAuthWebSession; import com.evolveum.midpoint.web.security.WebApplicationConfiguration; @@ -140,8 +137,8 @@ public PrismContext getPrismContext() { return getPageBase().getPrismContext(); } - public SchemaHelper getSchemaHelper() { - return getPageBase().getSchemaHelper(); + public SchemaService getSchemaService() { + return getPageBase().getSchemaService(); } protected String createComponentPath(String... components) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java index 92771d7b850..95fcbb6b673 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java @@ -249,7 +249,7 @@ protected void addPerformed(AjaxRequestTarget target, QName type, List select private Collection> getOptions() { if (ObjectTypes.SHADOW.getTypeQName().equals(typeModel.getObject() != null ? typeModel.getObject().getTypeQName() : null)) { - return getSchemaHelper().getOperationOptionsBuilder().noFetch().build(); + return getSchemaService().getOperationOptionsBuilder().noFetch().build(); } return null; } 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 index e86aad70a4c..2dcce982584 100644 --- 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 @@ -31,8 +31,6 @@ import org.apache.wicket.feedback.FeedbackMessages; import org.apache.wicket.injection.Injector; import org.apache.wicket.markup.ComponentTag; -import org.apache.wicket.markup.head.CssHeaderItem; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.TransparentWebMarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -46,8 +44,6 @@ import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.request.resource.CssResourceReference; -import org.apache.wicket.resource.CoreLibrariesContributor; import org.apache.wicket.spring.injection.annot.SpringBean; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; @@ -406,12 +402,12 @@ public PrismContext getPrismContext() { return getMidpointApplication().getPrismContext(); } - public SchemaHelper getSchemaHelper() { - return getMidpointApplication().getSchemaHelper(); + public SchemaService getSchemaService() { + return getMidpointApplication().getSchemaService(); } public GetOperationOptionsBuilder getOperationOptionsBuilder() { - return getSchemaHelper().getOperationOptionsBuilder(); + return getSchemaService().getOperationOptionsBuilder(); } public QueryConverter getQueryConverter() { 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 index 677199810bb..36157db1995 100644 --- 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 @@ -127,7 +127,6 @@ import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.DateLabelComponent; import com.evolveum.midpoint.web.component.TabbedPanel; -import com.evolveum.midpoint.web.component.assignment.AssignmentsUtil; import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb; import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageClass; import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance; @@ -4801,7 +4800,7 @@ public static PrismObject findLookupTable(Pris Task task = page.createSimpleTask("loadLookupTable"); OperationResult result = task.getResult(); - Collection> options = WebModelServiceUtils.createLookupTableRetrieveOptions(page.getSchemaHelper()); + Collection> options = WebModelServiceUtils.createLookupTableRetrieveOptions(page.getSchemaService()); return WebModelServiceUtils.loadObject(LookupTableType.class, lookupTableUid, options, page, task, result); } 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 index ae1c8275bfe..7f19cb4ae33 100644 --- 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 @@ -713,8 +713,8 @@ public static PrismObject reconstructObject(Class t return null; } - public static Collection> createLookupTableRetrieveOptions(SchemaHelper schemaHelper) { - return schemaHelper.getOperationOptionsBuilder() + public static Collection> createLookupTableRetrieveOptions(SchemaService schemaService) { + return schemaService.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() .asc(LookupTableRowType.F_LABEL) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java index d64498b4e43..11439ba6070 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java @@ -655,7 +655,7 @@ private PrismObject loadLookupTable(Item item) { OperationResult result = task.getResult(); Collection> options = WebModelServiceUtils - .createLookupTableRetrieveOptions(getPageBase().getSchemaHelper()); + .createLookupTableRetrieveOptions(getPageBase().getSchemaService()); return WebModelServiceUtils.loadObject(LookupTableType.class, lookupTableOid, options, getPageBase(), task, result); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java index 63a97647d9f..48950b6c1fc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java @@ -66,7 +66,7 @@ public MultivalueContainerListPanel(String id, Class type) { @Override protected Search createSearch(Class type) { PrismContainerDefinition containerDefinition = getPrismContext().getSchemaRegistry().findContainerDefinitionByCompileTimeClass(getType()); - return SearchFactory.createContainerSearch(new ContainerTypeSearchItem<>(new SearchValue<>(type, containerDefinition.getDisplayName())), + return SearchFactory.createContainerSearch(new ContainerTypeSearchItem<>(new SearchValue<>(type, containerDefinition == null ? getType().getTypeName() : containerDefinition.getDisplayName())), null, initSearchableItems(containerDefinition), getPageBase(), false); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java index 90d2c62e835..eb7ae6cf28c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java @@ -416,7 +416,7 @@ private SideBarMenuItem createConfigurationMenu(boolean experimentalFeaturesEnab createSystemConfigurationMenu(item); item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.internals", "fa fa-archive", PageInternals.class)); - item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.repoQuery", "fa fa-search", PageRepositoryQuery.class)); + item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.repoQuery", GuiStyleConstants.CLASS_ICON_SEARCH + " flip-icon-margin", PageRepositoryQuery.class)); item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.evaluateMapping", "fa fa-cog", PageEvaluateMapping.class)); item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.about", "fa fa-info-circle", PageAbout.class)); return item; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java new file mode 100644 index 00000000000..798599dc84f --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2019 Evolveum and contributors + * + * 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.gui.impl.factory.panel; + +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.prism.query.ObjectFilter; +import com.evolveum.midpoint.prism.query.PrismQuerySerialization; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.logging.LoggingUtils; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType; +import com.evolveum.prism.xml.ns._public.types_3.ObjectType; + +import org.apache.commons.lang3.StringUtils; +import org.apache.wicket.model.IModel; + +public class SearchFilterTypeForQueryModel extends SearchFilterTypeModel { + + private static final Trace LOGGER = TraceManager.getTrace(SearchFilterTypeForQueryModel.class); + + private static final long serialVersionUID = 1L; + + private IModel> filterTypeModel; + private final boolean useParsing; + + public SearchFilterTypeForQueryModel(IModel valueWrapper, PageBase pageBase, + IModel> filterTypeModel) { + this(valueWrapper, pageBase, filterTypeModel, true); + } + + public SearchFilterTypeForQueryModel(IModel valueWrapper, PageBase pageBase, + IModel> filterTypeModel, boolean useParsing) { + super(valueWrapper, pageBase); + this.filterTypeModel = filterTypeModel; + this.useParsing = useParsing; + } + + @Override + public String getObject() { + try { + SearchFilterType value = getBaseModel().getObject(); + if (value == null) { + return null; + } + if (useParsing) { + ObjectFilter objectFilter = getPageBase().getQueryConverter().createObjectFilter(filterTypeModel.getObject(), value); + PrismQuerySerialization serialization = getPageBase().getPrismContext().querySerializer().serialize(objectFilter); + if (serialization != null) { + return serialization.filterText(); + } + } + return value.getText(); + } catch (Exception e) { + LoggingUtils.logUnexpectedException(LOGGER, "Cannot serialize filter", e); + getPageBase().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log"); + } + return null; + } + + @Override + public void setObject(String object) { + if (StringUtils.isBlank(object)) { + return; + } + try { + ObjectFilter objectFilter = getPageBase().getPrismContext().createQueryParser().parseQuery(filterTypeModel.getObject(), object); + SearchFilterType filter = getPageBase().getQueryConverter().createSearchFilterType(objectFilter); + filter.setText(object); + getBaseModel().setObject(filter); + } catch (Exception e) { + LoggingUtils.logUnexpectedException(LOGGER, "Cannot parse filter", e); + getPageBase().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log"); + } + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java new file mode 100644 index 00000000000..28a33b046a8 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2019 Evolveum and contributors + * + * 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.gui.impl.factory.panel; + +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.logging.LoggingUtils; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType; + +import org.apache.commons.lang3.StringUtils; +import org.apache.wicket.model.IModel; + +public class SearchFilterTypeForXmlModel extends SearchFilterTypeModel { + + private static final Trace LOGGER = TraceManager.getTrace(SearchFilterTypeForXmlModel.class); + + private static final long serialVersionUID = 1L; + + public SearchFilterTypeForXmlModel(IModel valueWrapper, PageBase pageBase) { + super(valueWrapper, pageBase); + } + + @Override + public String getObject() { + try { + SearchFilterType value = getBaseModel().getObject(); + if (value == null) { + return null; + } + + return getPageBase().getPrismContext().xmlSerializer().serializeRealValue(value); + } catch (Exception e) { + LoggingUtils.logUnexpectedException(LOGGER, "Cannot serialize filter", e); + getPageBase().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log"); + } + return null; + } + + @Override + public void setObject(String object) { + if (StringUtils.isBlank(object)) { + return; + } + + try { + SearchFilterType filter = getPageBase().getPrismContext().parserFor(object).parseRealValue(SearchFilterType.class); + getBaseModel().setObject(filter); + } catch (Exception e) { + LoggingUtils.logUnexpectedException(LOGGER, "Cannot parse filter", e); + getPageBase().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log"); + } + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeModel.java index 1d7b934c798..f971ce2d15a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeModel.java @@ -6,105 +6,28 @@ */ package com.evolveum.midpoint.gui.impl.factory.panel; -import com.evolveum.midpoint.gui.api.page.PageBase; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.logging.LoggingUtils; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType; -import org.apache.commons.lang3.StringUtils; -import org.apache.wicket.Component; -import org.apache.wicket.Session; -import org.apache.wicket.model.IComponentAssignedModel; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.IWrapModel; - -public class SearchFilterTypeModel implements IComponentAssignedModel { - - private static final Trace LOGGER = TraceManager.getTrace(SearchFilterTypeModel.class); - - private static final long serialVersionUID = 1L; - - private IModel baseModel; - private PageBase pageBase; - - public SearchFilterTypeModel(IModel valueWrapper, PageBase pageBase) { - this.baseModel = valueWrapper; - this.pageBase = pageBase; - } - - @Override - public void detach() { - // TODO Auto-generated method stub - - } - @Override - public String getObject() { - try { - SearchFilterType value = baseModel.getObject(); - if (value == null) { - return null; - } - - return pageBase.getPrismContext().xmlSerializer().serializeRealValue(value); - } catch (SchemaException e) { - LoggingUtils.logUnexpectedException(LOGGER, "Cannot serialize filter", e); - throw new IllegalStateException("Cannot serialize filter: " + e.getMessage() + ". For more details, please, see midpoint log"); - } - } +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType; - @Override - public void setObject(String object) { - if (StringUtils.isBlank(object)) { - return; - } +public abstract class SearchFilterTypeModel implements IModel { - try { - SearchFilterType filter = pageBase.getPrismContext().parserFor(object).parseRealValue(SearchFilterType.class); - baseModel.setObject(filter); - } catch (SchemaException e) { - LoggingUtils.logUnexpectedException(LOGGER, "Cannot parse filter", e); - throw new IllegalStateException("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log"); - } + private static final long serialVersionUID = 1L; - } + private IModel baseModel; + private PageBase pageBase; - @Override - public IWrapModel wrapOnAssignment(Component component) { - return new SearchFilterWrapperModel(component); + public SearchFilterTypeModel(IModel valueWrapper, PageBase pageBase) { + this.baseModel = valueWrapper; + this.pageBase = pageBase; } - class SearchFilterWrapperModel implements IWrapModel { - - private Component component; - - public SearchFilterWrapperModel(Component component) { - this.component = component; - } - - @Override - public IModel getWrappedModel() { - return SearchFilterTypeModel.this; - } - - @Override - public String getObject() { - try { - return SearchFilterTypeModel.this.getObject(); - } catch (Throwable e) { - component.error(e.getMessage()); - } - return null; - } + protected IModel getBaseModel() { + return baseModel; + } - @Override - public void setObject(String object) { - try { - SearchFilterTypeModel.this.setObject(object); - } catch (Throwable e) { - component.error(e.getMessage()); - } - } + protected PageBase getPageBase() { + return pageBase; } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismPropertyWrapperFactoryImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismPropertyWrapperFactoryImpl.java index 1c224a6cec8..3863a6108ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismPropertyWrapperFactoryImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismPropertyWrapperFactoryImpl.java @@ -22,7 +22,7 @@ import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyWrapperImpl; import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SchemaHelper; +import com.evolveum.midpoint.schema.SchemaService; import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; @@ -41,7 +41,7 @@ public class PrismPropertyWrapperFactoryImpl private static final Trace LOGGER = TraceManager.getTrace(PrismPropertyWrapperFactoryImpl.class); - @Autowired protected SchemaHelper schemaHelper; + @Autowired protected SchemaService schemaService; private static final String DOT_CLASS = PrismPropertyWrapperFactoryImpl.class.getSimpleName() + "."; private static final String OPERATION_LOAD_LOOKUP_TABLE = DOT_CLASS + "loadLookupTable"; @@ -86,7 +86,7 @@ protected LookupTableType getPredefinedValues(PrismProperty item, WrapperCont Task task = wrapperContext.getTask(); OperationResult result = wrapperContext.getResult().createSubresult(OPERATION_LOAD_LOOKUP_TABLE); Collection> options = WebModelServiceUtils - .createLookupTableRetrieveOptions(schemaHelper); + .createLookupTableRetrieveOptions(schemaService); try { PrismObject lookupTable = getModelService().getObject(LookupTableType.class, valueEnumerationRef.getOid(), options, task, result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java index 7ca79f55a9d..8911e0f1b6d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java @@ -12,7 +12,6 @@ import java.util.*; import javax.xml.namespace.QName; -import com.evolveum.midpoint.web.component.search.Search; import com.evolveum.midpoint.web.session.PageStorage; import org.apache.commons.lang3.Validate; @@ -35,14 +34,12 @@ import com.evolveum.midpoint.prism.query.ObjectPaging; import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.prism.query.OrderDirection; -import com.evolveum.midpoint.repo.api.RepositoryService; import com.evolveum.midpoint.schema.*; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.TaskManager; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.security.MidPointApplication; -import com.evolveum.midpoint.wf.api.WorkflowManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.DistinctSearchOptionType; /** @@ -98,17 +95,17 @@ protected PrismContext getPrismContext() { return application.getPrismContext(); } - protected SchemaHelper getSchemaHelper() { + protected SchemaService getSchemaService() { MidPointApplication application = MidPointApplication.get(); - return application.getSchemaHelper(); + return application.getSchemaService(); } protected GetOperationOptionsBuilder getOperationOptionsBuilder() { - return getSchemaHelper().getOperationOptionsBuilder(); + return getSchemaService().getOperationOptionsBuilder(); } protected GetOperationOptionsBuilder getOperationOptionsBuilder(Collection> createFrom) { - return getSchemaHelper().getOperationOptionsBuilder().setFrom(createFrom); + return getSchemaService().getOperationOptionsBuilder().setFrom(createFrom); } protected RelationRegistry getRelationRegistry() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java index e48d20075d6..56ac26cbb00 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java @@ -233,7 +233,7 @@ private String createDeleteUsersMessage(){ Task task = getPagebase().createSimpleTask(OPERATION_COUNT_TASK); OperationResult result = new OperationResult(OPERATION_COUNT_TASK); - Collection> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder() + Collection> options = getPagebase().getSchemaService().getOperationOptionsBuilder() .raw().build(); try { @@ -259,7 +259,7 @@ private String createDeleteOrgUnitsMessage(){ Task task = getPagebase().createSimpleTask(OPERATION_COUNT_TASK); OperationResult result = new OperationResult(OPERATION_COUNT_TASK); - Collection> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder().raw().build(); + Collection> options = getPagebase().getSchemaService().getOperationOptionsBuilder().raw().build(); try { dto.setOrgUnitCount(getPagebase().getModelService().countObjects(OrgType.class, null, options, task, result)); @@ -278,7 +278,7 @@ private void countShadows(boolean isAccountShadow){ Task task = getPagebase().createSimpleTask(OPERATION_SEARCH_ITERATIVE_TASK); OperationResult result = new OperationResult(OPERATION_SEARCH_ITERATIVE_TASK); - Collection> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder().raw().build(); + Collection> options = getPagebase().getSchemaService().getOperationOptionsBuilder().raw().build(); try { PrismContext prismContext = getPagebase().getPrismContext(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java index dac5b2b6b27..7b9a59a1425 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java @@ -130,19 +130,15 @@ protected Component createButton(int index, String componentId, IModel -
+ -
+
@@ -16,7 +16,7 @@
-
+
-
+
- -
- +
+
+
+ -
+
+ + +
-
-
-
- - -