RFR: Filter out invalid GitLab merge requests

Erik Helin ehelin at openjdk.java.net
Wed Nov 18 13:23:57 UTC 2020


On Wed, 18 Nov 2020 10:31:49 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:

> Sometimes GitLab returns merge request data that doesn't contain a head hash. Since we can't really do anything with these, just ignore them.

Looks good, just a minor suggestion on how to make `mergeRequestValid` a bit shorter ��

forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java line 126:

> 124: 
> 125:         return true;
> 126:     }

Suggestion:

    private boolean hasHeadHash(JSONValue json) {
        return json.contains("sha") && !json.get("sha").isNull());
    }

forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java line 133:

> 131:                       .param("state", "opened")
> 132:                       .execute().stream()
> 133:                       .filter(this::mergeRequestValid)

Suggestion:

                      .filter(this::hasHeadHash)

forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java line 144:

> 142:                       .param("updated_after", updatedAfter.format(DateTimeFormatter.ISO_DATE_TIME))
> 143:                       .execute().stream()
> 144:                       .filter(this::mergeRequestValid)

Suggestion:

                      .filter(this::hasHeadHash)

-------------

Marked as reviewed by ehelin (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/956


More information about the skara-dev mailing list