Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Mar 21, 2023
2 parents ed6f58f + 2afb9a1 commit c204c45
Show file tree
Hide file tree
Showing 10 changed files with 206 additions and 118 deletions.
2 changes: 1 addition & 1 deletion ...src/main/java/com/evolveum/midpoint/web/component/data/column/DeltaProgressBarColumn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protected String load() {
break;
case DELETE:
default:
count = delta.getModifications().size();
count = delta.getModifications().stream().filter(i -> !i.isOperational()).count();
}

return LocalizationUtil.translate("ProcessedObjectsPanel.progressMessage", new Object[] { msg, count });
Expand Down
186 changes: 152 additions & 34 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
Expand All @@ -35,23 +35,21 @@
import com.evolveum.midpoint.authentication.api.util.AuthConstants;
import com.evolveum.midpoint.authentication.api.util.AuthUtil;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.impl.page.login.PageLogin;
import com.evolveum.midpoint.init.InitialDataImport;
import com.evolveum.midpoint.init.StartupConfiguration;
import com.evolveum.midpoint.model.api.ModelPublicConstants;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.query.NotFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.QueryFactory;
import com.evolveum.midpoint.prism.query.TypeFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.repo.cache.RepositoryCache;
import com.evolveum.midpoint.repo.common.SystemObjectCache;
import com.evolveum.midpoint.schema.LabeledString;
import com.evolveum.midpoint.schema.ProvisioningDiag;
import com.evolveum.midpoint.schema.RepositoryDiag;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
Expand All @@ -66,10 +64,8 @@
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;
import com.evolveum.midpoint.web.component.dialog.Popupable;
import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.query_3.QueryType;

/**
* @author lazyman
Expand Down Expand Up @@ -545,57 +541,179 @@ private Popupable getDeleteAllObjectsConfirmationPanel() {
public void yesPerformed(AjaxRequestTarget target) {
resetStateToInitialConfig(target);
}

};
}

private ActivityDefinitionType createDeleteAllPerObjectType(QName type, QueryType query, Integer threads) {
// @formatter:off
return new ActivityDefinitionType()
.identifier("Delete all " + type.getLocalPart())
.beginDistribution()
.workerThreads(threads)
.<ActivityDefinitionType>end()
.beginWork()
.beginDeletion()
.beginObjects()
.type(type)
.query(query)
.<DeletionWorkDefinitionType>end()
.<WorkDefinitionsType>end()
.end();
// @formatter:on
}

private QueryType createTaskQuery(String taskIdentifier) throws SchemaException {
// @formatter:off
final ObjectQuery query = getPrismContext().queryFor(TaskType.class)
.not().item(TaskType.F_TASK_IDENTIFIER).eq(taskIdentifier)
.and()
.not().item(TaskType.F_PARENT).eq(taskIdentifier).build();
// @formatter:on
return getPrismContext().getQueryConverter().createQueryType(query);
}

private <T extends ObjectType> QueryType createAllQuery(Class<T> type) throws SchemaException {
return getPrismContext().getQueryConverter().createQueryType(
getPrismContext().queryFor(type)
.all()
.build());
}

private List<ObjectTypes> createSortedTypes() {
final List<ObjectTypes> first = new ArrayList<>();
first.add(ObjectTypes.SHADOW);
first.add(ObjectTypes.USER);
first.add(ObjectTypes.ROLE);
first.add(ObjectTypes.ORG);

final List<ObjectTypes> last = new ArrayList<>();
last.add(ObjectTypes.RESOURCE);
last.add(ObjectTypes.CONNECTOR);
last.add(ObjectTypes.MARK);
last.add(ObjectTypes.OBJECT_TEMPLATE);
last.add(ObjectTypes.OBJECT_COLLECTION);
last.add(ObjectTypes.ARCHETYPE);
last.add(ObjectTypes.SECURITY_POLICY);
last.add(ObjectTypes.PASSWORD_POLICY);
last.add(ObjectTypes.SYSTEM_CONFIGURATION);

final List<ObjectTypes> types = new ArrayList<>();

types.addAll(first);

for (ObjectTypes type : ObjectTypes.values()) {
if (first.contains(type) || last.contains(type)) {
continue;
}

if (Modifier.isAbstract(type.getClassDefinition().getModifiers())) {
continue;
}

if (ObjectTypes.NODE == type) {
continue;
}

types.add(type);
}

types.addAll(last);

return types;
}

private String runDeleteAllTask(OperationResult result) throws SchemaException {
Task task = createSimpleTask(result.getOperation());

// @formatter:off
ActivityDefinitionType definition = new ActivityDefinitionType()
.beginComposition()
.<ActivityDefinitionType>end()
.beginDistribution()
.subtasks(new ActivitySubtaskDefinitionType())
.end();
// @formatter:on

List<ActivityDefinitionType> activities = definition.getComposition().getActivity();
for (ObjectTypes type : createSortedTypes()) {
QueryType query;
if (ObjectTypes.TASK == type) {
query = createTaskQuery(task.getTaskIdentifier());
} else {
query = createAllQuery(type.getClassDefinition());
}

Integer threads = null;
if (FocusType.class.isAssignableFrom(type.getClassDefinition())
|| ShadowType.class.equals(type.getClassDefinition())) {
threads = 4;
}

activities.add(createDeleteAllPerObjectType(type.getTypeQName(), query, threads));
}

task.setName("Delete all objects");
task.setRootActivityDefinition(definition);
task.addArchetypeInformation(SystemObjectsType.ARCHETYPE_UTILITY_TASK.value());
task.addAuxiliaryArchetypeInformation(SystemObjectsType.ARCHETYPE_OBJECTS_DELETE_TASK.value());

getModelInteractionService().switchToBackground(task, result);
return task.getOid();
}

private void resetStateToInitialConfig(AjaxRequestTarget target) {
hideMainPopup(target);

OperationResult result = new OperationResult(OPERATION_DELETE_ALL_OBJECTS);
String taskOid = null;
String taskName = "Delete all objects";

QueryFactory factory = getPrismContext().queryFactory();

TypeFilter nodeFilter = factory.createType(NodeType.COMPLEX_TYPE, factory.createAll());
final ObjectFilter taskFilter = getPrismContext().queryFor(TaskType.class)
.item(TaskType.F_NAME).eq(taskName).buildFilter();
NotFilter notNodeFilter = factory.createNot(nodeFilter);
NotFilter notTaskFilter = factory.createNot(taskFilter);

try {
QName type = ObjectType.COMPLEX_TYPE;
taskOid = deleteObjectsAsync(type, factory.createQuery(
factory.createAnd(notTaskFilter, notNodeFilter)),
taskName, result);
taskOid = runDeleteAllTask(result);

info("PageAbout.factoryResetStarted");
} catch (Exception ex) {
String msg = getString("PageAbout.message.resetStateToInitialConfig.allObject.fatalError");
result.recomputeStatus();
result.recordFatalError(getString("PageAbout.message.resetStateToInitialConfig.allObject.fatalError"), ex);
result.recordFatalError(msg, ex);

LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete all objects", ex);
info(msg);
}

target.add(getFeedbackPanel());

if (taskOid == null) {
return;
}

final String taskOidToRemoving = taskOid;

try {
while (!getTaskManager().getTaskPlain(taskOid, result).isClosed()) {TimeUnit.SECONDS.sleep(5);}
while (true) {
Task task = getTaskManager().getTaskPlain(taskOid, result);
if (task.isClosed() || task.isSuspended()) {
break;
}

TimeUnit.SECONDS.sleep(5);
}

runPrivileged(new Producer<>() {

private static final long serialVersionUID = 1L;

@Override
public Object run() {
Task task = createAnonymousTask(OPERATION_DELETE_TASK);
OperationResult result = new OperationResult(OPERATION_DELETE_TASK);
ObjectDelta<TaskType> delta = getPrismContext().deltaFactory().object()
.createDeleteDelta(TaskType.class, taskOidToRemoving);
Collection<ObjectDelta<? extends ObjectType>> deltaCollection = Collections.singletonList(delta);
Task task = getTaskManager().createTaskInstance(OPERATION_DELETE_TASK);
task.setChannel(SchemaConstants.CHANNEL_USER_URI);

OperationResult result = task.getResult();

try {
getModelService().executeChanges(deltaCollection, null, task, result);
getTaskService().suspendAndDeleteTasks(Arrays.asList(taskOidToRemoving), 2000L, true, task, result);
} catch (Exception ex) {
result.recomputeStatus();
result.recordFatalError(getString("PageAbout.message.resetStateToInitialConfig.task.fatalError"), ex);
result.recordFatalError(LocalizationUtil.translate("PageAbout.message.resetStateToInitialConfig.task.fatalError"), ex);

LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete task", ex);
}
Expand Down
33 changes: 11 additions & 22 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionValidator.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2019 Evolveum and contributors
* Copyright (C) 2010-2023 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
Expand All @@ -8,34 +8,27 @@

import java.util.Collection;

import com.evolveum.midpoint.prism.PrismContext;

import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;

import org.apache.wicket.model.IModel;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;

import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.PrismPropertyDefinition;
import com.evolveum.midpoint.prism.PrismPropertyValue;
import com.evolveum.midpoint.prism.Referencable;
import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple;
import com.evolveum.midpoint.repo.common.expression.Expression;
import com.evolveum.midpoint.repo.common.expression.ExpressionEvaluationContext;
import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
import com.evolveum.midpoint.schema.expression.VariablesMap;
import com.evolveum.midpoint.schema.constants.ExpressionConstants;
import com.evolveum.midpoint.schema.expression.VariablesMap;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.exception.CommunicationException;
import com.evolveum.midpoint.util.exception.ConfigurationException;
import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
Expand All @@ -44,8 +37,8 @@ public class ExpressionValidator<T> implements INullAcceptingValidator<T> {

private static final long serialVersionUID = 1L;

private IModel<ExpressionType> expressionTypeModel;
private ModelServiceLocator serviceLocator;
private final IModel<ExpressionType> expressionTypeModel;
private final ModelServiceLocator serviceLocator;

private static final String OPERATION_EVALUATE_EXPRESSION = ExpressionValidator.class.getName() + ".evaluateValidationExpression";

Expand All @@ -54,8 +47,6 @@ public ExpressionValidator(IModel<ExpressionType> expressionType, ModelServiceLo
this.serviceLocator = serviceLocator;
}



@Override
public void validate(IValidatable<T> validatable) {
ExpressionType expressionType = expressionTypeModel.getObject();
Expand All @@ -74,7 +65,6 @@ public void validate(IValidatable<T> validatable) {
ExpressionFactory expressionFactory = serviceLocator.getExpressionFactory();
Expression<PrismPropertyValue<OperationResultType>, PrismPropertyDefinition<OperationResultType>> expression;
try {

expression = expressionFactory
.makeExpression(expressionType, outputDefinition, MiscSchemaUtil.getExpressionProfile(), contextDesc, task, result);
} catch (SchemaException | ObjectNotFoundException | SecurityViolationException e) {
Expand All @@ -84,12 +74,12 @@ public void validate(IValidatable<T> validatable) {
return;
}
VariablesMap variables = new VariablesMap();
Class typeClass = (valueToValidate == null ? String.class : valueToValidate.getClass());
if (valueToValidate instanceof ObjectReferenceType && ((ObjectReferenceType) valueToValidate).asReferenceValue().isEmpty()) {
Class<?> typeClass = (valueToValidate == null ? String.class : valueToValidate.getClass());
if (valueToValidate instanceof Referencable && ((Referencable) valueToValidate).asReferenceValue().isEmpty()) {
valueToValidate = null;
}
variables.put(ExpressionConstants.VAR_INPUT, valueToValidate, typeClass);
variables.putObject(ExpressionConstants.VAR_OBJECT, (ObjectType)getObjectType(), ObjectType.class);
variables.putObject(ExpressionConstants.VAR_OBJECT, (ObjectType) getObjectType(), ObjectType.class);
ExpressionEvaluationContext context = new ExpressionEvaluationContext(null, variables, contextDesc, task);
context.setExpressionFactory(expressionFactory);
PrismValueDeltaSetTriple<PrismPropertyValue<OperationResultType>> outputTriple;
Expand All @@ -111,7 +101,7 @@ public void validate(IValidatable<T> validatable) {
}
if (outputValues.size() > 1) {
ValidationError error = new ValidationError();
error.setMessage("Expression "+contextDesc+" produced more than one value");
error.setMessage("Expression " + contextDesc + " produced more than one value");
validatable.error(error);
}

Expand Down Expand Up @@ -141,5 +131,4 @@ protected <O extends ObjectType> O getObjectType() {
protected Object getValueToValidate(IValidatable<T> validatable) {
return validatable.getValue();
}

}

0 comments on commit c204c45

Please sign in to comment.