Resolve dependencies to untagged contexts only

When looking for dependency sources/targets, we match only contexts with null tag. This restores the behavior of midPoint 4.5 and earlier, and gives more determinism to the processing.
Evolveum · Jun 9, 2022 · 9feca71 · 9feca71
1 parent 36650b9
commit 9feca71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
@@ -1812,6 +1812,10 @@ public int getOrder() {
         return key.getOrder();
     }
 
+    public String getTag() {
+        return key.getTag();
+    }
+
     /** Use with care! */
     @Experimental
     public boolean isDefaultForKind(@NotNull ShadowKindType kind) {

diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
@@ -490,7 +490,8 @@ private LensProjectionContext findFirstUpstreamContext(
     public static boolean matches(LensProjectionContext ctx, ResourceObjectTypeDependencyType dependency) {
         return getResourceOidRequired(dependency).equals(ctx.getResourceOid())
                 && getKindRequired(dependency) == ctx.getKind()
-                && intentMatches(ctx, dependency);
+                && intentMatches(ctx, dependency)
+                && ctx.getTag() == null; // This is how it was before 4.6.
     }
 
     private static boolean intentMatches(LensProjectionContext ctx, ResourceObjectTypeDependencyType dependency) {