Switch jface.text.tests to Java 17

Author: akurtakov

org.eclipse.jface.text.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>

org.eclipse.jface.text.tests/.settings/org.eclipse.jdt.core.prefs

@@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -135,7 +135,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

org.eclipse.jface.text.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.jface.text.tests
-Bundle-Version: 3.12.700.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: 
@@ -23,6 +23,6 @@ Require-Bundle:
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.test.performance;bundle-version="3.13.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.jface.text.tests

org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java

@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -128,14 +127,14 @@ public void tearDown() {
 	protected List<Shell> getCurrentShells() {
 		return Arrays.stream(fParent.getDisplay().getShells())
 				.filter(Shell::isVisible)
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	protected List<Shell> findNewShells(Collection<Shell> beforeShells) {
 		return Arrays.stream(fParent.getDisplay().getShells())
 				.filter(Shell::isVisible)
 				.filter(shell -> !beforeShells.contains(shell))
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	protected Shell findNewShell(Collection<Shell> beforeShells) {

org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AbstractContentAssistTest.java

@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -216,14 +215,14 @@ private Display getDisplay() {
 	protected List<Shell> getCurrentShells() {
 		return Arrays.stream(getDisplay().getShells())
 				.filter(Shell::isVisible)
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	protected List<Shell> findNewShells(Collection<Shell> beforeShells) {
 		return Arrays.stream(getDisplay().getShells())
 				.filter(Shell::isVisible)
 				.filter(s -> !beforeShells.contains(s))
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	protected Shell findNewShell(Collection<Shell> beforeShells) {

org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java

@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.junit.After;
 import org.junit.Before;
@@ -506,13 +505,13 @@ static List<ICompletionProposal> getFilteredProposals(ContentAssistant ca) throw
 	private static List<ICompletionProposal> getComputedProposals(ContentAssistant ca, Predicate<ICompletionProposal> p)
 			throws Exception {
 		List<ICompletionProposal> computedProposals = getComputedProposals(ca);
-		return computedProposals == null ? null : computedProposals.stream().filter(p).collect(Collectors.toList());
+		return computedProposals == null ? null : computedProposals.stream().filter(p).toList();
 	}
 
 	private static List<ICompletionProposal> getFilteredProposals(ContentAssistant ca, Predicate<ICompletionProposal> p)
 			throws Exception {
 		List<ICompletionProposal> filteredProposals = getFilteredProposals(ca);
-		return filteredProposals == null ? null : filteredProposals.stream().filter(p).collect(Collectors.toList());
+		return filteredProposals == null ? null : filteredProposals.stream().filter(p).toList();
 	}
 
 	private static class IncompleteCompletionProposal implements ICompletionProposal {

org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java

@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.jface.text.tests.contentassist;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
@@ -81,9 +80,9 @@ public void testIncrementalComplete() throws Exception {
 
 		DisplayHelper.sleep(shell.getDisplay(), 300);
 
-		List<String> filteredProposals= FilteringAsyncContentAssistTests.getFilteredProposals(ca).stream() //
-				.map(ICompletionProposal::getDisplayString) //
-				.collect(toList());
+		List<String> filteredProposals= FilteringAsyncContentAssistTests.getFilteredProposals(ca).stream()
+				.map(ICompletionProposal::getDisplayString)
+				.toList();
 		assertEquals(Arrays.asList("testA", "testB", "testC"), filteredProposals);
 	}
 
@@ -101,9 +100,9 @@ public void testIncrementalComplete_async() throws Exception {
 
 		DisplayHelper.sleep(shell.getDisplay(), delay + 100);
 
-		List<String> filteredProposals= FilteringAsyncContentAssistTests.getFilteredProposals(ca).stream() //
-				.map(ICompletionProposal::getDisplayString) //
-				.collect(toList());
+		List<String> filteredProposals= FilteringAsyncContentAssistTests.getFilteredProposals(ca).stream()
+				.map(ICompletionProposal::getDisplayString)
+				.toList();
 		assertEquals(Arrays.asList("testA", "testB", "testC"), filteredProposals);
 	}