commit 2da09d0ae76eff0eafeef901f0d973dfb43d4d70
author Edwin Kempin <edwin.kempin@sap.com> Fri Mar 06 15:14:18 2015 +0100
committer Saša Živkov <sasa.zivkov@sap.com> Mon Mar 09 14:48:41 2015 +0100
tree fd33d02183723dc6172d7b6e50244dcce7818a2e
parent 1a7928322eec67829d1d817604e27308879649d3

More detailed error message on failure of REST call to source system

Include the HTTP method and the REST endpoint into the error message.
Just the response code on its own it not very helpful.

Change-Id: Id2ad30544e661f16b197e578a45af2654fa40840
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/importer/RemoteApi.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/RemoteApi.java b/src/main/java/com/googlesource/gerrit/plugins/importer/RemoteApi.java
index 1125601..15767fc 100755
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/RemoteApi.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/RemoteApi.java
@@ -38,8 +38,7 @@
 
   public ProjectInfo getProject(String projectName) throws IOException {
     String endPoint = "/projects/" + projectName;
-    RestResponse r = restSession.get(endPoint);
-    assertOK(r);
+    RestResponse r = checkedGet(endPoint);
     return newGson().fromJson(r.getReader(),
         new TypeToken<ProjectInfo>() {}.getType());
   }
@@ -55,8 +54,7 @@
                 ListChangesOption.CURRENT_REVISION,
                 ListChangesOption.ALL_REVISIONS,
                 ListChangesOption.ALL_COMMITS)));
-    RestResponse r = restSession.get(endPoint);
-    assertOK(r);
+    RestResponse r = checkedGet(endPoint);
     List<ChangeInfo> result =
         newGson().fromJson(r.getReader(),
             new TypeToken<List<ChangeInfo>>() {}.getType());
@@ -73,8 +71,7 @@
   public Iterable<CommentInfo> getComments(int changeId, String rev)
       throws IOException {
     String endPoint = "/changes/" + changeId + "/revisions/" + rev + "/comments";
-    RestResponse r = restSession.get(endPoint);
-    assertOK(r);
+    RestResponse r = checkedGet(endPoint);
     Map<String, List<CommentInfo>> result =
         newGson().fromJson(r.getReader(),
             new TypeToken<Map<String, List<CommentInfo>>>() {}.getType());
@@ -90,9 +87,22 @@
     return OutputFormat.JSON_COMPACT.newGson();
   }
 
-  private static void assertOK(RestResponse r) throws IOException {
+  private RestResponse checkedGet(String endPoint) throws IOException {
+    RestResponse r = restSession.get(endPoint);
+    assertOK(HttpMethod.GET, endPoint, r);
+    return r;
+  }
+
+  private static void assertOK(HttpMethod method, String endPoint,
+      RestResponse r) throws IOException {
     if (r.getStatusCode() < 200 || 300 <= r.getStatusCode()) {
-      throw new IOException("Unexpected response code: " + r.getStatusCode());
+      throw new IOException(String.format(
+          "Unexpected response code for %s on %s : %s", method.name(),
+          endPoint, r.getStatusCode()));
     }
   }
+
+  private static enum HttpMethod {
+    GET
+  }
 }