JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http #1364

amCap1712 · 2020-11-21T11:45:42Z

Hi!
Kindly review this patch to replace switch statements with switch expressions (where it makes sense) in the http client modules. The rationale is to improve readability of the code.
Regards,
Kartik

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http

Reviewers

Chris Hegarty (@ChrisHegarty - Reviewer) ⚠️ Review applies to 3e66742
Daniel Fuchs (@dfuch - Reviewer)
pconcannon - Committer ⚠️ Added manually

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1364/head:pull/1364
$ git checkout pull/1364

bridgekeeper · 2020-11-21T11:45:59Z

👋 Welcome back amCap1712! 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 · 2020-11-21T11:46:58Z

@amCap1712 The following labels will be automatically applied to this pull request:

net
security

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

….net.http

mlbridge · 2020-11-30T12:53:01Z

Webrevs

04: Full - Incremental (e73ab02)
03: Full - Incremental (3e66742)
02: Full - Incremental (7fa11daf10e1249a7f75b490304c0695dac52888)
01: Full - Incremental (542298e)
00: Full (4ecf4e0d4600a188cac8602eaae2f926cfeb30d5)

johnshajiang · 2020-12-01T01:51:35Z

Just a question.
Do we have clear guideline or requirement for using this new lang feature?
We know there are a lot of old switch-case blocks in the existing codes,
including source codes and test codes.

pconcannon · 2020-12-01T12:05:25Z

src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java

-            return "MAX_HEADER_LIST_SIZE";
-        }
-        return "unknown parameter";
+        return switch (i + 1) {


Hi Kartik. I think it would improve the readability for each of the switch/case expressions if you tab aligned each of the cases, and place the default case on its own line e.g.

return switch (i + 1) { case HEADER_TABLE_SIZE -> "HEADER_TABLE_SIZE"; case ENABLE_PUSH -> "ENABLE_PUSH"; case MAX_CONCURRENT_STREAMS -> "MAX_CONCURRENT_STREAMS"; case INITIAL_WINDOW_SIZE -> "INITIAL_WINDOW_SIZE"; case MAX_FRAME_SIZE -> "MAX_FRAME_SIZE"; case MAX_HEADER_LIST_SIZE -> "MAX_HEADER_LIST_SIZE"; default -> "unknown parameter"; };

dfuch · 2020-12-01T12:38:37Z

Do we have clear guideline or requirement for using this new lang feature?
We know there are a lot of old switch-case blocks in the existing codes,
including source codes and test codes.

@johnshajiang I don't think we have any global guideline but in this specific case I agree that using switch expressions as proposed is making the code generally more readable, with maybe a few cases where it might not have improved readability as much (for instance I'm not a big fan of line 54 in that file: https://github.com/openjdk/jdk/pull/1364/files#diff-ae0f662913a65511f983a3f0f9a98b708c11906a6f87aa4c96ab6fc7abf5ae9f )

best regards,

-- daniel

ChrisHegarty

I think that the actual source changes look good.

A few notes:

there are whitespace issues. jcheck is failing.
Please do not force push - just push. Force push messes up prior comments in the thread.

dfuch · 2020-12-02T16:23:11Z

src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java

+            case MAX_FRAME_SIZE ->          "MAX_FRAME_SIZE";
+            case MAX_HEADER_LIST_SIZE ->    "MAX_HEADER_LIST_SIZE";
+
+            default -> "unknown parameter";


Check failure on line 81 in src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java
openjdk / jcheck

Whitespace error

Column 0: trailing whitespace
...

WRT to whitespace errors detected by jcheck, note that you can fix them by running the script:

make/scripts/normalizer.pl

on this file.

That's handy. Thanks!

pconcannon · 2020-12-02T16:26:43Z

src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java

-                case HEADER_FOUND_CR, HEADER_FOUND_LF -> resumeOrLF(input);
-                case HEADER_FOUND_CR_LF -> resumeOrSecondCR(input);
-                case HEADER_FOUND_CR_LF_CR -> resumeOrEndHeaders(input);
+                case INITIAL ->                                     state = State.STATUS_LINE;


Looks good. Although, I think you can improve it further if you align the lambda operators as well

Yes right. Just noticed I had missed that. Fixed in latest commit :)

Looks much better, Kartik. Thanks

openjdk · 2020-12-02T16:28:17Z

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

8257401: Use switch expressions in jdk.internal.net.http and java.net.http

Reviewed-by: chegar, dfuchs, pconcannon

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

86b6575: 8257574: C2: "failed: parsing found no loops but there are some" assert failure
dede01e: 8257622: MemoryAccess methods are missing @ForceInline annotations
1d2d981: 8257423: [PPC64] Support -XX:-UseInlineCaches
feabdde: 8251843: jfr/tool/TestPrintJSON.java fails intermittently
c6f93ec: 8257707: Fix incorrect format string in Http1HeaderParser
fbdc187: 8257624: C2: PhaseMacroExpand::eliminate_macro_nodes() crashes on out-of-bounds access into macro node array
fd6756e: 8257634: C2: Introduce IncrementalInliningForceCleanup diagnostic flag
af6b7f9: 8257743: Minimal build on AArch64 failed with --disable-precompiled-headers
d6dd440: 8256264: Printed GlyphVector outline with low DPI has bad quality on Windows
2b4a423: 8255542: Attribute length of Module, ModulePackages and other attributes is ignored
... and 166 more: https://git.openjdk.java.net/jdk/compare/0d91f0a1df2dbb484e964efa4f1a9500eab799fe...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@ChrisHegarty, @dfuch) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

amCap1712 · 2020-12-02T16:30:51Z

@ChrisHegarty Thanks for the review. I'll keep in mind not to use force push again.

amCap1712 · 2020-12-04T11:22:34Z

@pconcannon, If everything is in order, can you please approve the changes on Github. I'll then issue the integrate command. Thanks.

pconcannon · 2020-12-04T14:00:04Z

@pconcannon, If everything is in order, can you please approve the changes on Github. I'll then issue the integrate command. Thanks.

Hi @amCap1712, you will have to /integrate first, and then afterwards I will sponsor

amCap1712 · 2020-12-04T14:25:52Z

/integrate

openjdk · 2020-12-04T14:26:29Z

@amCap1712
Your change (at version e73ab02) is now ready to be sponsored by a Committer.

amCap1712 · 2020-12-04T14:29:59Z

/reviewer credit @pconcannon

openjdk · 2020-12-04T14:30:18Z

@amCap1712
Reviewer pconcannon successfully credited.

pconcannon · 2020-12-04T15:15:19Z

/sponsor

openjdk · 2020-12-04T15:16:10Z

@pconcannon @amCap1712 Since your change was applied there have been 176 commits pushed to the master branch:

86b6575: 8257574: C2: "failed: parsing found no loops but there are some" assert failure
dede01e: 8257622: MemoryAccess methods are missing @ForceInline annotations
1d2d981: 8257423: [PPC64] Support -XX:-UseInlineCaches
feabdde: 8251843: jfr/tool/TestPrintJSON.java fails intermittently
c6f93ec: 8257707: Fix incorrect format string in Http1HeaderParser
fbdc187: 8257624: C2: PhaseMacroExpand::eliminate_macro_nodes() crashes on out-of-bounds access into macro node array
fd6756e: 8257634: C2: Introduce IncrementalInliningForceCleanup diagnostic flag
af6b7f9: 8257743: Minimal build on AArch64 failed with --disable-precompiled-headers
d6dd440: 8256264: Printed GlyphVector outline with low DPI has bad quality on Windows
2b4a423: 8255542: Attribute length of Module, ModulePackages and other attributes is ignored
... and 166 more: https://git.openjdk.java.net/jdk/compare/0d91f0a1df2dbb484e964efa4f1a9500eab799fe...master

Your commit was automatically rebased without conflicts.

Pushed as commit ac54900.

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

openjdk bot added security security-dev@openjdk.org net net-dev@openjdk.org labels Nov 21, 2020

amCap1712 changed the title ~~Use switch expressions in jdk.internal.net.http and java.net.http~~ JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http Nov 30, 2020

openjdk bot added the rfr Pull request is ready for review label Nov 30, 2020

JDK-8257401: Use switch expressions in jdk.internal.net.http and java…

542298e

….net.http

pconcannon reviewed Dec 1, 2020

View reviewed changes

openjdk bot removed the rfr Pull request is ready for review label Dec 2, 2020

Vertically align statements in switch expressions

3e66742

ChrisHegarty approved these changes Dec 2, 2020

View reviewed changes

dfuch reviewed Dec 2, 2020

View reviewed changes

pconcannon reviewed Dec 2, 2020

View reviewed changes

Align -> and remove trailing whitespace

e73ab02

openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 2, 2020

dfuch approved these changes Dec 2, 2020

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 4, 2020

openjdk bot closed this Dec 4, 2020

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 4, 2020

JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http #1364

JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http #1364

amCap1712 commented Nov 21, 2020 •

edited by openjdk bot

bridgekeeper bot commented Nov 21, 2020

openjdk bot commented Nov 21, 2020

mlbridge bot commented Nov 30, 2020 •

edited

johnshajiang commented Dec 1, 2020

pconcannon Dec 1, 2020

dfuch commented Dec 1, 2020

ChrisHegarty left a comment •

edited

dfuch Dec 2, 2020

amCap1712 Dec 2, 2020

pconcannon Dec 2, 2020

amCap1712 Dec 2, 2020

pconcannon Dec 2, 2020

openjdk bot commented Dec 2, 2020 •

edited

amCap1712 commented Dec 2, 2020

amCap1712 commented Dec 4, 2020

pconcannon commented Dec 4, 2020

amCap1712 commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

amCap1712 commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

pconcannon commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http #1364

JDK-8257401: Use switch expressions in jdk.internal.net.http and java.net.http #1364

Conversation

amCap1712 commented Nov 21, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Nov 21, 2020

openjdk bot commented Nov 21, 2020

mlbridge bot commented Nov 30, 2020 • edited

Webrevs

johnshajiang commented Dec 1, 2020

pconcannon Dec 1, 2020

Choose a reason for hiding this comment

dfuch commented Dec 1, 2020

ChrisHegarty left a comment • edited

Choose a reason for hiding this comment

dfuch Dec 2, 2020

Choose a reason for hiding this comment

amCap1712 Dec 2, 2020

Choose a reason for hiding this comment

pconcannon Dec 2, 2020

Choose a reason for hiding this comment

amCap1712 Dec 2, 2020

Choose a reason for hiding this comment

pconcannon Dec 2, 2020

Choose a reason for hiding this comment

openjdk bot commented Dec 2, 2020 • edited

amCap1712 commented Dec 2, 2020

amCap1712 commented Dec 4, 2020

pconcannon commented Dec 4, 2020

amCap1712 commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

amCap1712 commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

pconcannon commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

amCap1712 commented Nov 21, 2020 •

edited by openjdk bot

mlbridge bot commented Nov 30, 2020 •

edited

ChrisHegarty left a comment •

edited

openjdk bot commented Dec 2, 2020 •

edited