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

8259439: Apply java.io.Serial annotations in java.datatransfer #1996

Closed
wants to merge 2 commits into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jan 8, 2021

Please review the application of @java.io.Serial annotation (JDK-8202385) to types in the datatransfer module to enable stricter compile-time checking of serialization-related declarations.

This annotation can be applied to these methods in the module:

  • private void writeObject(java.io.ObjectOutputStream stream) throws IOException
  • private void readObject(java.io.ObjectInputStream stream) throws IOException, ClassNotFoundException
  • private void readObjectNoData() throws ObjectStreamException
  • ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException
  • ANY-ACCESS-MODIFIER Object readResolve() throws ObjectStreamException
  • private static final ObjectStreamField[] serialPersistentFields
  • private static final long serialVersionUID

But only the serialVersionUID is updated since only this field is used in the datatransfer module.

A similar fix was implemented for java.base module as well:
http://mail.openjdk.java.net/pipermail/core-libs-dev/2019-August/062046.html


Progress

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

Issue

  • JDK-8259439: Apply java.io.Serial annotations in java.datatransfer

Reviewers

Download

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 8, 2021

👋 Welcome back serb! 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 Jan 8, 2021

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

  • awt

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 awt client-libs-dev@openjdk.org label Jan 8, 2021
@mrserb mrserb marked this pull request as ready for review January 8, 2021 06:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 8, 2021
@mrserb
Copy link
Member Author

mrserb commented Jan 8, 2021

@jddarcy please take a look, as far as I understand we do not create a CSR for such changes.

@mlbridge
Copy link

mlbridge bot commented Jan 8, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 8, 2021

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

8259439: Apply java.io.Serial annotations in java.datatransfer

Reviewed-by: aivanov, pbansal, trebari, darcy

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

  • 33fbc10: 8259025: Record compact constructor using Objects.requireNonNull
  • 23801da: 8259482: jni_Set/GetField_probe are the same as their _nh versions
  • 01b2804: 8237578: JDK-8214339 (SSLSocketImpl wraps SocketException) appears to not be fully fixed
  • 1bd015f: 8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk
  • 2354882: 8250768: javac should be adapted to changes in JEP 12
  • 18a37f9: 8259368: Zero: UseCompressedClassPointers does not depend on UseCompressedOops
  • a03e22b: 8253910: UseCompressedClassPointers depends on UseCompressedOops in vmError.cpp
  • e0d748d: 8258606: os::print_signal_handlers() should resolve the function name of the handlers
  • bd34418: 8258445: Move make/templates to make/data
  • d21a0ea: 8258449: Move make/hotspot/symbols to make/data
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/56a354eb554a38e7853aba927302244e8cc07f6c...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 Jan 8, 2021
Copy link
Member

@jddarcy jddarcy left a comment

Choose a reason for hiding this comment

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

Looks fine.

@mrserb
Copy link
Member Author

mrserb commented Jan 11, 2021

/integrate

@openjdk openjdk bot closed this Jan 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@mrserb Since your change was applied there have been 43 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit ff54b77.

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

@mrserb mrserb deleted the JDK-8259439 branch January 11, 2021 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awt client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

5 participants