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

Read resolvedInBuild JBS property properly #1042

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Mar 1, 2021

The resolvedInBuild property was not read correctly from JBS, leading to incorrect issue labels.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/1042/head:pull/1042
$ git checkout pull/1042

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 1, 2021

👋 Welcome back rwestberg! 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 Mar 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 1, 2021

Webrevs

Copy link
Member

@edvbld edvbld left a comment

Looks good, I just have a minor comment inline!

if (issue.properties().containsKey("customfield_10006")) {
return JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").asString());
Copy link
Member

@edvbld edvbld Mar 10, 2021

Choose a reason for hiding this comment

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

Would you mind creating a variable naming the custom field? For example:

var resolvedInBuild = "customfield_10006";
if (issue.properties().containsKey(resolvedInBuild)) {

Copy link
Member Author

@rwestberg rwestberg Mar 10, 2021

Choose a reason for hiding this comment

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

This exist in quite a few places already, and properly fixing it would require a larger refactoring. So I think we should do that separately.

Copy link
Member

@edvbld edvbld Mar 10, 2021

Choose a reason for hiding this comment

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

Ok, sounds good!

Copy link
Member

@magicus magicus left a comment

LGTM (but I agree with Erik's suggestion).

edvbld
edvbld approved these changes Mar 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 10, 2021

@rwestberg 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.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

Read resolvedInBuild JBS property properly

Reviewed-by: ehelin, ihse

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

  • 589227f: pr: update all local branches for commit comments
  • 591fb2c: 666: Integrated message delivered to wrong thread
  • 10ee68e: 708: Email version of UI file comment used the wrong version of the file
  • 421b1b6: 636: Quote @-characters in bridged emails

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.

➡️ 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 Mar 10, 2021
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Mar 10, 2021

/integrate

@openjdk openjdk bot closed this Mar 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 10, 2021

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

  • 589227f: pr: update all local branches for commit comments
  • 591fb2c: 666: Integrated message delivered to wrong thread
  • 10ee68e: 708: Email version of UI file comment used the wrong version of the file
  • 421b1b6: 636: Quote @-characters in bridged emails

Your commit was automatically rebased without conflicts.

Pushed as commit 2c63ced.

💡 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
3 participants