Use Java 11 methods where possible #6700

basil · 2022-06-25T00:31:45Z

Applies the OpenRewrite Migrate to Java 11 from Java 8 migration against this code base, along with any suggestions from IntelliJ's Java language migration aids and some manual touch-up.

Proposed changelog entries

N/A

Proposed upgrade guidelines

N/A

Submitter checklist

(If applicable) Jira issue is well described
Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. Examples
- Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
Appropriate autotests or explanation to why this change has no tests
New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadoc, as appropriate.
For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

There are at least 2 approvals for the pull request and no outstanding requests for change
Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
Changelog entries in the PR title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood
Proper changelog labels are set so that the changelog can be generated automatically
If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

basil · 2022-06-25T19:11:35Z

bom/pom.xml

+    <!-- TODO https://github.com/jenkinsci/stapler/pull/377 -->
+    <stapler.version>1701.va_9519c27c7c2</stapler.version>


jenkinsci/stapler#377

basil · 2022-06-25T19:11:49Z

pom.xml

+    <!-- TODO https://github.com/jenkinsci/remoting/pull/551 -->
+    <remoting.version>3032.v630e4c777a_75</remoting.version>


jenkinsci/remoting#551

Just to pretest these PRs, not actually required, right?

Correct, have reverted now that BOM tests passed

jglick

Other than the POM bumps, all looks fine to merge right away, from a random sampling of diffs (did not attempt to read every line). Any reason to hold back on this?

jglick · 2022-06-28T15:27:27Z

pom.xml

+    <!-- TODO https://github.com/jenkinsci/remoting/pull/551 -->
+    <remoting.version>3032.v630e4c777a_75</remoting.version>


Just to pretest these PRs, not actually required, right?

basil · 2022-06-28T17:49:21Z

Any reason to hold back on this?

Testing is still underway in jenkinsci/bom#1234

basil · 2022-06-28T20:37:06Z

BOM test passed: https://ci.jenkins.io/job/Tools/job/bom/job/PR-1234/5/

basil · 2022-06-28T20:45:04Z

did not attempt to read every line)

I suggest at least reading the changes to core/src/main/resources/jenkins/security/whitelisted-classes.txt which were needed to prevent numerous failures in the core test suite

timja

I looked through most of it, nice job :)

NotMyFault

Hot stuff, nice one 🔥

basil · 2022-06-29T20:54:31Z

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!

jglick · 2022-06-30T16:53:18Z

core/src/main/resources/jenkins/security/whitelisted-classes.txt

@@ -58,6 +58,7 @@ java.time.Ser
 java.util.ArrayDeque
 java.util.ArrayList
 java.util.Arrays$ArrayList
+java.util.CollSer


(private top-level class in ImmutableCollections.java)

jglick · 2022-06-30T16:55:15Z

core/src/main/resources/jenkins/security/whitelisted-classes.txt

@@ -103,6 +104,7 @@ java.util.GregorianCalendar
 java.util.HashMap
 java.util.HashSet
 java.util.Hashtable
+java.util.ImmutableCollections$List12


Just saw #6700 (comment). For reference, I think this is so that tests like

jenkins/test/src/test/java/hudson/model/ParametersAction2Test.java

Line 131 in a6ec1b0

p.addProperty(new ParametersDefinitionProperty(List.of(

could still work. We would not expect such entries to be used in production code, any more than we would older entries like

jenkins/core/src/main/resources/jenkins/security/whitelisted-classes.txt

Line 78 in a6ec1b0

java.util.Collections$SingletonList

jglick · 2022-09-28T16:28:38Z

core/src/main/java/hudson/Functions.java

        if (url.endsWith("/")) url = url.substring(0, url.length() - 1);
        if (href.endsWith("/")) href = href.substring(0, href.length() - 1);

        return url.endsWith(href);
    }

    public <T> List<T> singletonList(T t) {
-        return Collections.singletonList(t);
+        return List.of(t);


Incompatible I think: jenkinsci/emailext-template-plugin#71 (comment)

Use Java 11 methods where possible

21e8db0

basil added the skip-changelog Should not be shown in the changelog label Jun 25, 2022

basil added 7 commits June 24, 2022 21:16

Whitelist java.util.ImmutableCollections

68fd631

Revert AbstractProject changes

85e99e9

Add java.util.CollSer to serialization list

f90c828

Merge remote-tracking branch 'origin/master' into java11-migration

816b87c

Keep list sorted

bdfe07a

Consume remoting incremental

8f063f0

Use incremental of Stapler

410e271

basil marked this pull request as draft June 25, 2022 19:11

basil commented Jun 25, 2022

View reviewed changes

IntelliJ suggestions

208a04e

basil added the work-in-progress The PR is under active development, not ready to the final review label Jun 25, 2022

basil added 3 commits June 26, 2022 16:24

Merge branch 'master' into java11-migration

8612540

Declare variable on the same line

a4252e9

Merge branch 'master' into java11-migration

24cb4b3

basil mentioned this pull request Jun 28, 2022

Testing Java 11 methods PRs jenkinsci/bom#1234

Closed

6 tasks

jglick reviewed Jun 28, 2022

View reviewed changes

jetersen mentioned this pull request Jun 28, 2022

Bump parent POM, aws-java-sdk, BOM dependencies jenkinsci/aws-secrets-manager-secret-source-plugin#88

Merged

Merge branch 'master' into java11-migration

3bcbf57

Reverting incrementals

a6ec1b0

basil marked this pull request as ready for review June 28, 2022 20:42

basil removed the work-in-progress The PR is under active development, not ready to the final review label Jun 28, 2022

basil requested a review from timja June 28, 2022 20:43

timja approved these changes Jun 28, 2022

View reviewed changes

timja requested a review from jglick June 28, 2022 21:28

NotMyFault approved these changes Jun 28, 2022

View reviewed changes

StefanSpieker approved these changes Jun 29, 2022

View reviewed changes

basil added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jun 29, 2022

basil merged commit 6d17999 into jenkinsci:master Jun 30, 2022

basil deleted the java11-migration branch June 30, 2022 16:31

jglick reviewed Jun 30, 2022

View reviewed changes

jglick mentioned this pull request Jul 1, 2022

DoubleLaunchChecker can use ProcessHandle to get its own PID #6743

Merged

6 tasks

jglick mentioned this pull request Sep 28, 2022

[JENKINS-69153] Do not call deprecated h.singletonList jenkinsci/emailext-template-plugin#71

Merged

6 tasks

jglick reviewed Sep 28, 2022

View reviewed changes

jglick mentioned this pull request Dec 15, 2022

Require Java 11 or newer jenkinsci/workflow-cps-plugin#635

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Java 11 methods where possible #6700

Use Java 11 methods where possible #6700

basil commented Jun 25, 2022 •

edited

basil Jun 25, 2022

basil Jun 25, 2022

jglick Jun 28, 2022

basil Jun 28, 2022

jglick left a comment

jglick Jun 28, 2022

basil commented Jun 28, 2022

basil commented Jun 28, 2022

basil commented Jun 28, 2022

timja left a comment

NotMyFault left a comment

basil commented Jun 29, 2022

jglick Jun 30, 2022

jglick Jun 30, 2022

jglick Sep 28, 2022

		<!-- TODO https://github.com/jenkinsci/stapler/pull/377 -->
		<stapler.version>1701.va_9519c27c7c2</stapler.version>

		<!-- TODO https://github.com/jenkinsci/remoting/pull/551 -->
		<remoting.version>3032.v630e4c777a_75</remoting.version>

Use Java 11 methods where possible #6700

Use Java 11 methods where possible #6700

Conversation

basil commented Jun 25, 2022 • edited

Proposed changelog entries

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Maintainer checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jglick left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basil commented Jun 28, 2022

basil commented Jun 28, 2022

basil commented Jun 28, 2022

timja left a comment

Choose a reason for hiding this comment

NotMyFault left a comment

Choose a reason for hiding this comment

basil commented Jun 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basil commented Jun 25, 2022 •

edited