ProviderType: inheritance + package level

---
 Signed-off-by: Peter Kriens <[email protected]>

Signed-off-by: Peter Kriens <[email protected]>

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

@@ -147,6 +147,8 @@ public class Analyzer extends Processor {
 	private Set<PackageRef>							nonClassReferences		= new HashSet<>();
 	private Set<Check>								checks;
 	private final Map<TypeRef, String>				bcpTypes				= map();
+	final TypeRef									providerType			= getTypeRef(
+		"org/osgi/annotation/versioning/ProviderType");
 
 	public enum Check {
 		ALL,
@@ -2170,18 +2172,31 @@ Set<PackageRef> findProvidedPackages() throws Exception {
 		return providers;
 	}
 
-	private boolean isProvider(TypeRef t) {
-		Clazz c;
+
+	boolean isProvider(TypeRef t) {
+		if (t == null || t.isJava())
+			return false;
+
 		try {
-			c = findClass(t);
+
+			if (isProvider(t.getPackageRef()))
+				return true;
+
+			Clazz c = findClass(t);
+
+			return c.annotations()
+				.contains(providerType) || isProvider(c.superClass);
 		} catch (Exception e) {
 			return false;
 		}
-		if (c == null)
-			return false;
+	}
 
-		TypeRef providerType = getTypeRef("org/osgi/annotation/versioning/ProviderType");
-		return c.annotations()
+	boolean isProvider(PackageRef packageRef) throws Exception {
+		if (packageRef == null)
+			return false;
+		TypeRef packageInfo = getTypeRef(packageRef.binaryName.concat("/package-info"));
+		Clazz c = findClass(packageInfo);
+		return c != null && c.annotations()
 			.contains(providerType);
 	}
 
@@ -3212,6 +3227,7 @@ public PackageRef getPackageRef(String binaryName) {
 	public TypeRef getTypeRefFrom(Class<?> clazz) {
 		return descriptors.getTypeRefFromFQN(clazz.getName());
 	}
+
 	public TypeRef getTypeRefFromFQN(String fqn) {
 		return descriptors.getTypeRefFromFQN(fqn);
 	}
@@ -3865,10 +3881,9 @@ public void addDelta(Jar delta) {
 	}
 
 	/**
-	 * Useful to reuse the annotation processing. The Annotation
-	 * can be created from other sources than Java code. This
-	 * is mostly useful for the annotations that generate Manifest
-	 * headers.
+	 * Useful to reuse the annotation processing. The Annotation can be created
+	 * from other sources than Java code. This is mostly useful for the
+	 * annotations that generate Manifest headers.
 	 */
 	public void addAnnotation(Annotation ann, TypeRef c) throws Exception {
 		Clazz clazz = findClass(c);

biz.aQute.bndlib/test/aQute/bnd/osgi/AnalyzerTest.java

@@ -0,0 +1,43 @@
+package aQute.bnd.osgi;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import aQute.bnd.osgi.providertype.TestProviderInheritance;
+import aQute.bnd.osgi.providertype.packg.TestProviderInheritancePackage;
+import aQute.lib.io.IO;
+
+class AnalyzerTest {
+
+	/**
+	 * Test provider type inheritance and package
+	 */
+
+	@Test
+	public void testProviderInheritance() throws Exception {
+		try (Builder outer = new Builder()) {
+			try (Builder builder = new Builder()) {
+				builder.addClasspath(IO.getFile("bin_test"));
+				builder.setProperty("-includepackage", "aQute.bnd.osgi.providertype.*");
+				builder.build();
+				assertThat(builder.check()).isTrue();
+
+				assertThat(isProvider(builder, TestProviderInheritance.Top.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritance.Middle.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritance.Bottom.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritance.None.class)).isFalse();
+
+				assertThat(isProvider(builder, TestProviderInheritancePackage.Top.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritancePackage.Middle.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritancePackage.Bottom.class)).isTrue();
+				assertThat(isProvider(builder, TestProviderInheritancePackage.None.class)).isTrue();
+			}
+		}
+	}
+
+	private boolean isProvider(Builder builder, Class<?> type) {
+		return builder.isProvider(builder.getTypeRefFromFQN(type.getName()));
+	}
+
+}

biz.aQute.bndlib/test/aQute/bnd/osgi/providertype/TestProviderInheritance.java

@@ -0,0 +1,15 @@
+package aQute.bnd.osgi.providertype;
+
+import org.osgi.annotation.versioning.ProviderType;
+
+public class TestProviderInheritance {
+	@ProviderType
+	public static class Top {}
+
+	public static class Middle extends Top {}
+
+	public static class Bottom extends Middle {}
+
+	public static class None {}
+
+}

biz.aQute.bndlib/test/aQute/bnd/osgi/providertype/package-info.java

@@ -0,0 +1,6 @@
+@Version("1.0.0")
+@Export
+package aQute.bnd.osgi.providertype;
+
+import org.osgi.annotation.bundle.Export;
+import org.osgi.annotation.versioning.Version;

biz.aQute.bndlib/test/aQute/bnd/osgi/providertype/packg/TestProviderInheritancePackage.java

@@ -0,0 +1,12 @@
+package aQute.bnd.osgi.providertype.packg;
+
+public class TestProviderInheritancePackage {
+	public static class Top {}
+
+	public static class Middle extends Top {}
+
+	public static class Bottom extends Middle {}
+
+	public static class None {}
+
+}

biz.aQute.bndlib/test/aQute/bnd/osgi/providertype/packg/package-info.java

@@ -0,0 +1,8 @@
+@Version("1.0.0")
+@Export
+@ProviderType
+package aQute.bnd.osgi.providertype.packg;
+
+import org.osgi.annotation.bundle.Export;
+import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.Version;