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

TRUNK-5480: Make ModuleUtil support more version specification format #4611

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

helderjosue
Copy link
Contributor

@helderjosue helderjosue commented Apr 4, 2024

Description of what I changed

Issue I worked on

see https://issues.openmrs.org/browse/TRUNK-5480

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@dkayiwa
Copy link
Member

dkayiwa commented Apr 4, 2024

Can you always include a link to the ticket as recommend at? https://wiki.openmrs.org/display/docs/Pull+Request+Tips

@helderjosue
Copy link
Contributor Author

@dkayiwa Noted! I will add the links and other required informations as I'm still working on the ticket.

Copy link
Member

@ibacher ibacher left a comment

Choose a reason for hiding this comment

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

Thanks @helderjosue! Some quick thoughts on this.

if (lowerBound.indexOf("*") > 0) {
lowerBound = lowerBound.replaceAll("\\*", "0");
}else if (lowerBound.indexOf("+") > 0) {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
}else if (lowerBound.indexOf("+") > 0) {
} else if (lowerBound.indexOf("+") > 0) {

@@ -773,4 +773,18 @@ protected File getEmptyJarDestinationFolder() throws IOException {
}
return destinationFolder;
}

@Test
public void matchRequiredVersions_shouldAllowRangedUsingPlusSignVersion() {
Copy link
Member

@ibacher ibacher Apr 8, 2024

Choose a reason for hiding this comment

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

Couple of thoughts here:

  1. We want to test the simple cases, i.e. 1.4+, etc..
  2. Did you see my comment on the ticket here, because I'm not sure that 2.2.5+ - 3.19.2+ is clear.
  3. I think the easiest way to get the requested behavior without a lot of changes is to only support the forms: 1.4+, 1+, and 1.4.2+, i.e., don't support the + without the separator (-). (This would make it similar to, e.g., Node and Rust's .X suffix).
  4. The comments on the + format should mention that it's only available on platform 2.7+.
  5. It would be good to have some checks on the boundaries, i.e., 1.4+ should be strictly equivalent to 1.4.0 - 1.4.*, 1.4.2+ should be equivalent to 1.4.2 - 1.4.*, etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Regarding the last recommendation, I hope it doesn't require the complexity that we are avoiding to check all this scenarios.
Therefore, I agree with the recommendations and explanations!
I will apply the changes and reach out to you for any concerns.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants