commit 47dc9826b62159af1ff8a600b6bc3de7bb06b46d
author Roy Teeuwen <roy.teeuwen@kbc.be> Wed Feb 10 14:06:27 2021 +0100
committer Roy Teeuwen <roy.teeuwen@kbc.be> Wed Feb 10 14:06:27 2021 +0100
tree c15d8613e579d5044ecd1c5e8718e2cd799ac92c
parent f4003ac0ca2ba798770b0c59cf6b6e5d208ef8ce

Fix the sorting for dynamic references based on a collection in the target class

core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java

diff --git a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
index 8adb41b..4fd8e64 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
@@ -22,15 +22,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.felix.scr.impl.inject.Annotations;
@@ -443,8 +435,12 @@
         // multiple references found? inject only first one with highest ranking
         if (matchingServices.size() > 1 && !reference.isCardinalityMultiple()) {
             matchingServices = matchingServices.subList(0, 1);
+        } else {
+            // sorting based on lowest ranking first
+            matchingServices.sort(Comparator.comparing(ServiceInfo::getServiceReference));
         }
 
+
         // try to invoke bind method
         for (ServiceInfo matchingService : matchingServices) {
             invokeBindUnbindMethod(reference, target, matchingService, true);