Remove access to deprecated PackageAdmin Access in activator

Adjusting the tests to used the bundleContext to access org.eclipse.jdt.annotation, hence the initialization of the package admin can also be removed from the activator and therefore also the activator. Signed-off-by: Lars Vogel <[email protected]> Co-authored-by: Hannes Wellmann <[email protected]>
vogellacompany · Dec 6, 2024 · ecc8e59 · ecc8e59
1 parent 243787e
commit ecc8e59
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 56 deletions.
diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
@@ -27,6 +27,5 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  org.eclipse.jdt.internal.compiler.apt.dispatch
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Eclipse-BundleShape: dir
-Bundle-Activator: org.eclipse.jdt.core.tests.compiler.Activator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.jdt.core.tests.compiler
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/Activator.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/Activator.java
diff --git a/...mpiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractNullAnnotationTest.java b/...mpiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractNullAnnotationTest.java
@@ -16,12 +16,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Map;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 
 @SuppressWarnings({ "unchecked", "rawtypes" })
 public abstract class AbstractNullAnnotationTest extends AbstractComparableTest {
@@ -81,16 +83,22 @@ protected void setUp() throws Exception {
 		setUpAnnotationLib();
 	}
 
-	/**
-	 * @deprecated indirectly uses deprecated class PackageAdmin
-	 */
 	protected void setUpAnnotationLib() throws IOException {
 		if (this.LIBS == null) {
 			String[] defaultLibs = getDefaultClassPaths();
 			int len = defaultLibs.length;
 			this.LIBS = new String[len+1];
 			System.arraycopy(defaultLibs, 0, this.LIBS, 0, len);
 			this.LIBS[len] = getAnnotationLibPath();
+
+			Bundle[] bundles = FrameworkUtil.getBundle(this.getClass()).getBundleContext().getBundles();
+			File bundleFile = Arrays.stream(bundles)
+					.filter(b -> "org.eclipse.jdt.annotation".equals(b.getSymbolicName())) //
+					.findFirst().flatMap(FileLocator::getBundleFileLocation).orElseThrow();
+			if (bundleFile.isDirectory())
+				this.LIBS[len] = bundleFile.getPath()+"/bin";
+			else
+				this.LIBS[len] = bundleFile.getPath();
 		}
 	}