Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CODETOOLS-7903302: cleanup code #118

Conversation

jonathan-gibbons
Copy link
Collaborator

@jonathan-gibbons jonathan-gibbons commented Sep 13, 2022

Please review a medium-sized update to clean up the jtreg code.

Most of the changes were performed directly by the IDE. Many of the changes are very local (same line) but some affect surrounding lines when the code was reformatted ... for example, when using lambdas, or try with resources.

The most "risky" change was converting Arrays.asList, which permits null, to List.of, which does not. This was fixed up manually in a few places, most notable in ModuleConfig. In all places, null was easily changed to an empty string "".


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jtreg pull/118/head:pull/118
$ git checkout pull/118

Update a local copy of the PR:
$ git checkout pull/118
$ git pull https://git.openjdk.org/jtreg pull/118/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 118

View PR using the GUI difftool:
$ git pr show -t 118

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jtreg/pull/118.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 13, 2022

👋 Welcome back jjg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 13, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 13, 2022

Webrevs

Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like that several instances of @SuppressWarnings have been removed/resolved.

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@jonathan-gibbons this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout jtreg.7903302.code-cleanup
git fetch https://git.openjdk.org/jtreg master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 14, 2022
@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@jonathan-gibbons This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

7903302: cleanup code

Reviewed-by: iris

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 14, 2022
@jonathan-gibbons
Copy link
Collaborator Author

Like that several instances of @SuppressWarnings have been removed/resolved.

Yes, mostly because JT Harness was updated to use generic types, meaning that we could get rid of raw types.

@jonathan-gibbons
Copy link
Collaborator Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

Going to push as commit f081a45.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 14, 2022
@openjdk openjdk bot closed this Sep 14, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 14, 2022
@jonathan-gibbons jonathan-gibbons deleted the jtreg.7903302.code-cleanup branch September 14, 2022 04:22
@openjdk openjdk bot removed the rfr Pull request is ready for review label Sep 14, 2022
@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@jonathan-gibbons Pushed as commit f081a45.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants