Skip to content

Commit 45335a9

Browse files
philwebbphilwebb
committed
Update supported JDK version from 11 to 17
Fix a few items that were missed. See gh-398
1 parent 634a1ff commit 45335a9

File tree

8 files changed

+40
-39
lines changed

8 files changed

+40
-39
lines changed

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class Activator extends AbstractUIPlugin {
4141

4242
public Activator() {
4343
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());
4545
}
4646

4747
@Override

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,15 @@ private String updateFormatter(JavaFormatConfig javaFormatConfig, String content
7373
String formatterId = getFormatterId(javaFormatConfig);
7474
if (formatterId != null) {
7575
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",
7777
"org.eclipse.jdt.core.javaFormatter=" + formatterId);
7878
}
7979
return content;
8080
}
8181

8282
private String getFormatterId(JavaFormatConfig config) {
8383
String jdk = config.getJavaBaseline().name().substring(1);
84+
jdk = (!"11".equals(jdk)) ? jdk : "17";
8485
String indentation = config.getIndentationStyle().name().toLowerCase();
8586
return "io.spring.javaformat.eclipse.formatter.jdk" + jdk + "." + indentation;
8687
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
101101
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
102102
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
103103
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
104-
org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk11.tabs
104+
org.eclipse.jdt.core.javaFormatter=io.spring.javaformat.eclipse.formatter.jdk17.tabs

‎spring-javaformat/spring-javaformat-formatter-eclipse-jdt-jdk17/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<relocations>
5858
<relocation>
5959
<pattern>org.eclipse.jdt</pattern>
60-
<shadedPattern>io.spring.javaformat.eclipse.jdt.jdk11</shadedPattern>
60+
<shadedPattern>io.spring.javaformat.eclipse.jdt.jdk17</shadedPattern>
6161
</relocation>
6262
</relocations>
6363
<createDependencyReducedPom>false</createDependencyReducedPom>

‎spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite/EclipseRewriter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void rewrite(JdkVersion jdkVersion, FileSystem zip) throws IOException {
8080
deleteWrapPreparator(zip);
8181
}
8282
else {
83-
rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk11Manipulator::new);
83+
rewrite(zip, "org/eclipse/osgi/util/NLS.class", NlsJdk17Manipulator::new);
8484
}
8585
}
8686

@@ -202,16 +202,16 @@ public void visitEnd() {
202202
* {@link ClassVisitor} to update the {@code NLS} class in the JDK 8 version so it
203203
* doesn't use a System property to disable warning messages.
204204
*/
205-
private static class NlsJdk11Manipulator extends ClassVisitor {
205+
private static class NlsJdk17Manipulator extends ClassVisitor {
206206

207-
NlsJdk11Manipulator(ClassVisitor visitor) {
207+
NlsJdk17Manipulator(ClassVisitor visitor) {
208208
super(Opcodes.ASM9, visitor);
209209
}
210210

211211
@Override
212212
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
213213
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));
215215
}
216216
return super.visitMethod(access, name, desc, signature, exceptions);
217217
}
@@ -222,11 +222,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
222222
* {@link MethodVisitor} to update the {@code NLS} class in the JDK 8 version so it
223223
* doesn't use a System property to disable warning messages.
224224
*/
225-
private static class NslJdk11MethodManipulator extends MethodVisitor {
225+
private static class NslJdk17MethodManipulator extends MethodVisitor {
226226

227227
private final MethodVisitor methodVisitor;
228228

229-
NslJdk11MethodManipulator(MethodVisitor mv) {
229+
NslJdk17MethodManipulator(MethodVisitor mv) {
230230
super(Opcodes.ASM9, null);
231231
this.methodVisitor = mv;
232232
}

‎spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/CodeLineBreakPreparator.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
package io.spring.javaformat.formatter.jdk17.eclipse;
1818

19-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTNode;
20-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTVisitor;
21-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AbstractTypeDeclaration;
22-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AnnotationTypeDeclaration;
23-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.EnumDeclaration;
24-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.FieldDeclaration;
25-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.SimpleName;
26-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TypeDeclaration;
27-
import io.spring.javaformat.eclipse.jdt.jdk11.core.formatter.CodeFormatter;
28-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.compiler.parser.TerminalTokens;
29-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
30-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Token;
31-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.TokenManager;
19+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTNode;
20+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTVisitor;
21+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AbstractTypeDeclaration;
22+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AnnotationTypeDeclaration;
23+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.EnumDeclaration;
24+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.FieldDeclaration;
25+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.SimpleName;
26+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TypeDeclaration;
27+
import io.spring.javaformat.eclipse.jdt.jdk17.core.formatter.CodeFormatter;
28+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.compiler.parser.TerminalTokens;
29+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
30+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Token;
31+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.TokenManager;
3232

3333
/**
3434
* {@link Preparator} to finetune curly-brace line breaks.

‎spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/EclipseJdk17CodeFormatter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.util.Map;
2020

2121
import io.spring.javaformat.config.JavaFormatConfig;
22-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.ExtendedCodeFormatter;
23-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
22+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.ExtendedCodeFormatter;
23+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
2424
import io.spring.javaformat.formatter.eclipse.EclipseCodeFormatter;
2525
import io.spring.javaformat.formatter.eclipse.Options;
2626

@@ -35,7 +35,7 @@ public class EclipseJdk17CodeFormatter extends ExtendedCodeFormatter implements
3535
private final Map<String, String> appliedOptions;
3636

3737
public EclipseJdk17CodeFormatter(JavaFormatConfig javaFormatConfig) {
38-
this(new Options("io.spring.javaformat.eclipse.jdt.jdk11").load(javaFormatConfig));
38+
this(new Options("io.spring.javaformat.eclipse.jdt.jdk17").load(javaFormatConfig));
3939
}
4040

4141
EclipseJdk17CodeFormatter(Map<String, String> options) {

‎spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/JavadocLineBreakPreparator.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
import java.util.Collections;
2121
import java.util.List;
2222

23-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTNode;
24-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.ASTVisitor;
25-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.AbstractTypeDeclaration;
26-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.Comment;
27-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.CompilationUnit;
28-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.Javadoc;
29-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TagElement;
30-
import io.spring.javaformat.eclipse.jdt.jdk11.core.dom.TextElement;
31-
import io.spring.javaformat.eclipse.jdt.jdk11.core.formatter.CodeFormatter;
32-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.compiler.parser.TerminalTokens;
33-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Preparator;
34-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.Token;
35-
import io.spring.javaformat.eclipse.jdt.jdk11.internal.formatter.TokenManager;
23+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTNode;
24+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ASTVisitor;
25+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.AbstractTypeDeclaration;
26+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.Comment;
27+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.CompilationUnit;
28+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.Javadoc;
29+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TagElement;
30+
import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.TextElement;
31+
import io.spring.javaformat.eclipse.jdt.jdk17.core.formatter.CodeFormatter;
32+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.compiler.parser.TerminalTokens;
33+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
34+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Token;
35+
import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.TokenManager;
3636

3737
/**
3838
* {@link Preparator} to finetune Javadoc whitespace.

0 commit comments

Comments
 (0)