[contract] bnd finds 2 contracts in bundle that provides only 1 if `-…

…contract` instruction is parameterized fixes #3726 Signed-off-by: Raymond Augé <[email protected]> Signed-off-by: BJ Hargrave <[email protected]>
bndtools · Mar 9, 2020 · 1c7c049 · 1c7c049
1 parent df73dea
commit 1c7c049
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/biz.aQute.bndlib.tests/test/test/ContractTest.java b/biz.aQute.bndlib.tests/test/test/ContractTest.java
@@ -20,6 +20,32 @@
 
 public class ContractTest extends TestCase {
 
+	public void testParameterized() throws Exception {
+		Jar bjara = getContractExporter("atest", "2.5", "${exports}");
+
+		Builder a = newBuilder();
+		a.setTrace(true);
+
+		a.addClasspath(bjara); // 1x
+		a.setProperty(Constants.CONTRACT, "atest;resolution:=optional,*");
+		a.setImportPackage("org.osgi.service.cm,*");
+		a.setProperty("Export-Package", "test.refer");
+		Jar ajar = a.build();
+		ajar.getManifest()
+			.write(System.out);
+		assertTrue(a.check());
+
+		Domain domain = Domain.domain(ajar.getManifest());
+		Parameters p = domain.getRequireCapability();
+		p.remove("osgi.ee");
+		assertNotNull(p);
+		assertEquals(1, p.size());
+		Attrs attrs = p.get("osgi.contract");
+		String optional = attrs.get("resolution:");
+		assertEquals("optional", optional);
+		assertEquals("(&(osgi.contract=atest)(version=2.5.0))", attrs.get("filter:"));
+	}
+
 	public void testDefinedContract() throws Exception {
 		Builder b = newBuilder();
 		b.setTrace(true);

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
@@ -1823,6 +1823,7 @@ public boolean referred(PackageRef packageName) {
 	 * @param contracted
 	 */
 	private void getManifestInfoFromClasspath(Jar jar, Packages classpathExports, Contracts contracts) {
+		logger.debug("get Manifest Info From Classpath for {}", jar);
 		try {
 			Manifest m = jar.getManifest();
 			if (m != null) {

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Contracts.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Contracts.java
@@ -76,6 +76,7 @@ public void clear() {
 	 * compare the imports against.
 	 */
 	void collectContracts(String from, Parameters pcs) {
+		logger.debug("collecting Contracts {} from {}", pcs, from);
 
 		contract: for (Entry<String, Attrs> p : pcs.entrySet()) {
 			String namespace = p.getKey();
@@ -98,7 +99,7 @@ void collectContracts(String from, Parameters pcs) {
 							continue contract;
 						}
 
-						logger.debug("accepted {}", p);
+						logger.debug("accepted {} from {}", p, from);
 
 						Contract c = new Contract();
 						c.name = name;
@@ -144,6 +145,8 @@ void collectContracts(String from, Parameters pcs) {
 						for (String pname : c.uses) {
 							contracted.add(analyzer.getPackageRef(pname), c);
 						}
+
+						break;
 					}
 				}
 			}