Get commits for merge request (timols#361)

* Update getCommits for merge requests to use the correct gitlab API endpoint; closes timols#259

* Fix failing unit tests

* use openjdk8 instead of oraclejdk8 in travis config

Author: rkpatel7

.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:

src/main/java/org/gitlab/api/GitlabAPI.java

@@ -2125,13 +2125,9 @@ public List<GitlabCommit> 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);

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

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);