Maintain collection-order in FeatureFilter and FeatureConditionPack

This ensure the order of mined conditions is maintained throughout the process, as described in: eclipse-passage#1105
HannesWell · Jul 1, 2022 · 07e2e44 · 07e2e44
1 parent f944890
commit 07e2e44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FeatureFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FeatureFilter.java
@@ -14,6 +14,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -56,7 +57,7 @@ private Collection<T> filter(Collection<T> targets) {
 				.map(target -> map.apply(target, feature))//
 				.filter(Optional::isPresent) //
 				.map(Optional::get) //
-				.collect(Collectors.toSet());
+				.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
 }
diff --git a/...se.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/FeatureConditionPack.java b/...se.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/FeatureConditionPack.java
@@ -13,6 +13,7 @@
 package org.eclipse.passage.lic.base.conditions;
 
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -49,7 +50,7 @@ public Collection<Condition> conditions() {
 		// FIXME: work for CachingFunction
 		return parent.conditions().stream()//
 				.filter(condition -> condition.feature().equals(feature))//
-				.collect(Collectors.toSet());
+				.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
 	@Override