commit 1b2097f277c7978de7e07d9052edaa878fccd2a0
author Karl Pauls <kpauls@adobe.com> Mon Jan 20 18:30:52 2020 +0100
committer Karl Pauls <kpauls@adobe.com> Mon Jan 20 18:30:52 2020 +0100
tree 12319aa84d8954cb5f6884b38f91f2006b798d72
parent 1ba6cefbcabbb4d14bb06a7fbf13efb6e24fa168

SLING-8970 - adding test & fixing logic to consider inherited exports in region checks

src/main/java/org/apache/sling/feature/extension/apiregions/api/ApiRegions.java

diff --git a/src/main/java/org/apache/sling/feature/extension/apiregions/api/ApiRegions.java b/src/main/java/org/apache/sling/feature/extension/apiregions/api/ApiRegions.java
index 790d84c..e92908f 100644
--- a/src/main/java/org/apache/sling/feature/extension/apiregions/api/ApiRegions.java
+++ b/src/main/java/org/apache/sling/feature/extension/apiregions/api/ApiRegions.java
@@ -103,11 +103,16 @@
                 return false;
             }
         }
+        Set<ArtifactId> origins = new LinkedHashSet<>(Arrays.asList(region.getFeatureOrigins()));
+
         this.regions.stream()
             .filter(
                 existingRegion ->
-                    Stream.of(existingRegion.getFeatureOrigins())
-                        .anyMatch(Arrays.asList(region.getFeatureOrigins())::contains)
+                {
+                    ArtifactId[] targetOrigins = existingRegion.getFeatureOrigins();
+                    return (targetOrigins.length == 0 && origins.isEmpty())
+                        || Stream.of(targetOrigins).anyMatch(origins::contains);
+                }
             ).reduce((a,b) -> b).ifPresent(region::setParent);
 
         this.regions.add(region);