Update supported JDK version from 11 to 17

philwebb · philwebb · commit 45335a9990e4 · 2024-01-11T17:59:48.000-08:00
Fix a few items that were missed. See gh-398
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java
@@ -41,7 +41,7 @@ public class Activator extends AbstractUIPlugin {
 
 	public Activator() {
 		this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk8.core.JavaCore());
-		this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk11.core.JavaCore());
+		this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk17.core.JavaCore());
 	}
 
 	@Override
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocator.java
@@ -73,14 +73,15 @@ private String updateFormatter(JavaFormatConfig javaFormatConfig, String content
 		String formatterId = getFormatterId(javaFormatConfig);
 		if (formatterId != null) {
 			return content.replace(
-					"org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk11.tabs",
+					"org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk17.tabs",
 					"org.eclipse.jdt.core.javaFormatter=" + formatterId);
 		}
 		return content;
 	}
 
 	private String getFormatterId(JavaFormatConfig config) {
 		String jdk = config.getJavaBaseline().name().substring(1);
+		jdk = (!"11".equals(jdk)) ? jdk : "17";
 		String indentation = config.getIndentationStyle().name().toLowerCase();
 		return "io.spring.javaformat.eclipse.formatter.jdk" + jdk + "." + indentation;
 	}
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.core.prefs b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.core.prefs
@@ -101,4 +101,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk11.tabs
+org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk17.tabs
diff --git a/spring-javaformat/spring-javaformat-formatter-eclipse-jdt-jdk17/pom.xml b/spring-javaformat/spring-javaformat-formatter-eclipse-jdt-jdk17/pom.xml
@@ -57,7 +57,7 @@
 							<relocations>
 								<relocation>
 									<pattern>org.eclipse.jdt</pattern>
-									<shadedPattern>io.spring.javaformat.eclipse.jdt.jdk11</shadedPattern>
+									<shadedPattern>io.spring.javaformat.eclipse.jdt.jdk17</shadedPattern>
 								</relocation>
 							</relocations>
 							<createDependencyReducedPom>false</createDependencyReducedPom>
diff --git a/spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite/EclipseRewriter.java b/spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite/EclipseRewriter.java
@@ -80,7 +80,7 @@ private void rewrite(JdkVersion jdkVersion, FileSystem zip) throws IOException {
 			deleteWrapPreparator(zip);
 		}
 		else {
-			rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk11Manipulator::new);
+			rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk17Manipulator::new);
 		}
 	}
 
@@ -202,16 +202,16 @@ public void visitEnd() {
 	 * {@link ClassVisitor} to update the {@code NLS} class in the JDK 8 version so it
 	 * doesn't use a System property to disable warning messages.
 	 */
-	private static class NlsJdk11Manipulator extends ClassVisitor {
+	private static class NlsJdk17Manipulator extends ClassVisitor {
 
-		NlsJdk11Manipulator(ClassVisitor visitor) {
+		NlsJdk17Manipulator(ClassVisitor visitor) {
 			super(Opcodes.ASM9, visitor);
 		}
 
 		@Override
 		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 			if ("<clinit>".equals(name)) {
-				return new NslJdk11MethodManipulator(super.visitMethod(access, name, desc, signature, exceptions));
+				return new NslJdk17MethodManipulator(super.visitMethod(access, name, desc, signature, exceptions));
 			}
 			return super.visitMethod(access, name, desc, signature, exceptions);
 		}
@@ -222,11 +222,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
 	 * {@link MethodVisitor} to update the {@code NLS} class in the JDK 8 version so it
 	 * doesn't use a System property to disable warning messages.
 	 */
-	private static class NslJdk11MethodManipulator extends MethodVisitor {
+	private static class NslJdk17MethodManipulator extends MethodVisitor {
 
 		private final MethodVisitor methodVisitor;
 
-		NslJdk11MethodManipulator(MethodVisitor mv) {
+		NslJdk17MethodManipulator(MethodVisitor mv) {
 			super(Opcodes.ASM9, null);
 			this.methodVisitor = mv;
 		}
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/CodeLineBreakPreparator.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/CodeLineBreakPreparator.java
@@ -16,19 +16,19 @@
 
 package io.spring.javaformat.formatter.jdk17.eclipse;
 
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTNode;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTVisitor;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AbstractTypeDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AnnotationTypeDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.EnumDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.FieldDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.SimpleName;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TypeDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.formatter.CodeFormatter;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.compiler.parser.TerminalTokens;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Token;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.TokenManager;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTNode;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTVisitor;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AbstractTypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AnnotationTypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.EnumDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.FieldDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.SimpleName;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.formatter.CodeFormatter;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.compiler.parser.TerminalTokens;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Token;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.TokenManager;
 
 /**
  * {@link Preparator} to finetune curly-brace line breaks.
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/EclipseJdk17CodeFormatter.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/EclipseJdk17CodeFormatter.java
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import io.spring.javaformat.config.JavaFormatConfig;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.ExtendedCodeFormatter;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.ExtendedCodeFormatter;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
 import io.spring.javaformat.formatter.eclipse.EclipseCodeFormatter;
 import io.spring.javaformat.formatter.eclipse.Options;
 
@@ -35,7 +35,7 @@ public class EclipseJdk17CodeFormatter extends ExtendedCodeFormatter implements
 	private final Map<String, String> appliedOptions;
 
 	public EclipseJdk17CodeFormatter(JavaFormatConfig javaFormatConfig) {
-		this(new Options("io.spring.javaformat.eclipse.jdt.jdk11").load(javaFormatConfig));
+		this(new Options("io.spring.javaformat.eclipse.jdt.jdk17").load(javaFormatConfig));
 	}
 
 	EclipseJdk17CodeFormatter(Map<String, String> options) {
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/JavadocLineBreakPreparator.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/JavadocLineBreakPreparator.java
@@ -20,19 +20,19 @@
 import java.util.Collections;
 import java.util.List;
 
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTNode;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTVisitor;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AbstractTypeDeclaration;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.Comment;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.CompilationUnit;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.Javadoc;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TagElement;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TextElement;
-import io.spring.javaformat.eclipse.jdt.jdk11.core.formatter.CodeFormatter;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.compiler.parser.TerminalTokens;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Token;
-import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.TokenManager;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTNode;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTVisitor;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AbstractTypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.Comment;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.CompilationUnit;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.Javadoc;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TagElement;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TextElement;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.formatter.CodeFormatter;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.compiler.parser.TerminalTokens;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Token;
+import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.TokenManager;
 
 /**
  * {@link Preparator} to finetune Javadoc whitespace.

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class Activator extends AbstractUIPlugin {`
`41`	`41`
`42`	`42`	`public Activator() {`
`43`	`43`	`this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk8.core.JavaCore());`
`44`		`- this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk11.core.JavaCore());`
	`44`	`+ this.javaCorePlugins.add(new io.spring.javaformat.eclipse.jdt.jdk17.core.JavaCore());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,15 @@ private String updateFormatter(JavaFormatConfig javaFormatConfig, String content`
`73`	`73`	`String formatterId = getFormatterId(javaFormatConfig);`
`74`	`74`	`if (formatterId != null) {`
`75`	`75`	`return content.replace(`
`76`		`- "org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk11.tabs",`
	`76`	`+ "org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk17.tabs",`
`77`	`77`	`"org.eclipse.jdt.core.javaFormatter=" + formatterId);`
`78`	`78`	`}`
`79`	`79`	`return content;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private String getFormatterId(JavaFormatConfig config) {`
`83`	`83`	`String jdk = config.getJavaBaseline().name().substring(1);`
	`84`	`+ jdk = (!"11".equals(jdk)) ? jdk : "17";`
`84`	`85`	`String indentation = config.getIndentationStyle().name().toLowerCase();`
`85`	`86`	`return "io.spring.javaformat.eclipse.formatter.jdk" + jdk + "." + indentation;`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private void rewrite(JdkVersion jdkVersion, FileSystem zip) throws IOException {`
`80`	`80`	`deleteWrapPreparator(zip);`
`81`	`81`	`}`
`82`	`82`	`else {`
`83`		`- rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk11Manipulator::new);`
	`83`	`+ rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk17Manipulator::new);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -202,16 +202,16 @@ public void visitEnd() {`
`202`	`202`	`* {@link ClassVisitor} to update the {@code NLS} class in the JDK 8 version so it`
`203`	`203`	`* doesn't use a System property to disable warning messages.`
`204`	`204`	`*/`
`205`		`- private static class NlsJdk11Manipulator extends ClassVisitor {`
	`205`	`+ private static class NlsJdk17Manipulator extends ClassVisitor {`
`206`	`206`
`207`		`- NlsJdk11Manipulator(ClassVisitor visitor) {`
	`207`	`+ NlsJdk17Manipulator(ClassVisitor visitor) {`
`208`	`208`	`super(Opcodes.ASM9, visitor);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@Override`
`212`	`212`	`public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {`
`213`	`213`	`if ("<clinit>".equals(name)) {`
`214`		`- return new NslJdk11MethodManipulator(super.visitMethod(access, name, desc, signature, exceptions));`
	`214`	`+ return new NslJdk17MethodManipulator(super.visitMethod(access, name, desc, signature, exceptions));`
`215`	`215`	`}`
`216`	`216`	`return super.visitMethod(access, name, desc, signature, exceptions);`
`217`	`217`	`}`
`@@ -222,11 +222,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si`
`222`	`222`	`* {@link MethodVisitor} to update the {@code NLS} class in the JDK 8 version so it`
`223`	`223`	`* doesn't use a System property to disable warning messages.`
`224`	`224`	`*/`
`225`		`- private static class NslJdk11MethodManipulator extends MethodVisitor {`
	`225`	`+ private static class NslJdk17MethodManipulator extends MethodVisitor {`
`226`	`226`
`227`	`227`	`private final MethodVisitor methodVisitor;`
`228`	`228`
`229`		`- NslJdk11MethodManipulator(MethodVisitor mv) {`
	`229`	`+ NslJdk17MethodManipulator(MethodVisitor mv) {`
`230`	`230`	`super(Opcodes.ASM9, null);`
`231`	`231`	`this.methodVisitor = mv;`
`232`	`232`	`}`