Consider multiple versions when finding bundles in host runtime

Extracted from and required by:
- #2013

Author: HannesWell

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECore.java

@@ -18,7 +18,9 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -109,7 +111,7 @@ public class PDECore extends Plugin implements DebugOptionsListener {
 	 */
 	private static PDEPreferencesManager fPreferenceManager;
 
-	private Map<String, IPluginModelBase> fHostPlugins;
+	private Map<String, List<IPluginModelBase>> fHostPlugins;
 
 	public static PDECore getDefault() {
 		return inst;
@@ -221,7 +223,15 @@ public PDECore() {
 		inst = this;
 	}
 
-	public synchronized IPluginModelBase findPluginInHost(String id) {
+	public Stream<IPluginModelBase> findPluginInHost(String id) {
+		Map<String, List<IPluginModelBase>> hostPlugins = getHostPlugins();
+		if (hostPlugins == null) {
+			return null;
+		}
+		return hostPlugins.getOrDefault(id, List.of()).stream();
+	}
+
+	private synchronized Map<String, List<IPluginModelBase>> getHostPlugins() {
 		if (fHostPlugins == null) {
 			fHostPlugins = new HashMap<>();
 
@@ -239,12 +249,10 @@ public synchronized IPluginModelBase findPluginInHost(String id) {
 			PDEState state = new PDEState(pluginPaths, true, false, new NullProgressMonitor());
 			state.resolveState(false);
 
-			for (IPluginModelBase plugin : state.getTargetModels()) {
-				fHostPlugins.put(plugin.getPluginBase().getId(), plugin);
-			}
+			fHostPlugins = Arrays.stream(state.getTargetModels())
+					.collect(Collectors.groupingBy(p -> p.getPluginBase().getId()));
 		}
-
-		return fHostPlugins.get(id);
+		return fHostPlugins;
 	}
 
 	public PluginModelManager getModelManager() {

ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java

@@ -397,7 +397,7 @@ private IPluginModelBase findRequiredPluginInTargetOrHost(String id) throws Core
 		IPluginModelBase model = PluginRegistry.findModel(id);
 		if (model == null || !model.getBundleDescription().isResolved()) {
 			// prefer bundle from host over unresolved bundle from target
-			model = PDECore.getDefault().findPluginInHost(id);
+			model = PDECore.getDefault().findPluginInHost(id).max(Comparator.comparing(p -> p.getBundleDescription().getVersion())).orElse(null);
 		}
 		if (model == null) {
 			abort(NLS.bind(PDEMessages.JUnitLaunchConfiguration_error_missingPlugin, id), null, IStatus.OK);

ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java

@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -1089,7 +1090,8 @@ private IPluginModelBase findRequiredPluginInTargetOrHost(String id) throws Core
 		IPluginModelBase model = PluginRegistry.findModel(id);
 		if (model == null || !model.getBundleDescription().isResolved()) {
 			// prefer bundle from host over unresolved bundle from target
-			model = PDECore.getDefault().findPluginInHost(id);
+			model = PDECore.getDefault().findPluginInHost(id)
+					.max(Comparator.comparing(p -> p.getBundleDescription().getVersion())).orElse(null);
 		}
 		if (model == null) {
 			abort(NLS.bind(Messages.JUnitPluginLaunchConfigurationDelegate_error_missingPlugin, id), null, IStatus.OK);