Skip to content

Commit

Permalink
Merge branch 'support-3.3' of github.com:Evolveum/midpoint into suppo…
Browse files Browse the repository at this point in the history 
…rt-3.3
  • Loading branch information
@semancik
semancik committed Mar 14, 2016
2 parents 62974c7 + efd931a commit b559a1a
Show file tree
Hide file tree
Showing 24 changed files with 1,597 additions and 814 deletions.
2 changes: 1 addition & 1 deletion infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
View file
Expand Up @@ -324,7 +324,7 @@ public void checkConsistenceInternal(Itemable rootItem, boolean requireDefinitio

@Override
public boolean isEmpty() {
return oid == null && object == null;
return oid == null && object == null && filter == null;
}

/**
Expand Down
20 changes: 20 additions & 0 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
View file
Expand Up @@ -23,6 +23,9 @@
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.PrismReference;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.Referencable;
import com.evolveum.midpoint.prism.parser.XPathHolder;
import com.evolveum.midpoint.prism.parser.XPathSegment;
import com.evolveum.midpoint.prism.path.ItemPath;
Expand Down Expand Up @@ -90,6 +93,23 @@ public static <T> Collection<T> getExtensionPropertyValues(ObjectType objectType
}
return property.getRealValues();
}

public static Collection<Referencable> getExtensionReferenceValues(ObjectType objectType, QName propertyQname) {
PrismObject<? extends ObjectType> object = objectType.asPrismObject();
PrismContainer<Containerable> extensionContainer = object.findContainer(ObjectType.F_EXTENSION);
if (extensionContainer == null) {
return null;
}
PrismReference property = extensionContainer.findReference(propertyQname);
if (property == null) {
return null;
}
Collection<Referencable> refs = new ArrayList<Referencable>(property.getValues().size());
for (PrismReferenceValue refVal : property.getValues()){
refs.add(refVal.asReferencable());
}
return refs;
}


public static ObjectReferenceType findRef(String oid, List<ObjectReferenceType> refs) {
Expand Down
13 changes: 13 additions & 0 deletions ...ava/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
View file
Expand Up @@ -48,6 +48,7 @@
import com.evolveum.midpoint.prism.PrismContainer;
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.Referencable;
import com.evolveum.midpoint.prism.crypto.EncryptionException;
import com.evolveum.midpoint.prism.crypto.Protector;
import com.evolveum.midpoint.prism.path.ItemPath;
Expand Down Expand Up @@ -354,6 +355,10 @@ public <T> T getExtensionPropertyValue(ObjectType object, String namespace, Stri
return getExtensionPropertyValue(object, new javax.xml.namespace.QName(namespace, localPart));
}

public Referencable getExtensionReferenceValue(ObjectType object, String namespace, String localPart) throws SchemaException {
return getExtensionReferenceValue(object, new javax.xml.namespace.QName(namespace, localPart));
}

public <T> T getExtensionPropertyValue(ObjectType object, groovy.xml.QName propertyQname) throws SchemaException {
return getExtensionPropertyValue(object, propertyQname.getNamespaceURI(), propertyQname.getLocalPart());
}
Expand All @@ -366,6 +371,14 @@ public <T> T getExtensionPropertyValue(ObjectType object, javax.xml.namespace.QN
return toSingle(values, "a multi-valued extension property "+propertyQname);
}

public Referencable getExtensionReferenceValue(ObjectType object, javax.xml.namespace.QName propertyQname) throws SchemaException {
if (object == null) {
return null;
}
Collection<Referencable> values = ObjectTypeUtil.getExtensionReferenceValues(object, propertyQname);
return toSingle(values, "a multi-valued extension property "+propertyQname);
}

public <T> T getPropertyValue(ObjectType object, String path) throws SchemaException {
Collection<T> values = getPropertyValues(object, path);
return toSingle(values, "a multi-valued property "+path);
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
View file
Expand Up @@ -461,7 +461,7 @@ public <T extends ObjectType> void modifyObject(Class<T> type, String oid,

ObjectDelta<T> objectDelta = (ObjectDelta<T>) ObjectDelta.createModifyDelta(oid, modifications, type, prismContext);
Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil.createCollection(objectDelta);
modelController.executeChanges(deltas, null, task, result);
modelController.executeChanges(deltas, options, task, result);

result.computeStatus();

Expand Down
84 changes: 57 additions & 27 deletions ...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
View file
Expand Up @@ -15,42 +15,39 @@
*/
package com.evolveum.midpoint.model.impl.lens;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.common.ActivationComputer;
import com.evolveum.midpoint.model.api.PolicyViolationException;
import com.evolveum.midpoint.model.api.context.EvaluatedAssignment;
import com.evolveum.midpoint.model.common.expression.ExpressionUtil;
import com.evolveum.midpoint.model.common.expression.ExpressionVariables;
import com.evolveum.midpoint.model.common.expression.ItemDeltaItem;
import com.evolveum.midpoint.model.common.expression.ObjectDeltaObject;
import com.evolveum.midpoint.model.common.mapping.Mapping;
import com.evolveum.midpoint.model.common.mapping.MappingFactory;
import com.evolveum.midpoint.model.impl.lens.projector.MappingEvaluator;
import com.evolveum.midpoint.model.impl.util.Utils;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.Item;
import com.evolveum.midpoint.prism.ItemDefinition;
import com.evolveum.midpoint.prism.OriginType;
import com.evolveum.midpoint.prism.PrismContainer;
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.PrismContainerValue;
import com.evolveum.midpoint.prism.PrismContainerable;
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.OriginType;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.PrismPropertyDefinition;
import com.evolveum.midpoint.prism.PrismPropertyValue;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.delta.DeltaSetTriple;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.PlusMinusZero;
import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple;
import com.evolveum.midpoint.prism.parser.QueryConvertor;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.repo.api.RepositoryService;
import com.evolveum.midpoint.schema.SearchResultList;
import com.evolveum.midpoint.schema.constants.ExpressionConstants;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
Expand All @@ -60,29 +57,23 @@
import com.evolveum.midpoint.security.api.Authorization;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.DOMUtil;
import com.evolveum.midpoint.util.Transformer;
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.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthorizationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ConstructionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ExclusionPolicyConstraintType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyConstraintsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TimeIntervalStatusType;
import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;

/**
* @author semancik
Expand Down Expand Up @@ -392,19 +383,30 @@ private void evaluateFocusMappings(EvaluatedAssignmentImpl<F> evaluatedAssignmen
private PrismObject<?> resolveTarget(AssignmentType assignmentType, ObjectType source, String sourceDescription, Task task, OperationResult result) throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException {
ObjectReferenceType targetRef = assignmentType.getTargetRef();
String oid = targetRef.getOid();
if (oid == null) {
throw new SchemaException("The OID is null in assignment targetRef in "+source);
}

// Target is referenced, need to fetch it
Class<? extends ObjectType> clazz = null;
if (targetRef.getType() != null) {
clazz = (Class) prismContext.getSchemaRegistry().determineCompileTimeClass(targetRef.getType());
if (clazz == null) {
throw new SchemaException("Cannot determine type from " + targetRef.getType() + " in target reference in " + assignmentType + " in " + sourceDescription);
Class<? extends ObjectType> clazz = null;
if (targetRef.getType() != null) {
clazz = (Class) prismContext.getSchemaRegistry().determineCompileTimeClass(targetRef.getType());
if (clazz == null) {
throw new SchemaException("Cannot determine type from " + targetRef.getType() + " in target reference in " + assignmentType + " in " + sourceDescription);
}
} else {
throw new SchemaException("Missing type in target reference in " + assignmentType + " in " + sourceDescription);
}

if (oid == null) {

if (targetRef.getFilter() == null){
throw new SchemaException("The OID and filter are both null in assignment targetRef in "+source);
}
} else {
throw new SchemaException("Missing type in target reference in " + assignmentType + " in " + sourceDescription);

PrismObject<? extends ObjectType> target = resolveTarget(clazz, source, targetRef.getFilter(), sourceDescription, task, result);
assignmentType.getTargetRef().setOid(target.getOid());
// Handling ObjectNotFoundException - we just pass it to the caller

}

PrismObject<? extends ObjectType> target = null;
target = repository.getObject(clazz, oid, null, result);
if (target == null) {
Expand All @@ -414,6 +416,34 @@ private PrismObject<?> resolveTarget(AssignmentType assignmentType, ObjectType s

return target;
}

private PrismObject<? extends ObjectType> resolveTarget(Class clazz, ObjectType source, SearchFilterType filter, String sourceDescription, Task task, OperationResult result) throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException{
// SearchFilterType filter = targetRef.getFilter();
ExpressionVariables variables = Utils.getDefaultExpressionVariables(source, null, null, LensUtil.getSystemConfiguration(lensContext, repository, result).asObjectable());

ObjectFilter origFilter = QueryConvertor.parseFilter(filter, clazz, prismContext);
ObjectFilter evaluatedFilter = ExpressionUtil.evaluateFilterExpressions(origFilter, variables, getMappingFactory().getExpressionFactory(), prismContext, " evaluating resource filter expression ", task, result);

if (evaluatedFilter == null){
throw new SchemaException("The OID is null and filter could not be evaluated in assignment targetRef in "+source);
}


SearchResultList<?> results = repository.searchObjects(clazz, ObjectQuery.createObjectQuery(evaluatedFilter), null, result);

if (org.apache.commons.collections.CollectionUtils.isEmpty(results)){
throw new IllegalArgumentException("Got null target from repository, filter:"+evaluatedFilter+", class:"+clazz+" (should not happen, probably a bug) in "+sourceDescription);
}

if (results.size() > 1){
throw new IllegalArgumentException("Got more than one target from repository, filter:"+evaluatedFilter+", class:"+clazz+" (should not happen, probably a bug) in "+sourceDescription);
}

PrismObject<? extends ObjectType> target = (PrismObject<? extends ObjectType>) results.iterator().next();

// assignmentType.getTargetRef().setOid(target.getOid());
return target;
}


private void evaluateTarget(EvaluatedAssignmentImpl<F> assignment, AssignmentPathSegment assignmentPathSegment,
Expand Down

0 comments on commit b559a1a

Please sign in to comment.