Skip to content

Commit

Permalink
Rework resource-related definitions
Browse files Browse the repository at this point in the history
Definitions related to resource objects: resource schemas, object
classes, object types, and attributes were completely restructured.

Along with this, algorithms that select appropriate object type/class
definition for given coordinates (kind, intent, object class) are now
much more elaborated. !!! This may present incompatible changes. !!!

For details please see
https://docs.evolveum.com/midpoint/devel/design/resource-definitions-4.5/.

Unrelated changes:

1. Started adapting synchronization code to asynchronous correlation.
2. Started writing async correlation tests (TestIdMatch).
3. Some new features to help writing tests:
 - CsvResource to manage test CSV resources;
 - TestTask to manage test tasks;
 - TestSpringBeans to be used when auto-wiring is not available.
4. Added SpringApplicationContextHolder (model.impl.expr package)
for exceptional uses e.g. from within scripts. The original hacked
holder in com.evolveum.midpoint.wf.impl.processes.common is now
deprecated.
  • Loading branch information
mederly committed Dec 19, 2021
1 parent 18a37f2 commit a5ba3d7
Show file tree
Hide file tree
Showing 425 changed files with 16,028 additions and 14,726 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@
import java.util.List;
import java.util.Map;

import com.evolveum.midpoint.schema.processor.ResourceAssociationDefinition;
import com.evolveum.midpoint.model.api.AssignmentObjectRelation;

import com.evolveum.midpoint.schema.processor.ResourceSchema;

import com.evolveum.midpoint.schema.processor.ResourceSchemaFactory;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
Expand All @@ -22,9 +27,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

import com.evolveum.midpoint.common.refinery.RefinedAssociationDefinition;
import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
import com.evolveum.midpoint.schema.processor.ResourceObjectTypeDefinition;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.prism.path.ItemPath;
Expand Down Expand Up @@ -60,7 +63,7 @@ public class ResourceTypeAssignmentPopupTabPanel extends AbstractAssignmentPopup
private static final String ID_ASSOCIATION = "association";

private LoadableModel<List<String>> intentValues;
private LoadableModel<List<RefinedAssociationDefinition>> associationValuesModel;
private LoadableModel<List<ResourceAssociationDefinition>> associationValuesModel;

private static final String DOT_CLASS = ResourceTypeAssignmentPopupTabPanel.class.getName();
private static final Trace LOGGER = TraceManager.getTrace(ResourceTypeAssignmentPopupTabPanel.class);
Expand Down Expand Up @@ -133,22 +136,22 @@ protected void onUpdate(AjaxRequestTarget target) {
associationContainer.add(new VisibleBehaviour(() -> isEntitlementAssignment()));
parametersPanel.add(associationContainer);

DropDownChoicePanel<RefinedAssociationDefinition> associationSelector = new DropDownChoicePanel<>(ID_ASSOCIATION,
Model.of(), associationValuesModel, new IChoiceRenderer<RefinedAssociationDefinition>() {
DropDownChoicePanel<ResourceAssociationDefinition> associationSelector = new DropDownChoicePanel<>(ID_ASSOCIATION,
Model.of(), associationValuesModel, new IChoiceRenderer<ResourceAssociationDefinition>() {
private static final long serialVersionUID = 1L;

@Override
public Object getDisplayValue(RefinedAssociationDefinition refinedAssociationDefinition) {
public Object getDisplayValue(ResourceAssociationDefinition refinedAssociationDefinition) {
return WebComponentUtil.getAssociationDisplayName(refinedAssociationDefinition);
}

@Override
public String getIdValue(RefinedAssociationDefinition refinedAssociationDefinition, int index) {
public String getIdValue(ResourceAssociationDefinition refinedAssociationDefinition, int index) {
return Integer.toString(index);
}

@Override
public RefinedAssociationDefinition getObject(String id, IModel<? extends List<? extends RefinedAssociationDefinition>> choices) {
public ResourceAssociationDefinition getObject(String id, IModel<? extends List<? extends ResourceAssociationDefinition>> choices) {
return StringUtils.isNotBlank(id) ? choices.getObject().get(Integer.parseInt(id)) : null;
}
}, true);
Expand Down Expand Up @@ -180,11 +183,11 @@ protected List<String> load() {
ResourceType selectedResource = selectedResources.get(0);

try {
RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(selectedResource.asPrismObject());
ResourceSchema refinedSchema = ResourceSchemaFactory.getCompleteSchema(selectedResource.asPrismObject());
if (refinedSchema != null) {
ShadowKindType kind = getKindDropDown().getBaseFormComponent().getModelObject();
List<? extends RefinedObjectClassDefinition> definitions = refinedSchema.getRefinedDefinitions(kind);
for (RefinedObjectClassDefinition def : definitions) {
List<? extends ResourceObjectTypeDefinition> definitions = refinedSchema.getObjectTypeDefinitions(kind);
for (ResourceObjectTypeDefinition def : definitions) {
availableIntentValues.add(def.getIntent());
}
}
Expand All @@ -199,9 +202,9 @@ protected List<String> load() {
return availableIntentValues;
}
};
associationValuesModel = new LoadableModel<List<RefinedAssociationDefinition>>() {
associationValuesModel = new LoadableModel<List<ResourceAssociationDefinition>>() {
@Override
protected List<RefinedAssociationDefinition> load() {
protected List<ResourceAssociationDefinition> load() {
ResourceType resource = getSelectedObjectsList() != null && getSelectedObjectsList().size() > 0 ?
getSelectedObjectsList().get(0) : null;
if (resource == null) {
Expand Down Expand Up @@ -255,8 +258,8 @@ private String getIntentValue() {
return intentDropDown.getModel() != null ? intentDropDown.getModel().getObject() : null;
}

private RefinedAssociationDefinition getAssociationValue() {
DropDownChoicePanel<RefinedAssociationDefinition> associationDropDown = getAssociationDropDown();
private ResourceAssociationDefinition getAssociationValue() {
DropDownChoicePanel<ResourceAssociationDefinition> associationDropDown = getAssociationDropDown();
return associationDropDown != null ? associationDropDown.getModel().getObject() : null;
}

Expand All @@ -268,8 +271,8 @@ private DropDownChoicePanel<ShadowKindType> getKindDropDown() {
return (DropDownChoicePanel<ShadowKindType>) get(getPageBase().createComponentPath(ID_PARAMETERS_PANEL, ID_KIND_CONTAINER, ID_KIND));
}

private DropDownChoicePanel<RefinedAssociationDefinition> getAssociationDropDown() {
return (DropDownChoicePanel<RefinedAssociationDefinition>) get(getPageBase().createComponentPath(ID_PARAMETERS_PANEL, ID_ASSOCIATION_CONTAINER, ID_ASSOCIATION));
private DropDownChoicePanel<ResourceAssociationDefinition> getAssociationDropDown() {
return (DropDownChoicePanel<ResourceAssociationDefinition>) get(getPageBase().createComponentPath(ID_PARAMETERS_PANEL, ID_ASSOCIATION_CONTAINER, ID_ASSOCIATION));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
import java.util.List;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.schema.processor.ResourceObjectTypeDefinition;
import com.evolveum.midpoint.schema.processor.ResourceSchema;

import com.evolveum.midpoint.schema.processor.ResourceSchemaFactory;

import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand All @@ -23,8 +28,6 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;

import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
Expand Down Expand Up @@ -505,11 +508,11 @@ protected List<String> load() {
ResourceType selectedResource = (ResourceType) selectedResources.get(0);

try {
RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(selectedResource.asPrismObject());
ResourceSchema refinedSchema = ResourceSchemaFactory.getCompleteSchema(selectedResource.asPrismObject());
if (refinedSchema != null) {
ShadowKindType kind = (ShadowKindType) TypedAssignablePanel.this.getKindDropdownComponent().getBaseFormComponent().getModelObject();
List<? extends RefinedObjectClassDefinition> definitions = refinedSchema.getRefinedDefinitions(kind);
for (RefinedObjectClassDefinition def : definitions) {
List<? extends ResourceObjectTypeDefinition> definitions = refinedSchema.getObjectTypeDefinitions(kind);
for (ResourceObjectTypeDefinition def : definitions) {
availableIntentValues.add(def.getIntent());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/
package com.evolveum.midpoint.gui.api.factory.wrapper;

import com.evolveum.midpoint.common.refinery.RefinedAssociationDefinition;
import com.evolveum.midpoint.common.refinery.RefinedAttributeDefinition;
import com.evolveum.midpoint.schema.processor.ResourceAssociationDefinition;
import com.evolveum.midpoint.gui.api.prism.ItemStatus;
import com.evolveum.midpoint.model.api.MetadataItemProcessingSpec;
import com.evolveum.midpoint.prism.PrismObject;
Expand Down Expand Up @@ -47,7 +46,7 @@ public class WrapperContext {
private ResourceShadowDiscriminator discriminator;

//Association related attributes
private Collection<RefinedAssociationDefinition> refinedAssociationDefinitions;
private Collection<ResourceAssociationDefinition> resourceAssociationDefinitions;

//used e.g. for metadata - opertionsla attributes but want to create wrappers for them
private boolean createOperational;
Expand Down Expand Up @@ -117,12 +116,12 @@ public void setResource(ResourceType resource) {
this.resource = resource;
}

public Collection<RefinedAssociationDefinition> getRefinedAssociationDefinitions() {
return refinedAssociationDefinitions;
public Collection<ResourceAssociationDefinition> getRefinedAssociationDefinitions() {
return resourceAssociationDefinitions;
}

public void setRefinedAssociationDefinitions(Collection<RefinedAssociationDefinition> refinedAssociationDefinitions) {
this.refinedAssociationDefinitions = refinedAssociationDefinitions;
public void setRefinedAssociationDefinitions(Collection<ResourceAssociationDefinition> resourceAssociationDefinitions) {
this.resourceAssociationDefinitions = resourceAssociationDefinitions;
}

public void setDiscriminator(ResourceShadowDiscriminator discriminator) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
*/
public interface PrismPropertyWrapper<T> extends ItemWrapper<PrismProperty<T>, PrismPropertyValueWrapper<T>>, PrismPropertyDefinition<T> {


LookupTableType getPredefinedValues();
void setPredefinedValues(LookupTableType lookupTableType);

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,23 @@
*/
package com.evolveum.midpoint.gui.api.prism.wrapper;

import com.evolveum.midpoint.common.refinery.RefinedAttributeDefinition;
import java.util.Map;
import java.util.function.Consumer;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.prism.ComplexTypeDefinition;
import com.evolveum.midpoint.prism.DeepCloneOperation;
import com.evolveum.midpoint.prism.ItemDefinition;
import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;

import org.jetbrains.annotations.NotNull;

/**
* @author skublik
*
*/
public interface ResourceAttributeWrapper<T> extends PrismPropertyWrapper<T>, RefinedAttributeDefinition<T> {

public interface ResourceAttributeWrapper<T> extends PrismPropertyWrapper<T>, ResourceAttributeDefinition<T> {

@Override
ResourceAttributeDefinition<T> deepClone(@NotNull DeepCloneOperation operation);
}

0 comments on commit a5ba3d7

Please sign in to comment.