Remove compilation error resolution proposal for adding Junit 5 bundles

For junit-5 it's sufficient and recommended to just import the packages
needed for compilation. Alternatively it's also possible to require the
junit-jupiter-api bundle.

Both is already proposed by default and in both cases it's not necessary
to require the junit-4 bundle (org.junit) too.

Furthermore the current code seems to be partially incorrect, because
actually package names have to be checked while it seems that the code
assumed bundle names (which only coincidentally match).

As this extra proposal also complicates the code significantly, it is
removed with the recommendation to use the other standard proposals in
case of missing JUnit-5 dependencies too.

Removing it also avoids the need to handle the JUnit-6 case too.

Author: HannesWell

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java

@@ -185,11 +185,6 @@ private RequireBundleManifestChange(IProject project, ExportPackageDescription d
 			super(project, desc, cu, qualifiedTypeToImport);
 		}
 
-		private RequireBundleManifestChange(IProject project, String desc, CompilationUnit cu,
-				String qualifiedTypeToImport) {
-			super(project, desc, cu, qualifiedTypeToImport);
-		}
-
 		@Override
 		public Change perform(IProgressMonitor pm) throws CoreException {
 			PDEModelUtility.modifyModel(new ModelModification(getProject()) {
@@ -198,69 +193,43 @@ protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws Co
 					if (!(model instanceof IPluginModelBase base)) {
 						return;
 					}
-					String[] pluginIdStrings = null;
-					if ("JUnit 5 bundles".equals(getChangeObject())) { //$NON-NLS-1$
-						pluginIdStrings = getJUnit5Bundles();
-					}
-					if (getChangeObject() instanceof ExportPackageDescription) {
-						pluginIdStrings = new String[1];
-						pluginIdStrings[0] = ((ExportPackageDescription) getChangeObject()).getSupplier()
-								.getSymbolicName();
-					}
-					for (int i = 0; i < pluginIdStrings.length; i++) {
-						String pluginId = pluginIdStrings[i];
-						if (!isUndo()) {
-							IPluginImport[] imports = base.getPluginBase().getImports();
-							boolean duplicate = false;
-							for (IPluginImport iPluginImport : imports) {
-								if (iPluginImport.getId().equals(pluginId)) {
-									duplicate = true;
-									break;
-								}
-							}
-							if (duplicate) {
-								continue;
+					String pluginId = ((ExportPackageDescription) getChangeObject()).getSupplier().getSymbolicName();
+					if (!isUndo()) {
+						IPluginImport[] imports = base.getPluginBase().getImports();
+						boolean duplicate = false;
+						for (IPluginImport iPluginImport : imports) {
+							if (iPluginImport.getId().equals(pluginId)) {
+								duplicate = true;
+								break;
 							}
-							IPluginImport impt = base.getPluginFactory().createImport();
-							impt.setId(pluginId);
-							base.getPluginBase().add(impt);
-						} else {
-							IPluginImport[] imports = base.getPluginBase().getImports();
-							for (IPluginImport pluginImport : imports) {
-								if (pluginImport.getId().equals(pluginId)) {
-									base.getPluginBase().remove(pluginImport);
-								}
+						}
+						if (duplicate) {
+							return;
+						}
+						IPluginImport impt = base.getPluginFactory().createImport();
+						impt.setId(pluginId);
+						base.getPluginBase().add(impt);
+					} else {
+						IPluginImport[] imports = base.getPluginBase().getImports();
+						for (IPluginImport pluginImport : imports) {
+							if (pluginImport.getId().equals(pluginId)) {
+								base.getPluginBase().remove(pluginImport);
 							}
 						}
 					}
 				}
-
-				private String[] getJUnit5Bundles() {
-					return new String[] { "org.junit", "junit-jupiter-api" }; //$NON-NLS-1$ //$NON-NLS-2$
-				}
 			}, new NullProgressMonitor());
 
 			insertImport(getCompilationUnit(), getQualifiedTypeToImport(), pm);
 
 			if (!isUndo()) {
-				if (getChangeObject() instanceof ExportPackageDescription) {
-					return new RequireBundleManifestChange(getProject(), (ExportPackageDescription) getChangeObject(),
-							getCompilationUnit(), getQualifiedTypeToImport()) {
-						@Override
-						public boolean isUndo() {
-							return true;
-						}
-					};
-				}
-				if (getChangeObject() instanceof String) {
-					return new RequireBundleManifestChange(getProject(),(String) getChangeObject(),
-							getCompilationUnit(), getQualifiedTypeToImport()) {
-						@Override
-						public boolean isUndo() {
-							return true;
-						}
-					};
-				}
+				return new RequireBundleManifestChange(getProject(), (ExportPackageDescription) getChangeObject(),
+						getCompilationUnit(), getQualifiedTypeToImport()) {
+					@Override
+					public boolean isUndo() {
+						return true;
+					}
+				};
 			}
 			return null;
 		}
@@ -474,39 +443,6 @@ public static final Object createRequireBundleProposal(IProject project, ExportP
 		return createWrapper(change, type, relevance);
 	}
 
-	/**
-	 * Creates and returns a proposal which create multiple Require-Bundle entry in the
-	 * MANIFEST.MF (or corresponding plugin.xml) for desc name.
-	 *
-	 * @param project
-	 *            the project to be updated
-	 * @param desc
-	 *            multiple bundles that is to be  added as a Require-Bundle dependency
-	 *            based on description name
-	 * @param type
-	 *            the type of the proposal to be returned
-	 * @param relevance
-	 *            the relevance of the new proposal
-	 * @param qualifiedTypeToImport
-	 *            the qualified type name of the type that requires this
-	 *            proposal. If this argument and cu are supplied the proposal
-	 *            will add an import statement for this type to the source file
-	 *            in which the proposal was invoked.
-	 * @param cu
-	 *            the AST root of the java source file in which this fix was
-	 *            invoked
-	 * @see JavaResolutionFactory#TYPE_JAVA_COMPLETION
-	 * @see JavaResolutionFactory#TYPE_CLASSPATH_FIX
-	 */
-	public static final Object createRequireBundleProposal(IProject project, String desc, int type, int relevance,
-			CompilationUnit cu, String qualifiedTypeToImport) {
-		if (desc == null) {
-			return null;
-		}
-		AbstractManifestChange change = new RequireBundleManifestChange(project, desc, cu, qualifiedTypeToImport);
-		return createWrapper(change, type, relevance);
-	}
-
 	/**
 	 * Creates and returns a proposal which create an Import-Package entry in
 	 * the MANIFEST.MF for the package represented by desc. The object will be

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java

@@ -59,22 +59,6 @@ public void addResolutionModification(IProject project, ExportPackageDescription
 			}
 		}
 
-		/*
-		 * Creates proposal for adding require bundles in manifest file based on the
-		 * description name given
-		 */
-		public void addResolutionModification(IProject project, String desc, CompilationUnit cu,
-				String qualifiedTypeToImport) {
-			if (desc == null) {
-				return;
-			}
-			Object proposal = JavaResolutionFactory.createRequireBundleProposal(project, desc,
-					JavaResolutionFactory.TYPE_CLASSPATH_FIX, 16, cu, qualifiedTypeToImport);
-			if (proposal != null) {
-				fList.add(proposal);
-			}
-		}
-
 		/*
 		 * Returns all the ClasspathFixProposals which were found
 		 */
@@ -96,12 +80,6 @@ public ClasspathFixProposal[] getFixImportProposals(IJavaProject project, String
 			return new ClasspathFixProposal[0];
 		}
 		ClasspathFixCollector collector = new ClasspathFixCollector();
-		// Add require bundles for junit5
-		if (name.startsWith("junit-jupiter") || name.startsWith("junit-platform") || name.startsWith("org.junit.jupiter") || name.startsWith("org.junit.platform")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-			collector.addResolutionModification(project.getProject(), "JUnit 5 bundles", null, null);////$NON-NLS-1$
-			return collector.getProposals();
-		}
-
 		IRunnableWithProgress findOperation = new FindClassResolutionsOperation(project.getProject(), name, collector);
 		try {
 			findOperation.run(new NullProgressMonitor());