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

8295953: Use enhanced-for cycle instead of Enumeration in sun.security #10734

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Oct 17, 2022

java.util.Enumeration is a legacy interface from java 1.0.
There are a few places with cycles which use it to iterate over collections. We can replace this manual cycle with enchanced-for, which is shorter and easier to read.


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

  • JDK-8295953: Use enhanced-for cycle instead of Enumeration in sun.security

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10734

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10734.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 17, 2022

👋 Welcome back aturbanov! 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
Copy link

openjdk bot commented Oct 17, 2022

@turbanoff The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the security security-dev@openjdk.org label Oct 17, 2022
ex = e.nextElement();
inCertOID = ex.getExtensionId();
for (Extension ex : extensions.getAllExtensions()) {
ObjectIdentifier inCertOID = ex.getExtensionId();
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the old getElements method still useful?

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems it's not used in current codebase anymore. Do you propose to drop it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Re-read. Maybe not. A lot of other x509 classes have this getElements method and it seems the one you touched is the only actually used. This might be an obsolete convention and if we want to remove them we can remove them in another issue.

@turbanoff turbanoff changed the title [PATCH] Use enhanced-for cycle instead of Enumeration in sun.security 8295953: Use enhanced-for cycle instead of Enumeration in sun.security Oct 26, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 26, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 26, 2022

Webrevs

Copy link
Contributor

@wangweij wangweij left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Oct 28, 2022

@turbanoff 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:

8295953: Use enhanced-for cycle instead of Enumeration in sun.security

Reviewed-by: weijun

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 163 new commits pushed to the master branch:

  • 823fd4a: 8293785: Add a jtreg test for TraceOptoParse
  • 754bd53: 8296030: compiler/c2/irTests/TestVectorizeTypeConversion.java fails with release VMs after JDK-8291781
  • 1fdbb1b: 8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic
  • cf5546b: 8291336: Add ideal rule to convert floating point multiply by 2 into addition
  • 4b89fce: 8291781: assert(!is_visited) failed: visit only once with -XX:+SuperWordRTDepCheck
  • d5d3424: 8295405: Add cause in a couple of IllegalArgumentException and InvalidParameterException shown by sun/security/pkcs11 tests
  • fd668dc: 8295537: Enhance TRACE_METHOD_LINKAGE to show the target MethodHandle
  • 182c215: 8295994: Remove left over InetAddressContainer class
  • 78763fc: 8295000: java/util/Formatter/Basic test cleanup
  • 907d583: 8295323: Unnecessary HashTable usage in StyleSheet
  • ... and 153 more: https://git.openjdk.org/jdk/compare/8d751de3198675b22704cdccafaff2fc0fdd3f59...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 the ready Pull request is ready to be integrated label Oct 28, 2022
@turbanoff
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 7, 2022

Going to push as commit 3baad06.
Since your change was applied there have been 255 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 7, 2022
@openjdk openjdk bot closed this Nov 7, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 7, 2022
@openjdk
Copy link

openjdk bot commented Nov 7, 2022

@turbanoff Pushed as commit 3baad06.

💡 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 security security-dev@openjdk.org
2 participants