Skip to content

Commit

Permalink
Visualization of container add/delete/replace + some fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Mar 16, 2016
1 parent 66360cc commit 7ef231c
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 71 deletions.
4 changes: 2 additions & 2 deletions model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.java
View file
Expand Up @@ -61,7 +61,7 @@ public class Resolver {
private Visualizer visualizer;

public <O extends ObjectType> void resolve(PrismObject<O> object, Task task, OperationResult result) throws SchemaException {
if (object.getDefinition() == null) {
/*if (object.getDefinition() == null) */{
Class<O> clazz = object.getCompileTimeClass();
if (clazz == null) {
warn(result, "Compile time class for " + toShortString(object) + " is not known");
Expand Down Expand Up @@ -90,7 +90,7 @@ public <O extends ObjectType> void resolve(ObjectDelta<O> objectDelta, Task task
warn(result, "Definition for " + objectTypeClass + " couldn't be found");
}
for (ItemDelta itemDelta : objectDelta.getModifications()) {
if (itemDelta.getDefinition() == null) {
/*if (itemDelta.getDefinition() == null)*/ {
ItemDefinition<?> def = objectDefinition.findItemDefinition(itemDelta.getPath());
if (def != null) {
itemDelta.applyDefinition(def);
Expand Down
221 changes: 163 additions & 58 deletions model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
View file
Expand Up @@ -37,6 +37,7 @@

import java.util.*;

import static com.evolveum.midpoint.prism.delta.ChangeType.*;
import static com.evolveum.midpoint.prism.path.ItemPath.EMPTY_PATH;
import static com.evolveum.midpoint.prism.path.ItemPath.isNullOrEmpty;
import static com.evolveum.midpoint.prism.polystring.PolyString.getOrig;
Expand Down Expand Up @@ -85,6 +86,7 @@ private SceneImpl visualize(PrismObject<? extends ObjectType> object, SceneImpl
scene.setChangeType(null);
scene.setName(createSceneName(object));
scene.setSourcePath(EMPTY_PATH);
scene.setSourceFullPath(EMPTY_PATH);
scene.setSourceDefinition(object.getDefinition());
scene.setSourceValue(object.getValue());
scene.setSourceDelta(null);
Expand All @@ -98,6 +100,7 @@ private SceneImpl visualize(PrismContainerValue<?> containerValue, SceneImpl own
NameImpl name = new NameImpl("id " + containerValue.getId()); // TODO
scene.setName(name);
scene.setSourcePath(EMPTY_PATH);
scene.setSourceFullPath(EMPTY_PATH);
if (containerValue.getConcreteTypeDefinition() != null) {
scene.setSourceDefinition(containerValue.getConcreteTypeDefinition());
} else if (containerValue.getParent() != null && containerValue.getParent().getDefinition() != null) {
Expand Down Expand Up @@ -150,6 +153,7 @@ private SceneImpl visualizeDelta(ObjectDelta<? extends ObjectType> objectDelta,
scene.setChangeType(objectDelta.getChangeType());
scene.setSourceDelta(objectDelta);
scene.setSourcePath(ItemPath.EMPTY_PATH);
scene.setSourceFullPath(ItemPath.EMPTY_PATH);
PrismObject<? extends ObjectType> object =
objectDelta.isAdd() ? objectDelta.getObjectToAdd() : getOldObject(objectDelta.getOid(), objectDelta.getObjectTypeClass(), context, task, result);
if (object != null) {
Expand Down Expand Up @@ -221,8 +225,19 @@ private void visualizeItems(SceneImpl scene, List<Item<?, ?>> items, Visualizati
for (PrismContainerValue<?> pcv : pc.getValues()) {
if (separate) {
SceneImpl si = new SceneImpl(scene);
NameImpl name = createSceneName(pc, pcv);
NameImpl name = new NameImpl(item.getElementName().getLocalPart());
name.setId(name.getSimpleName());
if (def != null) {
name.setDisplayName(def.getDisplayName());
}
si.setName(name);
if (def != null) {
si.setOperational(def.isOperational());
si.setSourceDefinition(def);
}
si.setSourcePath(new ItemPath(item.getElementName()));
si.setSourceFullPath(scene.getSourceFullPath().subPath(item.getElementName()));
si.setSourceDelta(null);
scene.addPartialScene(si);
currentScene = si;
}
Expand Down Expand Up @@ -262,76 +277,165 @@ private void visualizeItemDeltas(SceneImpl scene, Collection<? extends ItemDelta
List<ItemDelta<?, ?>> deltasToShow = new ArrayList<>(deltas);
// Collections.sort(deltasToShow, getDeltaDisplayOrderComparator());
for (ItemDelta<?, ?> delta : deltasToShow) {

ItemPath deltaParentPath = delta.getParentPath();
ItemPath deltaPath = delta.getPath();

if (delta instanceof ContainerDelta) {
// visualize container ADD, REPLACE, DELETE
visualizeContainerDelta((ContainerDelta) delta, scene, context, task, result);
} else {
SceneImpl sceneForItem = null;
if (isNullOrEmpty(deltaParentPath)) {
sceneForItem = scene;
} else {
sceneForItem = findPartialSceneByPath(scene, deltaParentPath);
if (sceneForItem == null) {
sceneForItem = new SceneImpl(scene);
sceneForItem.setChangeType(ChangeType.MODIFY);
NameImpl name = new NameImpl(deltaParentPath.toString());

if (delta.getDefinition() != null && delta.getDefinition().getDisplayName() != null) {
name.setDisplayName(delta.getDefinition().getDisplayName());
}
ItemPath deltaParentItemPath;
Long lastId;
if (deltaParentPath.last() instanceof IdItemPathSegment) {
deltaParentItemPath = deltaParentPath.allExceptLast();
lastId = ((IdItemPathSegment) deltaParentPath.last()).getId();
name.setId(String.valueOf(lastId));
} else {
deltaParentItemPath = deltaParentPath;
lastId = null;
}
sceneForItem.setName(name);
ItemPath sceneRelativePath = deltaParentPath.remainder(scene.getSourcePath());
ItemPath sceneRelativeItemPath = deltaParentItemPath.remainder(scene.getSourcePath());
sceneForItem.setSourcePath(sceneRelativePath);

PrismContainerValue<?> ownerPCV = scene.getSourceValue();
if (ownerPCV != null) {
Item<?,?> item = ownerPCV.findItem(sceneRelativeItemPath);
if (item instanceof PrismContainer) {
PrismContainer<?> container = (PrismContainer<?>) item;
sceneForItem.setSourceDefinition(container.getDefinition());
if (lastId == null) {
if (container.size() == 1) {
sceneForItem.setSourceValue(container.getValues().get(0));
}
} else {
PrismContainerValue<?> pcv = container.findValue(lastId);
if (pcv != null) {
sceneForItem.setSourceValue(pcv);
}
}
}
}
visualizeAtomicDelta(delta, scene, context, task, result);
}
}
}

sceneForItem.setSourceDelta(null);
private <C extends Containerable> void visualizeContainerDelta(ContainerDelta<C> delta, SceneImpl scene, VisualizationContext context, Task task, OperationResult result) {
if (delta.isEmpty()) {
return;
}
Collection<PrismContainerValue<C>> valuesToAdd;
Collection<PrismContainerValue<C>> valuesToDelete;
if (!delta.isReplace()) {
valuesToAdd = delta.getValuesToAdd();
valuesToDelete = delta.getValuesToDelete();
} else {
valuesToAdd = new ArrayList<>();
valuesToDelete = new ArrayList<>();
Collection<PrismContainerValue<C>> oldValues = delta.getEstimatedOldValues();
for (PrismContainerValue<C> newValue : delta.getValuesToReplace()) {
if (oldValues == null || !oldValues.contains(newValue)) {
valuesToAdd.add(newValue);
}
}
if (oldValues != null) {
for (PrismContainerValue<C> oldValue : oldValues) {
if (!delta.getValuesToReplace().contains(oldValue)) {
valuesToDelete.add(oldValue);
}
}
}
}
if (valuesToDelete != null) {
for (PrismContainerValue<C> value : valuesToDelete) {
visualizeContainerDeltaValue(value, DELETE, delta.getPath(), scene, context, task, result);
}
}
if (valuesToAdd != null) {
for (PrismContainerValue<C> value : valuesToAdd) {
visualizeContainerDeltaValue(value, ADD, delta.getPath(), scene, context, task, result);
}
}
}

private <C extends Containerable> void visualizeContainerDeltaValue(PrismContainerValue<C> value, ChangeType changeType,
ItemPath containerPath, SceneImpl owningScene, VisualizationContext context, Task task, OperationResult result) {
SceneImpl scene = createContainerScene(changeType, containerPath, owningScene);
scene.setSourceValue(value);
visualizeItems(scene, value.getItems(), context, task, result);

owningScene.addPartialScene(scene);
}

private SceneImpl createContainerScene(ChangeType changeType, ItemPath containerPath, SceneImpl owningScene) {
SceneImpl scene = new SceneImpl(owningScene);
scene.setChangeType(changeType);

ItemPath deltaParentItemPath = getDeltaParentItemPath(containerPath);
PrismContainerDefinition<?> sceneDefinition = getSceneDefinition(scene, deltaParentItemPath);

NameImpl name = createNameForContainerDelta(containerPath, scene);
scene.setName(name);

if (delta.getDefinition() != null) {
sceneForItem.setOperational(delta.getDefinition().isOperational());
if (sceneDefinition != null) {
scene.setOperational(sceneDefinition.isOperational());
scene.setSourceDefinition(sceneDefinition);
}

ItemPath sceneRelativePath = containerPath.remainder(owningScene.getSourcePath());
scene.setSourcePath(sceneRelativePath);
scene.setSourceFullPath(containerPath);
scene.setSourceDelta(null);
return scene;
}

private NameImpl createNameForContainerDelta(ItemPath deltaParentPath, SceneImpl ownerScene) {
NameImpl name = new NameImpl(deltaParentPath.toString());
name.setId(String.valueOf(getLastId(deltaParentPath)));
PrismContainerDefinition<?> sceneDefinition = getSceneDefinition(ownerScene, getDeltaParentItemPath(deltaParentPath));
if (sceneDefinition != null) {
name.setDisplayName(sceneDefinition.getDisplayName());
}
return name;
}

private ItemPath getDeltaParentItemPath(ItemPath deltaParentPath) {
if (deltaParentPath.last() instanceof IdItemPathSegment) {
return deltaParentPath.allExceptLast();
} else {
return deltaParentPath;
}
}

private Long getLastId(ItemPath deltaParentPath) {
if (deltaParentPath.last() instanceof IdItemPathSegment) {
return ((IdItemPathSegment) deltaParentPath.last()).getId();
} else {
return null;
}
}

private PrismContainerDefinition<?> getSceneDefinition(SceneImpl ownerScene, ItemPath deltaParentItemPath) {
PrismContainerDefinition<?> rootDefinition = getRootDefinition(ownerScene);
if (rootDefinition == null) {
return null;
} else {
return rootDefinition.findContainerDefinition(deltaParentItemPath);
}
}

private void visualizeAtomicDelta(ItemDelta<?, ?> delta, SceneImpl scene, VisualizationContext context, Task task, OperationResult result)
throws SchemaException {
ItemPath deltaParentPath = delta.getParentPath();
SceneImpl sceneForItem;
if (isNullOrEmpty(deltaParentPath)) {
sceneForItem = scene;
} else {
sceneForItem = findPartialSceneByPath(scene, deltaParentPath);
if (sceneForItem == null) {
sceneForItem = createContainerScene(MODIFY, deltaParentPath, scene);
ItemPath sceneRelativeItemPath = getDeltaParentItemPath(deltaParentPath).remainder(scene.getSourcePath());

PrismContainerValue<?> ownerPCV = scene.getSourceValue();
if (ownerPCV != null) {
Item<?,?> item = ownerPCV.findItem(sceneRelativeItemPath);
if (item instanceof PrismContainer) {
PrismContainer<?> container = (PrismContainer<?>) item;
sceneForItem.setSourceDefinition(container.getDefinition());
Long lastId = getLastId(deltaParentPath);
if (lastId == null) {
if (container.size() == 1) {
sceneForItem.setSourceValue(container.getValues().get(0));
}
} else {
PrismContainerValue<?> pcv = container.findValue(lastId);
if (pcv != null) {
sceneForItem.setSourceValue(pcv);
}
}
scene.addPartialScene(sceneForItem);
}
}
visualizeAtomicItemDelta(sceneForItem, delta, context, task, result);
scene.addPartialScene(sceneForItem);
}
}
visualizeAtomicItemDelta(sceneForItem, delta, context, task, result);
}

private PrismContainerDefinition<?> getRootDefinition(SceneImpl scene) {
while (scene.getOwner() != null) {
scene = scene.getOwner();
}
return scene.getSourceDefinition();
}

private SceneImpl findPartialSceneByPath(SceneImpl scene, ItemPath deltaParentPath) {
for (SceneImpl subscene : scene.getPartialScenes()) {
if (subscene.getSourcePath().equivalent(deltaParentPath)) {
if (subscene.getSourceFullPath().equivalent(deltaParentPath) && subscene.getChangeType() == MODIFY) {
return subscene;
}
}
Expand Down Expand Up @@ -388,6 +492,7 @@ private SceneItemImpl createSceneItemCommon(Item<?,?> item) {
if (def != null) {
si.setOperational(def.isOperational());
}
si.setSourceItem(item);
si.setSourcePath(new ItemPath(item.getElementName()));
return si;
}
Expand Down
11 changes: 7 additions & 4 deletions .../src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneDeltaItemImpl.java
View file
Expand Up @@ -88,15 +88,18 @@ public String debugDump() {
public String debugDump(int indent) {
StringBuilder sb = new StringBuilder();
DebugUtil.indentDebugDump(sb, indent);
sb.append("ItemDelta: ").append(name).append(" [path: ").append(sourcePath).append("]");
sb.append("ItemDelta: ").append(name).append(" [rel-path: ").append(sourcePath).append("]");
if (sourceItem != null) {
sb.append(" SITEM");
sb.append(" ITEM");
if (sourceItem.getDefinition() != null) {
sb.append(" SDEF");
sb.append(" DEF(").append(sourceItem.getDefinition().getName().getLocalPart()).append(")");
}
}
if (sourceDelta != null) {
sb.append(" SDELTA");
sb.append(" DELTA");
}
if (operational) {
sb.append(" OPER");
}
sb.append("\n");
DebugUtil.indentDebugDump(sb, indent+1);
Expand Down
21 changes: 17 additions & 4 deletions ...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneImpl.java
View file
Expand Up @@ -42,6 +42,7 @@ public class SceneImpl implements Scene, DebugDumpable {
private final SceneImpl owner;
private boolean operational;
private ItemPath sourcePath;
private ItemPath sourceFullPath;
private PrismContainerValue<?> sourceValue;
private PrismContainerDefinition<?> sourceDefinition;
private ObjectDelta<?> sourceDelta;
Expand Down Expand Up @@ -109,6 +110,14 @@ public void setSourcePath(ItemPath sourcePath) {
this.sourcePath = sourcePath;
}

public ItemPath getSourceFullPath() {
return sourceFullPath;
}

public void setSourceFullPath(ItemPath sourceFullPath) {
this.sourceFullPath = sourceFullPath;
}

@Override
public PrismContainerValue<?> getSourceValue() {
return sourceValue;
Expand Down Expand Up @@ -153,15 +162,19 @@ public String debugDump(int indent) {
} else {
sb.append("(unnamed)");
}
sb.append(" [path: ").append(sourcePath).append("]");
sb.append(" [rel-path: ").append(sourcePath).append("]");
sb.append(" [full-path: ").append(sourceFullPath).append("]");
if (sourceValue != null) {
sb.append(" SVAL");
sb.append(" VAL");
}
if (sourceDefinition != null) {
sb.append(" SDEF");
sb.append(" DEF(").append(sourceDefinition.getName().getLocalPart()).append(")");
}
if (sourceDelta != null) {
sb.append(" SDELTA");
sb.append(" DELTA");
}
if (operational) {
sb.append(" OPER");
}
for (SceneItemImpl dataItem : items) {
sb.append("\n");
Expand Down
9 changes: 6 additions & 3 deletions ...-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/SceneItemImpl.java
View file
Expand Up @@ -96,13 +96,16 @@ public String debugDump() {
public String debugDump(int indent) {
StringBuilder sb = new StringBuilder();
DebugUtil.indentDebugDump(sb, indent);
sb.append("Item: ").append(name).append(" [path: ").append(sourcePath).append("]");
sb.append("Item: ").append(name).append(" [rel-path: ").append(sourcePath).append("]");
if (sourceItem != null) {
sb.append(" SITEM");
sb.append(" ITEM");
if (sourceItem.getDefinition() != null) {
sb.append(" SDEF");
sb.append(" DEF(").append(sourceItem.getDefinition().getName().getLocalPart()).append(")");
}
}
if (operational) {
sb.append(" OPER");
}
sb.append("\n");
DebugUtil.indentDebugDump(sb, indent+1);
sb.append("VALUES: ").append(newValues);
Expand Down

0 comments on commit 7ef231c

Please sign in to comment.