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

SDK-295: Multiple invocations of watch for the same project and serve… #250

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

wikumChamith
Copy link
Member

@wikumChamith wikumChamith commented Sep 4, 2023

Description of what I changed

This prevents users from adding the same module twice if they are located in different directories.

Issue I worked on

see https://issues.openmrs.org/browse/SDK-295

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 install right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute the 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

Set<Project> watchedProjects = getWatchedProjects();
Optional<Project> existingSameModule = watchedProjects.stream().filter(existingProject -> existingProject.getArtifactId().equals(project.getArtifactId())).findFirst();
if(existingSameModule.isPresent()) {
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

@dkayiwa could you elaborate more on this? I do not see what should be changed here.

Copy link
Member

Choose a reason for hiding this comment

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

space after if

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you. I fixed it.

@@ -67,6 +70,8 @@ public class Server extends BaseSdkProperties {

public static final String PROPERTY_SERVER_PORT = "server.port";

private static final Logger log = LoggerFactory.getLogger(Server.class);
Copy link
Member

Choose a reason for hiding this comment

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

What are we using this for?

Copy link
Member Author

Choose a reason for hiding this comment

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

First I decided to log the error message rather than throwing the exception. I forgot to remove it after changing the code. I removed this in the new push.

@@ -9,6 +9,8 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
import org.openmrs.maven.plugins.utility.SDKConstants;
import org.slf4j.Logger;
Copy link
Member

Choose a reason for hiding this comment

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

How about this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed it

…r add multiple records

This prevents users from adding the same module twice if they are located in different directories.
@dkayiwa dkayiwa merged commit 2bd50eb into openmrs:master Sep 5, 2023
2 checks passed
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.

2 participants