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

8273513: Make java.io.FilterInputStream specification more precise about overrides #5426

Closed
wants to merge 3 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Sep 8, 2021

Modify the class level specification of java.io.FilterInputStream to be more exact about java.io.InputStream methods that it overrides.


Progress

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

Issue

  • JDK-8273513: Make java.io.FilterInputStream specification more precise about overrides

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5426/head:pull/5426
$ git checkout pull/5426

Update a local copy of the PR:
$ git checkout pull/5426
$ git pull https://git.openjdk.java.net/jdk pull/5426/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5426

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5426.diff

@bplb
Copy link
Member Author

@bplb bplb commented Sep 8, 2021

Some other incidental modifications are made in passing, principally adding @Override annotations and putting statements like This method does X in @implSpec blocks.

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 8, 2021

👋 Welcome back bpb! 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 label Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

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

  • core-libs

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 core-libs label Sep 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 8, 2021

Webrevs

@bplb
Copy link
Member Author

@bplb bplb commented Sep 8, 2021

/csr

@openjdk openjdk bot added the csr label Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@bplb has indicated that a compatibility and specification (CSR) request is needed for this pull request.
@bplb please create a CSR request for issue JDK-8273513. This pull request cannot be integrated until the CSR request is approved.

@bplb
Copy link
Member Author

@bplb bplb commented Sep 9, 2021

CSR filed: JDK-8273517.

dfuch
dfuch approved these changes Sep 9, 2021
Copy link
Member

@dfuch dfuch left a comment

LGTM. The use of synchronized on mark() and reset() is strange. But I guess that should be for another day...

naotoj
naotoj approved these changes Sep 10, 2021
Copy link
Member

@naotoj naotoj left a comment

LGTM.

@@ -86,7 +83,8 @@ public int read() throws IOException {
* Reads up to {@code b.length} bytes of data from this
* input stream into an array of bytes. This method blocks until some
* input is available.
* <p>
*
* @implSpec
* This method simply performs the call
* {@code read(b, 0, b.length)} and returns
* the result. It is important that it does
Copy link
Member

@naotoj naotoj Sep 10, 2021

Choose a reason for hiding this comment

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

Preexisting: an extra space before "result."

@openjdk openjdk bot removed the csr label Sep 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

8273513: Make java.io.FilterInputStream specification more precise about overrides

Reviewed-by: dfuchs, naoto

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

  • 2ee1f96: 8273484: Cleanup unnecessary null comparison before instanceof check in java.naming
  • f189dff: 8273595: tools/jpackage tests do not work on apt-based Linux distros like Debian
  • 922e86f: 8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap
  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • ... and 35 more: https://git.openjdk.java.net/jdk/compare/a5e4def526697d88ff31a5fdb41d823b899372f2...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 label Sep 13, 2021
@bplb
Copy link
Member Author

@bplb bplb commented Sep 13, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

Going to push as commit 6cf5079.
Since your change was applied there have been 54 commits pushed to the master branch:

  • b4b1210: 8273616: Fix trivial doc typos in the java.base module
  • 7c26ddb: 8195809: [TESTBUG] jps and jcmd -l support for containers is not tested
  • 4cfa230: 8273259: Character.getName doesn't follow Unicode spec for ideographs
  • f9b2507: 8271834: TestStringDeduplicationAgeThreshold intermittent failures on Shenandoah
  • 261cb44: 8273629: compiler/uncommontrap/TestDeoptOOM.java fails with release VMs
  • b0d0497: 8273584: TypeElement.getSuperclass crashes for a record TypeElement when j.l.Record is not available
  • 4efcd20: 8273478: [macos11] JTabbedPane selected and pressed tab is not legible
  • a73c06d: 8273021: C2: Improve Add and Xor ideal optimizations
  • 9f86082: 8273610: LogTestFixture::restore_config() should not restore options
  • 2ee1f96: 8273484: Cleanup unnecessary null comparison before instanceof check in java.naming
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/a5e4def526697d88ff31a5fdb41d823b899372f2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 13, 2021
@bplb bplb deleted the FilterInputStream-spec-8273513 branch Sep 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

@bplb Pushed as commit 6cf5079.

💡 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
core-libs integrated
3 participants