WIP filter repos for buildpath,testpath

Signed-off-by: Christoph Rueger <[email protected]>

Author: chrisrueger

biz.aQute.bndlib/src/aQute/bnd/build/Project.java

@@ -105,7 +105,6 @@
 import aQute.bnd.service.export.Exporter;
 import aQute.bnd.service.release.ReleaseBracketingPlugin;
 import aQute.bnd.service.specifications.RunSpecification;
-import aQute.bnd.service.tags.Tags;
 import aQute.bnd.stream.MapStream;
 import aQute.bnd.version.Version;
 import aQute.bnd.version.VersionRange;
@@ -638,6 +637,8 @@ public List<Container> getBundles(Strategy strategyx, String spec, String source
 			decorator.decorate(bundles, true);
 		}
 
+		List<RepositoryPlugin> repos = getRepositories(repoTagsBySource(source));
+
 		List<Container> result = new ArrayList<>();
 		try {
 			for (Entry<String, Attrs> entry : bundles.entrySet()) {
@@ -650,12 +651,12 @@ public List<Container> getBundles(Strategy strategyx, String spec, String source
 				boolean triedGetBundle = false;
 
 				if (bsn.indexOf('*') >= 0) {
-					return getBundlesWildcard(bsn, versionRange, strategyx, attrs);
+					return getBundlesWildcard(bsn, versionRange, strategyx, attrs, repos);
 				}
 
 				if (versionRange != null) {
 					if (versionRange.equals(VERSION_ATTR_LATEST) || versionRange.equals(VERSION_ATTR_SNAPSHOT)) {
-						found = getBundle(bsn, versionRange, strategyx, attrs);
+						found = getBundle(bsn, versionRange, strategyx, attrs, repos);
 						triedGetBundle = true;
 					}
 				}
@@ -694,7 +695,7 @@ public List<Container> getBundles(Strategy strategyx, String spec, String source
 							found = new Container(this, bsn, "file", Container.TYPE.EXTERNAL, f, error, attrs, null);
 						}
 					} else if (!triedGetBundle) {
-						found = getBundle(bsn, versionRange, strategyx, attrs);
+						found = getBundle(bsn, versionRange, strategyx, attrs, repos);
 					}
 				}
 
@@ -728,6 +729,25 @@ public List<Container> getBundles(Strategy strategyx, String spec, String source
 		return result;
 	}
 
+	private String[] repoTagsBySource(String source) {
+
+		if (source == null) {
+			return null;
+		}
+
+		if (Constants.BUILDPATH.equals(source)) {
+			return new String[] {
+				Constants.REPOTAGS_COMPILE
+			};
+		} else if (Constants.TESTPATH.equals(source)) {
+			return new String[] {
+				Constants.REPOTAGS_COMPILE, Constants.REPOTAGS_TEST
+			};
+		}
+		// TODO how to determine tag "debug"
+		return null;
+	}
+
 	/**
 	 * Just calls a new method with a default parm.
 	 *
@@ -751,6 +771,13 @@ Collection<Container> getBundles(Strategy strategy, String spec) throws Exceptio
 	public List<Container> getBundlesWildcard(String bsnPattern, String range, Strategy strategyx,
 		Map<String, String> attrs) throws Exception {
 
+		List<RepositoryPlugin> plugins = getRepositories();
+		return getBundlesWildcard(bsnPattern, range, strategyx, attrs, plugins);
+	}
+
+	private List<Container> getBundlesWildcard(String bsnPattern, String range, Strategy strategyx,
+		Map<String, String> attrs, List<RepositoryPlugin> repos) throws Exception {
+
 		if (VERSION_ATTR_SNAPSHOT.equals(range) || VERSION_ATTR_PROJECT.equals(range))
 			return Collections.singletonList(new Container(this, bsnPattern, range, TYPE.ERROR, null,
 				"Cannot use snapshot or project version with wildcard matches", null, null));
@@ -774,8 +801,7 @@ public List<Container> getBundlesWildcard(String bsnPattern, String range, Strat
 
 		SortedMap<String, Pair<Version, RepositoryPlugin>> providerMap = new TreeMap<>();
 
-		List<RepositoryPlugin> plugins = getRepositories();
-		for (RepositoryPlugin plugin : plugins) {
+		for (RepositoryPlugin plugin : repos) {
 
 			if (repoFilter != null && !repoFilter.match(plugin))
 				continue;
@@ -1256,6 +1282,14 @@ public void release(String name, boolean test) throws Exception {
 	public Container getBundle(String bsn, String range, Strategy strategy, Map<String, String> attrs)
 		throws Exception {
 
+		List<RepositoryPlugin> plugins = getRepositories();
+		return getBundle(bsn, range, strategy, attrs, plugins);
+
+	}
+
+	private Container getBundle(String bsn, String range, Strategy strategy, Map<String, String> attrs,
+		List<RepositoryPlugin> repos) throws Exception {
+
 		if (range == null)
 			range = "0";
 		if (attrs == null) {
@@ -1281,7 +1315,7 @@ public Container getBundle(String bsn, String range, Strategy strategy, Map<Stri
 		useStrategy = overrideStrategy(attrs, useStrategy);
 		RepoFilter repoFilter = parseRepoFilter(attrs);
 
-		List<RepositoryPlugin> plugins = getRepositories();
+
 
 		if (useStrategy == Strategy.EXACT) {
 			if (!Verifier.isVersion(range))
@@ -1291,7 +1325,8 @@ public Container getBundle(String bsn, String range, Strategy strategy, Map<Stri
 			// For an exact range we just iterate over the repos
 			// and return the first we find.
 			Version version = new Version(range);
-			for (RepositoryPlugin plugin : plugins) {
+
+			for (RepositoryPlugin plugin : repos) {
 				DownloadBlocker blocker = new DownloadBlocker(this);
 				File result = plugin.get(bsn, version, attrs, blocker);
 				if (result != null)
@@ -1307,7 +1342,8 @@ public Container getBundle(String bsn, String range, Strategy strategy, Map<Stri
 			// multiple repos we take the first
 
 			SortedMap<Version, RepositoryPlugin> versions = new TreeMap<>();
-			for (RepositoryPlugin plugin : plugins) {
+
+			for (RepositoryPlugin plugin : repos) {
 
 				if (repoFilter != null && !repoFilter.match(plugin))
 					continue;
@@ -1385,8 +1421,7 @@ public Container getBundle(String bsn, String range, Strategy strategy, Map<Stri
 		//
 
 		return new Container(this, bsn, range, Container.TYPE.ERROR, null,
-			bsn + ";version=" + range + " Not found in " + plugins, attrs, null);
-
+			bsn + ";version=" + range + " Not found in " + repos, attrs, null);
 	}
 
 	/**
@@ -1397,19 +1432,8 @@ public Container getBundle(String bsn, String range, Strategy strategy, Map<Stri
 	 *
 	 * @return a list of relevant repositories used by various methods.
 	 */
-	public List<RepositoryPlugin> getRepositories() {
-
-		return workspace.getRepositories()
-			.stream()
-			.filter(repo -> {
-				Tags tags = repo.getTags();
-
-				if (tags == null || tags.includesAny(Constants.REPOTAGS_COMPILE)) {
-					return true;
-				}
-				return false;
-			})
-			.toList();
+	public List<RepositoryPlugin> getRepositories(String... tags) {
+		return workspace.getRepositories(tags);
 	}
 
 	/**

biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java

@@ -98,6 +98,7 @@
 import aQute.bnd.service.repository.Prepare;
 import aQute.bnd.service.repository.RepositoryDigest;
 import aQute.bnd.service.repository.SearchableRepository.ResourceDescriptor;
+import aQute.bnd.service.tags.Tags;
 import aQute.bnd.stream.MapStream;
 import aQute.bnd.url.MultiURLConnectionHandler;
 import aQute.bnd.util.home.Home;
@@ -720,6 +721,29 @@ public List<RepositoryPlugin> getRepositories() {
 		return data.repositories.get();
 	}
 
+	/**
+	 * @param tags list tags to filter. <code>null</code> means all.
+	 * @return matching repositories.
+	 */
+	public List<RepositoryPlugin> getRepositories(String... tags) {
+
+		if (tags == null) {
+			return data.repositories.get();
+		}
+
+		return data.repositories.get()
+			.stream()
+			.filter(repo -> {
+				Tags repotags = repo.getTags();
+
+				if (repotags == null || repotags.includesAny(tags)) {
+					return true;
+				}
+				return false;
+			})
+			.toList();
+	}
+
 	private List<RepositoryPlugin> initRepositories() {
 		List<RepositoryPlugin> plugins = getPlugins(RepositoryPlugin.class);
 		for (RepositoryPlugin repo : plugins) {

biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java

@@ -259,17 +259,14 @@ public interface Constants {
 	String		REMOTEWORKSPACE								= "-remoteworkspace";
 
 	/**
-	 * tag for repos which should be used for Resolving bundles. This is also
+	 * tags for repos which should be used for Resolving bundles. This is also
 	 * the default tag for all repos which not have specified tags (also for bc
 	 * reasons)
 	 */
 	String		REPOTAGS_RESOLVE							= "resolve";
-
-	/**
-	 * tag for repos which should be included in project compilation
-	 * (-buildpath, -testpath).
-	 */
 	String		REPOTAGS_COMPILE							= "compile";
+	String		REPOTAGS_TEST								= "test";
+	String		REPOTAGS_DEBUG								= "debug";
 
 	String		RUNBLACKLIST								= "-runblacklist";
 	String		RUNREQUIRES									= "-runrequires";

biz.aQute.resolve/test/biz/aQute/resolve/RunResolutionTest.java

@@ -591,7 +591,7 @@ public MyBndrun(Workspace workspace, File propertiesFile) throws Exception {
 		}
 
 		@Override
-		public List<RepositoryPlugin> getRepositories() {
+		public List<RepositoryPlugin> getRepositories(String... tags) {
 			return getPlugins(RepositoryPlugin.class);
 		}