From 5f7cb849fb72ce139428defc27e3948ff3d1b626 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 14 Oct 2019 15:41:40 -0500 Subject: [PATCH 1/3] Update getCommits for merge requests to use the correct gitlab API endpoint; closes #259 --- src/main/java/org/gitlab/api/GitlabAPI.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4295f1f0..4f2ebccb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2125,13 +2125,9 @@ public List getCommits(GitlabMergeRequest mergeRequest, Pagination projectId = mergeRequest.getProjectId(); } - Query query = new Query() - .append("ref_name", mergeRequest.getSourceBranch()); - - query.mergeWith(pagination.asQuery()); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + - "/repository" + GitlabCommit.URL + query.toString(); + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabCommit.URL + pagination.toString(); GitlabCommit[] commits = retrieve().to(tailUrl, GitlabCommit[].class); return Arrays.asList(commits); From cf932407190cf4e9a25dba19c78a1b3609e5b205 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 14 Oct 2019 15:41:57 -0500 Subject: [PATCH 2/3] Fix failing unit tests --- src/test/java/org/gitlab/api/GitlabAPIUT.java | 5 +++-- src/test/java/org/gitlab/api/InstantDeserializerTest.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/gitlab/api/GitlabAPIUT.java b/src/test/java/org/gitlab/api/GitlabAPIUT.java index b2cce34a..40a63c9a 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIUT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIUT.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import java.io.IOException; +import java.net.NoRouteToHostException; import java.net.ServerSocket; import java.net.SocketTimeoutException; @@ -23,8 +24,8 @@ public class GitlabAPIUT { public void unitTest_20180503175711() { GitlabAPI api = GitlabAPI.connect("http://172.16.0.0:80", "test"); api.setConnectionTimeout(100); - Throwable exception = assertThrows(SocketTimeoutException.class, api::getVersion); - assertThat(exception.getMessage(), is("connect timed out")); + Throwable exception = assertThrows(NoRouteToHostException.class, api::getVersion); + assertThat(exception.getMessage(), is("No route to host")); } @Test diff --git a/src/test/java/org/gitlab/api/InstantDeserializerTest.java b/src/test/java/org/gitlab/api/InstantDeserializerTest.java index 03c6f49e..727554db 100644 --- a/src/test/java/org/gitlab/api/InstantDeserializerTest.java +++ b/src/test/java/org/gitlab/api/InstantDeserializerTest.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.time.*; +import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.*; @@ -24,7 +25,7 @@ void deserialize() throws IOException { assertEquals(Instant.from( ZonedDateTime.of( LocalDate.of(2016, 8, 11), - LocalTime.of(11, 28, 34, 85), + LocalTime.of(11, 28, 34, (int) TimeUnit.MILLISECONDS.toNanos(85)), ZoneOffset.UTC ) ), instant); From 73e42ae1a0660399e9b42ecfd99d7f07c4982da8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 18 Oct 2019 09:57:04 -0500 Subject: [PATCH 3/3] use openjdk8 instead of oraclejdk8 in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 87800ef2..257d4981 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required services: - docker jdk: -- oraclejdk8 +- openjdk8 install: - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip script: