Skip to content

8304376: Rename t1/t2 classes in com/sun/jdi/CLETest.java to avoid class duplication error in IDE #13069

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

Closed
wants to merge 2 commits into from

Conversation

lmesnik
Copy link
Member

@lmesnik lmesnik commented Mar 16, 2023

The com/sun/jdi tests are located in the on package, and classes with same name cause 'class duplication error' when this directory is opened as source code in IDE.

The simplest fix to avoid this is just to rename class.


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-8304376: Rename t1/t2 classes in com/sun/jdi/CLETest.java to avoid class duplication error in IDE

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13069

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2023

👋 Welcome back lmesnik! 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 Pull request is ready for review label Mar 16, 2023
@openjdk
Copy link

openjdk bot commented Mar 16, 2023

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Mar 16, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2023

Webrevs

Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

The fix looks good in general - approved.
Nit: But why don't use longer/better class names?

@openjdk
Copy link

openjdk bot commented Mar 17, 2023

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

8304376: Rename t1/t2 classes in com/sun/jdi/CLETest.java to avoid class duplication error in IDE

Reviewed-by: sspitsyn, cjplummer

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

  • f593a6b: 8303018: Unicode Emoji Properties
  • bc0ed73: 8304303: implement VirtualThread class notifyJvmti methods as C2 intrinsics
  • 2d0d057: 8304016: Add BitMap find_last suite of functions
  • 42723dc: 8304420: Regression ~11% with Javac-Generates on all platforms in b14
  • 19f2edd: 8304541: Modules THROW_MSG_ should return nullptr instead of JNI_FALSE
  • 622f239: 8304163: Move jdk.internal.module.ModuleInfoWriter to the test library
  • 4c8c993: 8304364: [AIX] Build erroneously determines build disk is non-local when using GNU-utils df on AIX
  • 4ed7350: 8304393: Provide method to iterate over regions of humongous object in G1
  • eb73fa8: 8301715: CDS should be disabled in exploded JDK
  • 80e9797: 8304433: cleanup sentence breaker code in DocTreeMaker
  • ... and 28 more: https://git.openjdk.org/jdk/compare/8eed7dea7b92dd98b74277e8521100f7f807eabb...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 Mar 17, 2023
@plummercj
Copy link
Contributor

Nit: But why don't use longer/better class names?

You also might want to make it start with an uppercase letter.

@lmesnik
Copy link
Member Author

lmesnik commented Mar 18, 2023

Not sure there is any meaningful name for these classes. So I updated it to CLEClass1/2 so it uses CamelCase notation and has test name as prefix to be unique.

@sspitsyn
Copy link
Contributor

sspitsyn commented Mar 20, 2023

Not sure there is any meaningful name for these classes. So I updated it to CLEClass1/2 so it uses CamelCase notation and has test name as prefix to be unique.

What does CLE stand for?

@lmesnik
Copy link
Member Author

lmesnik commented Mar 20, 2023

It is a just prefix for this test. It is named CLETest, where CLE is co-located event. I'm fine to change it to any unique enough name. However I didn't find any.

@sspitsyn
Copy link
Contributor

Okay, thanks.

@lmesnik
Copy link
Member Author

lmesnik commented Mar 22, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Mar 22, 2023

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

  • a2d8f63: 8288730: Add type parameter to Lookup::accessClass and Lookup::ensureInitialized
  • 3777455: 8302191: Performance degradation for float/double modulo on Linux
  • 760c012: 8304683: Memory leak in WB_IsMethodCompatible
  • 75168ea: 8304134: jib bootstrapper fails to quote filename when checking download filetype
  • 4154a98: 8301498: Replace NULL with nullptr in cpu/x86
  • ddf1e34: 8304089: Convert TraceDependencies to UL
  • 358c61b: 8294972: Convert jdk.jlink internal plugins to use the Classfile API
  • c74507e: 8304657: G1: Rename set_state_empty to set_state_untracked
  • ca94287: 8304144: G1: Remove unnecessary is_survivor check in G1ClearCardTableTask
  • eda0065: 8304286: java/net/SocketOption/OptionsTest.java failing after JDK-8302659
  • ... and 52 more: https://git.openjdk.org/jdk/compare/8eed7dea7b92dd98b74277e8521100f7f807eabb...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 22, 2023

@lmesnik Pushed as commit e73411a.

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

@lmesnik lmesnik deleted the 8304376 branch June 5, 2024 20:53
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 serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants