Fix for resolveNames option and other minor ones.

Evolveum · Jun 1, 2017 · efe3b81 · efe3b81
1 parent 8403214
commit efe3b81
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
@@ -1638,7 +1638,8 @@ public void keepPaths(List<ItemPath> keep) {
 		if (items != null) {
 			for (Iterator<Item<?, ?>> iterator = items.iterator(); iterator.hasNext(); ) {
 				Item<?, ?> item = iterator.next();
-				if (!ItemPath.containsSuperpathOrEquivalent(keep, item.getPath())) {
+				ItemPath itemPath = item.getPath().removeIdentifiers();
+				if (!ItemPath.containsSuperpathOrEquivalent(keep, itemPath)) {
 					iterator.remove();
 				} else {
 					if (item instanceof PrismContainer) {
@@ -1656,9 +1657,10 @@ public void removePaths(List<ItemPath> remove) {
 		if (items != null) {
 			for (Iterator<Item<?, ?>> iterator = items.iterator(); iterator.hasNext(); ) {
 				Item<?, ?> item = iterator.next();
-				if (ItemPath.containsEquivalent(remove, item.getPath())) {
+				ItemPath itemPath = item.getPath().removeIdentifiers();
+				if (ItemPath.containsEquivalent(remove, itemPath)) {
 					iterator.remove();
-				} else if (ItemPath.containsSuperpath(remove, item.getPath())) {
+				} else if (ItemPath.containsSuperpath(remove, itemPath)) {
 					if (item instanceof PrismContainer) {
 						((PrismContainer<?>) item).getValues().forEach(v -> v.removePaths(remove));
 					}

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
@@ -187,6 +187,10 @@ private void add(QName qname) {
 		this.segments.add(createSegment(qname, false));
 	}
 
+	private void add(ItemPathSegment segment) {
+		this.segments.add(segment);
+	}
+
 	public static ItemPathSegment createSegment(QName qname, boolean variable) {
 		if (ParentPathSegment.QNAME.equals(qname)) {
 			return new ParentPathSegment();
@@ -343,6 +347,16 @@ public ItemPath normalize() {
 		return normalizedPath;
 	}
 
+	public ItemPath removeIdentifiers() {
+		ItemPath rv = new ItemPath();
+		for (ItemPathSegment segment : segments) {
+			if (!(segment instanceof IdItemPathSegment)) {
+				rv.add(segment);
+			}
+		}
+		return rv;
+	}
+
 	/**
 	 * path1.compareComplex(path2) returns:
 	 *

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
@@ -652,12 +652,7 @@ public Response searchObjects(@PathParam("type") String type, QueryType queryTyp
 	}
 
 	private void removeExcludes(PrismObject<? extends ObjectType> object, List<String> exclude) {
-		for (ItemPath path : ItemPath.fromStringList(exclude)) {
-			Item item = object.findItem(path);		// reduce to "removeItem" after fixing that method implementation
-			if (item != null) {
-				object.removeItem(item.getPath(), Item.class);
-			}
-		}
+		object.getValue().removePaths(ItemPath.fromStringList(exclude));
 	}
 
 	@POST

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/NameResolutionHelper.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/NameResolutionHelper.java
@@ -56,7 +56,7 @@ public void resolveNamesIfRequested(Session session, List<? extends PrismContain
 		Visitor oidExtractor = visitable -> {
 			if (visitable instanceof PrismReferenceValue) {
 				PrismReferenceValue value = (PrismReferenceValue) visitable;
-				if (!ItemPath.containsSuperpathOrEquivalent(pathsToResolve, value.getPath())) {
+				if (!ItemPath.containsSubpathOrEquivalent(pathsToResolve, value.getPath())) {
 					return;
 				}
 				if (value.getTargetName() != null) {    // just for sure