Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Feb 1, 2023
2 parents 9ff38be + fca3db1 commit c3dd4fd
Show file tree
Hide file tree
Showing 8 changed files with 372 additions and 627 deletions.
5 changes: 3 additions & 2 deletions ...ain/java/com/evolveum/midpoint/gui/impl/component/data/column/ReportExpressionColumn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

package com.evolveum.midpoint.gui.impl.component.data.column;

import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;

Expand All @@ -25,7 +26,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectColumnType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;

public class ReportExpressionColumn<C extends Containerable> extends ConfigurableExpressionColumn<SelectableBean<C>, C> {
public class ReportExpressionColumn<C extends Serializable> extends ConfigurableExpressionColumn<SelectableBean<C>, C> {

public ReportExpressionColumn(IModel<String> displayModel, String sortProperty, GuiObjectColumnType customColumns, ExpressionType expressionType, PageBase modelServiceLocator) {
super(displayModel, sortProperty, customColumns, expressionType, modelServiceLocator);
Expand All @@ -35,7 +36,7 @@ public ReportExpressionColumn(IModel<String> displayModel, String sortProperty,
protected void processVariables(VariablesMap variablesMap, C rowValue) {
processReportSpecificVariables(variablesMap);
if (!variablesMap.containsKey(ExpressionConstants.VAR_OBJECT)) {
variablesMap.put(ExpressionConstants.VAR_OBJECT, rowValue, rowValue.asPrismContainerValue().getDefinition());
variablesMap.put(ExpressionConstants.VAR_OBJECT, rowValue, rowValue != null ? rowValue.getClass() : null);
}
}

Expand Down
295 changes: 17 additions & 278 deletions ...olveum/midpoint/gui/impl/component/data/provider/SelectableBeanContainerDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,106 +7,39 @@

package com.evolveum.midpoint.gui.impl.component.data.provider;

import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;

import static com.evolveum.midpoint.schema.DefinitionProcessingOption.FULL;
import static com.evolveum.midpoint.schema.DefinitionProcessingOption.ONLY_IF_EXISTS;

import java.io.Serializable;
import java.util.*;

import com.evolveum.midpoint.gui.api.component.data.provider.ISelectableDataProvider;
import com.evolveum.midpoint.prism.PrismContext;

import com.evolveum.midpoint.web.component.data.TypedCacheKey;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
import com.evolveum.midpoint.gui.impl.component.search.Search;
import com.evolveum.midpoint.prism.Containerable;
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.GetOperationOptionsBuilder;
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.exception.CommonException;
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.gui.impl.component.search.Search;
import com.evolveum.midpoint.web.component.data.TypedCacheKey;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.component.util.SelectableBeanImpl;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;

/**
* @author lazyman
* @author semancik
*/
public class SelectableBeanContainerDataProvider<C extends Containerable> extends BaseSearchDataProvider<C, SelectableBean<C>>
implements ISelectableDataProvider<SelectableBean<C>> {
public class SelectableBeanContainerDataProvider<C extends Containerable> extends SelectableBeanDataProvider<C> {
private static final long serialVersionUID = 1L;

private static final Trace LOGGER = TraceManager.getTrace(SelectableBeanContainerDataProvider.class);
private static final String DOT_CLASS = SelectableBeanContainerDataProvider.class.getName() + ".";
private static final String OPERATION_SEARCH_OBJECTS = DOT_CLASS + "searchObjects";
private static final String OPERATION_COUNT_OBJECTS = DOT_CLASS + "countObjects";

private Set<? extends C> selected = new HashSet<>();

private boolean emptyListOnNullQuery = false;
private boolean useObjectCounting = true;
// private CompiledObjectCollectionView objectCollectionView;

// we use special options when exporting to CSV (due to bulk nature of the operation)
private boolean export;

// it seems that if connector doesn't support counting, provisioning return null. the default before was 0
// which resulted to the empty list of object. Therefore we need to set this the default count to "undefined"
// at least for the shadows.
private int defaultCountIfNull = 0;

private Collection<SelectorOptions<GetOperationOptions>> options;

//This is quick hack how to disable counting for each preview panel on dashboard..
// probably the solution will be to work directly with panel configuration
private boolean isForPreview;

public SelectableBeanContainerDataProvider(Component component, @NotNull IModel<Search<C>> search, Set<? extends C> selected, boolean useDefaultSortingField) {
super(component, search, false, useDefaultSortingField);

if (selected != null) {
this.selected = selected;
}
}

public void clearSelectedObjects() {
selected.clear();
}

private void preprocessSelectedData() {
preprocessSelectedDataInternal();
getAvailableData().clear();
}

protected void preprocessSelectedDataInternal() {
for (SelectableBean<C> available : getAvailableData()) {
if (available.isSelected() && available.getValue() != null) {
((Set) selected).add(available.getValue());
}
}

for (SelectableBean<C> available : getAvailableData()) {
if (!available.isSelected()) {
selected.remove(available.getValue());
}
}
public SelectableBeanContainerDataProvider(Component component, @NotNull IModel<Search<C>> search, Set<C> selected, boolean useDefaultSortingField) {
super(component, search, selected, useDefaultSortingField);
}

@Override
Expand All @@ -115,137 +48,11 @@ protected boolean checkOrderingSettings() {
}

@Override
public Iterator<SelectableBean<C>> internalIterator(long offset, long pageSize) {
LOGGER.trace("begin::iterator() offset {} pageSize {}.", offset, pageSize);

preprocessSelectedData();

OperationResult result = new OperationResult(OPERATION_SEARCH_OBJECTS);
try {
ObjectPaging paging = createPaging(offset, pageSize);
Task task = getPageBase().createSimpleTask(OPERATION_SEARCH_OBJECTS);

ObjectQuery query = getQuery();
if (query == null) {
if (emptyListOnNullQuery) {
return Collections.emptyIterator();
}
query = PrismContext.get().queryFactory().createQuery();
}
query.setPaging(paging);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Query {} with {}", getType().getSimpleName(), query.debugDump());
}

Collection<SelectorOptions<GetOperationOptions>> options = getOptions();

if (ResourceType.class.equals(getType()) && (options == null || options.isEmpty())) {
options = SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
}
GetOperationOptionsBuilder optionsBuilder = getOperationOptionsBuilder(options);
if (export) {
// TODO also for other classes
if (ShadowType.class.equals(getType())) {
optionsBuilder = optionsBuilder
.definitionProcessing(ONLY_IF_EXISTS)
.item(ShadowType.F_FETCH_RESULT).definitionProcessing(FULL)
.item(ShadowType.F_AUXILIARY_OBJECT_CLASS).definitionProcessing(FULL);
}
}
optionsBuilder.mergeFrom(getDistinctRelatedOptions());

getAvailableData().addAll(createDataObjectWrappers(getType(), query, optionsBuilder.build(), task, result));

} catch (Exception ex) {
result.recordFatalError(getPageBase().createStringResource("ObjectDataProvider.message.listObjects.fatalError").getString(), ex);
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't list objects", ex);
return handleNotSuccessOrHandledErrorInIterator(result);
} finally {
result.computeStatusIfUnknown();
}

LOGGER.trace("end::iterator() {}", result);
return getAvailableData().iterator();
protected List<C> searchObjects(Class<C> type, ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult result) throws CommonException {
return getModelService().searchContainers(type, query, options, task, result);
}
public List<SelectableBean<C>> createDataObjectWrappers(Class<? extends C> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult result)
throws CommonException {
List<C> list = searchObjects(type, query, options, task, result);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Query {} resulted in {} objects", type.getSimpleName(), list.size());
}

List<SelectableBean<C>> data = new ArrayList<>();
for (C object : list) {
data.add(createDataObjectWrapper(object));
}
return data;
}

protected List<C> searchObjects(Class<? extends C> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult result)
throws CommonException {
return (List) getModelService().searchContainers(type, query, options, task, result);
}

protected Iterator<SelectableBean<C>> handleNotSuccessOrHandledErrorInIterator(OperationResult result) {
LOGGER.trace("handling non-success result {}", result);
// page.showResult() will not work here. We are too deep in the rendering now.
// Also do NOT re-throw not redirect to the error page. That will break the page.
// Just return a SelectableBean that indicates the error.
List<SelectableBean<C>> errorList = new ArrayList<>(1);
SelectableBean<C> bean = new SelectableBeanImpl<>();
bean.setResult(result);
errorList.add(bean);
return errorList.iterator();
}

public SelectableBean<C> createDataObjectWrapper(C obj) {
SelectableBean<C> selectable = new SelectableBeanImpl<>(Model.of(obj));

for (C s : selected) {
if (s.asPrismContainerValue().equivalent(obj.asPrismContainerValue())) {
selectable.setSelected(true);
}
}

return selectable;
}

@Override
protected int internalSize() {
LOGGER.trace("begin::internalSize()");
if (!isUseObjectCounting() || isForPreview) {
return Integer.MAX_VALUE;
}
int count = 0;
Task task = getPageBase().createSimpleTask(OPERATION_COUNT_OBJECTS);
OperationResult result = task.getResult();
try {
Collection<SelectorOptions<GetOperationOptions>> currentOptions = GetOperationOptions.merge(PrismContext.get(), getOptions(),
null);
Integer counted = countObjects(getType(), getQuery(), currentOptions, task, result);
count = defaultIfNull(counted, defaultCountIfNull);
} catch (Exception ex) {
result.recordFatalError(getPageBase().createStringResource("ObjectDataProvider.message.countObjects.fatalError").getString(), ex);
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex);
} finally {
result.computeStatusIfUnknown();
}

if (!WebComponentUtil.isSuccessOrHandledError(result) && !result.isNotApplicable()) {
getPageBase().showResult(result);
// Let us do nothing. The error will be shown on the page and a count of 0 will be used.
// Redirecting to the error page does more harm than good (see also MID-4306).
}

LOGGER.trace("end::internalSize(): {}", count);
return count;
}

protected Integer countObjects(Class<? extends C> type, ObjectQuery query,
protected Integer countObjects(Class<C> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> currentOptions, Task task, OperationResult result)
throws CommonException {
return getModelService().countContainers(type, getQuery(), currentOptions, task, result);
Expand All @@ -261,81 +68,13 @@ protected void addCachedSize(Map<Serializable, CachedSize> cache, CachedSize new
cache.put(new TypedCacheKey(getQuery(), getType()), newSize);
}

// public void setType(Class<C> type) {
// Validate.notNull(type, "Class must not be null.");
// this.type = type;
//
// clearCache();
// }

public boolean isUseObjectCounting() {
CompiledObjectCollectionView guiObjectListViewType = getCompiledObjectCollectionView();
if (guiObjectListViewType != null && guiObjectListViewType.isDisableCounting() != null) {
return !guiObjectListViewType.isDisableCounting();
}
return true;
}

public Collection<SelectorOptions<GetOperationOptions>> getOptions() {
if (getCompiledObjectCollectionView() != null && getCompiledObjectCollectionView().getOptions() != null
&& !getCompiledObjectCollectionView().getOptions().isEmpty()) {
return getCompiledObjectCollectionView().getOptions();
}

Collection<SelectorOptions<GetOperationOptions>> options = this.options;

if (options == null) {
if (ResourceType.class.equals(getType())) {
options = SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
}
} else {
if (ResourceType.class.equals(getType())) {
GetOperationOptions root = SelectorOptions.findRootOptions(options);
root.setNoFetch(Boolean.TRUE);
}
}
return options;

}

public void setOptions(Collection<SelectorOptions<GetOperationOptions>> options) {
this.options = options;
}

public boolean isEmptyListOnNullQuery() {
return emptyListOnNullQuery;
}

public void setEmptyListOnNullQuery(boolean emptyListOnNullQuery) {
this.emptyListOnNullQuery = emptyListOnNullQuery;
}

public boolean isExport() {
return export;
}

public void setExport(boolean export) {
this.export = export;
}

public void setDefaultCountIfNull(int defaultCountIfNull) {
this.defaultCountIfNull = defaultCountIfNull;
}

public Set<? extends C> getSelected() {
return selected;
}

@Override
public boolean isOrderingDisabled() {
CompiledObjectCollectionView guiObjectListViewType = getCompiledObjectCollectionView();
if (guiObjectListViewType != null && guiObjectListViewType.isDisableSorting() != null) {
return guiObjectListViewType.isDisableSorting();
}
return false;
public IModel<SelectableBean<C>> model(SelectableBean<C> selectableBean) {
return null;
}

public void setForPreview(boolean forPreview) {
isForPreview = forPreview;
@Override
protected boolean match(C selectedValue, C foundValue) {
return selectedValue.asPrismContainerValue().equivalent(foundValue.asPrismContainerValue());
}
}

0 comments on commit c3dd4fd

Please sign in to comment.