Skip to content

Commit

Permalink
Merge branch 'master' into access-certification
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Dec 18, 2015
2 parents 86ed5ab + f0b2619 commit 4a77515
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 124 deletions.
8 changes: 5 additions & 3 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
View file
Expand Up @@ -60,9 +60,11 @@ public T getObject() {
return null;
}

for(LookupTableRowType row: lookupTable.getRow()){
if(key.equals(row.getKey())){
return (T)WebMiscUtil.getOrigStringFromPoly(row.getLabel());
if (lookupTable != null) {
for (LookupTableRowType row : lookupTable.getRow()) {
if (key.equals(row.getKey())) {
return (T) WebMiscUtil.getOrigStringFromPoly(row.getLabel());
}
}
}
return (T)key;
Expand Down
247 changes: 127 additions & 120 deletions ...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
View file
Expand Up @@ -1513,6 +1513,7 @@ public Set<PropertyModificationOperation> modifyObject(ObjectClassComplexTypeDef

Uid uid = getUid(objectClassDef, identifiers);
if (uid == null) {
result.recordFatalError("No UID in identifiers: " + identifiers);
throw new IllegalArgumentException("No UID in identifiers: " + identifiers);
}
String originalUid = uid.getUidValue();
Expand Down Expand Up @@ -1541,140 +1542,145 @@ public Set<PropertyModificationOperation> modifyObject(ObjectClassComplexTypeDef
}
}

Map<QName,ObjectClassComplexTypeDefinition> auxiliaryObjectClassMap = new HashMap<>();
if (auxiliaryObjectClassDelta != null) {
// Activation change means modification of attributes
if (auxiliaryObjectClassDelta.isReplace()) {
if (auxiliaryObjectClassDelta.getValuesToReplace() == null || auxiliaryObjectClassDelta.getValuesToReplace().isEmpty()) {
attributesToUpdate.add(AttributeBuilder.build(PredefinedAttributes.AUXILIARY_OBJECT_CLASS_NAME));
try {
Map<QName,ObjectClassComplexTypeDefinition> auxiliaryObjectClassMap = new HashMap<>();
if (auxiliaryObjectClassDelta != null) {
// Activation change means modification of attributes
if (auxiliaryObjectClassDelta.isReplace()) {
if (auxiliaryObjectClassDelta.getValuesToReplace() == null || auxiliaryObjectClassDelta.getValuesToReplace().isEmpty()) {
attributesToUpdate.add(AttributeBuilder.build(PredefinedAttributes.AUXILIARY_OBJECT_CLASS_NAME));
} else {
addConvertedValues(auxiliaryObjectClassDelta.getValuesToReplace(), attributesToUpdate, auxiliaryObjectClassMap);
}
} else {
addConvertedValues(auxiliaryObjectClassDelta.getValuesToReplace(), attributesToUpdate, auxiliaryObjectClassMap);
}
} else {
addConvertedValues(auxiliaryObjectClassDelta.getValuesToAdd(), attributesToAdd, auxiliaryObjectClassMap);
addConvertedValues(auxiliaryObjectClassDelta.getValuesToDelete(), attributesToRemove, auxiliaryObjectClassMap);
}
}

for (Operation operation : changes) {
if (operation instanceof PropertyModificationOperation) {
PropertyModificationOperation change = (PropertyModificationOperation) operation;
PropertyDelta<?> delta = change.getPropertyDelta();

if (delta.getParentPath().equivalent(new ItemPath(ShadowType.F_ATTRIBUTES))) {
if (delta.getDefinition() == null || !(delta.getDefinition() instanceof ResourceAttributeDefinition)) {
ResourceAttributeDefinition def = objectClassDef
.findAttributeDefinition(delta.getElementName());
if (def == null) {
String message = "No definition for attribute "+delta.getElementName()+" used in modification delta";
result.recordFatalError(message);
throw new SchemaException(message);
addConvertedValues(auxiliaryObjectClassDelta.getValuesToAdd(), attributesToAdd, auxiliaryObjectClassMap);
addConvertedValues(auxiliaryObjectClassDelta.getValuesToDelete(), attributesToRemove, auxiliaryObjectClassMap);
}
}

for (Operation operation : changes) {
if (operation instanceof PropertyModificationOperation) {
PropertyModificationOperation change = (PropertyModificationOperation) operation;
PropertyDelta<?> delta = change.getPropertyDelta();

if (delta.getParentPath().equivalent(new ItemPath(ShadowType.F_ATTRIBUTES))) {
if (delta.getDefinition() == null || !(delta.getDefinition() instanceof ResourceAttributeDefinition)) {
ResourceAttributeDefinition def = objectClassDef
.findAttributeDefinition(delta.getElementName());
if (def == null) {
String message = "No definition for attribute "+delta.getElementName()+" used in modification delta";
result.recordFatalError(message);
throw new SchemaException(message);
}
try {
delta.applyDefinition(def);
} catch (SchemaException e) {
result.recordFatalError(e.getMessage(), e);
throw e;
}
}
try {
delta.applyDefinition(def);
} catch (SchemaException e) {
result.recordFatalError(e.getMessage(), e);
throw e;
boolean isInRemovedAuxClass = false;
if (auxiliaryObjectClassDelta != null && auxiliaryObjectClassDelta.isDelete()) {
// We need to change all the deltas of all the attributes that belong
// to the removed auxiliary object class from REPLACE to DELETE. The change of
// auxiliary object class and the change of the attributes must be done in
// one operation. Otherwise we get schema error. And as auxiliary object class
// is removed, the attributes must be removed as well.
for (PrismPropertyValue<QName> auxPval: auxiliaryObjectClassDelta.getValuesToDelete()) {
ObjectClassComplexTypeDefinition auxDef = auxiliaryObjectClassMap.get(auxPval.getValue());
ResourceAttributeDefinition<Object> attrDef = auxDef.findAttributeDefinition(delta.getElementName());
if (attrDef != null) {
isInRemovedAuxClass = true;
break;
}
}
}
}
boolean isInRemovedAuxClass = false;
if (auxiliaryObjectClassDelta != null && auxiliaryObjectClassDelta.isDelete()) {
// We need to change all the deltas of all the attributes that belong
// to the removed auxiliary object class from REPLACE to DELETE. The change of
// auxiliary object class and the change of the attributes must be done in
// one operation. Otherwise we get schema error. And as auxiliary object class
// is removed, the attributes must be removed as well.
for (PrismPropertyValue<QName> auxPval: auxiliaryObjectClassDelta.getValuesToDelete()) {
ObjectClassComplexTypeDefinition auxDef = auxiliaryObjectClassMap.get(auxPval.getValue());
ResourceAttributeDefinition<Object> attrDef = auxDef.findAttributeDefinition(delta.getElementName());
if (attrDef != null) {
isInRemovedAuxClass = true;
break;
boolean isInAddedAuxClass = false;
if (auxiliaryObjectClassDelta != null && auxiliaryObjectClassDelta.isAdd()) {
// We need to change all the deltas of all the attributes that belong
// to the new auxiliary object class from REPLACE to ADD. The change of
// auxiliary object class and the change of the attributes must be done in
// one operation. Otherwise we get schema error. And as auxiliary object class
// is added, the attributes must be added as well.
for (PrismPropertyValue<QName> auxPval: auxiliaryObjectClassDelta.getValuesToAdd()) {
ObjectClassComplexTypeDefinition auxDef = auxiliaryObjectClassMap.get(auxPval.getValue());
ResourceAttributeDefinition<Object> attrDef = auxDef.findAttributeDefinition(delta.getElementName());
if (attrDef != null) {
isInAddedAuxClass = true;
break;
}
}
}
}
boolean isInAddedAuxClass = false;
if (auxiliaryObjectClassDelta != null && auxiliaryObjectClassDelta.isAdd()) {
// We need to change all the deltas of all the attributes that belong
// to the new auxiliary object class from REPLACE to ADD. The change of
// auxiliary object class and the change of the attributes must be done in
// one operation. Otherwise we get schema error. And as auxiliary object class
// is added, the attributes must be added as well.
for (PrismPropertyValue<QName> auxPval: auxiliaryObjectClassDelta.getValuesToAdd()) {
ObjectClassComplexTypeDefinition auxDef = auxiliaryObjectClassMap.get(auxPval.getValue());
ResourceAttributeDefinition<Object> attrDef = auxDef.findAttributeDefinition(delta.getElementName());
if (attrDef != null) {
isInAddedAuxClass = true;
break;
// Change in (ordinary) attributes. Transform to the ConnId attributes.
if (delta.isAdd()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToAdd()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
if (mpAttr.getDefinition().isMultiValue()) {
attributesToAdd.add(connIdAttr);
} else {
// Force "update" for single-valued attributes instead of "add". This is saving one
// read in some cases. It should also make no substantial difference in such case.
// But it is working around some connector bugs.
attributesToUpdate.add(connIdAttr);
}
}
}
// Change in (ordinary) attributes. Transform to the ConnId attributes.
if (delta.isAdd()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToAdd()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
if (mpAttr.getDefinition().isMultiValue()) {
attributesToAdd.add(connIdAttr);
} else {
// Force "update" for single-valued attributes instead of "add". This is saving one
// read in some cases. It should also make no substantial difference in such case.
// But it is working around some connector bugs.
attributesToUpdate.add(connIdAttr);
if (delta.isDelete()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
if (mpAttr.getDefinition().isMultiValue() || isInRemovedAuxClass) {
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToDelete()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
attributesToRemove.add(connIdAttr);
} else {
// Force "update" for single-valued attributes instead of "add". This is saving one
// read in some cases.
// Update attribute to no values. This will efficiently clean up the attribute.
// It should also make no substantial difference in such case.
// But it is working around some connector bugs.
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
// update with EMTPY value. The mpAttr.addValues() is NOT in this branch
attributesToUpdate.add(connIdAttr);
}
}
}
if (delta.isDelete()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
if (mpAttr.getDefinition().isMultiValue() || isInRemovedAuxClass) {
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToDelete()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
attributesToRemove.add(connIdAttr);
} else {
// Force "update" for single-valued attributes instead of "add". This is saving one
// read in some cases.
// Update attribute to no values. This will efficiently clean up the attribute.
// It should also make no substantial difference in such case.
// But it is working around some connector bugs.
if (delta.isReplace()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToReplace()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
// update with EMTPY value. The mpAttr.addValues() is NOT in this branch
attributesToUpdate.add(connIdAttr);
}
}
if (delta.isReplace()) {
ResourceAttribute<?> mpAttr = (ResourceAttribute<?>) delta.instantiateEmptyProperty();
mpAttr.addValues((Collection)PrismValue.cloneCollection(delta.getValuesToReplace()));
Attribute connIdAttr = icfConvertor.convertToConnIdAttribute(mpAttr, objectClassDef);
if (isInAddedAuxClass) {
attributesToAdd.add(connIdAttr);
} else {
attributesToUpdate.add(connIdAttr);
if (isInAddedAuxClass) {
attributesToAdd.add(connIdAttr);
} else {
attributesToUpdate.add(connIdAttr);
}
}
} else if (delta.getParentPath().equivalent(new ItemPath(ShadowType.F_ACTIVATION))) {
activationDeltas.add(delta);
} else if (delta.getParentPath().equivalent(
new ItemPath(new ItemPath(ShadowType.F_CREDENTIALS),
CredentialsType.F_PASSWORD))) {
passwordDelta = (PropertyDelta<ProtectedStringType>) delta;
} else if (delta.getPath().equivalent(new ItemPath(ShadowType.F_AUXILIARY_OBJECT_CLASS))) {
// already processed
} else {
throw new SchemaException("Change of unknown attribute " + delta.getPath());
}
} else if (delta.getParentPath().equivalent(new ItemPath(ShadowType.F_ACTIVATION))) {
activationDeltas.add(delta);
} else if (delta.getParentPath().equivalent(
new ItemPath(new ItemPath(ShadowType.F_CREDENTIALS),
CredentialsType.F_PASSWORD))) {
passwordDelta = (PropertyDelta<ProtectedStringType>) delta;
} else if (delta.getPath().equivalent(new ItemPath(ShadowType.F_AUXILIARY_OBJECT_CLASS))) {
// already processed

} else if (operation instanceof PasswordChangeOperation) {
passwordChangeOperation = (PasswordChangeOperation) operation;
// TODO: check for multiple occurrences and fail

} else if (operation instanceof ExecuteProvisioningScriptOperation) {
ExecuteProvisioningScriptOperation scriptOperation = (ExecuteProvisioningScriptOperation) operation;
additionalOperations.add(scriptOperation);

} else {
throw new SchemaException("Change of unknown attribute " + delta.getPath());
throw new IllegalArgumentException("Unknown operation type " + operation.getClass().getName()
+ ": " + operation);
}

} else if (operation instanceof PasswordChangeOperation) {
passwordChangeOperation = (PasswordChangeOperation) operation;
// TODO: check for multiple occurrences and fail

} else if (operation instanceof ExecuteProvisioningScriptOperation) {
ExecuteProvisioningScriptOperation scriptOperation = (ExecuteProvisioningScriptOperation) operation;
additionalOperations.add(scriptOperation);

} else {
throw new IllegalArgumentException("Unknown operation type " + operation.getClass().getName()
+ ": " + operation);

}

} catch (SchemaException | RuntimeException e) {
result.recordFatalError(e);
throw e;
}

if (LOGGER.isTraceEnabled()) {
Expand Down Expand Up @@ -2844,6 +2850,7 @@ private Object executeScriptIcf(StateReporter reporter, ExecuteProvisioningScrip
} else if (scriptOperation.isResourceHost()) {
icfOpName = "runScriptOnResource";
} else {
result.recordFatalError("Where to execute the script?");
throw new IllegalArgumentException("Where to execute the script?");
}

Expand Down
6 changes: 5 additions & 1 deletion ...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
View file
Expand Up @@ -319,7 +319,11 @@ Attribute convertToConnIdAttribute(ResourceAttribute<?> mpAttribute, ObjectClass
connIdAttributeValues.add(UcfUtil.convertValueToIcf(pval, protector, mpAttribute.getElementName()));
}

return AttributeBuilder.build(connIdAttrName, connIdAttributeValues);
try {
return AttributeBuilder.build(connIdAttrName, connIdAttributeValues);
} catch (IllegalArgumentException e) {
throw new SchemaException(e.getMessage(), e);
}
}

private <T> T getSingleValue(Attribute icfAttr, Class<T> type) throws SchemaException {
Expand Down

0 comments on commit 4a77515

Please sign in to comment.