8299563: Fix typos #10029

mernst · 2022-08-25T15:35:53Z

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-8299563: Fix typos

Reviewers

Lance Andersen (@LanceAndersen - Reviewer)
Alexey Ivanov (@aivanov-jdk - Reviewer)
Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to 4e062196

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10029

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

Using diff file

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

bridgekeeper · 2022-08-25T15:37:15Z

Hi @mernst, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user mernst" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

openjdk · 2022-08-25T16:02:51Z

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

client
compiler
core-libs
hotspot
i18n
javadoc
jmx
net
nio
security
serviceability

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.

mernst · 2022-08-25T19:55:47Z

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user mernst" as summary for the issue.

Done: https://bugs.openjdk.org/browse/SKARA-1566

AlanBateman · 2022-08-30T09:31:07Z

src/java.base/share/native/libzip/zlib/zlib.h

@@ -753,7 +753,7 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
   Then no more input data should be provided before the deflateParams() call.
   If this is done, the old level and strategy will be applied to the data
   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
+   applied to the data compressed after deflateParams().


This is an issue for the upstream zlib project, we probably don't want to change it here.

Agree. See madler/zlib@5752b17 which is in the zlib development branch and addresses a wide range of typos.

OK. I backed out the change to zlib.

jaikiran · 2022-09-05T06:32:44Z

Hello Michael @mernst, these changes are mostly fine. However, they are spread across files which reside in different areas of the JDK. For changes like these, we usually split up the changes into different PRs to help reviewers of specific areas focus on the individual PRs.

Would you be willing to split this PR into separate ones. I would recommend starting with one PR which includes changes that are part of test/jdk/java, test/jdk/jdk and test/jdk/jni. If you can come up with that PR, then I'll go ahead and create a JBS issue for it and you can then link the PR against that issue.

mernst · 2022-09-05T14:54:50Z

these changes are mostly fine.

Can you be specific about the exact problems that you noticed that prevented you from saying "these changes are fine"? It doesn't seem useful to make a pull request with known deficiencies.

we usually split up the changes into different PRs to help reviewers of specific areas focus on the individual PRs.

Feel free to split up the pull request, if you feel that specific expertise in specific parts of the JDK is necessary to review these changes.

SWinxy · 2022-09-23T05:02:38Z

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java

@@ -1050,7 +1050,7 @@ public int indexOf(int elem)
   * you call getCurrentPos() and the return is 0, the next
   * fetch will take place at index 1.
   *
-   * @return The the current position index.
+   * @return The current position index.


Note that there is an inconsistent change here, albeit insignificant. In NodeSet, the capital 'The' is removed after the @return, while the lowercase 'the' is removed here.

Thanks for pointing out the inconsistency. I have fixed it. (I noticed many violations of the official Javadoc style, but this is not the right pull request to fix them.)

SWinxy · 2022-09-23T05:27:29Z

Can you be specific about the exact problems that you noticed that prevented you from saying "these changes are fine"?

These changes are fine. I don't see an instance where the duplicated words would mean a change in the specification.

jaikiran · 2022-09-24T10:41:05Z

Hello Michael,

these changes are mostly fine.

Can you be specific about the exact problems that you noticed that prevented you from saying "these changes are fine"? It doesn't seem useful to make a pull request with known deficiencies.

I wasn't implying this PR had deficiencies. What I meant was, to be able to have this reviewed, in addition to code changes this will also need a issue to be created and linked to this PR (and the PR title changed to the form <bugid>: <bug summary>).
I have now created https://bugs.openjdk.org/browse/JDK-8294321. Splitting these changes into smaller PRs instead of one big one that touches several different areas of the JDK and 108 files, will help reviewers.

mernst · 2022-09-24T19:06:11Z

Splitting these changes into smaller PRs instead of one big one that touches several different areas of the JDK and 108 files, will help reviewers.

OK. I'll repeat my comment from before:

Feel free to split up the pull request, if you feel that specific expertise in specific parts of the JDK is necessary to review these changes.

openjdk · 2022-09-25T00:42:58Z

@mernst 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 typos-typos
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2022-12-27T17:47:19Z

@AlanBateman
The net label was successfully removed.

openjdk · 2022-12-27T17:49:35Z

@AlanBateman
The nio label was successfully removed.

openjdk · 2022-12-27T17:51:23Z

@AlanBateman
The security label was successfully removed.

openjdk · 2023-01-03T18:50:03Z

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

8299563: Fix typos

Reviewed-by: lancea, aivanov, sspitsyn

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

44be5ed: 8219810: javac throws NullPointerException
b9758d2: 8200610: Compiling fails with java.nio.file.ReadOnlyFileSystemException

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 (@LanceAndersen, @aivanov-jdk, @sspitsyn) 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).

sspitsyn · 2023-01-03T19:08:59Z

Michael, I've reviewed the changes but the JDK-8294321 seems to be already resolved. So, what JBS issue are you actually trying to fix?

plummercj · 2023-01-03T21:56:23Z

Michael, I've reviewed the changes but the JDK-8294321 seems to be already resolved. So, what JBS issue are you actually trying to fix?

It's closed because #11385 used it to fix some of the typos. #11385 should have used a new issue, but now instead a new issue is needed for the remaining typos.

jaikiran · 2023-01-04T01:19:52Z

Hello Michael, I've created https://bugs.openjdk.org/browse/JDK-8299563 to track this final few typos. Could you please update the title of this PR to 8299563: Fix typos? That should then allow you to proceed using this PR. Please also merge with latest master branch once more since some typo fixes from this PR have been merged recently. Thank you for your patience.

mernst · 2023-01-04T16:30:20Z

/integrate

openjdk · 2023-01-04T16:31:58Z

@mernst
Your change (at version 6147b06) is now ready to be sponsored by a Committer.

aivanov-jdk · 2023-01-04T19:57:56Z

/sponsor

openjdk · 2023-01-04T20:00:03Z

Going to push as commit 7dcc689.
Since your change was applied there have been 2 commits pushed to the master branch:

44be5ed: 8219810: javac throws NullPointerException
b9758d2: 8200610: Compiling fails with java.nio.file.ReadOnlyFileSystemException

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-04T20:00:30Z

@aivanov-jdk @mernst Pushed as commit 7dcc689.

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

mernst · 2023-01-04T22:34:54Z

Thank you @jaikiran @LanceAndersen @aivanov-jdk !

Fix typos

085dfd2

bridgekeeper bot added the oca Needs verification of OCA signatory status label Aug 25, 2022

bridgekeeper bot removed the oca Needs verification of OCA signatory status label Aug 25, 2022

AlanBateman reviewed Aug 30, 2022

View reviewed changes

Undo change in zlip

a7150ef

SWinxy reviewed Sep 23, 2022

View reviewed changes

Fix inconsistency in capitalization

579dd77

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 25, 2022

Remove file that was removed upstream

477e05c

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 25, 2022

openjdk bot removed the nio nio-dev@openjdk.org label Dec 27, 2022

openjdk bot removed the security security-dev@openjdk.org label Dec 27, 2022

jaikiran mentioned this pull request Jan 2, 2023

8299441: Fix typos in some test files under core-libs component #11810

Closed

3 tasks

sspitsyn approved these changes Jan 3, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 3, 2023

mernst added 2 commits January 4, 2023 08:23

Merge ../jdk-openjdk into typos-typos

f8ab1c5

Address review feedback

6147b06

mernst changed the title ~~8294321: Fix typos in files under test/jdk/java, test/jdk/jdk, test/jdk/jni~~ 8299563: Fix typos Jan 4, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 4, 2023

LanceAndersen approved these changes Jan 4, 2023

View reviewed changes

aivanov-jdk approved these changes Jan 4, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 4, 2023

openjdk bot closed this Jan 4, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jan 4, 2023

mernst deleted the typos-typos branch January 4, 2023 22:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8299563: Fix typos #10029

8299563: Fix typos #10029

mernst commented Aug 25, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Aug 25, 2022

openjdk bot commented Aug 25, 2022

mernst commented Aug 25, 2022 •

edited by bridgekeeper bot

Loading

AlanBateman Aug 30, 2022

LanceAndersen Aug 30, 2022

mernst Aug 30, 2022

jaikiran commented Sep 5, 2022

mernst commented Sep 5, 2022

SWinxy Sep 23, 2022

mernst Sep 24, 2022

SWinxy commented Sep 23, 2022 •

edited

Loading

jaikiran commented Sep 24, 2022

mernst commented Sep 24, 2022

openjdk bot commented Sep 25, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Jan 3, 2023 •

edited

Loading

sspitsyn commented Jan 3, 2023

plummercj commented Jan 3, 2023

jaikiran commented Jan 4, 2023 •

edited

Loading

mernst commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

aivanov-jdk commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

mernst commented Jan 4, 2023

8299563: Fix typos #10029

8299563: Fix typos #10029

Conversation

mernst commented Aug 25, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Aug 25, 2022

openjdk bot commented Aug 25, 2022

mernst commented Aug 25, 2022 • edited by bridgekeeper bot Loading

AlanBateman Aug 30, 2022

Choose a reason for hiding this comment

LanceAndersen Aug 30, 2022

Choose a reason for hiding this comment

mernst Aug 30, 2022

Choose a reason for hiding this comment

jaikiran commented Sep 5, 2022

mernst commented Sep 5, 2022

SWinxy Sep 23, 2022

Choose a reason for hiding this comment

mernst Sep 24, 2022

Choose a reason for hiding this comment

SWinxy commented Sep 23, 2022 • edited Loading

jaikiran commented Sep 24, 2022

mernst commented Sep 24, 2022

openjdk bot commented Sep 25, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Dec 27, 2022

openjdk bot commented Jan 3, 2023 • edited Loading

sspitsyn commented Jan 3, 2023

plummercj commented Jan 3, 2023

jaikiran commented Jan 4, 2023 • edited Loading

mernst commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

aivanov-jdk commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

openjdk bot commented Jan 4, 2023

mernst commented Jan 4, 2023

mernst commented Aug 25, 2022 •

edited by openjdk bot

Loading

mernst commented Aug 25, 2022 •

edited by bridgekeeper bot

Loading

SWinxy commented Sep 23, 2022 •

edited

Loading

openjdk bot commented Jan 3, 2023 •

edited

Loading

jaikiran commented Jan 4, 2023 •

edited

Loading