diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html
deleted file mode 100644
index 934bc86a4c5..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
deleted file mode 100644
index a6fb072f979..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.component;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.IModel;
-
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismContainerValue;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.page.admin.configuration.component.ObjectPolicyPanel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectPolicyConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ItemConstraintType;
-
-/**
- * @author shood
- */
-
-public class ObjectPolicyConfigurationEditor extends BasePanel> {
-
- private static final long serialVersionUID = 1L;
-
-
- private static final Trace LOGGER = TraceManager.getTrace(ObjectPolicyConfigurationEditor.class);
-
- private static final String DOT_CLASS = ObjectPolicyConfigurationEditor.class.getName() + ".";
-
- private static final String ID_LABEL = "label";
- private static final String ID_REPEATER = "repeater";
- private static final String ID_TEXT_WRAPPER = "textWrapper";
- private static final String ID_BUTTON_EDIT = "edit";
- private static final String ID_NAME = "name";
- private static final String ID_FEEDBACK = "feedback";
- private static final String ID_BUTTON_GROUP = "buttonGroup";
- private static final String ID_BUTTON_REMOVE = "remove";
- private static final String ID_BUTTON_ADD = "add";
- private static final String ID_BUTTON_ADD_FIRST = "addFirstButton";
-
- private static final String CLASS_MULTI_VALUE = "multivalue-form";
- private static final String OFFSET_CLASS = "col-md-offset-4";
-
- public ObjectPolicyConfigurationEditor(String id, IModel> model){
- super(id, model);
-
- setOutputMarkupId(true);
-
- initLayout();
- }
-
- protected void initLayout(){
-
- final Label label = new Label(ID_LABEL, createStringResource("objectPolicyConfigurationEditor.label"));
- add(label);
-
- AjaxLink addFirst = new AjaxLink(ID_BUTTON_ADD_FIRST) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- addPerformed(target);
- }
- };
- addFirst.add(new VisibleEnableBehaviour() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isVisible() {
- List modelObj = ObjectPolicyConfigurationEditor.this.getModelObject();
- return modelObj == null || modelObj.size() == 0;
- }
- });
- addFirst.setOutputMarkupId(true);
- add(addFirst);
-
- ListView repeater = new ListView(ID_REPEATER, getModel()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final ListItem item) {
- WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER);
- textWrapper.add(AttributeAppender.prepend("class", new IModel(){
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject(){
- if(item.getIndex() > 0){
- return OFFSET_CLASS + " " + CLASS_MULTI_VALUE;
- }
-
- return null;
- }
- }));
- item.add(textWrapper);
-
- TextField name = new TextField<>(ID_NAME, createNameModel(item.getModel()));
- name.setOutputMarkupId(true);
- name.add(new AjaxFormComponentUpdatingBehavior("blur") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {}
- });
- name.setEnabled(false);
- name.add(AttributeAppender.replace("placeholder", createStringResource("objectPolicyConfigurationEditor.name.placeholder")));
- textWrapper.add(name);
-
- FeedbackPanel feedback = new FeedbackPanel(ID_FEEDBACK, new ComponentFeedbackMessageFilter(name));
- textWrapper.add(feedback);
-
- AjaxLink edit = new AjaxLink(ID_BUTTON_EDIT) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- editPerformed(target, item);
- }
- };
- textWrapper.add(edit);
-
- WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP);
- buttonGroup.add(AttributeAppender.append("class", new IModel() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- if(item.getIndex() > 0){
- return CLASS_MULTI_VALUE;
- }
-
- return null;
- }
- }));
- item.add(buttonGroup);
- initButtons(buttonGroup, item);
- }
- };
-
- repeater.setOutputMarkupId(true);
- add(repeater);
- }
-
- private void replace(ObjectPolicyConfigurationType old, ObjectPolicyConfigurationType newC){
- boolean added = false;
-
- List list = getModelObject();
- for(ObjectPolicyConfigurationType o: list){
- if(old.equals(o)){
- o.getPropertyConstraint().clear();
- for (ItemConstraintType constraintType : newC.getPropertyConstraint()) {
- PrismContainerValue constraint = constraintType.asPrismContainerValue();
- o.getPropertyConstraint().add(constraint.clone().asContainerable());
- }
- o.setObjectTemplateRef(newC.getObjectTemplateRef());
- o.setType(newC.getType());
- o.setSubtype(newC.getSubtype());
- added = true;
- }
- }
-
- if(!added){
- list.add((ObjectPolicyConfigurationType) newC.asPrismContainerValue().clone().asContainerable());
- }
- }
-
- private void initButtons(WebMarkupContainer buttonGroup, final ListItem item){
- AjaxLink add = new AjaxLink(ID_BUTTON_ADD) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- addPerformed(target);
- }
- };
- add.add(new VisibleEnableBehaviour() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isVisible() {
- return isAddButtonVisible(item);
- }
- });
- buttonGroup.add(add);
-
- AjaxLink remove = new AjaxLink(ID_BUTTON_REMOVE) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- removePerformed(target, item);
- }
- };
- remove.add(new VisibleEnableBehaviour() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isVisible() {
- return isRemoveButtonVisible();
- }
- });
- buttonGroup.add(remove);
- }
-
- protected boolean isAddButtonVisible(ListItem item) {
- int size = getModelObject().size();
- if (size <= 1) {
- return true;
- }
- if (item.getIndex() == size - 1) {
- return true;
- }
-
- return false;
- }
-
- protected boolean isRemoveButtonVisible() {
- int size = getModelObject().size();
- if (size > 0) {
- return true;
- }
-
- return false;
- }
-
- private IModel createNameModel(final IModel model){
- return new LoadableModel() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String load() {
- StringBuilder sb = new StringBuilder();
- ObjectPolicyConfigurationType config = model.getObject();
-
- if(config != null){
- ObjectReferenceType ref = config.getObjectTemplateRef();
-
- if (ref != null) {
- sb.append(WebComponentUtil.getOrigStringFromPoly(ref.getTargetName()));
- }
-
- if (config.getConflictResolution() != null) {
- if (sb.length() > 0) {
- sb.append(" ");
- }
- sb.append(getString("ObjectPolicyConfigurationEditor.conflictResolution"));
- }
-
- if(config.getType() != null) {
- if (sb.length() > 0) {
- sb.append(": ");
- }
- sb.append(config.getType().getLocalPart());
- }
-
- if (config.getSubtype() != null) {
- sb.append("(").append(config.getSubtype()).append(")");
- }
- }
-
- return sb.toString();
- }
- };
- }
-
- private void addPerformed(AjaxRequestTarget target){
- List list = getModelObject();
- list.add(new ObjectPolicyConfigurationType());
-
- target.add(this);
- }
-
- private void removePerformed(AjaxRequestTarget target, ListItem item){
- List list = getModelObject();
- Iterator iterator = list.iterator();
-
- while (iterator.hasNext()){
- ObjectPolicyConfigurationType object = iterator.next();
-
- if(object.equals(item.getModelObject())){
- iterator.remove();
- break;
- }
- }
-
- target.add(this);
- }
-
- private void editPerformed(AjaxRequestTarget target, ListItem item){
- ObjectPolicyPanel objectPolicyPanel = new ObjectPolicyPanel(getPageBase().getMainPopupBodyId(), item.getModelObject()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void savePerformed(AjaxRequestTarget target){
- ObjectPolicyConfigurationType oldConfig = getModel().getObject().getConfig();
- OperationResult result = new OperationResult(DOT_CLASS + "preparePropertyConstraint");
- ObjectPolicyConfigurationType newConfig = getModel().getObject().preparePolicyConfig(result);
-//
- ObjectPolicyConfigurationEditor.this.replace(oldConfig, newConfig);
- ObjectPolicyConfigurationEditor.this.getPageBase().hideMainPopup(target);
- getPageBase().showResult(result, false);
- target.add(ObjectPolicyConfigurationEditor.this);
- }
- };
- objectPolicyPanel.setOutputMarkupId(true);
- getPageBase().showMainPopup(objectPolicyPanel, target);
- }
-
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java
deleted file mode 100644
index 50a27f351bf..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseDto.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2010-2015 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.web.page.admin.cases.dto;
-
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.util.Selectable;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
-import org.jetbrains.annotations.NotNull;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import java.util.List;
-
-/**
- * DTO representing a particular Case.
- *
- * TODO cleanup a bit
- *
- * @author bpowers
- */
-public class CaseDto extends Selectable {
-
- public static final String F_NAME = "name";
- public static final String F_OBJECT_NAME = "objectName";
- public static final String F_TARGET_NAME = "targetName";
- public static final String F_DESCRIPTION = "description";
- public static final String F_EVENT = "event";
- public static final String F_OUTCOME = "outcome";
- public static final String F_OPEN_TIMESTAMP = "openTimestamp";
- public static final String F_CLOSE_TIMESTAMP = "closeTimestamp";
- public static final String F_STATE = "state";
- private static final Trace LOGGER = TraceManager.getTrace(CaseDto.class);
-
- @NotNull private final CaseType caseInstance;
- private String objectName;
- private String targetName;
-
- public CaseDto(@NotNull CaseType _case) {
- this.caseInstance = _case;
- this.objectName = extractObjectName(this.caseInstance.getObjectRef());
- this.targetName = extractObjectName(this.caseInstance.getTargetRef());
- }
-
- // ugly hack (for now) - we extract the name from serialization metadata
- private String extractObjectName(ObjectReferenceType ref) {
- if (ref == null) {
- return null;
- }
-
- LOGGER.debug("TARGET NAME: {}", ref.getTargetName());
- String name = ref.getTargetName() != null ? ref.getTargetName().getOrig() : null;
- if (name == null) {
- return "(" + ref.getOid() + ")";
- } else {
- return name.trim();
- }
- }
-
- public String getObjectName() {
- return objectName;
- }
-
- public String getTargetName() {
- return targetName;
- }
-
- public QName getObjectType() {
- return caseInstance.getObjectRef().getType();
- }
-
- public String getObjectOid() {
- return caseInstance.getObjectRef().getOid();
- }
-
- public Long getCaseId() {
- return caseInstance.asPrismContainerValue().getId();
- }
-
- public CaseType getCase() {
- return caseInstance;
- }
-
- public String getName() {
- return caseInstance.getName().toString();
- }
-
- public String getDescription() {
- return caseInstance.getDescription();
- }
-
- public String getEvent() {
- return caseInstance.getEvent().toString();
- }
-
- public String getOutcome() {
- return caseInstance.getOutcome();
- }
-
- public XMLGregorianCalendar getOpenTimestamp() {
- if (caseInstance.getMetadata() != null) {
- return caseInstance.getMetadata().getCreateTimestamp();
- }
- return null;
- }
-
- public XMLGregorianCalendar getCloseTimestamp() {
- return caseInstance.getCloseTimestamp();
- }
-
- public String getState() {
- return caseInstance.getState();
- }
-
- public List getWorkItems() {
- return caseInstance.getWorkItem();
- }
-
- public CaseWorkItemType getWorkItem(Long caseWorkItemId) {
- List caseWorkItems = caseInstance.getWorkItem();
- for (CaseWorkItemType caseWorkItem : caseWorkItems){
- if (caseWorkItem.getId().equals(caseWorkItemId)) {
- return caseWorkItem;
- }
- }
- return null;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDto.java
deleted file mode 100644
index dd3b651d822..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDto.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2010-2015 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.web.page.admin.cases.dto;
-
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.schema.util.CaseWorkItemUtil;
-import com.evolveum.midpoint.schema.util.WorkItemTypeUtil;
-import com.evolveum.midpoint.web.component.util.Selectable;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractWorkItemOutputType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-import org.jetbrains.annotations.NotNull;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-/**
- * DTO representing a particular CaseWorkItem.
- *
- * TODO cleanup a bit
- *
- * @author bpowers
- */
-public class CaseWorkItemDto extends Selectable {
-
- public static final String F_NAME = "name";
- public static final String F_OBJECT_NAME = "objectName";
- public static final String F_ASSIGNEES = "assignees";
- public static final String F_ORIGINAL_ASSIGNEE = "originalAssignee";
- public static final String F_DESCRIPTION = "description";
- public static final String F_OPEN_TIMESTAMP = "openTimestamp";
- public static final String F_CLOSE_TIMESTAMP = "closeTimestamp";
- public static final String F_DEADLINE = "deadline";
- public static final String F_STATE = "state";
- public static final String F_COMMENT = "comment";
- public static final String F_OUTCOME = "outcome";
- public static final String F_EVIDENCE = "evidence";
-
- @NotNull private final CaseWorkItemType workItem;
-
- private CaseType acase;
- private String objectName;
-
- public CaseWorkItemDto(@NotNull CaseWorkItemType workItem) {
- this.acase = CaseWorkItemUtil.getCase(workItem);
- this.workItem = workItem;
- this.objectName = getName(this.acase.getObjectRef());
- }
-
- // ugly hack (for now) - we extract the name from serialization metadata
- private String getName(ObjectReferenceType ref) {
- if (ref == null) {
- return null;
- }
- String name = ref.getTargetName() != null ? ref.getTargetName().getOrig() : null;
- if (name == null) {
- return "(" + ref.getOid() + ")";
- } else {
- return name.trim();
- }
- }
-
- public String getObjectName() {
- return objectName;
- }
-
- public QName getObjectType() {
- return acase.getObjectRef().getType();
- }
-
- public Long getCaseId() {
- return acase.asPrismContainerValue().getId();
- }
-
- public CaseType getCase() {
- return acase;
- }
-
- public String getOutcome() {
- return WorkItemTypeUtil.getOutcome(workItem);
- }
-
- public String getComment() {
- return WorkItemTypeUtil.getComment(workItem);
- }
-
- public void setComment(String value) {
- if (workItem.getOutput() == null) {
- workItem.beginOutput().comment(value);
- } else {
- workItem.getOutput().comment(value);
- }
- }
-
- public byte[] getEvidence() {
- return WorkItemTypeUtil.getEvidence(workItem);
- }
-
- public String getEvidenceFilename() {
- return WorkItemTypeUtil.getEvidenceFilename(workItem);
- }
-
- public String getEvidenceContentType() {
- return WorkItemTypeUtil.getEvidenceContentType(workItem);
- }
-
- public void setEvidence(byte[] value) {
- if (workItem.getOutput() == null) {
- workItem.beginOutput().evidence(value);
- } else {
- workItem.getOutput().evidence(value);
- }
- }
-
- public long getWorkItemId() {
- return workItem.getId();
- }
-
- public String getAssignees() {
- return WebComponentUtil.getReferencedObjectNames(workItem.getAssigneeRef(), false);
- }
-
- public String getOriginalAssignee() {
-// return WebComponentUtil.getReferencedObjectNames(Collections.singletonList(workItem.getOriginalAssigneeRef()), false);
- return WebComponentUtil.getName(workItem.getOriginalAssigneeRef());
- }
-
- public String getName() {
- return PolyString.getOrig(workItem.getName()); // todo MID-5916, not used anymore (honchar)
- }
-
- public AbstractWorkItemOutputType getOutput() {
- return workItem.getOutput();
- }
-
- public String getDescription() {
- return acase.getDescription();
- }
-
- public XMLGregorianCalendar getCloseTimestamp() {
- return workItem.getCloseTimestamp();
- }
-
- public XMLGregorianCalendar getOpenTimestamp() {
- return acase.getMetadata().getCreateTimestamp();
- }
-
- public XMLGregorianCalendar getDeadline() {
- return workItem.getDeadline();
- }
-
- public String getState() {
- return acase.getState();
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java
deleted file mode 100644
index 06ab3468eb1..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2010-2015 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.web.page.admin.cases.dto;
-
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.query.ObjectOrdering;
-import com.evolveum.midpoint.prism.query.ObjectPaging;
-import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.schema.GetOperationOptions;
-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.logging.LoggingUtils;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
-import com.evolveum.midpoint.web.page.error.PageError;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import com.evolveum.midpoint.model.api.ModelService;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import static com.evolveum.midpoint.schema.GetOperationOptions.createResolveNames;
-import static com.evolveum.midpoint.schema.SelectorOptions.createCollection;
-
-/**
- * @author bpowers
- */
-public class CaseWorkItemDtoProvider extends BaseSortableDataProvider {
-
- private static final Trace LOGGER = TraceManager.getTrace(CaseWorkItemDtoProvider.class);
- private static final String DOT_CLASS = CaseWorkItemDtoProvider.class.getName() + ".";
- private static final String OPERATION_SEARCH_OBJECTS = DOT_CLASS + "searchObjects";
- private static final String OPERATION_COUNT_OBJECTS = DOT_CLASS + "countObjects";
-
- public CaseWorkItemDtoProvider(Component component) {
- super(component, false); // TODO make this cache-able
- }
-
- @Override
- public Iterator internalIterator(long first, long count) {
- LOGGER.trace("begin::iterator() from {} count {}.", first, count);
- getAvailableData().clear();
-
- OperationResult result = new OperationResult(OPERATION_SEARCH_OBJECTS);
- try {
- ObjectPaging paging = createPaging(first, count);
- LOGGER.trace("ITERATOR PAGING: {}.",paging);
- Task task = getPage().createSimpleTask(OPERATION_SEARCH_OBJECTS);
-
- ObjectQuery caseQuery = getQuery();
- caseQuery = caseQuery != null ? caseQuery.clone() : getPrismContext().queryFactory().createQuery();
- caseQuery.setPaging(paging);
-
- Collection> resolveNames = createCollection(createResolveNames());
- ModelService modelService = getPage().getModelService();
- List workItems = modelService.searchContainers(CaseWorkItemType.class, caseQuery, resolveNames, task, result);
- for (CaseWorkItemType workItem : workItems) {
- getAvailableData().add(new CaseWorkItemDto(workItem));
- }
- } catch (Exception ex) {
- result.recordFatalError(getPage().createStringResource("CaseWorkItemDtoProvider.message.internalIterator.fatalError").getString(), ex);
- LoggingUtils.logUnexpectedException(LOGGER, "Couldn't list case work items", ex);
- } finally {
- result.computeStatusIfUnknown();
- }
-
- if (!WebComponentUtil.isSuccessOrHandledError(result)) {
- handleNotSuccessOrHandledErrorInIterator(result);
- }
-
- LOGGER.trace("end::iterator()");
- return getAvailableData().iterator();
- }
-
- private void handleNotSuccessOrHandledErrorInIterator(OperationResult result) {
- getPage().showResult(result);
- throw new RestartResponseException(PageError.class);
- }
-
- @Override
- protected int internalSize() {
- LOGGER.trace("begin::internalSize()");
- int count = 0;
- OperationResult result = new OperationResult(OPERATION_COUNT_OBJECTS);
- try {
- Task task = getPage().createSimpleTask(OPERATION_COUNT_OBJECTS);
- ObjectQuery query = getQuery().clone();
-
- ModelService modelService = getPage().getModelService();
- Collection> resolveNames = createCollection(createResolveNames());
- count = modelService.countContainers(CaseWorkItemType.class, query, resolveNames, task, result);
- } catch (Exception ex) {
- result.recordFatalError(getPage().createStringResource("CaseWorkItemDtoProvider.message.internalSize.fatalError").getString(), ex);
- LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex);
- } finally {
- result.computeStatusIfUnknown();
- }
-
- if (!WebComponentUtil.isSuccessOrHandledError(result)) {
- getPage().showResult(result);
- throw new RestartResponseException(PageError.class);
- }
- LOGGER.trace("end::internalSize()");
- return count;
- }
-
- @NotNull
- @Override
- protected List createObjectOrderings(SortParam sortParam) {
- return SearchingUtils.createObjectOrderings(sortParam, getPrismContext());
- }
-
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/SearchingUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/SearchingUtils.java
deleted file mode 100644
index dcc9fc6199e..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/SearchingUtils.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.web.page.admin.cases.dto;
-
-import com.evolveum.midpoint.prism.PrismConstants;
-import com.evolveum.midpoint.prism.PrismContext;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.prism.query.ObjectOrdering;
-import com.evolveum.midpoint.prism.query.OrderDirection;
-import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.jetbrains.annotations.NotNull;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.evolveum.midpoint.prism.PrismConstants.T_PARENT;
-
-/**
- * TODO better class name
- * @author bpowers
- */
-public class SearchingUtils {
-
- @SuppressWarnings("unused")
- private static final Trace LOGGER = TraceManager.getTrace(SearchingUtils.class);
-
- public static final String WORK_ITEM_CLOSE_TIMESTAMP = CaseWorkItemType.F_CLOSE_TIMESTAMP.getLocalPart();
- public static final String WORK_ITEM_DEADLINE = CaseWorkItemType.F_DEADLINE.getLocalPart();
- public static final String CASE_OPEN_TIMESTAMP = MetadataType.F_CREATE_TIMESTAMP.getLocalPart();
- public static final String CASE_DESCRIPTION = CaseType.F_DESCRIPTION.getLocalPart();
- public static final String CASE_OBJECT_NAME = CaseType.F_OBJECT_REF.getLocalPart();
- public static final String CASE_STATE = CaseType.F_STATE.getLocalPart();
-
- @NotNull
- public static List createObjectOrderings(SortParam sortParam,
- PrismContext prismContext) {
- if (sortParam == null || sortParam.getProperty() == null) {
- return Collections.emptyList();
- }
- String propertyName = sortParam.getProperty();
- ItemPath casePath = ItemPath.create(T_PARENT);
- ItemPath workItemPath = ItemPath.EMPTY_PATH;
- ItemPath primaryItemPath;
- if (CASE_DESCRIPTION.equals(propertyName)) {
- primaryItemPath = casePath.append(CaseType.F_DESCRIPTION);
- } else if (WORK_ITEM_CLOSE_TIMESTAMP.equals(propertyName)) {
- primaryItemPath = workItemPath.append(CaseWorkItemType.F_CLOSE_TIMESTAMP);
- } else if (WORK_ITEM_DEADLINE.equals(propertyName)) {
- primaryItemPath = workItemPath.append(CaseWorkItemType.F_DEADLINE);
- } else if (CASE_OPEN_TIMESTAMP.equals(propertyName)) {
- primaryItemPath = casePath.append(CaseType.F_METADATA, MetadataType.F_CREATE_TIMESTAMP);
- } else if (CASE_OBJECT_NAME.equals(propertyName)) {
- primaryItemPath = casePath.append(CaseType.F_OBJECT_REF, PrismConstants.T_OBJECT_REFERENCE, ObjectType.F_NAME);
- } else if (CASE_STATE.equals(propertyName)) {
- primaryItemPath = casePath.append(CaseType.F_STATE);
- } else {
- primaryItemPath = ItemPath.create(new QName(SchemaConstantsGenerated.NS_COMMON, propertyName));
- }
-
- List rv = new ArrayList<>();
- rv.add(prismContext.queryFactory().createOrdering(primaryItemPath, sortParam.isAscending() ? OrderDirection.ASCENDING : OrderDirection.DESCENDING));
- // additional criteria are used to avoid random shuffling if first criteria is too vague)
- rv.add(prismContext.queryFactory().createOrdering(casePath.append(PrismConstants.T_ID), OrderDirection.ASCENDING)); // case ID
- rv.add(prismContext.queryFactory().createOrdering(workItemPath.append(PrismConstants.T_ID), OrderDirection.ASCENDING)); // work item ID
- return rv;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
deleted file mode 100644
index f04adc6463f..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
deleted file mode 100644
index defc5953e5d..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.page.admin.configuration.component;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ItemConstraintType;
-
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidator;
-import org.apache.wicket.validation.ValidationError;
-
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.AjaxSubmitButton;
-import com.evolveum.midpoint.web.component.dialog.Popupable;
-import com.evolveum.midpoint.web.component.form.DropDownFormGroup;
-import com.evolveum.midpoint.web.component.input.ChoiceableChoiceRenderer;
-import com.evolveum.midpoint.web.component.input.QNameObjectTypeChoiceRenderer;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.page.admin.configuration.dto.ObjectPolicyDialogDto;
-import com.evolveum.midpoint.web.page.admin.configuration.dto.ObjectTemplateConfigTypeReferenceDto;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectPolicyConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType;
-import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
-
-
-/**
- * @author shood
- */
-public class ObjectPolicyPanel extends BasePanel implements Popupable{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- private static final Trace LOGGER = TraceManager.getTrace(ObjectPolicyPanel.class);
-
- private static final String DOT_CLASS = ObjectPolicyPanel.class.getName() + ".";
-
- private static final String OPERATION_LOAD_ALL_OBJECT_TEMPLATES = DOT_CLASS + "loadObjectTemplates";
-
- private static final String ID_FORM = "mainForm";
- private static final String ID_TYPE = "type";
- private static final String ID_SUBTYPE = "subtype";
- private static final String ID_OBJECT_TEMPLATE = "objectTemplate";
- private static final String ID_BUTTON_SAVE = "saveButton";
- private static final String ID_BUTTON_CANCEL = "cancelButton";
- private static final String ID_OID_BOUND = "oidBound";
- private static final String ID_PROPERTY = "property";
- private static final String ID_PROPERTY_PATH = "propertyPath";
- private static final String ID_REPEATER = "repeater";
- private static final String ID_TEXT_WRAPPER = "textWrapper";
- private static final String ID_BUTTON_GROUP = "buttonGroup";
- private static final String ID_BUTTON_REMOVE = "remove";
- private static final String ID_BUTTON_ADD = "add";
- private static final String ID_FEEDBACK = "feedback";
- private static final String ID_CONFLICT_RESOLUTION_CONTAINER = "conflictResolutionContainer";
-
- private static final String ID_LABEL_SIZE = "col-md-4";
- private static final String ID_INPUT_SIZE = "col-md-8";
-
- private static final String CLASS_MULTI_VALUE = "multivalue-form";
- private static final String OFFSET_CLASS = "col-md-offset-4";
-
- private IModel model;
-
- public ObjectPolicyPanel(String id, final ObjectPolicyConfigurationType config) {
- super(id);
-
- model = new LoadableModel(false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected ObjectPolicyDialogDto load() {
- return loadModel(config);
- }
- };
-
- initLayout(config);
-
- setOutputMarkupId(true);
- }
-
- private ObjectPolicyDialogDto loadModel(ObjectPolicyConfigurationType config) {
- ObjectPolicyDialogDto dto = new ObjectPolicyDialogDto(config, getPageBase());
- return dto;
- }
-
- public StringResourceModel createStringResource(String resourceKey, Object... objects) {
- return PageBase.createStringResourceStatic(this, resourceKey, objects);
- }
-
- public void initLayout(ObjectPolicyConfigurationType config) {
- Form form = new Form<>(ID_FORM);
- form.setOutputMarkupId(true);
- add(form);
-
- DropDownFormGroup type = new DropDownFormGroup<>(ID_TYPE,
- new PropertyModel<>(model, ObjectPolicyDialogDto.F_TYPE), createTypeChoiceList(),
- new QNameObjectTypeChoiceRenderer(), createStringResource("ObjectPolicyDialog.type"), ID_LABEL_SIZE,
- ID_INPUT_SIZE, false);
- form.add(type);
- type.getInput().setNullValid(config.getConflictResolution() != null);
- type.getInput().setRequired(config.getConflictResolution() == null); // traditional template entries still require object type
- TextField fieldSubtype = new TextField<>(ID_SUBTYPE, new PropertyModel(model, ObjectPolicyDialogDto.F_SUBTYPE));
- form.add(fieldSubtype);
- form.add(fieldSubtype);
-
- DropDownFormGroup template = new DropDownFormGroup<>(ID_OBJECT_TEMPLATE,
- new PropertyModel<>(model, ObjectPolicyDialogDto.F_TEMPLATE_REF),
- createObjectTemplateList(), new ChoiceableChoiceRenderer<>(),
- createStringResource("ObjectPolicyDialog.template"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- form.add(template);
- template.getInput().setNullValid(config.getConflictResolution() != null);
- template.getInput().setRequired(config.getConflictResolution() == null);
-
- WebMarkupContainer conflictResolutionContainer = new WebMarkupContainer(ID_CONFLICT_RESOLUTION_CONTAINER);
- conflictResolutionContainer.setVisible(config.getConflictResolution() != null);
- form.add(conflictResolutionContainer);
-
- ListView repeater = new ListView(ID_REPEATER,
- new PropertyModel<>(model, ObjectPolicyDialogDto.F_PROPERTY_LIST)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final ListItem item) {
- WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER);
- textWrapper.setOutputMarkupId(true);
- textWrapper.add(AttributeAppender.prepend("class", new IModel() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public String getObject() {
- if (item.getIndex() > 0) {
- return OFFSET_CLASS + " " + CLASS_MULTI_VALUE;
- }
-
- return null;
- }
- }));
- item.add(textWrapper);
-
-
- ItemPathType itemPathType = (item.getModelObject() != null ) ? item.getModelObject().getPath() : null;
- String pathToShow = itemPathType != null ? itemPathType.getItemPath().toString() : null;
-
- TextField property = new TextField<>(ID_PROPERTY, Model.of(pathToShow));
-
- property.add(new AjaxFormComponentUpdatingBehavior("blur") {
- private static final long serialVersionUID = 1L;
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- Component component = this.getComponent();
- String newValue = (String) component.getDefaultModelObject();
- ItemPathType itemPathType = null;
- if (StringUtils.isNotBlank(newValue)) {
- itemPathType = getPrismContext().itemPathParser().asItemPathType(newValue);
- }
- item.getModelObject().setPath(itemPathType);
- }
- });
- property.add(AttributeAppender.replace("placeholder",
- createStringResource("ObjectPolicyDialog.property.placeholder")));
- textWrapper.add(property);
-
-
-
- CheckBox oidBound = new CheckBox(ID_OID_BOUND,
- new PropertyModel<>(item.getModel(), ItemConstraintType.F_OID_BOUND.getLocalPart()));
-
- oidBound.add(AttributeModifier.replace("title",
- createStringResource("ObjectPolicyDialog.label.oidBound.help")));
- textWrapper.add(oidBound);
- oidBound.add(new PropertyConstraintValidator(item.getModelObject()));
- oidBound.add(new EmptyOnChangeAjaxFormUpdatingBehavior());
- FeedbackPanel feedback = new FeedbackPanel(ID_FEEDBACK, new ComponentFeedbackMessageFilter(oidBound));
- textWrapper.add(feedback);
-
- WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP);
- buttonGroup.add(AttributeAppender.append("class", new IModel() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public String getObject() {
- if (item.getIndex() > 0) {
- return CLASS_MULTI_VALUE;
- }
-
- return null;
- }
- }));
- item.add(buttonGroup);
- initButtons(buttonGroup, item);
- }
-
- };
- form.add(repeater);
-
- AjaxSubmitButton cancel = new AjaxSubmitButton(ID_BUTTON_CANCEL,
- createStringResource("ObjectPolicyDialog.button.cancel")) {
-
- private static final long serialVersionUID = 1L;
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- cancelPerformed(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target) {
- cancelPerformed(target);
- }
- };
- form.add(cancel);
-
- AjaxSubmitButton save = new AjaxSubmitButton(ID_BUTTON_SAVE,
- createStringResource("ObjectPolicyDialog.button.save")) {
-
- private static final long serialVersionUID = 1L;
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- savePerformed(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target) {
- target.add(getPageBase().getFeedbackPanel());
- target.add(form);
- }
- };
- form.add(save);
- }
-
- private void initButtons(WebMarkupContainer buttonGroup, final ListItem item) {
- AjaxLink add = new AjaxLink(ID_BUTTON_ADD) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- addPerformed(target);
- }
- };
-
- add.add(new VisibleEnableBehaviour() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public boolean isVisible() {
- return isAddButtonVisible(item);
- }
- });
- buttonGroup.add(add);
-
- AjaxLink remove = new AjaxLink(ID_BUTTON_REMOVE) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- removePerformed(target, item);
- }
- };
- remove.add(new VisibleEnableBehaviour() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public boolean isVisible() {
- return isRemoveButtonVisible();
- }
- });
- buttonGroup.add(remove);
- }
-
- private void addPerformed(AjaxRequestTarget target) {
- List list = model.getObject().getPropertyConstraintsList();
- list.add(new ItemConstraintType());
- }
-
- private void removePerformed(AjaxRequestTarget target, ListItem item) {
- List list = model.getObject().getPropertyConstraintsList();
- Iterator iterator = list.iterator();
-
- while (iterator.hasNext()) {
- ItemConstraintType object = iterator.next();
-
- if (object.equals(item.getModelObject())) {
- iterator.remove();
- break;
- }
- }
-
- if (list.size() == 0) {
- list.add(new ItemConstraintType());
- }
- }
-
- protected boolean isAddButtonVisible(ListItem item) {
- int size = model.getObject().getPropertyConstraintsList().size();
- if (size <= 1) {
- return true;
- }
- if (item.getIndex() == size - 1) {
- return true;
- }
-
- return false;
- }
-
- protected boolean isRemoveButtonVisible() {
- int size = model.getObject().getPropertyConstraintsList().size();
- if (size > 0) {
- return true;
- }
-
- return false;
- }
-
- protected IModel> createObjectTemplateList() {
- return new IModel>() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public List getObject() {
- List> templateList = null;
- List list = new ArrayList<>();
- OperationResult result = new OperationResult(OPERATION_LOAD_ALL_OBJECT_TEMPLATES);
- Task task = getPageBase().createSimpleTask(OPERATION_LOAD_ALL_OBJECT_TEMPLATES);
-
- try {
- templateList = getPageBase().getModelService().searchObjects(ObjectTemplateType.class,
- null, null, task, result);
- result.recomputeStatus();
- } catch (Exception e) {
- result.recordFatalError(getString("ObjectPolicyPanel.message.createObjectTemplateList.fatalError"), e);
- LoggingUtils.logUnexpectedException(LOGGER, "Could not get list of object templates", e);
- // TODO - show this error in GUI
- }
-
- if (templateList != null) {
- ObjectTemplateType template;
- for (PrismObject obj : templateList) {
- template = obj.asObjectable();
- list.add(new ObjectTemplateConfigTypeReferenceDto(template.getOid(),
- WebComponentUtil.getName(template)));
- }
- }
- return list;
- }
- };
- }
-
- // TODO - to what types can be ObjectTemplate bound?
- private IModel> createTypeChoiceList() {
- return new IModel>() {
-
- private static final long serialVersionUID = 1L;
- @Override
- public List getObject() {
- return WebComponentUtil.createFocusTypeList();
- }
- };
- }
-
- private static class PropertyConstraintValidator implements IValidator {
-
- private static final long serialVersionUID = 1L;
-
- private ItemConstraintType itemConstraintType;
-
- private PropertyConstraintValidator(ItemConstraintType propertyConstraint) {
- this.itemConstraintType = propertyConstraint;
-
- }
-
- @Override
- public void validate(IValidatable validatable) {
-
- if (itemConstraintType == null) {
- return;
- }
-
- if (BooleanUtils.isTrue(validatable.getValue()) && (itemConstraintType == null || itemConstraintType.getPath() == null)) {
- ValidationError err = new ValidationError();
- err.addKey("propertyConstraintValidator.error");
- validatable.error(err);
- }
-
- }
- }
-
-
- private void cancelPerformed(AjaxRequestTarget target) {
- getPageBase().hideMainPopup(target);
- }
-
- protected void savePerformed(AjaxRequestTarget target) {
- target.add(getPageBase().getFeedbackPanel());
- getPageBase().hideMainPopup(target);
- }
-
- public IModel getModel() {
- return model;
- }
-
- @Override
- public int getWidth() {
- return 625;
- }
-
- @Override
- public int getHeight() {
- return 400;
- }
-
- @Override
- public String getWidthUnit(){
- return "px";
- }
-
- @Override
- public String getHeightUnit(){
- return "px";
- }
-
- @Override
- public StringResourceModel getTitle() {
- return createStringResource("ObjectPolicyDialog.label");
- }
-
- @Override
- public Component getComponent() {
- return this;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
deleted file mode 100644
index 0753de6f3b6..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2010-2013 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.web.page.admin.configuration.dto;
-
-import com.evolveum.midpoint.web.component.util.Selectable;
-import com.evolveum.midpoint.web.component.util.Editable;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AppenderConfigurationType;
-
-import org.apache.commons.lang.Validate;
-
-/**
- * @author lazyman
- */
-public class AppenderConfiguration
- extends Selectable implements Editable, Comparable {
-
- private boolean editing;
- private T config;
-
- public AppenderConfiguration(T config) {
- Validate.notNull(config, "Appender configuration type must not be null.");
- this.config = config;
- }
-
- public T getConfig() {
- return config;
- }
-
- public String getPattern() {
- return config.getPattern();
- }
-
- public void setPattern(String pattern) {
- config.setPattern(pattern);
- }
-
- public void setName(String name) {
- config.setName(name);
- }
-
- public String getName() {
- return config.getName();
- }
-
- public String getFilePath() {
- return null;
- }
-
- public String getFilePattern() {
- return null;
- }
-
- public Integer getMaxHistory() {
- return null;
- }
-
- public String getMaxFileSize() {
- return null;
- }
-
- public boolean isAppending() {
- return false;
- }
-
- public boolean isPrudent() {
- return false;
- }
-
- public boolean isEditing() {
- return editing;
- }
-
- public void setEditing(boolean editing) {
- this.editing = editing;
- }
-
- @Override
- public int compareTo(O o) {
- if (o == null) {
- return 0;
- }
- return String.CASE_INSENSITIVE_ORDER.compare(getName(), o.getName());
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
deleted file mode 100644
index aa1895afa52..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.page.admin.configuration.dto;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
-import org.apache.commons.lang3.BooleanUtils;
-
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
-import com.evolveum.midpoint.prism.PrismContainerValue;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ItemConstraintType;
-import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
-
-/**
- * @author shood
- * */
-public class ObjectPolicyDialogDto implements Serializable{
- private static final long serialVersionUID = 1L;
-
- private static final String DOT_CLASS = ObjectPolicyDialogDto.class.getName() + ".";
-
- private static final String OPERATION_LOAD_OBJECT_TEMPLATE = DOT_CLASS + "loadObjectTemplate";
-
- public static final String F_CONFIG = "config";
- public static final String F_TEMPLATE_REF = "templateRef";
- public static final String F_TYPE = "type";
- public static final String F_SUBTYPE = "subtype";
- public static final String F_PROPERTY_LIST = "propertyConstraintsList";
-
- private List propertyConstraintsList;
- private ObjectPolicyConfigurationType config;
- private QName type;
- private String subtype;
- private ObjectTemplateConfigTypeReferenceDto templateRef;
- PageBase page;
-
- public ObjectPolicyDialogDto(ObjectPolicyConfigurationType config, PageBase page) {
- this.config = config;
- type = config.getType();
- subtype = config.getSubtype();
- this.page =page;
-
-// for (PropertyConstraintType constraint : config.getPropertyConstraint()) {
-// propertyConstraintsList.add(new PropertyConstraintTypeDto(constraint));
-// }
-
- propertyConstraintsList = config.getPropertyConstraint();
-
- if (propertyConstraintsList.isEmpty()) {
- propertyConstraintsList.add(new ItemConstraintType());
- }
-
- if(config.getObjectTemplateRef() != null){
- ObjectReferenceType ref = config.getObjectTemplateRef();
- templateRef = new ObjectTemplateConfigTypeReferenceDto(ref.getOid(), getObjectTemplateName(ref.getOid(), page));
- }
- }
-
- public ObjectPolicyConfigurationType preparePolicyConfig(OperationResult result){
- ObjectPolicyConfigurationType newConfig = new ObjectPolicyConfigurationType();
-
- for (ItemConstraintType constraintType : propertyConstraintsList) {
- PrismContainerValue constraint = constraintType.asPrismContainerValue();
- if (BooleanUtils.isTrue(constraintType.isOidBound()) && constraintType.getPath() == null) {
- result.recordWarning(page.createStringResource("ObjectPolicyDialogDto.message.preparePolicyConfig.warning").getString());
- }
- if (!constraint.isEmpty() && constraintType.getPath() != null) {
- newConfig.getPropertyConstraint().add(constraint.clone().asContainerable());
- }
- }
- newConfig.setType(type);
- newConfig.setSubtype(subtype);
- newConfig.setConflictResolution(config.getConflictResolution());
-
- if (templateRef != null) {
- ObjectReferenceType ref = new ObjectReferenceType();
- ref.setOid(templateRef.getOid());
- ref.setType(ObjectTemplateType.COMPLEX_TYPE);
- ref.setTargetName(new PolyStringType(templateRef.getName()));
- newConfig.setObjectTemplateRef(ref);
- }
-
- result.recordSuccessIfUnknown();
- return newConfig;
- }
-
- public List getPropertyConstraintsList() {
- return propertyConstraintsList;
- }
-
- public void setPropertyConstraintsList(List propertyConstraintsList) {
- this.propertyConstraintsList = propertyConstraintsList;
- }
-
- public QName getType() {
- return type;
- }
-
- public void setType(QName type) {
- this.type = type;
- }
-
- public String getSubtype() {
- return subtype;
- }
-
- public void setSubtype(String subtype) {
- this.subtype = subtype;
- }
-
- private String getObjectTemplateName(String oid, PageBase page){
- Task task = page.createSimpleTask(OPERATION_LOAD_OBJECT_TEMPLATE);
- OperationResult result = task.getResult();
-
- PrismObject templatePrism = WebModelServiceUtils.loadObject(ObjectTemplateType.class, oid,
- page, task, result);
-
- if(templatePrism != null){
- return WebComponentUtil.getName(templatePrism);
- }
-
- return "";
- }
-
- public ObjectPolicyConfigurationType getConfig() {
- return config;
- }
-
- public void setConfig(ObjectPolicyConfigurationType config) {
- this.config = config;
- }
-
- public ObjectTemplateConfigTypeReferenceDto getTemplateRef() {
- return templateRef;
- }
-
- public void setTemplateRef(ObjectTemplateConfigTypeReferenceDto templateRef) {
- this.templateRef = templateRef;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((config == null) ? 0 : config.hashCode());
- result = prime * result
- + ((propertyConstraintsList == null) ? 0 : propertyConstraintsList.hashCode());
- result = prime * result + ((subtype == null) ? 0 : subtype.hashCode());
- result = prime * result + ((templateRef == null) ? 0 : templateRef.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- ObjectPolicyDialogDto other = (ObjectPolicyDialogDto) obj;
- if (config == null) {
- if (other.config != null) {
- return false;
- }
- } else if (!config.equals(other.config)) {
- return false;
- }
- if (propertyConstraintsList == null) {
- if (other.propertyConstraintsList != null) {
- return false;
- }
- } else if (!propertyConstraintsList.equals(other.propertyConstraintsList)) {
- return false;
- }
- if (subtype == null) {
- if (other.subtype != null) {
- return false;
- }
- } else if (!subtype.equals(other.subtype)) {
- return false;
- }
- if (templateRef == null) {
- if (other.templateRef != null) {
- return false;
- }
- } else if (!templateRef.equals(other.templateRef)) {
- return false;
- }
- if (type == null) {
- if (other.type != null) {
- return false;
- }
- } else if (!type.equals(other.type)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "ObjectPolicyDialogDto(propertyConstraintsList=" + propertyConstraintsList + ", config="
- + config + ", type=" + type + ", subtype=" + subtype + ", templateRef=" + templateRef + ")";
- }
-
-
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectTemplateConfigTypeReferenceDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectTemplateConfigTypeReferenceDto.java
deleted file mode 100644
index 495a283511e..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectTemplateConfigTypeReferenceDto.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2010-2013 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.web.page.admin.configuration.dto;
-
-import java.io.Serializable;
-
-import com.evolveum.midpoint.web.component.util.Choiceable;
-
-/**
- * @author shood
- * */
-public class ObjectTemplateConfigTypeReferenceDto implements Serializable, Choiceable{
-
- private String name;
- private String oid;
-
- public ObjectTemplateConfigTypeReferenceDto(String oid, String name){
- this.oid = oid;
- this.name = name;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getOid() {
- return oid;
- }
-
- public void setOid(String oid) {
- this.oid = oid;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ObjectTemplateConfigTypeReferenceDto)) return false;
-
- ObjectTemplateConfigTypeReferenceDto that = (ObjectTemplateConfigTypeReferenceDto) o;
-
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (oid != null ? !oid.equals(that.oid) : that.oid != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (oid != null ? oid.hashCode() : 0);
- return result;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PrincipalDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PrincipalDto.java
deleted file mode 100644
index 7dd12f73b42..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/PrincipalDto.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.web.page.admin.configuration.dto;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class PrincipalDto implements Serializable {
-
- private UserType userType;
- private List nodeIdentidier;
-
- public PrincipalDto(UserType userType, List nodeIdentidier) {
- this.userType = userType;
- this.nodeIdentidier = nodeIdentidier;
- }
-
- public List getNodeIdentidier() {
- return nodeIdentidier;
- }
-
- public void setNodeIdentidier(List nodeIdentidier) {
- this.nodeIdentidier = nodeIdentidier;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ResourceItemDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ResourceItemDto.java
deleted file mode 100644
index ad5cade581b..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ResourceItemDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2010-2013 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.web.page.admin.configuration.dto;
-
-import java.io.Serializable;
-
-import com.evolveum.midpoint.web.component.util.Choiceable;
-
-/**
- * @author lazyman
- */
-public class ResourceItemDto implements Serializable, Choiceable, Comparable {
-
- private String oid;
- private String name;
-
- public ResourceItemDto(String oid, String name) {
- this.name = name;
- this.oid = oid;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public String getOid() {
- return oid;
- }
-
- @Override
- public int compareTo(ResourceItemDto o) {
- return String.CASE_INSENSITIVE_ORDER.compare(name, o.name);
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.html
deleted file mode 100644
index 57b3ba0c6cd..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.java
deleted file mode 100644
index dfc20844f0c..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.page.admin.reports.component;
-
-import com.evolveum.midpoint.audit.api.AuditEventType;
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.web.component.form.DateFormGroup;
-import com.evolveum.midpoint.web.component.form.DropDownFormGroup;
-import com.evolveum.midpoint.web.component.form.TextFormGroup;
-import com.evolveum.midpoint.web.page.admin.reports.dto.AuditReportDto;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExportType;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.form.*;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * TODO - add proper date validator
- *
- * @author lazyman
- */
-public class AuditPopupPanel extends BasePanel {
-
- private static final String ID_NAME = "name";
- private static final String ID_DATE_FROM = "dateFrom";
- private static final String ID_DATE_TO = "dateTo";
- private static final String ID_AUDITEVENTTYPE = "auditEventType";
- private static final String ID_DESCRIPTION = "description";
- private static final String ID_EXPORT_TYPE = "exportType";
-
- private static final String ID_LABEL_SIZE = "col-md-4";
- private static final String ID_INPUT_SIZE = "col-md-6";
-
- public AuditPopupPanel(String id, IModel model) {
- super(id, model);
-
- initLayout(this);
- }
-
- @SuppressWarnings("serial")
- private void initLayout(final Component component) {
-
- TextFormGroup name = new TextFormGroup(ID_NAME, new PropertyModel<>(getModel(), AuditReportDto.F_NAME),
- createStringResource("ObjectType.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, true);
- add(name);
-
- TextFormGroup description = new TextFormGroup(ID_DESCRIPTION, new PropertyModel<>(getModel(), AuditReportDto.F_DESCRIPTION),
- createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, true);
- add(description);
-
- IModel choices = WebComponentUtil.createReadonlyModelFromEnum(ExportType.class);
- IChoiceRenderer renderer = new EnumChoiceRenderer();
- DropDownFormGroup exportType = new DropDownFormGroup(ID_EXPORT_TYPE, new PropertyModel(getModel(), AuditReportDto.F_EXPORT_TYPE),
- choices, renderer, createStringResource("AuditPopulPanel.exportType.label"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(exportType);
-
- choices = WebComponentUtil.createReadonlyModelFromEnum(AuditEventType.class);
- DropDownFormGroup auditEventType = new DropDownFormGroup(ID_AUDITEVENTTYPE, new PropertyModel(getModel(), AuditReportDto.F_AUDITEVENTTYPE),
- choices, renderer, createStringResource("AuditPopupPanel.auditEventType"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(auditEventType);
-
- DateFormGroup dateFrom = new DateFormGroup(ID_DATE_FROM, new PropertyModel<>(getModel(), AuditReportDto.F_FROM_GREG),
- createStringResource("AuditPopupPanel.dateFrom"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(dateFrom);
-
- DateFormGroup dateTo = new DateFormGroup(ID_DATE_TO, new PropertyModel<>(getModel(), AuditReportDto.F_TO_GREG),
- createStringResource("AuditPopupPanel.dateTo"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(dateTo);
- }
-
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.html
deleted file mode 100644
index 747f95ac061..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.java
deleted file mode 100644
index b027e8a669b..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.page.admin.reports.component;
-
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.web.component.form.DropDownFormGroup;
-import com.evolveum.midpoint.web.component.form.TextFormGroup;
-import com.evolveum.midpoint.web.page.admin.configuration.dto.ResourceItemDto;
-import com.evolveum.midpoint.web.page.admin.reports.dto.ReconciliationReportDto;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExportType;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.form.*;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
-import java.util.List;
-
-/**
- * @author lazyman
- */
-public class ReconciliationPopupPanel extends BasePanel {
-
- private static final String ID_NAME = "name";
- private static final String ID_RESOURCE = "resource";
- private static final String ID_DESCRIPTION = "description";
- private static final String ID_EXPORT_TYPE = "exportType";
-
- private static final String ID_LABEL_SIZE = "col-md-4";
- private static final String ID_INPUT_SIZE = "col-md-6";
-
- public ReconciliationPopupPanel(String id, IModel model,
- IModel> resources) {
- super(id, model);
- initLayout(resources, this);
- }
-
- private void initLayout(IModel> resources,
- final Component component) {
-
- TextFormGroup name = new TextFormGroup(ID_NAME, new PropertyModel<>(getModel(), ReconciliationReportDto.F_NAME),
- createStringResource("ObjectType.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, true);
- add(name);
-
- TextFormGroup description = new TextFormGroup(ID_DESCRIPTION, new PropertyModel<>(getModel(), ReconciliationReportDto.F_DESCRIPTION),
- createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, true);
- add(description);
-
- IModel choices = WebComponentUtil.createReadonlyModelFromEnum(ExportType.class);
- IChoiceRenderer renderer = new EnumChoiceRenderer();
- DropDownFormGroup exportType = new DropDownFormGroup(ID_EXPORT_TYPE, new
- PropertyModel(getModel(), ReconciliationReportDto.F_EXPORT_TYPE), choices, renderer,
- createStringResource("ReconciliationPopupPanel.exportFileType"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(exportType);
-
- DropDownFormGroup resourceDropDown = new DropDownFormGroup(ID_RESOURCE, createModel(resources.getObject()),
- resources, renderer, createStringResource("ReconciliationPopupPanel.resource"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
- add(resourceDropDown);
- }
-
- private IModel createModel(final List resources) {
- return new IModel() {
-
- @Override
- public ResourceItemDto getObject() {
- ReconciliationReportDto dto = getModel().getObject();
- if (dto.getResourceOid() == null) {
- return null;
- }
-
- for (ResourceItemDto item : resources) {
- if (StringUtils.equals(item.getOid(), dto.getResourceOid())) {
- return item;
- }
- }
-
- return null;
- }
-
- @Override
- public void setObject(ResourceItemDto object) {
- ReconciliationReportDto dto = getModel().getObject();
-
- dto.setResourceOid(object != null ? object.getOid() : null);
- dto.setResourceName(object != null ? object.getName() : null);
- }
-
- @Override
- public void detach() {
- }
- };
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java
deleted file mode 100644
index 380d488f9a6..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2010-2013 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.web.page.admin.roles.dto;
-
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDto;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author shood
- *
- * Deprecated for now. May find usage in future
- * */
-
-@Deprecated
-public class RoleDto implements Serializable{
-
- public static final String F_NAME = "name";
- public static final String F_DESCRIPTION = "description";
- public static final String F_TYPE = "type";
- public static final String F_REQUESTABLE = "requestable";
- public static final String F_FROM = "from";
- public static final String F_TO = "to";
- public static final String F_ADMIN_STATUS = "adminStatus";
- public static final String F_INDUCEMENTS = "inducements";
- public static final String F_ASSIGNMENTS = "assignments";
-
- private PrismObject role;
- private String name;
- private String description;
- private String type;
- private Boolean requestable;
- private XMLGregorianCalendar from;
- private XMLGregorianCalendar to;
- private ActivationStatusType adminStatus;
- private List inducements;
- private List assignments;
-
- public RoleDto(){}
-
- public RoleDto(String name, String description, String type, Boolean requestable,
- XMLGregorianCalendar from, XMLGregorianCalendar to, ActivationStatusType adminStatus){
-
- this.name = name;
- this.description = description;
- this.type = type;
- this.requestable = requestable;
- this.from = from;
- this.to = to;
- this.adminStatus = adminStatus;
- }
-
- public PrismObject getRole() {
- return role;
- }
-
- public void setRole(PrismObject role) {
- this.role = role;
- }
-
- public List getInducements() {
- return inducements;
- }
-
- public void setInducements(List inducements) {
- this.inducements = inducements;
- }
-
- public List getAssignments() {
- return assignments;
- }
-
- public void setAssignments(List assignments) {
- this.assignments = assignments;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Boolean getRequestable() {
- return requestable;
- }
-
- public void setRequestable(Boolean requestable) {
- this.requestable = requestable;
- }
-
- public XMLGregorianCalendar getFrom() {
- return from;
- }
-
- public void setFrom(XMLGregorianCalendar from) {
- this.from = from;
- }
-
- public XMLGregorianCalendar getTo() {
- return to;
- }
-
- public void setTo(XMLGregorianCalendar to) {
- this.to = to;
- }
-
- public ActivationStatusType getAdminStatus() {
- return adminStatus;
- }
-
- public void setAdminStatus(ActivationStatusType adminStatus) {
- this.adminStatus = adminStatus;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.java
deleted file mode 100644
index 515bd0938d2..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.page.admin.users.dto;
-
-import java.io.Serializable;
-
-import com.evolveum.midpoint.util.DebugDumpable;
-import com.evolveum.midpoint.util.DebugUtil;
-
-/**
- * @author shood
- * */
-public class OrgUnitSearchDto implements Serializable, DebugDumpable {
-
- public static final String F_SEARCH_TEXT = "text";
-
- private String text;
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- @Override
- public String debugDump() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String debugDump(int indent) {
- StringBuilder sb = new StringBuilder();
- DebugUtil.indentDebugDump(sb, indent);
- sb.append("OrgUnitSearchDto\n");
- DebugUtil.debugDumpWithLabel(sb, "text", text, indent+1);
- return sb.toString();
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UsersDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UsersDto.java
deleted file mode 100644
index 4a11467633b..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UsersDto.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2010-2013 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.web.page.admin.users.dto;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author lazyman
- */
-public class UsersDto implements Serializable {
-
- public static enum SearchType {
-
- NAME("SearchType.NAME"),
- GIVEN_NAME("SearchType.GIVEN_NAME"),
- FAMILY_NAME("SearchType.FAMILY_NAME"),
- FULL_NAME("SearchType.FULL_NAME");
-
- private String key;
-
- private SearchType(String key) {
- this.key = key;
- }
-
- public String getKey() {
- return key;
- }
- }
-
- public static final String F_TEXT = "text";
- public static final String F_TYPE = "type";
-
- private String text;
- private Collection type;
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public Collection getType() {
- if (type == null) {
- type = new ArrayList<>();
- type.add(SearchType.NAME);
- }
- return type;
- }
-
- public void setType(Collection type) {
- this.type = type;
- }
-
- public boolean hasType(SearchType type) {
- if (getType().contains(type)) {
- return true;
- }
- return false;
- }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
deleted file mode 100644
index 68572159b25..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2010-2017 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.web.session;
-
-import com.evolveum.midpoint.prism.query.ObjectPaging;
-import com.evolveum.midpoint.util.DebugDumpable;
-import com.evolveum.midpoint.util.DebugUtil;
-import com.evolveum.midpoint.web.component.search.Search;
-import com.evolveum.midpoint.web.page.admin.users.dto.OrgUnitSearchDto;
-
-/**
- * @author lazyman
- */
-public class UsersStorage implements PageStorage, DebugDumpable {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * DTO used for search in {@link com.evolveum.midpoint.web.page.admin.users.PageUsers}
- */
- private Search usersSearch;
-
- /**
- * DTO used for search purposes in {@link com.evolveum.midpoint.web.page.admin.users in OrgUnitBrowser}
- */
- private OrgUnitSearchDto orgUnitSearch;
-
- /**
- * Paging DTO used in table on page {@link com.evolveum.midpoint.web.page.admin.users in OrgUnitBrowser}
- */
- private ObjectPaging orgUnitPaging;
-
- /**
- * Paging DTO used in table on page {@link com.evolveum.midpoint.web.page.admin.users.PageUsers}
- */
- private ObjectPaging usersPaging;
-
- public OrgUnitSearchDto getOrgUnitSearch() {
- return orgUnitSearch;
- }
-
- public void setOrgUnitSearch(OrgUnitSearchDto orgUnitSearch) {
- this.orgUnitSearch = orgUnitSearch;
- }
-
- public ObjectPaging getOrgUnitPaging() {
- return orgUnitPaging;
- }
-
- public void setOrgUnitPaging(ObjectPaging orgUnitPaging) {
- this.orgUnitPaging = orgUnitPaging;
- }
-
-
- @Override
- public ObjectPaging getPaging() {
- return usersPaging;
- }
-
- @Override
- public void setPaging(ObjectPaging usersPaging) {
- this.usersPaging = usersPaging;
- }
-
- @Override
- public Search getSearch() {
- return usersSearch;
- }
-
- @Override
- public void setSearch(Search usersSearch) {
- this.usersSearch = usersSearch;
- }
-
- @Override
- public String debugDump() {
- return debugDump(0);
- }
-
- @Override
- public String debugDump(int indent) {
- StringBuilder sb = new StringBuilder();
- DebugUtil.indentDebugDump(sb, indent);
- sb.append("UsersStorage\n");
- DebugUtil.debugDumpWithLabelLn(sb, "usersSearch", usersSearch, indent+1);
- DebugUtil.debugDumpWithLabelLn(sb, "orgUnitSearch", orgUnitSearch, indent+1);
- DebugUtil.debugDumpWithLabelLn(sb, "orgUnitPaging", orgUnitPaging, indent+1);
- DebugUtil.debugDumpWithLabelLn(sb, "usersPaging", usersPaging, indent+1);
- return sb.toString();
- }
-}