[java] Support JDK 22 by adangel · Pull Request #4824 · pmd/pmd

adangel · 2024-02-15T11:43:45Z

Describe the PR

Related issues

Fixes [java] Support JDK 22 #4794

Ready?

Added unit tests for fixed bug/feature
Passing all unit tests
Complete build ./mvnw clean verify passes (checked automatically by github actions)
Added (in-code) documentation (if needed)

- Record patterns in enhanced for statements - parenthesized patterns These features have not been standardized.

- after 20-preview is gone - Note: DECONSTRUCTION_PATTERNS_IN_ENHANCED_FOR_STATEMENT is completely gone. This was only available for 20-preview and has been removed with 21.

TemplateFragment now has an attribute "content".

…ance Main Methods

This is now standardized.

ghost · 2024-02-15T12:14:08Z

	1 Message
📖	Compared to master: This changeset changes 0 violations, introduces 17 new violations, 0 new errors and 0 new configuration errors, removes 0 violations, 1 errors and 0 configuration errors. Download full report as build artifact
✅	Compared to master: This changeset changes 0 violations, introduces 17 new violations, 0 new errors and 0 new configuration errors, removes 0 violations, 1 errors and 0 configuration errors. Download full report as build artifact

Generated by 🚫 Danger

Java 22 provides a real console from System.console() even if it is non-interactive. In that case, we need to check whether we have a terminal.

jsotuyod · 2024-03-03T21:12:47Z

+            // Since Java 22, this returns a console even for redirected streams.
+            // In that case, we need to check Console.isTerminal()
+            // See: JLine As The Default Console Provider (JDK-8308591)
+            try {
+                Boolean isTerminal = (Boolean) MethodUtils.invokeMethod(console, "isTerminal");
+                if (!isTerminal) {
+                    // stop here, we don't have an interactive console.
+                    return null;
+                }
+            } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException ignored) {
+                // fall-through - we use a Java Runtime < 22.
+            }
+


I'd assume since our CLI progressbar uses JLine3 under the hood to detect terminal capabilities that it is safe and won't choke on this change… but did you have the chance to test it?

This change is about how we determine the console encoding for ant, if the report should be output to the console (toConsole=true) - and when building PMD with Java 22, the (ant) unit tests failed, because then we couldn't override the encoding for testing purpose anymore and couldn't test various encoding combinations. The tests are actually in pmd-java:

pmd/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java

Lines 89 to 110 in 04c2c01

private static void setDefaultCharset(String charsetName) {

System.setProperty("file.encoding", charsetName);

}

@Test

void testFormatterEncodingWithXML() throws Exception {

Locale.setDefault(Locale.FRENCH);

setDefaultCharset("cp1252");

executeTarget("testFormatterEncodingWithXML");

String report = IOUtil.readFileToString(currentTempFile(), StandardCharsets.UTF_8);

assertTrue(report.contains("someVariableWithÜmlaut"));

}

@Test

void testFormatterEncodingWithXMLConsole() throws UnsupportedEncodingException {

setDefaultCharset("cp1252");

String report = executeTarget("testFormatterEncodingWithXMLConsole");

assertTrue(report.startsWith("<?xml version=\"1.0\" encoding=\"windows-1252\"?>"));

assertTrue(report.contains("someVariableWithÜmlaut"));

}

And we explicitly set the system property "file.encoding" in the unit test, so that we can "override" the encoding for the test. That didn't work anymore, because Java 22 now returns always a Console and the tests used then always the correct console encoding rather than the faked test encoding.

I actually didn't test PMD CLI with Java 22 - if I remember correctly, I only tested the build with Java 22 and eventually it works - that means the integration tests in pmd-dist were successful. However, I think we don't test the progress bar there.

[java] Support JDK 22 #4824

adangel added 8 commits February 15, 2024 09:50

[java] Add new java language versions 22 and 22-preview

73dbd56

Update asm dependency to 9.6

c462063

[java] Remove java language version 20-preview

2a53eba

[java] Remove old java 20 preview features

c4eccf4

- Record patterns in enhanced for statements - parenthesized patterns These features have not been standardized.

[java] Update LanguageLevelChecker#RegularLanguageFeature

96bc9ef

- after 20-preview is gone - Note: DECONSTRUCTION_PATTERNS_IN_ENHANCED_FOR_STATEMENT is completely gone. This was only available for 20-preview and has been removed with 21.

[java] Update Tests for JEP 459 String Templates

fbb9da2

TemplateFragment now has an attribute "content".

[java] Update Tests for JEP 463: Implicitly Declared Classes and Inst…

cb3ceef

…ance Main Methods

[java] JEP 456: Unnamed Variables & Patterns

4e01a3d

This is now standardized.

adangel added this to the 7.0.0 milestone Feb 15, 2024

adangel added 5 commits February 15, 2024 13:20

[java] JEP 447: Statements before super(...) (Preview) (Java 22)

bfe9ce6

[java] Fix tests with ExplicitConstructorInvocations

2a1aaa6

[doc] Update release notes (pmd#4794) Java 22

01647be

[ant] Fix ant Formatter with Java 22

ac2c52e

Java 22 provides a real console from System.console() even if it is non-interactive. In that case, we need to check whether we have a terminal.

Ignore empty catch block

ccebca5

adangel marked this pull request as ready for review February 15, 2024 16:05

jsotuyod reviewed Mar 3, 2024

View reviewed changes

adangel merged commit 93bf4d5 into pmd:master Mar 4, 2024

adangel added a commit that referenced this pull request Mar 4, 2024

Merge pull request #4824 from adangel:issue-4794-java-22

49bc535

[java] Support JDK 22 #4824

adangel deleted the issue-4794-java-22 branch March 4, 2024 18:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[java] Support JDK 22#4824

[java] Support JDK 22#4824
adangel merged 13 commits into
pmd:masterfrom
adangel:issue-4794-java-22

adangel commented Feb 15, 2024 •

edited

Loading

Uh oh!

ghost commented Feb 15, 2024 •

edited by ghost

Loading

Uh oh!

jsotuyod Mar 3, 2024

Uh oh!

adangel Mar 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	private static void setDefaultCharset(String charsetName) {
	System.setProperty("file.encoding", charsetName);
	}

	@Test
	void testFormatterEncodingWithXML() throws Exception {
	Locale.setDefault(Locale.FRENCH);
	setDefaultCharset("cp1252");

	executeTarget("testFormatterEncodingWithXML");
	String report = IOUtil.readFileToString(currentTempFile(), StandardCharsets.UTF_8);
	assertTrue(report.contains("someVariableWithÜmlaut"));
	}

	@Test
	void testFormatterEncodingWithXMLConsole() throws UnsupportedEncodingException {
	setDefaultCharset("cp1252");

	String report = executeTarget("testFormatterEncodingWithXMLConsole");
	assertTrue(report.startsWith("<?xml version=\"1.0\" encoding=\"windows-1252\"?>"));
	assertTrue(report.contains("someVariableWithÜmlaut"));
	}

Uh oh!

Conversation

adangel commented Feb 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describe the PR

Related issues

Ready?

Uh oh!

ghost commented Feb 15, 2024 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jsotuyod Mar 3, 2024

Choose a reason for hiding this comment

Uh oh!

adangel Mar 4, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adangel commented Feb 15, 2024 •

edited

Loading

ghost commented Feb 15, 2024 •

edited by ghost

Loading