diff --git a/apitools/org.eclipse.pde.api.tools.ui/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ui/META-INF/MANIFEST.MF
index 18d7b18b27..077d05fa4d 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.api.tools.ui; singleton:=true
-Bundle-Version: 1.3.300.qualifier
+Bundle-Version: 1.3.400.qualifier
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinePreferencePage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinePreferencePage.java
index e9c0066e0f..266a6319d5 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinePreferencePage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinePreferencePage.java
@@ -17,7 +17,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -84,9 +86,9 @@ protected boolean isDefaultBaseline(Object element) {
 
 	IApiBaselineManager manager = ApiPlugin.getDefault().getApiBaselineManager();
 
-	private static HashSet<String> removed = new HashSet<>(8);
+	private static Set<String> removed = new HashSet<>(8);
 	CheckboxTableViewer tableviewer = null;
-	ArrayList<IApiBaseline> backingcollection = new ArrayList<>(8);
+	List<IApiBaseline> backingcollection = new ArrayList<>(8);
 	String newdefault = null;
 	private Button newbutton = null;
 
@@ -271,8 +273,7 @@ protected void doEdit(final IApiBaseline baseline) {
 	 * @return if the profile is the default or not
 	 */
 	protected boolean isDefault(Object element) {
-		if (element instanceof IApiBaseline) {
-			IApiBaseline profile = (IApiBaseline) element;
+		if (element instanceof IApiBaseline profile) {
 			if (newdefault == null) {
 				IApiBaseline def = ApiPlugin.getDefault().getApiBaselineManager().getDefaultApiBaseline();
 				if (def != null) {
@@ -378,7 +379,6 @@ private void findAndDeleteCompatibilityMarkers() {
 			}
 
 		}
-		return;
 	}
 
 	/**
@@ -429,11 +429,9 @@ protected void performDefaults() {
 	}
 	@Override
 	public void applyData(Object data) {
-		if (data instanceof Map) {
-			Map<?, ?> pageData = (Map<?, ?>) data;
+		if (data instanceof Map<?, ?> pageData) {
 			Object key = pageData.get(ApiErrorsWarningsPreferencePage.DATA_SELECT_OPTION_KEY);
-			if (key instanceof String) {
-				String option = (String) key;
+			if (key instanceof String option) {
 				if (option.equals(ApiBaselinePreferencePage.MISSING_BASELINE_OPTION)) {
 					block.selectOption(0);
 				}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
index 97881f198d..029604f356 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiBaselinesConfigurationBlock.java
@@ -14,6 +14,7 @@
 package org.eclipse.pde.api.tools.ui.internal.preferences;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.resources.IMarker;
@@ -187,7 +188,7 @@ public String toString() {
 	 *
 	 * @return the new {@link Key} for the {@link ApiUIPlugin} preference store
 	 */
-	protected final static Key getApiToolsKey(String key) {
+	protected static final Key getApiToolsKey(String key) {
 		return new Key(ApiPlugin.PLUGIN_ID, key);
 	}
 
@@ -222,8 +223,7 @@ protected final static Key getApiToolsKey(String key) {
 	private final SelectionListener selectionlistener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			if (e.widget instanceof Combo) {
-				Combo combo = (Combo) e.widget;
+			if (e.widget instanceof Combo combo) {
 				ControlData data = (ControlData) combo.getData();
 				data.key.setStoredValue(fLookupOrder[0], combo.getText(), fManager);
 				fDirty = true;
@@ -236,11 +236,11 @@ public void widgetSelected(SelectionEvent e) {
 	 * Listing of all of the {@link Combo}s added to the block
 	 */
 
-	private final ArrayList<Combo> fCombos = new ArrayList<>();
+	private final List<Combo> fCombos = new ArrayList<>();
 	/**
 	 * Listing of the label in the block
 	 */
-	private final ArrayList<Label> fLabels = new ArrayList<>();
+	private final List<Label> fLabels = new ArrayList<>();
 
 	/**
 	 * The context of settings locations to search for values in
@@ -323,7 +323,7 @@ public void performApply() {
 	private void save() {
 		if (fDirty) {
 			try {
-				ArrayList<Key> changes = new ArrayList<>();
+				List<Key> changes = new ArrayList<>();
 				collectChanges(fLookupOrder[0], changes);
 				filterOutChanges(changes);
 				if (changes.size() == 1 && changes.get(0).equals(KEY_MISSING_DEFAULT_API_PROFILE)) {
@@ -345,10 +345,8 @@ private void save() {
 							updateMissingBaselineMarkerSeverity(IMarker.SEVERITY_WARNING);
 						}
 						// if ignore to warning - calculate
-						if (original.equals(ApiPlugin.VALUE_IGNORE)) {
-							if (hasBaseline == false) {
-								createMissingBaselineMarker(IMarker.SEVERITY_WARNING);
-							}
+						if (original.equals(ApiPlugin.VALUE_IGNORE) && !hasBaseline) {
+							createMissingBaselineMarker(IMarker.SEVERITY_WARNING);
 						}
 
 					} else if (newval.equals(ApiPlugin.VALUE_ERROR)) {
@@ -357,17 +355,15 @@ private void save() {
 							updateMissingBaselineMarkerSeverity(IMarker.SEVERITY_ERROR);
 						}
 						// if ignore to warning - calculate
-						if (original.equals(ApiPlugin.VALUE_IGNORE)) {
-							if (hasBaseline == false) {
-								createMissingBaselineMarker(IMarker.SEVERITY_ERROR);
-							}
+						if (original.equals(ApiPlugin.VALUE_IGNORE) && !hasBaseline) {
+							createMissingBaselineMarker(IMarker.SEVERITY_ERROR);
 						}
 					}
 					fDirty = false;
 					return;
 				}
 				// code below probably redundant now
-				if (changes.size() > 0) {
+				if (!changes.isEmpty()) {
 					if (ApiBaselinePreferencePage.rebuildcount < 1) {
 						ApiBaselinePreferencePage.rebuildcount++;
 						fManager.applyChanges();
@@ -393,7 +389,7 @@ private void save() {
 	}
 
 	// Filter out redundant change
-	private void filterOutChanges(ArrayList<Key> changes) {
+	private void filterOutChanges(List<Key> changes) {
 		if (changes.size() == 2) {
 			Key k1 = changes.get(0);
 			String original1 = k1.getStoredValue(fLookupOrder[0], null);
@@ -401,10 +397,8 @@ private void filterOutChanges(ArrayList<Key> changes) {
 			if (original1 == null && newval1 == null) {
 				changes.remove(0);
 			}
-			if (original1 != null && newval1 != null) {
-				if (original1.equals(newval1)) {
-					changes.remove(0);
-				}
+			if (original1 != null && newval1 != null && original1.equals(newval1)) {
+				changes.remove(0);
 			}
 			if (changes.size() == 2) {
 				Key k2 = changes.get(1);
@@ -413,10 +407,8 @@ private void filterOutChanges(ArrayList<Key> changes) {
 				if (original2 == null && newval2 == null) {
 					changes.remove(1);
 				}
-				if (original2 != null && newval2 != null) {
-					if (original2.equals(newval2)) {
-						changes.remove(1);
-					}
+				if (original2 != null && newval2 != null && original2.equals(newval2)) {
+					changes.remove(1);
 				}
 			}
 
@@ -424,7 +416,7 @@ private void filterOutChanges(ArrayList<Key> changes) {
 	}
 
 	private void updateMissingBaselineMarkerSeverity(int severity) {
-		ArrayList<IMarker> marker = findMissingBaselineMarker();
+		List<IMarker> marker = findMissingBaselineMarker();
 
 		for (IMarker iMarker : marker) {
 			try {
@@ -436,7 +428,7 @@ private void updateMissingBaselineMarkerSeverity(int severity) {
 	}
 
 	private void deleteMissingBaselineMarker() {
-		ArrayList<IMarker> marker = findMissingBaselineMarker();
+		List<IMarker> marker = findMissingBaselineMarker();
 		for (IMarker iMarker : marker) {
 			try {
 				iMarker.delete();
@@ -508,17 +500,15 @@ private void createMissingBaselineMarkerOnProject(IResource res, int valueWarnin
 		}
 	}
 
-	private ArrayList<IMarker> findMissingBaselineMarker() {
-		ArrayList<IMarker> markList = new ArrayList<>();
+	private List<IMarker> findMissingBaselineMarker() {
+		List<IMarker> markList = new ArrayList<>();
 		int missing_plugin = ApiProblemFactory.createProblemId(IApiProblem.CATEGORY_API_BASELINE,
 				IElementDescriptor.RESOURCE, IApiProblem.API_PLUGIN_NOT_PRESENT_IN_BASELINE, IApiProblem.NO_FLAGS);
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 		try {
 			IMarker[] findMarkers = root.findMarkers(IApiMarkerConstants.DEFAULT_API_BASELINE_PROBLEM_MARKER, false,
 					IResource.DEPTH_ZERO);
-			for (IMarker iMarker : findMarkers) {
-				markList.add(iMarker);
-			}
+			Collections.addAll(markList, findMarkers);
 		} catch (CoreException e) {
 			ApiPlugin.log(e);
 		}
@@ -526,11 +516,10 @@ private ArrayList<IMarker> findMissingBaselineMarker() {
 		if (apiProjects == null) {
 			return markList;
 		}
-		for (IProject iProject : apiProjects) {
-			IMarker[] findMarkers;
+		for (IProject project : apiProjects) {
 			try {
-				findMarkers = iProject.findMarkers(IApiMarkerConstants.DEFAULT_API_BASELINE_PROBLEM_MARKER, false,
-						IResource.DEPTH_ZERO);
+				IMarker[] findMarkers = project.findMarkers(IApiMarkerConstants.DEFAULT_API_BASELINE_PROBLEM_MARKER,
+						false, IResource.DEPTH_ZERO);
 				for (IMarker iMarker : findMarkers) {
 					int id = ApiProblemFactory.getProblemId(iMarker);
 					if (id == missing_plugin) {
@@ -639,13 +628,10 @@ public static Key[] getAllKeys() {
 	public void selectOption(int index) {
 		if (fCombos.get(index) != null && !fCombos.get(index).isDisposed()) {
 			fCombos.get(index).setFocus();
-			if (fLabels.get(index) != null && !(fLabels.get(index).isDisposed())) {
-				if (org.eclipse.jface.util.Util.isMac()) {
-					if (fLabels.get(index) != null) {
-						highlight(fCombos.get(index).getParent(), fLabels.get(index), fCombos.get(index),
-								ConfigurationBlock.HIGHLIGHT_FOCUS);
-					}
-				}
+			Label label = fLabels.get(index);
+			if (label != null && !label.isDisposed() && org.eclipse.jface.util.Util.isMac()) {
+				highlight(fCombos.get(index).getParent(), label, fCombos.get(index),
+						ConfigurationBlock.HIGHLIGHT_FOCUS);
 			}
 		}
 	}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
index c16d18528b..9c47563997 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.ExecutionException;
@@ -585,10 +586,10 @@ public void widgetSelected(SelectionEvent e) {
 			ControlData data = (ControlData) widget.getData();
 			Key key = data.getKey();
 			String newValue = null;
-			if (widget instanceof Button) {
-				newValue = data.getValue(((Button) widget).getSelection());
-			} else if (widget instanceof Combo) {
-				newValue = data.getValue(((Combo) widget).getSelectionIndex());
+			if (widget instanceof Button button) {
+				newValue = data.getValue(button.getSelection());
+			} else if (widget instanceof Combo combo) {
+				newValue = data.getValue(combo.getSelectionIndex());
 			} else {
 				return;
 			}
@@ -677,22 +678,22 @@ public void widgetSelected(SelectionEvent e) {
 	/**
 	 * Listing of all of the {@link ExpandableComposite}s in the block
 	 */
-	private final ArrayList<ExpandableComposite> fExpComps = new ArrayList<>();
+	private final List<ExpandableComposite> fExpComps = new ArrayList<>();
 
 	/**
 	 * Listing of all of the {@link Combo}s added to the block
 	 */
-	private final ArrayList<Combo> fCombos = new ArrayList<>();
+	private final List<Combo> fCombos = new ArrayList<>();
 
 	/**
 	 * Map of combo and label
 	 */
-	private final HashMap<Combo, Label> fComboLabelMap = new HashMap<>();
+	private final Map<Combo, Label> fComboLabelMap = new HashMap<>();
 
 	/**
 	 * Listing of all of the {@link Button} with SWT.check added to the block
 	 */
-	private final ArrayList<Button> fCheckBoxes = new ArrayList<>();
+	private final List<Button> fCheckBoxes = new ArrayList<>();
 
 	/**
 	 * Control used inside the system library ee group
@@ -1241,8 +1242,7 @@ public void expansionStateChanged(ExpansionEvent e) {
 	 * Returns the scrolling parent for the given ExpandibleComposite object
 	 */
 	ScrolledComposite getScrollingParent(Object obj) {
-		if (obj instanceof ExpandableComposite) {
-			ExpandableComposite ecomp = (ExpandableComposite) obj;
+		if (obj instanceof ExpandableComposite ecomp) {
 			Composite parent = ecomp.getParent();
 			while (parent != null && !(parent instanceof ScrolledComposite)) {
 				parent = parent.getParent();
@@ -1251,8 +1251,8 @@ ScrolledComposite getScrollingParent(Object obj) {
 				return (ScrolledComposite) parent;
 			}
 		}
-		if (obj instanceof ScrolledComposite) {
-			return (ScrolledComposite) obj;
+		if (obj instanceof ScrolledComposite scrolledComposite) {
+			return scrolledComposite;
 		}
 		return null;
 	}
@@ -1299,9 +1299,9 @@ public void performApply() {
 	private void save() {
 		if (fDirty) {
 			try {
-				ArrayList<Key> changes = new ArrayList<>();
+				List<Key> changes = new ArrayList<>();
 				collectChanges(fLookupOrder[0], changes);
-				if (changes.size() > 0) {
+				if (!changes.isEmpty()) {
 					if (fRebuildcount < 1) {
 						fRebuildcount++;
 						fManager.applyChanges();
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsPreferencePage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsPreferencePage.java
index 7bca61547c..3e7a875fb7 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsPreferencePage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsPreferencePage.java
@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -106,7 +107,7 @@ protected Control createContents(Composite parent) {
 		link.setFont(comp.getFont());
 		link.setText(PreferenceMessages.ApiErrorsWarningsPreferencePage_1);
 		link.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
-			HashSet<IJavaProject> set = new HashSet<>();
+			Set<IJavaProject> set = new HashSet<>();
 			try {
 				IJavaProject[] projects = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProjects();
 				IProject project = null;
@@ -125,7 +126,7 @@ protected Control createContents(Composite parent) {
 			}
 			ProjectSelectionDialog psd = new ProjectSelectionDialog(getShell(), set);
 			if (psd.open() == IDialogConstants.OK_ID) {
-				HashMap<String, Boolean> data = new HashMap<>();
+				Map<String, Boolean> data = new HashMap<>();
 				data.put(NO_LINK, Boolean.TRUE);
 				PreferencesUtil.createPropertyDialogOn(getShell(), ((IJavaProject) psd.getFirstResult()).getProject(),
 						IApiToolsConstants.ID_ERRORS_WARNINGS_PROP_PAGE,
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
index 8e20efe16d..75a6093a76 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanConfigurationBlock.java
@@ -281,9 +281,9 @@ public void performApply() {
 	 */
 	private void save() {
 		try {
-			ArrayList<Key> changes = new ArrayList<>();
+			List<Key> changes = new ArrayList<>();
 			collectChanges(fLookupOrder[0], changes);
-			if (changes.size() > 0) {
+			if (!changes.isEmpty()) {
 				fManager.applyChanges();
 			}
 
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanPreferencePage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanPreferencePage.java
index 835de74871..9e6369dcb3 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanPreferencePage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiUseScanPreferencePage.java
@@ -17,7 +17,9 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -74,10 +76,8 @@ public class ApiUseScanPreferencePage extends PreferencePage implements IWorkben
 	public static final String ID = "org.eclipse.pde.api.tools.ui.apiusescan.prefpage"; //$NON-NLS-1$
 
 	private IWorkingCopyManager fManager;
-	CheckboxTableViewer fTableViewer;
-	HashSet<String> fLocationList = new HashSet<>();
-	Button remove = null;
-	Button editbutton = null;
+	private CheckboxTableViewer fTableViewer;
+	private final Set<String> fLocationList = new HashSet<>();
 
 	/**
 	 * Column provider for the use scan table
@@ -161,10 +161,10 @@ protected Control createContents(Composite parent) {
 			}
 		}));
 
-		editbutton = SWTFactory.createPushButton(bcomp, PreferenceMessages.ApiUseScanPreferencePage_1, null);
+		Button editbutton = SWTFactory.createPushButton(bcomp, PreferenceMessages.ApiUseScanPreferencePage_1, null);
 		editbutton.setEnabled(false);
 		editbutton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> edit()));
-		remove = SWTFactory.createPushButton(bcomp, PreferenceMessages.ApiUseScanPreferencePage_6, null);
+		Button remove = SWTFactory.createPushButton(bcomp, PreferenceMessages.ApiUseScanPreferencePage_6, null);
 		remove.setEnabled(false);
 		remove.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> removeLocation()));
 
@@ -175,7 +175,7 @@ protected Control createContents(Composite parent) {
 		});
 		fTableViewer.addDoubleClickListener(event -> edit());
 
-		HashMap<String, Object> linkdata = new HashMap<>();
+		Map<String, Object> linkdata = new HashMap<>();
 		linkdata.put(ApiErrorsWarningsPreferencePage.INITIAL_TAB, Integer.valueOf(ApiErrorsWarningsConfigurationBlock.API_USE_SCANS_PAGE_ID));
 		PreferenceLinkArea apiErrorLinkArea = new PreferenceLinkArea(comp, SWT.NONE, ApiErrorsWarningsPreferencePage.ID, PreferenceMessages.ApiUseScanPreferencePage_9, (IWorkbenchPreferenceContainer) getContainer(), linkdata);
 		GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
@@ -275,15 +275,11 @@ void removeLocation() {
 	 * Validates that the scan are all still valid
 	 */
 	private void validateScans() {
-		if (fLocationList.size() > 0) {
-			String loc = null;
-			for (Iterator<String> iterator = fLocationList.iterator(); iterator.hasNext();) {
-				loc = iterator.next();
-				if (!UseScanManager.isValidScanLocation(loc)) {
-					setErrorMessage(NLS.bind(PreferenceMessages.ApiUseScanPreferencePage_8, loc));
-					setValid(false);
-					return;
-				}
+		for (String loc : fLocationList) {
+			if (!UseScanManager.isValidScanLocation(loc)) {
+				setErrorMessage(NLS.bind(PreferenceMessages.ApiUseScanPreferencePage_8, loc));
+				setValid(false);
+				return;
 			}
 		}
 		setValid(true);
@@ -324,11 +320,11 @@ private void performInit() {
 
 		String location = getStoredValue(IApiCoreConstants.API_USE_SCAN_LOCATION, null);
 
-		ArrayList<String> checkedLocations = new ArrayList<>();
+		List<String> checkedLocations = new ArrayList<>();
 		if (location != null && location.length() > 0) {
 			String[] locations = location.split(UseScanManager.ESCAPE_REGEX + UseScanManager.LOCATION_DELIM);
 			for (String locationString : locations) {
-				String values[] = locationString.split(UseScanManager.ESCAPE_REGEX + UseScanManager.STATE_DELIM);
+				String[] values = locationString.split(UseScanManager.ESCAPE_REGEX + UseScanManager.STATE_DELIM);
 				fLocationList.add(values[0]);
 				if (Boolean.parseBoolean(values[1])) {
 					checkedLocations.add(values[0]);
@@ -362,10 +358,9 @@ private void applyChanges() {
 			IProject[] projects = Util.getApiProjects();
 			// If there are API projects in the workspace, ask the user if they
 			// should be cleaned and built to run the new tooling
-			if (projects != null) {
-				if (MessageDialog.openQuestion(getShell(), PreferenceMessages.ApiUseScanPreferencePage_11, PreferenceMessages.ApiUseScanPreferencePage_12)) {
-					Util.getBuildJob(projects).schedule();
-				}
+			if (projects != null && MessageDialog.openQuestion(getShell(),
+					PreferenceMessages.ApiUseScanPreferencePage_11, PreferenceMessages.ApiUseScanPreferencePage_12)) {
+				Util.getBuildJob(projects).schedule();
 			}
 		}
 		if (hasLocationChanges && newCheckedLocations.length == 0) {
@@ -392,9 +387,7 @@ private void findAndDeleteAPIUseScanMarkers() {
 						IResource.DEPTH_INFINITE);
 			} catch (CoreException e) {
 			}
-
 		}
-		return;
 	}
 
 	/**
@@ -409,11 +402,11 @@ private boolean hasLocationsChanges(String newLocations) {
 			return false;
 		}
 
-		ArrayList<String> oldCheckedElements = new ArrayList<>();
+		List<String> oldCheckedElements = new ArrayList<>();
 		if (oldLocations != null && oldLocations.length() > 0) {
 			String[] locations = oldLocations.split(UseScanManager.ESCAPE_REGEX + UseScanManager.LOCATION_DELIM);
 			for (String location : locations) {
-				String values[] = location.split(UseScanManager.ESCAPE_REGEX + UseScanManager.STATE_DELIM);
+				String[] values = location.split(UseScanManager.ESCAPE_REGEX + UseScanManager.STATE_DELIM);
 				if (Boolean.parseBoolean(values[1])) {
 					oldCheckedElements.add(values[0]);
 				}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ProjectSelectionDialog.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ProjectSelectionDialog.java
index 25780e0ec6..dfa1a6f843 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ProjectSelectionDialog.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/preferences/ProjectSelectionDialog.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.pde.api.tools.ui.internal.preferences;
 
-import java.util.HashSet;
+import java.util.Arrays;
 import java.util.Set;
 
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -56,20 +56,18 @@ public class ProjectSelectionDialog extends SelectionStatusDialog {
 	static class ApiJavaElementContentProvider extends StandardJavaElementContentProvider {
 		@Override
 		public Object[] getChildren(Object element) {
-			if (element instanceof IJavaModel) {
-				IJavaModel model = (IJavaModel) element;
-				HashSet<IJavaProject> set = new HashSet<>();
+			if (element instanceof IJavaModel model) {
 				try {
-					IJavaProject[] projects = model.getJavaProjects();
-					for (IJavaProject project : projects) {
-						if (project.getProject().hasNature(ApiPlugin.NATURE_ID)) {
-							set.add(project);
+					return Arrays.stream(model.getJavaProjects()).filter(p -> {
+						try {
+							return p.getProject().hasNature(ApiPlugin.NATURE_ID);
+						} catch (CoreException e) {
+							return false;
 						}
-					}
+					}).distinct().toArray();
 				} catch (CoreException ce) {
-					// ignore
+					return new Object[0];
 				}
-				return set.toArray();
 			}
 			return super.getChildren(element);
 		}
@@ -80,10 +78,10 @@ public Object[] getChildren(Object element) {
 	Set<IJavaProject> fProjectsWithSpecifics;
 
 	// sizing constants
-	private final static int SIZING_SELECTION_WIDGET_HEIGHT = 250;
-	private final static int SIZING_SELECTION_WIDGET_WIDTH = 300;
+	private static final int SIZING_SELECTION_WIDGET_HEIGHT = 250;
+	private static final int SIZING_SELECTION_WIDGET_WIDTH = 300;
 
-	private final static String DIALOG_SETTINGS_SHOW_ALL = "ProjectSelectionDialog.show_all"; //$NON-NLS-1$
+	private static final String DIALOG_SETTINGS_SHOW_ALL = "ProjectSelectionDialog.show_all"; //$NON-NLS-1$
 
 	/**
 	 * The filter for the viewer
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/APIFileGenerator.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/APIFileGenerator.java
index 6f256db666..7ebdcda0cd 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/APIFileGenerator.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/APIFileGenerator.java
@@ -111,12 +111,6 @@ public boolean isAPIToolsNature() {
 	public boolean allowNonApiProject = false;
 	public String encoding;
 
-	private static boolean isZipJarFile(String fileName) {
-		String normalizedFileName = fileName.toLowerCase();
-		return normalizedFileName.endsWith(".zip") //$NON-NLS-1$
-				|| normalizedFileName.endsWith(".jar"); //$NON-NLS-1$
-	}
-
 	public void generateAPIFile() {
 		if (this.binaryLocations == null || this.projectName == null || this.projectLocation == null || this.targetFolder == null) {
 			StringWriter out = new StringWriter();
@@ -176,7 +170,6 @@ public void generateAPIFile() {
 			}
 			apiDescriptionFile.delete();
 		}
-		Map<String, String> manifestMap = null;
 		// create the directory class file container used to resolve
 		// signatures during tag scanning
 		String[] allBinaryLocations = this.binaryLocations.split(File.pathSeparator);
@@ -196,6 +189,7 @@ public void generateAPIFile() {
 		if (manifestDir.exists() && manifestDir.isDirectory()) {
 			manifestFile = new File(manifestDir, "MANIFEST.MF"); //$NON-NLS-1$
 		}
+		Map<String, String> manifestMap = null;
 		if (manifestFile != null && manifestFile.exists()) {
 			try (BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(manifestFile));) {
 				manifestMap = ManifestElement.parseBundleManifest(inputStream, null);
@@ -211,7 +205,7 @@ public void generateAPIFile() {
 				Set<String> currentApiPackages = null;
 				if (currentManifest.exists()) {
 					try {
-						if (isZipJarFile(currentManifest.getName())) {
+						if (Util.isZipJarFile(currentManifest.getName())) {
 							try (ZipFile zipFile = new ZipFile(currentManifest)) {
 								final ZipEntry entry = zipFile.getEntry("META-INF/MANIFEST.MF"); //$NON-NLS-1$
 								if (entry != null) {
@@ -320,7 +314,7 @@ boolean isApi(String path) {
 	 *             names fail for some reason
 	 */
 	private Set<String> collectApiPackageNames(Map<String, String> manifestmap) throws BundleException {
-		HashSet<String> set = new HashSet<>();
+		Set<String> set = new HashSet<>();
 		ManifestElement[] packages = ManifestElement.parseHeader(Constants.EXPORT_PACKAGE, manifestmap.get(Constants.EXPORT_PACKAGE));
 		if (packages != null) {
 			for (int i = 0; i < packages.length; i++) {
@@ -358,7 +352,7 @@ private IApiTypeContainer getContainer(String location) {
 		if (!f.exists()) {
 			return null;
 		}
-		if (isZipJarFile(location)) {
+		if (Util.isZipJarFile(location)) {
 			return new ArchiveApiTypeContainer(null, location);
 		} else {
 			return new DirectoryApiTypeContainer(null, location);
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/AntFilterStore.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/AntFilterStore.java
index aace26e826..da71bba1ae 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/AntFilterStore.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/AntFilterStore.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.runtime.CoreException;
@@ -39,7 +40,7 @@ public class AntFilterStore extends FilterStore {
 
 	String fComponentId = null;
 	String fFiltersRoot = null;
-	public static ArrayList<IApiProblem> filteredAPIProblems = new ArrayList<>();
+	public static final List<IApiProblem> filteredAPIProblems = new ArrayList<>();
 	/**
 	 * Constructor
 	 */
@@ -99,11 +100,7 @@ protected void internalAddFilters(IApiProblem[] problems, String[] comments) {
 		}
 		// This filter store doesn't handle resources so all filters are added
 		// to GLOBAL
-		Set<IApiProblemFilter> globalFilters = fFilterMap.get(GLOBAL);
-		if (globalFilters == null) {
-			globalFilters = new HashSet<>();
-			fFilterMap.put(GLOBAL, globalFilters);
-		}
+		Set<IApiProblemFilter> globalFilters = fFilterMap.computeIfAbsent(GLOBAL, n -> new HashSet<>());
 
 		for (int i = 0; i < problems.length; i++) {
 			IApiProblem problem = problems[i];
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiFilterStore.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiFilterStore.java
index 537b1f54da..99516faee2 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiFilterStore.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiFilterStore.java
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -76,7 +77,7 @@ public class ApiFilterStore extends FilterStore implements IResourceChangeListen
 	/**
 	 * Map used to collect unused {@link IApiProblemFilter}s
 	 */
-	private HashMap<IResource, Set<IApiProblemFilter>> fUnusedFilters = null;
+	private Map<IResource, Set<IApiProblemFilter>> fUnusedFilters = null;
 
 	/**
 	 * The backing {@link IJavaProject}
@@ -85,7 +86,7 @@ public class ApiFilterStore extends FilterStore implements IResourceChangeListen
 
 	boolean fNeedsSaving = false;
 	boolean fTriggeredChange = false;
-	HashMap<IResource, Map<String, Set<IApiProblemFilter>>> fFilterMap;
+	Map<IResource, Map<String, Set<IApiProblemFilter>>> fFilterMap;
 
 	/**
 	 * Constructor
@@ -105,7 +106,7 @@ public void persistApiFilters() {
 		if (!fNeedsSaving) {
 			return;
 		}
-		final HashMap<IResource, Map<String, Set<IApiProblemFilter>>> filters = new LinkedHashMap<>(fFilterMap);
+		final Map<IResource, Map<String, Set<IApiProblemFilter>>> filters = new LinkedHashMap<>(fFilterMap);
 		WorkspaceJob job = new WorkspaceJob(Util.EMPTY_STRING) {
 			@Override
 			public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
@@ -122,7 +123,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 						return Status.CANCEL_STATUS;
 					}
 					String xml = getStoreAsXml(filters);
-					IFile file = project.getFile(getFilterFilePath(false));
+					IFile file = project.getFile(API_FILTERS_XML_PATH);
 					if (xml == null) {
 						if (ApiPlugin.DEBUG_FILTER_STORE) {
 							System.out.println("no XML to persist for plugin project component [" + fProject.getElementName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -212,11 +213,7 @@ public synchronized void addFilters(IApiProblemFilter[] filters) {
 				pTypeNames.put(typeName, pfilters);
 				fFilterMap.put(resource, pTypeNames);
 			} else {
-				pfilters = pTypeNames.get(typeName);
-				if (pfilters == null) {
-					pfilters = new HashSet<>();
-					pTypeNames.put(typeName, pfilters);
-				}
+				pfilters = pTypeNames.computeIfAbsent(typeName, n -> new HashSet<>());
 			}
 			fNeedsSaving |= pfilters.add(filter);
 		}
@@ -249,11 +246,7 @@ public synchronized IApiProblemFilter[] getFilters(IResource resource) {
 		if (pTypeNames == null) {
 			return FilterStore.NO_FILTERS;
 		}
-		List<IApiProblemFilter> allFilters = new ArrayList<>();
-		for (Set<IApiProblemFilter> values : pTypeNames.values()) {
-			allFilters.addAll(values);
-		}
-		return allFilters.toArray(new IApiProblemFilter[allFilters.size()]);
+		return pTypeNames.values().stream().flatMap(Set::stream).toArray(IApiProblemFilter[]::new);
 	}
 
 	@Override
@@ -309,8 +302,7 @@ public void dispose() {
 	@Override
 	public synchronized IResource[] getResources() {
 		initializeApiFilters();
-		Set<IResource> resources = fFilterMap.keySet();
-		return resources.toArray(new IResource[resources.size()]);
+		return fFilterMap.keySet().toArray(IResource[]::new);
 	}
 
 	@Override
@@ -394,13 +386,7 @@ synchronized String getStoreAsXml(Map<IResource, Map<String, Set<IApiProblemFilt
 		Set<Entry<IResource, Map<String, Set<IApiProblemFilter>>>> allFiltersEntrySet = filtermap.entrySet();
 		List<Entry<IResource, Map<String, Set<IApiProblemFilter>>>> allFiltersEntries = new ArrayList<>(allFiltersEntrySet.size());
 		allFiltersEntries.addAll(allFiltersEntrySet);
-		Collections.sort(allFiltersEntries, (o1, o2) -> {
-			Entry<IResource, Map<String, Set<IApiProblemFilter>>> entry1 = o1;
-			Entry<IResource, Map<String, Set<IApiProblemFilter>>> entry2 = o2;
-			String path1 = entry1.getKey().getFullPath().toOSString();
-			String path2 = entry2.getKey().getFullPath().toOSString();
-			return path1.compareTo(path2);
-		});
+		Collections.sort(allFiltersEntries, Comparator.comparing(e -> e.getKey().getFullPath().toOSString()));
 		for (Entry<IResource, Map<String, Set<IApiProblemFilter>>> allFiltersEntry : allFiltersEntries) {
 			IResource resource = allFiltersEntry.getKey();
 			Map<String, Set<IApiProblemFilter>> pTypeNames = allFiltersEntry.getValue();
@@ -410,13 +396,8 @@ synchronized String getStoreAsXml(Map<IResource, Map<String, Set<IApiProblemFilt
 			Set<Entry<String, Set<IApiProblemFilter>>> allTypeNamesEntriesSet = pTypeNames.entrySet();
 			List<Entry<String, Set<IApiProblemFilter>>> allTypeNamesEntries = new ArrayList<>(allTypeNamesEntriesSet.size());
 			allTypeNamesEntries.addAll(allTypeNamesEntriesSet);
-			Collections.sort(allTypeNamesEntries, (o1, o2) -> {
-				Entry<String, Set<IApiProblemFilter>> entry1 = o1;
-				Entry<String, Set<IApiProblemFilter>> entry2 = o2;
-				String typeName1 = entry1.getKey();
-				String typeName2 = entry2.getKey();
-				return typeName1.compareTo(typeName2);
-			});
+
+			Collections.sort(allTypeNamesEntries, Comparator.comparing(Entry::getKey));
 			for (Entry<String, Set<IApiProblemFilter>> entry : allTypeNamesEntries) {
 				String typeName = entry.getKey();
 				Set<IApiProblemFilter> filters = entry.getValue();
@@ -498,21 +479,17 @@ protected synchronized void initializeApiFilters() {
 			System.out.println("initializing api filter map for project [" + fProject.getElementName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		fFilterMap = new LinkedHashMap<>(5);
-		IPath filepath = getFilterFilePath(true);
-		IResource file = ResourcesPlugin.getWorkspace().getRoot().findMember(filepath, true);
-		if (file == null) {
+		IFile filterFile = fProject.getProject().getFile(API_FILTERS_XML_PATH);
+		if (!filterFile.exists()) {
 			if (ApiPlugin.DEBUG_FILTER_STORE) {
 				System.out.println(".api_filter file not found during initialization for project [" + fProject.getElementName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			return;
 		}
-		IFile filterFile = (IFile) file;
-		if (filterFile.exists()) {
-			try (InputStream contents = filterFile.getContents()) {
-				readFilterFile(contents);
-			} catch (CoreException | IOException e) {
-				ApiPlugin.log(e);
-			}
+		try (InputStream contents = filterFile.getContents()) {
+			readFilterFile(contents);
+		} catch (CoreException | IOException e) {
+			ApiPlugin.log(e);
 		}
 		// need to reset the flag during initialization if we are not going to
 		// persist
@@ -565,17 +542,6 @@ public void needsSaving() {
 		fNeedsSaving = true;
 	}
 
-	/**
-	 * @return the {@link IPath} to the filters file
-	 */
-	IPath getFilterFilePath(boolean includeproject) {
-		if (includeproject) {
-			IPath path = fProject.getPath();
-			return path.append(FilterStore.SETTINGS_FOLDER).append(IApiCoreConstants.API_FILTERS_XML_NAME);
-		}
-		return IPath.fromOSString(FilterStore.SETTINGS_FOLDER).append(IApiCoreConstants.API_FILTERS_XML_NAME);
-	}
-
 	static String getLineDelimiterPreference(IFile file) {
 		IScopeContext[] scopeContext;
 		if (file != null && file.getProject() != null) {
@@ -738,7 +704,7 @@ public void resourceChanged(IResourceChangeEvent event) {
 			return;
 		}
 		if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
-			IPath path = getFilterFilePath(true);
+			IPath path = fProject.getPath().append(API_FILTERS_XML_PATH);
 			IResourceDelta leafdelta = event.getDelta().findMember(path);
 			if (leafdelta == null) {
 				return;
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/FilterStore.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/FilterStore.java
index 6622db2d5a..80dd688aa0 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/FilterStore.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/FilterStore.java
@@ -22,6 +22,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -58,22 +60,24 @@ public class FilterStore implements IApiFilterStore {
 	 */
 	public static final int CURRENT_STORE_VERSION = 2;
 	/**
-	 * Constant representing the name of the .settings folder
+	 * Constant representing the path of the default path of the .api_filters file.
 	 */
-	static final String SETTINGS_FOLDER = ".settings"; //$NON-NLS-1$
+	static final IPath API_FILTERS_XML_PATH = IPath.fromOSString(".settings") //$NON-NLS-1$
+			.append(IApiCoreConstants.API_FILTERS_XML_NAME);
 	/**
 	 * The mapping of filters for this store.
 	 */
-	protected HashMap<String, Set<IApiProblemFilter>> fFilterMap = null;
+	protected Map<String, Set<IApiProblemFilter>> fFilterMap = null;
 	/**
 	 * The bundle component backing this store
 	 */
-	private BundleComponent fComponent = null;
+	private final BundleComponent fComponent;
 
 	/**
 	 * Constructor
 	 */
 	public FilterStore() {
+		fComponent = null;
 	}
 
 	/**
@@ -89,11 +93,7 @@ public void addFilters(IApiProblemFilter[] filters) {
 			initializeApiFilters();
 			// This store does not use resources so all filters are stored in
 			// the global set
-			Set<IApiProblemFilter> globalFilters = fFilterMap.get(GLOBAL);
-			if (globalFilters == null) {
-				globalFilters = new HashSet<>();
-				fFilterMap.put(GLOBAL, globalFilters);
-			}
+			Set<IApiProblemFilter> globalFilters = fFilterMap.computeIfAbsent(GLOBAL, n -> new HashSet<>());
 			Collections.addAll(globalFilters, filters);
 		}
 	}
@@ -155,7 +155,7 @@ protected synchronized void initializeApiFilters() {
 						filterstream = jarFile.getInputStream(filterfile);
 					}
 				} else {
-					File file = new File(loc, SETTINGS_FOLDER + File.separator + IApiCoreConstants.API_FILTERS_XML_NAME);
+					File file = new File(loc, API_FILTERS_XML_PATH.toOSString());
 					if (file.exists()) {
 						if (ApiPlugin.DEBUG_FILTER_STORE) {
 							System.out.println("found api filter file: [" + fComponent.getName() + "] at " + file); //$NON-NLS-1$ //$NON-NLS-2$
@@ -182,10 +182,7 @@ public boolean isFiltered(IApiProblem problem) {
 		if (fFilterMap == null || fFilterMap.isEmpty()) {
 			return false;
 		}
-		Set<IApiProblemFilter> globalFilters = fFilterMap.get(GLOBAL);
-		if (globalFilters == null) {
-			return false;
-		}
+		Set<IApiProblemFilter> globalFilters = fFilterMap.getOrDefault(GLOBAL, Set.of());
 		for (IApiProblemFilter filter : globalFilters) {
 			if (problemsMatch(filter.getUnderlyingProblem(), problem)) {
 				if (ApiPlugin.DEBUG_FILTER_STORE) {
@@ -260,17 +257,14 @@ private boolean argumentsEquals(String[] problemMessageArguments, String[] filte
 					if (filterProblemIndex == -1) {
 						return false; // simple names should match
 					}
-					if (filterProblemMessageArgument.substring(filterProblemIndex + 1).equals(problemMessageArgument)) {
-						continue;
-					} else {
+					if (!filterProblemMessageArgument.substring(filterProblemIndex + 1)
+							.equals(problemMessageArgument)) {
 						return false;
 					}
 				} else if (filterProblemIndex != -1) {
 					return false; // fully qualified name should match
 				} else {
-					if (problemMessageArgument.substring(index + 1).equals(filterProblemMessageArgument)) {
-						continue;
-					} else {
+					if (!problemMessageArgument.substring(index + 1).equals(filterProblemMessageArgument)) {
 						return false;
 					}
 				}
@@ -332,8 +326,8 @@ protected void readFilterFile(InputStream contents) throws IOException {
 			return;
 		}
 		NodeList resources = root.getElementsByTagName(IApiXmlConstants.ELEMENT_RESOURCE);
-		ArrayList<IApiProblem> newfilters = new ArrayList<>();
-		ArrayList<String> comments = new ArrayList<>();
+		List<IApiProblem> newfilters = new ArrayList<>();
+		List<String> comments = new ArrayList<>();
 		for (int i = 0; i < resources.getLength(); i++) {
 			Element element = (Element) resources.item(i);
 			String typeName = element.getAttribute(IApiXmlConstants.ATTR_TYPE);
@@ -389,11 +383,7 @@ protected void internalAddFilters(IApiProblem[] problems, String[] comments) {
 		}
 		// This filter store doesn't handle resources so all filters are added
 		// to GLOBAL
-		Set<IApiProblemFilter> globalFilters = fFilterMap.get(GLOBAL);
-		if (globalFilters == null) {
-			globalFilters = new HashSet<>();
-			fFilterMap.put(GLOBAL, globalFilters);
-		}
+		Set<IApiProblemFilter> globalFilters = fFilterMap.computeIfAbsent(GLOBAL, n -> new HashSet<>());
 
 		for (int i = 0; i < problems.length; i++) {
 			IApiProblem problem = problems[i];
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
index 22dc993cb2..f1cf5bbef8 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
@@ -15,21 +15,18 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.text.MessageFormat;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -83,6 +80,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -345,8 +343,7 @@ protected BundleDescription getBundleDescription(Map<String, String> manifest, S
 			return bundle;
 		}
 		StateObjectFactory factory = StateObjectFactory.defaultFactory;
-		Hashtable<String, String> dictionaryManifest = new Hashtable<>(manifest);
-		bundle = factory.createBundleDescription(state, dictionaryManifest, fLocation, id);
+		bundle = factory.createBundleDescription(state, FrameworkUtil.asDictionary(manifest), fLocation, id);
 		state.addBundle(bundle);
 		return bundle;
 	}
@@ -463,7 +460,8 @@ protected Set<String> getLocalPackageNames() throws CoreException {
 	 *            backing component
 	 * @throws CoreException if an error occurs
 	 */
-	public static void initializeApiDescription(IApiDescription apiDesc, BundleDescription bundle, Set<String> packages) throws CoreException {
+	public static void initializeApiDescription(IApiDescription apiDesc, BundleDescription bundle,
+			Set<String> packages) {
 		for (String name : packages) {
 			apiDesc.setVisibility(Factory.packageDescriptor(name), VisibilityModifiers.PRIVATE);
 		}
@@ -556,7 +554,7 @@ protected IApiFilterStore createApiFilterStore() throws CoreException {
 	@Override
 	protected List<IApiTypeContainer> createApiTypeContainers() throws CoreException {
 		List<IApiTypeContainer> containers = new ArrayList<>(5);
-		List<IApiComponent> all = new ArrayList<>();
+		List<BundleComponent> all = new ArrayList<>();
 		// build the classpath from bundle and all fragments
 		all.add(this);
 		BundleDescription[] fragments = getBundleDescription().getFragments();
@@ -569,29 +567,25 @@ protected List<IApiTypeContainer> createApiTypeContainers() throws CoreException
 				// force initialization of the fragment so we can
 				// retrieve its class file containers
 				component.getApiTypeContainers();
-				all.add(component);
+				all.add((BundleComponent) component);
 			}
 		}
-		Iterator<IApiComponent> iterator = all.iterator();
+
 		Set<String> entryNames = new HashSet<>(5);
-		while (iterator.hasNext()) {
-			BundleComponent component = (BundleComponent) iterator.next();
+		for (BundleComponent component : all) {
 			Map<String, String> manifest = component.getManifest();
 			if (manifest != null) {
 				try {
-					String[] paths = getClasspathEntries(manifest);
+					List<String> paths = getClasspathEntries(manifest);
 					for (String path : paths) {
 						// don't re-process the same entry twice (except default
 						// entries ".")
-						if (!(".".equals(path))) { //$NON-NLS-1$
-							if (entryNames.contains(path)) {
-								continue;
-							}
+						if (!".".equals(path) && entryNames.contains(path)) { //$NON-NLS-1$
+							continue;
 						}
 						IApiTypeContainer container = component.createApiTypeContainer(path);
 						if (container == null) {
-							for (IApiComponent iApiComponent : all) {
-								BundleComponent other = (BundleComponent) iApiComponent;
+							for (BundleComponent other : all) {
 								if (other != component) {
 									container = other.createApiTypeContainer(path);
 								}
@@ -629,19 +623,14 @@ protected boolean isApiEnabled() {
 	 *
 	 * @return classpath entries as bundle relative paths
 	 */
-	protected static String[] getClasspathEntries(Map<String, String> manifest) throws BundleException {
+	private static List<String> getClasspathEntries(Map<String, String> manifest) throws BundleException {
 		ManifestElement[] classpath = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, manifest.get(Constants.BUNDLE_CLASSPATH));
-		String elements[];
 		if (classpath == null) {
 			// default classpath is '.'
-			elements = new String[] { "." }; //$NON-NLS-1$
+			return List.of("."); //$NON-NLS-1$
 		} else {
-			elements = new String[classpath.length];
-			for (int i = 0; i < classpath.length; i++) {
-				elements[i] = classpath[i].getValue();
-			}
+			return Arrays.stream(classpath).map(ManifestElement::getValue).toList();
 		}
-		return elements;
 	}
 
 	/**
@@ -680,9 +669,9 @@ protected IApiTypeContainer createApiTypeContainer(String path) throws CoreExcep
 						if (entry != null) {
 							if (entry.isDirectory()) {
 								// extract the dir and all children
-								File dir = Util.createTempDirectory(TMP_API_FILE_PREFIX);
+								Path dir = Util.createTempDirectory(TMP_API_FILE_PREFIX).toRealPath();
 								extractDirectory(zip, entry.getName(), dir);
-								return new DirectoryApiTypeContainer(this, dir.getCanonicalPath());
+								return new DirectoryApiTypeContainer(this, dir.toString());
 							} else {
 								if (Util.isArchive(path)) {
 									// Create a uniquely named temp-directory and extract the file inside it.
@@ -690,9 +679,9 @@ protected IApiTypeContainer createApiTypeContainer(String path) throws CoreExcep
 									// due to pre-existing files in the temp dir or when comparing with
 									// a baseline during API analysis: one file would simply overwrite
 									// the other one and thus a difference cannot be found.
-									File dir = Util.createTempDirectory(TMP_API_FILE_PREFIX);
-									File file = extractEntry(zip, entry, dir);
-									return new ArchiveApiTypeContainer(this, file.getCanonicalPath());
+									Path dir = Util.createTempDirectory(TMP_API_FILE_PREFIX).toRealPath();
+									Path file = extractEntry(zip, entry, dir);
+									return new ArchiveApiTypeContainer(this, file.toRealPath().toString());
 								}
 							}
 						}
@@ -717,26 +706,13 @@ protected IApiTypeContainer createApiTypeContainer(String path) throws CoreExcep
 	 *             fails to write the file(s)
 	 * @throws IOException, CoreException
 	 */
-	static void extractDirectory(ZipFile zip, String pathprefix, File parent) throws IOException, CoreException {
-		Enumeration<? extends ZipEntry> entries = zip.entries();
+	private static void extractDirectory(ZipFile zip, String pathprefix, Path parent)
+			throws IOException {
 		String prefix = (pathprefix == null ? Util.EMPTY_STRING : pathprefix);
-		while (entries.hasMoreElements()) {
+		for (Enumeration<? extends ZipEntry> entries = zip.entries(); entries.hasMoreElements();) {
 			ZipEntry entry = entries.nextElement();
 			String name = entry.getName();
 			if (name.startsWith(prefix)) {
-				String parentDirCanonicalPath = parent.getCanonicalPath();
-				File file = new File(parent, name);
-				if (!file.toPath().normalize().startsWith(parent.toPath().normalize())) {
-					throw new ZipException("Bad zip entry: " + name); //$NON-NLS-1$
-				}
-				String destCanonicalPath = file.getCanonicalPath();
-				if (!destCanonicalPath.startsWith(parentDirCanonicalPath + File.separator)) {
-					throw new CoreException(Status.error(MessageFormat.format("Entry is outside of the target dir: : {0}", name))); //$NON-NLS-1$
-				}
-				if (entry.isDirectory()) {
-					file.mkdir();
-					continue;
-				}
 				extractEntry(zip, entry, parent);
 			}
 		}
@@ -752,20 +728,15 @@ static void extractDirectory(ZipFile zip, String pathprefix, File parent) throws
 	 * @return the file handle to the extracted entry, <code>null</code>
 	 *         otherwise
 	 */
-	static File extractEntry(ZipFile zip, ZipEntry entry, File parent) throws IOException {
+	private static Path extractEntry(ZipFile zip, ZipEntry entry, Path parent) throws IOException {
 		try (InputStream inputStream = zip.getInputStream(entry)) {
 			String name = entry.getName();
-			File file = new File(parent, name);
-			if (!file.toPath().normalize().startsWith(parent.toPath().normalize())) {
+			Path file = parent.resolve(name).normalize();
+			if (!file.startsWith(parent)) {
 				throw new ZipException("Bad zip entry: " + name); //$NON-NLS-1$
 			}
-			File lparent = file.getParentFile();
-			if (!lparent.exists()) {
-				lparent.mkdirs();
-			}
-			try (FileOutputStream outputStream = new FileOutputStream(file)) {
-				inputStream.transferTo(outputStream);
-			}
+			Files.createDirectories(file.getParent());
+			Files.copy(inputStream, file);
 			return file;
 		}
 	}
@@ -896,31 +867,6 @@ private static InputStream loadFixedBundleApiDescription(String bundleAndVersion
 		return FileLocator.openStream(bundle, pathInBundle, false);
 	}
 
-	/**
-	 * Returns a URL describing a file inside a bundle.
-	 *
-	 * @param bundleLocation root location of the bundle. May be a directory or
-	 *            a file (jar)
-	 * @param filePath bundle relative path to desired file
-	 * @return URL to the file
-	 */
-	protected static URL getFileInBundle(File bundleLocation, String filePath) throws MalformedURLException {
-		String extension = IPath.fromOSString(bundleLocation.getName()).getFileExtension();
-		StringBuilder urlSt = new StringBuilder();
-		if (extension != null && extension.equals("jar") && bundleLocation.isFile()) { //$NON-NLS-1$
-			urlSt.append("jar:file:"); //$NON-NLS-1$
-			urlSt.append(bundleLocation.getAbsolutePath());
-			urlSt.append("!/"); //$NON-NLS-1$
-			urlSt.append(filePath);
-		} else {
-			urlSt.append("file:"); //$NON-NLS-1$
-			urlSt.append(bundleLocation.getAbsolutePath());
-			urlSt.append(File.separatorChar);
-			urlSt.append(filePath);
-		}
-		return new URL(urlSt.toString());
-	}
-
 	@Override
 	public String[] getExecutionEnvironments() throws CoreException {
 		return getBundleDescription().getExecutionEnvironments();
@@ -939,12 +885,9 @@ public final String getSymbolicName() {
 	@Override
 	public IRequiredComponentDescription[] getRequiredComponents() throws CoreException {
 		BundleSpecification[] requiredBundles = getBundleDescription().getRequiredBundles();
-		IRequiredComponentDescription[] req = new IRequiredComponentDescription[requiredBundles.length];
-		for (int i = 0; i < requiredBundles.length; i++) {
-			BundleSpecification bundle = requiredBundles[i];
-			req[i] = new RequiredComponentDescription(bundle.getName(), new BundleVersionRange(bundle.getVersionRange()), bundle.isOptional(), bundle.isExported());
-		}
-		return req;
+		return Arrays.stream(requiredBundles).map( //
+				b -> new RequiredComponentDescription(b.getName(), new BundleVersionRange(b.getVersionRange()), b.isOptional(), b.isExported()))
+				.toArray(IRequiredComponentDescription[]::new);
 	}
 
 	@Override
@@ -1050,21 +993,14 @@ private static boolean isSourceComponent(Map<String, String> manifest, File loca
 		}
 		// check for the old format
 		String pluginXMLContents = readFileContents(IApiCoreConstants.PLUGIN_XML_NAME, location);
-		if (pluginXMLContents != null) {
-			if (containsSourceExtensionPoint(pluginXMLContents)) {
-				return true;
-			}
+		if (pluginXMLContents != null && containsSourceExtensionPoint(pluginXMLContents)) {
+			return true;
 		}
 		// check if it contains a fragment.xml with the appropriate extension
 		// point
 		pluginXMLContents = readFileContents(IApiCoreConstants.FRAGMENT_XML_NAME, location);
-		if (pluginXMLContents != null) {
-			if (containsSourceExtensionPoint(pluginXMLContents)) {
-				return true;
-			}
-		}
-		// parse XML contents to find extension points
-		return false;
+		// if false, parse XML contents to find extension points
+		return pluginXMLContents != null && containsSourceExtensionPoint(pluginXMLContents);
 	}
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
index 0949a5871f..82aee288cb 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ConsumerReportConvertor.java
@@ -181,12 +181,7 @@ public boolean visitMember(IMemberDescriptor referencedMember) {
 			if (desc == null) {
 				return false;
 			}
-			this.currenttype = this.keys.get(desc);
-			if (this.currenttype == null) {
-				this.currenttype = new Type2(desc);
-				this.keys.put(desc, this.currenttype);
-			}
-
+			this.currenttype = this.keys.computeIfAbsent(desc, Type2::new);
 			currentProducer.types.put(desc, currenttype);
 
 			this.currentmember = new Member(referencedMember);
@@ -494,15 +489,15 @@ protected void writeIndexPage(List<?> scanResult) throws Exception {
 			buffer.append(OPEN_P);
 			buffer.append(NLS.bind(SearchMessages.UseReportConverter_bundles_that_were_not_searched, new String[] {
 					"<a href=\"./not_searched.html\">", "</a></p>\n" })); //$NON-NLS-1$//$NON-NLS-2$
-			String additional = getAdditionalIndexInfo(scanResult.size() > 0);
+			String additional = getAdditionalIndexInfo(!scanResult.isEmpty());
 			if (additional != null) {
 				buffer.append(additional);
 			}
-			if (scanResult.size() > 0) {
+			if (!scanResult.isEmpty()) {
 				buffer.append(OPEN_P).append(SearchMessages.UseReportConverter_inlined_description).append(CLOSE_P);
 				buffer.append(getColourLegend());
 				buffer.append(getReferencesTableHeader(SearchMessages.ConsumerReportConvertor_ProducerListHeader, SearchMessages.UseReportConverter_bundle, true));
-				if (scanResult.size() > 0) {
+				if (!scanResult.isEmpty()) {
 					File refereehtml = null;
 					String link = null;
 					for (Object obj : scanResult) {
@@ -630,20 +625,16 @@ protected void writeProducerReport(Consumer parentConsumer, Producer producer) t
 			producerTypes.addAll(producer.types.keySet());
 			Collections.sort(producerTypes, compare);
 
-			CountGroup counts = null;
-			String link = null;
-			File typefile = null;
-			Type2 type = null;
 			for (IReferenceTypeDescriptor iReferenceTypeDescriptor : producerTypes) {
-				type = producer.types.get(iReferenceTypeDescriptor);
-				counts = type.counts;
+				Type2 type = producer.types.get(iReferenceTypeDescriptor);
+				CountGroup counts = type.counts;
 
 				String fqname = Signatures.getQualifiedTypeSignature((IReferenceTypeDescriptor) type.desc);
-				typefile = new File(htmlroot, fqname + HTML_EXTENSION);
+				File typefile = new File(htmlroot, fqname + HTML_EXTENSION);
 				if (!typefile.exists()) {
 					typefile.createNewFile();
 				}
-				link = extractLinkFrom(htmlroot, typefile.getAbsolutePath());
+				String link = extractLinkFrom(htmlroot, typefile.getAbsolutePath());
 				buffer.append(getReferenceTableEntry(counts, link, fqname, false));
 				writeTypePage(type.referencingMembers, type, typefile, fqname);
 			}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefMetadata.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefMetadata.java
index 9d857604a2..6bb36e8783 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefMetadata.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefMetadata.java
@@ -88,17 +88,15 @@ public MissingRefMetadata(String profile, String reportlocation, String apiusesc
 	 */
 	public static MissingRefMetadata getMetadata(File xmlFile) throws Exception {
 		MissingRefMetadata metadata = new MissingRefMetadata();
-		try {
-			if (xmlFile.exists()) {
+		if (xmlFile.exists()) {
+			try {
 				String xmlstr = Util.getFileContentAsString(xmlFile);
 				Element doc = Util.parseDocument(xmlstr.trim());
-				Element element = null;
-				String value = null, name = null;
 				NodeList nodes = doc.getElementsByTagName("*"); //$NON-NLS-1$
 				for (int i = 0; i < nodes.getLength(); i++) {
-					element = (Element) nodes.item(i);
-					value = element.getAttribute(MissingRefMetadata.VALUE);
-					name = element.getNodeName();
+					Element element = (Element) nodes.item(i);
+					String value = element.getAttribute(MissingRefMetadata.VALUE);
+					String name = element.getNodeName();
 
 					if (PROFILE.equals(name)) {
 						metadata.setProfile(value);
@@ -117,9 +115,10 @@ public static MissingRefMetadata getMetadata(File xmlFile) throws Exception {
 						continue;
 					}
 				}
+			} catch (CoreException e) {
+				throw new Exception(
+						NLS.bind(SearchMessages.MissingRefMetadata_CoreExceptionInParsing, xmlFile.getAbsolutePath()));
 			}
-		} catch (CoreException e) {
-			throw new Exception(NLS.bind(SearchMessages.MissingRefMetadata_CoreExceptionInParsing, xmlFile.getAbsolutePath()));
 		}
 		return metadata;
 	}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
index 66308a67b1..6bff470cfc 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/MissingRefReportConverter.java
@@ -243,17 +243,15 @@ static class Report {
 		int fieldProblems = 0;
 
 		public void add(List<IApiProblem> apipbs) {
-			List<IApiProblem> list = null;
-			TreeMap<String, List<IApiProblem>> types = null;
 			for (IApiProblem pb : apipbs) {
-				Integer key = Integer.valueOf(pb.getKind());
-				types = this.apiProblems.get(key);
+				Integer key = pb.getKind();
+				TreeMap<String, List<IApiProblem>> types = this.apiProblems.get(key);
 				if (types == null) {
 					types = new TreeMap<>(missingcompare);
 					this.apiProblems.put(key, types);
 				}
 				String tname = pb.getTypeName();
-				list = types.get(tname);
+				List<IApiProblem> list = types.get(tname);
 				if (list == null) {
 					list = new ArrayList<>();
 					types.put(tname, list);
@@ -312,7 +310,7 @@ public void convert(String xslt, IProgressMonitor monitor) throws Exception {
 			System.out.println("Parsing use scan..."); //$NON-NLS-1$
 			start = System.currentTimeMillis();
 		}
-		List<?> result = parse();
+		List<Report> result = parse();
 		if (ApiPlugin.DEBUG_USE_REPORT_CONVERTER) {
 			System.out.println("done in: " + (System.currentTimeMillis() - start) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
 			System.out.println("Sorting reports and writing index..."); //$NON-NLS-1$
@@ -362,9 +360,9 @@ protected void writeIndexPage(List<?> result) throws Exception {
 			buffer.append(OPEN_P);
 			buffer.append(NLS.bind(SearchMessages.MissingRefReportConverter_NotSearched, new String[] {
 					"<a href=\"./not_searched.html\">", "</a></p>\n" })); //$NON-NLS-1$//$NON-NLS-2$
-			if (result.size() > 0) {
+			if (!result.isEmpty()) {
 				buffer.append(getProblemSummaryTable());
-				if (result.size() > 0) {
+				if (!result.isEmpty()) {
 					for (Object obj : result) {
 						if (obj instanceof Report report) {
 							File refereehtml = new File(getReportsRoot(), report.name + File.separator + "index.html"); //$NON-NLS-1$
@@ -507,7 +505,7 @@ protected void writeMetadataHeaders(StringBuilder buffer) {
 	/**
 	 * Parse the XML directories and report.xml and generate HTML for them
 	 */
-	protected List<?> parse() throws Exception {
+	protected List<Report> parse() throws Exception {
 		MissingRefParser lparser = new MissingRefParser();
 		MissingRefVisitor visitor = new MissingRefVisitor();
 		lparser.parse(getXmlLocation(), visitor);
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java
index eacefbbcd1..3932ab45d3 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseReportConverter.java
@@ -35,6 +35,7 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
+import java.util.stream.IntStream;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -86,12 +87,12 @@ public class UseReportConverter extends HTMLConvertor {
 	 */
 	class Visitor extends UseScanVisitor {
 
-		ArrayList<Report> reports = new ArrayList<>();
+		List<Report> reports = new ArrayList<>();
 		Report currentreport = null;
 		Type currenttype = null, currentreferee = null;
 		Member currentmember = null;
-		HashMap<IReferenceTypeDescriptor, Type> keys = new HashMap<>();
-		ArrayList<Type> referees = new ArrayList<>();
+		Map<IReferenceTypeDescriptor, Type> keys = new HashMap<>();
+		List<Type> referees = new ArrayList<>();
 
 		/**
 		 * Returns if the reference should be reported or not
@@ -179,21 +180,10 @@ public boolean visitMember(IMemberDescriptor referencedMember) {
 			if (desc == null) {
 				return false;
 			}
-			this.currenttype = this.keys.get(desc);
-			if (this.currenttype == null) {
-				this.currenttype = new Type(desc);
-				this.keys.put(desc, this.currenttype);
-			}
-			TreeMap<IMemberDescriptor, Member> map = this.currentreport.children.get(this.currenttype);
-			if (map == null) {
-				map = new TreeMap<>(compare);
-				this.currentreport.children.put(this.currenttype, map);
-			}
-			this.currentmember = map.get(referencedMember);
-			if (this.currentmember == null) {
-				this.currentmember = new Member(referencedMember);
-				map.put(referencedMember, this.currentmember);
-			}
+			this.currenttype = this.keys.computeIfAbsent(desc, Type::new);
+			Map<IMemberDescriptor, Member> map = this.currentreport.children.computeIfAbsent(this.currenttype,
+					t -> new TreeMap<>(compare));
+			this.currentmember = map.computeIfAbsent(referencedMember, Member::new);
 			return true;
 		}
 
@@ -597,7 +587,7 @@ public UseReportConverter(String htmlroot, String xmlroot, String[] topatterns,
 		this.xmlLocation = xmlroot;
 		this.htmlLocation = htmlroot;
 		if (topatterns != null) {
-			ArrayList<Pattern> pats = new ArrayList<>(topatterns.length);
+			List<Pattern> pats = new ArrayList<>(topatterns.length);
 			for (String topattern : topatterns) {
 				try {
 					pats.add(Pattern.compile(topattern));
@@ -613,7 +603,7 @@ public UseReportConverter(String htmlroot, String xmlroot, String[] topatterns,
 			}
 		}
 		if (frompatterns != null) {
-			ArrayList<Pattern> pats = new ArrayList<>(frompatterns.length);
+			List<Pattern> pats = new ArrayList<>(frompatterns.length);
 			for (String frompattern : frompatterns) {
 				try {
 					pats.add(Pattern.compile(frompattern));
@@ -885,14 +875,13 @@ protected String getMissingBundlesHeader() {
 	 * HTML report location
 	 */
 	void writeMetaPage(File htmlroot) throws Exception {
-		File meta = null;
 		File file = new File(getReportsRoot(), "meta.xml"); //$NON-NLS-1$
 		if (!file.exists()) {
 			// do nothing if no meta.xml file
 			return;
 		}
 		String filename = "meta"; //$NON-NLS-1$
-		meta = new File(htmlroot, filename + HTML_EXTENSION);
+		File meta = new File(htmlroot, filename + HTML_EXTENSION);
 		if (!meta.exists()) {
 			meta.createNewFile();
 		}
@@ -1165,9 +1154,8 @@ void writeTypePage(Map<IMemberDescriptor, Member> map, Type type, File typefile,
 		buffer.append("<td bgcolor=\"").append(REFERENCES_TABLE_HEADER_COLOUR).append("\">").append(OPEN_B) //$NON-NLS-1$ //$NON-NLS-2$
 				.append(SearchMessages.UseReportConverter_member).append("</b></td>\n"); //$NON-NLS-1$
 		buffer.append(CLOSE_TR);
-		IElementDescriptor desc = null;
 		for (Entry<IMemberDescriptor, Member> entry : map.entrySet()) {
-			desc = entry.getKey();
+			IElementDescriptor desc = entry.getKey();
 			buffer.append(OPEN_TR);
 			buffer.append("<td align=\"left\">\n"); //$NON-NLS-1$
 			buffer.append(OPEN_B);
@@ -1362,23 +1350,21 @@ protected void writeIndexPage(List<?> scanResult) throws Exception {
 			}
 			buffer.append(OPEN_P);
 			buffer.append(NLS.bind(SearchMessages.UseReportConverter_bundles_that_were_not_searched, new String[] {
-					useNotSearchedXml == false ? "<a href=\"./not_searched.html\">" : "<a href=\"../xml/not_searched.xml\">", //$NON-NLS-1$//$NON-NLS-2$
+					!useNotSearchedXml ? "<a href=\"./not_searched.html\">" : "<a href=\"../xml/not_searched.xml\">", //$NON-NLS-1$//$NON-NLS-2$
 					"</a></p>\n" }));//$NON-NLS-1$
-			String additional = getAdditionalIndexInfo(scanResult.size() > 0);
+			String additional = getAdditionalIndexInfo(!scanResult.isEmpty());
 			if (additional != null) {
 				buffer.append(additional);
 			}
-			if (scanResult.size() > 0) {
+			if (!scanResult.isEmpty()) {
 				buffer.append(OPEN_P).append(SearchMessages.UseReportConverter_inlined_description).append(CLOSE_P);
 				buffer.append(getColourLegend());
 				buffer.append(getReferencesTableHeader(SearchMessages.UseReportConverter_references, SearchMessages.UseReportConverter_bundle, true));
-				if (scanResult.size() > 0) {
-					File refereehtml = null;
-					String link = null;
+				if (!scanResult.isEmpty()) {
 					for (Object obj : scanResult) {
 						if (obj instanceof Report report) {
-							refereehtml = new File(getReportsRoot(), report.name + File.separator + "index.html"); //$NON-NLS-1$
-							link = extractLinkFrom(getReportsRoot(), refereehtml.getAbsolutePath());
+							File refereehtml = new File(getReportsRoot(), report.name + File.separator + "index.html"); //$NON-NLS-1$
+							String link = extractLinkFrom(getReportsRoot(), refereehtml.getAbsolutePath());
 							buffer.append(getReferenceTableEntry(report.counts, link, report.name, true));
 						}
 					}
@@ -1583,31 +1569,23 @@ void writeFilterCount(StringBuilder buffer) throws Exception {
 		}
 
 	}
+
 	/**
 	 * Returns the use metadata from this scan
 	 */
 	IMetadata getMetadata() throws Exception {
 		if (this.metadata == null) {
-			File xml = null;
-			try {
-				xml = new File(getReportsRoot(), "meta" + XML_EXTENSION); //$NON-NLS-1$
-				if (!xml.exists()) {
-					// try looking in the default 'xml' directory as a raw
-					// report root
-					// might have been specified
-					xml = new File(getReportsRoot() + File.separator + "xml", "meta" + XML_EXTENSION); //$NON-NLS-1$//$NON-NLS-2$
-				}
-				if (xml.exists()) {
+			File xml = getXML("meta"); //$NON-NLS-1$
+			if (xml.exists()) {
+				try {
 					String xmlstr = Util.getFileContentAsString(xml);
 					Element doc = Util.parseDocument(xmlstr.trim());
 					this.metadata = new UseMetadata();
-					Element element = null;
-					String value = null, name = null;
 					NodeList nodes = doc.getElementsByTagName("*"); //$NON-NLS-1$
 					for (int i = 0; i < nodes.getLength(); i++) {
-						element = (Element) nodes.item(i);
-						value = element.getAttribute(UseMetadata.VALUE);
-						name = element.getNodeName();
+						Element element = (Element) nodes.item(i);
+						String value = element.getAttribute(UseMetadata.VALUE);
+						String name = element.getNodeName();
 						if (UseMetadata.FLAGS.equals(name)) {
 							try {
 								this.metadata.setSearchflags(Integer.parseInt(value));
@@ -1657,9 +1635,10 @@ IMetadata getMetadata() throws Exception {
 							continue;
 						}
 					}
+				} catch (CoreException e) {
+					throw new Exception(NLS.bind(SearchMessages.UseReportConverter_core_exep_reading_metadata,
+							xml.getAbsolutePath()));
 				}
-			} catch (CoreException e) {
-				throw new Exception(NLS.bind(SearchMessages.UseReportConverter_core_exep_reading_metadata, xml.getAbsolutePath()));
 			}
 		}
 		return this.metadata;
@@ -1670,16 +1649,9 @@ IMetadata getMetadata() throws Exception {
 	 */
 	int getFilteredCount() throws Exception {
 		if (this.filteredCount == -1) {
-			File xml = null;
-			try {
-				xml = new File(getReportsRoot(), "counts" + XML_EXTENSION); //$NON-NLS-1$
-				if (!xml.exists()) {
-					// try looking in the default 'xml' directory as a raw
-					// report root
-					// might have been specified
-					xml = new File(getReportsRoot() + File.separator + "xml", "meta" + XML_EXTENSION); //$NON-NLS-1$//$NON-NLS-2$
-				}
-				if (xml.exists()) {
+			File xml = getXML("counts"); //$NON-NLS-1$
+			if (xml.exists()) {
+				try {
 					String xmlstr = Util.getFileContentAsString(xml);
 					Element doc = Util.parseDocument(xmlstr.trim());
 
@@ -1692,30 +1664,34 @@ int getFilteredCount() throws Exception {
 							filteredCount = Integer.parseInt(value);
 						}
 					}
+				} catch (CoreException e) {
+					throw new Exception(NLS.bind(SearchMessages.UseReportConverter_core_exep_reading_metadata,
+							xml.getAbsolutePath()));
 				}
-			} catch (CoreException e) {
-				throw new Exception(NLS.bind(SearchMessages.UseReportConverter_core_exep_reading_metadata, xml.getAbsolutePath()));
 			}
 		}
 		return filteredCount;
 	}
 
+	private File getXML(String type) {
+		File xml = new File(getReportsRoot(), type + XML_EXTENSION);
+		if (xml.exists()) {
+			return xml;
+		}
+		// try looking in the default 'xml' directory as a raw report root
+		// might have been specified
+		return new File(getReportsRoot() + File.separator + "xml", "meta" + XML_EXTENSION); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
 	/**
 	 * Reads saved patterns from the meta.xml file
 	 *
 	 * @return the array of patterns or <code>null</code>
 	 */
 	private String[] readPatterns(Element element) {
-		String[] pats = null;
 		NodeList patterns = element.getElementsByTagName(UseMetadata.PATTERN);
-		int length = patterns.getLength();
-		if (length > 0) {
-			pats = new String[length];
-			for (int j = 0; j < length; j++) {
-				pats[j] = ((Element) patterns.item(j)).getAttribute(UseMetadata.VALUE);
-			}
-		}
-		return pats;
+		return IntStream.range(0, patterns.getLength()).mapToObj(patterns::item).map(Element.class::cast)
+				.map(e -> e.getAttribute(UseMetadata.VALUE)).toArray(String[]::new);
 	}
 
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanManager.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanManager.java
index 2e19134f7f..069ce26aa0 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanManager.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/UseScanManager.java
@@ -133,7 +133,7 @@ public IReferenceDescriptor[] getExternalDependenciesFor(IApiComponent apiCompon
 			references = apiComponent.getExternalDependencies();
 		}
 		SubMonitor localmonitor = SubMonitor.convert(monitor, SearchMessages.collecting_external_dependencies, 10);
-		ArrayList<String> unavailableMembers = new ArrayList<>();
+		List<String> unavailableMembers = new ArrayList<>();
 		if (apiUseTypes != null && apiUseTypes.length > 0) {
 			for (String apiUseType : apiUseTypes) {
 				if (!references.hasReferencesTo(apiUseType)) {
@@ -333,8 +333,7 @@ public static boolean isValidArchive(File file) {
 	 */
 	public static boolean isValidScanLocation(String location) {
 		if (location != null && location.length() > 0) {
-			IPath path = IPath.fromOSString(location);
-			File file = path.toFile();
+			File file = new File(location);
 			return isValidDirectory(file) || isValidArchive(file);
 		}
 		return false;
@@ -351,7 +350,7 @@ public String[] getReportLocations() {
 		}
 
 		String[] locations = apiUseScanPaths.split(ESCAPE_REGEX + LOCATION_DELIM);
-		ArrayList<String> locationList = new ArrayList<>(locations.length);
+		List<String> locationList = new ArrayList<>(locations.length);
 		for (String location : locations) {
 			String[] values = location.split(ESCAPE_REGEX + STATE_DELIM);
 			if (Boolean.parseBoolean(values[1])) {
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
index bac83abe8c..2378cf0f85 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java
@@ -40,6 +40,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,6 +49,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -1619,7 +1621,7 @@ public static boolean isArchive(String fileName) {
 	 *         false otherwise
 	 */
 	public static boolean isZipJarFile(String fileName) {
-		String normalizedFileName = fileName.toLowerCase();
+		String normalizedFileName = fileName.toLowerCase(Locale.ENGLISH);
 		return normalizedFileName.endsWith(DOT_ZIP) || normalizedFileName.endsWith(DOT_JAR);
 	}
 
@@ -1631,7 +1633,7 @@ public static boolean isZipJarFile(String fileName) {
 	 *         otherwise
 	 */
 	public static boolean isTGZFile(String fileName) {
-		String normalizedFileName = fileName.toLowerCase();
+		String normalizedFileName = fileName.toLowerCase(Locale.ENGLISH);
 		return normalizedFileName.endsWith(DOT_TAR_GZ) || normalizedFileName.endsWith(DOT_TGZ);
 	}
 
@@ -1651,7 +1653,7 @@ public static boolean isClass(int accessFlags) {
 	 * @return true if the name is for a class file false otherwise
 	 */
 	public static boolean isClassFile(String fileName) {
-		return fileName.toLowerCase().endsWith(DOT_CLASS_SUFFIX);
+		return fileName.toLowerCase(Locale.ENGLISH).endsWith(DOT_CLASS_SUFFIX);
 	}
 
 	public static boolean isDefault(int accessFlags) {
@@ -1691,7 +1693,7 @@ public static final boolean isDifferentVersion(String versionToBeChecked, String
 	 * @return true if the name is for a java source file, false otherwise
 	 */
 	public static boolean isJavaFileName(String fileName) {
-		return fileName.toLowerCase().endsWith(DOT_JAVA_SUFFIX);
+		return fileName.toLowerCase(Locale.ENGLISH).endsWith(DOT_JAVA_SUFFIX);
 	}
 
 	/**
@@ -1934,8 +1936,8 @@ public static File createTempFile(String prefix, String suffix) throws IOExcepti
 	 *
 	 * @return a new temp directory
 	 */
-	public static File createTempDirectory(String prefix) throws IOException {
-		return recordTempFile(Files.createTempDirectory(prefix).toFile());
+	public static Path createTempDirectory(String prefix) throws IOException {
+		return recordTempFile(Files.createTempDirectory(prefix).toFile()).toPath();
 	}
 
 	private static File recordTempFile(File file) throws IOException {