Merge pull request #6052 from kwin/bugfix/designate-allow-same-value-…

…for-factoryPid-and-pid Allow duplicate pids in designates if one is for regular the other for
bndtools · Mar 15, 2024 · 9377a7d · 9377a7d
2 parents c951830 + 1a3880f
commit 9377a7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/biz.aQute.bndlib.tests/test/test/metatype/SpecMetatypeTest.java b/biz.aQute.bndlib.tests/test/test/metatype/SpecMetatypeTest.java
@@ -321,6 +321,7 @@ public interface DupPid4 {
 
 	}
 
+	// this is allowed (no duplicate)
 	@ObjectClassDefinition(pid = {
 		"3"
 	}, factoryPid = {
@@ -330,13 +331,15 @@ public interface DupPid5 {
 
 	}
 
+	// this is allowed (no duplicate)
 	@ObjectClassDefinition(pid = {
 		"4"
 	})
 	public interface DupPid6 {
 
 	}
 
+	// this is allowed (no duplicate)
 	@ObjectClassDefinition(factoryPid = {
 		"4"
 	})
@@ -354,7 +357,7 @@ public void testPidCollision() throws Exception {
 		b.setProperty(Constants.METATYPE_ANNOTATIONS, name.substring(0, name.length() - "1".length()) + "*");
 		b.build();
 		System.err.println(b.getErrors());
-		assertEquals(4, b.getErrors()
+		assertEquals(2, b.getErrors()
 			.size());
 	}
 

diff --git a/biz.aQute.bndlib/src/aQute/bnd/metatype/MetatypeAnnotations.java b/biz.aQute.bndlib/src/aQute/bnd/metatype/MetatypeAnnotations.java
@@ -105,6 +105,7 @@ public boolean analyzeJar(Analyzer analyzer) throws Exception {
 
 		Set<String> ocdIds = new HashSet<>();
 		Set<String> pids = new HashSet<>();
+		Set<String> factoryPids = new HashSet<>();
 
 		Instructions instructions = new Instructions(header);
 
@@ -142,8 +143,10 @@ public boolean analyzeJar(Analyzer analyzer) throws Exception {
 				analyzer.error("Duplicate OCD id %s from class %s; known ids %s", definition.id, c.getFQN(), ocdIds);
 			}
 			for (DesignateDef dDef : definition.designates) {
-				if (dDef.pid != null && !pids.add(dDef.pid)) {
-					analyzer.error("Duplicate pid %s from class %s", dDef.pid, c.getFQN());
+				Set<String> relevantPids = dDef.factory ? factoryPids : pids;
+				if (dDef.pid != null && !relevantPids.add(dDef.pid)) {
+					analyzer.error("Duplicate %s from class %s", dDef.factory ? "factoryPid" : "pid", dDef.pid,
+						c.getFQN());
 				}
 			}
 			String name = "OSGI-INF/metatype/" + analyzer.validResourcePath(definition.id, "Invalid resource name")