Merge pull request hub4j#401

kohsuke · kohsuke · commit 41c028d4d903 · 2018-01-12T21:00:56.000-08:00
diff --git a/src/main/java/org/kohsuke/github/GHGist.java b/src/main/java/org/kohsuke/github/GHGist.java
@@ -103,7 +103,7 @@ public Map<String,GHGistFile> getFiles() {
      * Used when caller obtains {@link GHGist} without knowing its owner.
      * A partially constructed owner object is interned.
      */
-    /*package*/ GHGist wrapUp(GitHub root) throws IOException {
+    /*package*/ GHGist wrapUp(GitHub root) {
         this.owner = root.getUser(owner);
         this.root = root;
         wrapUp();
@@ -144,12 +144,8 @@ public PagedIterator<GHGist> _iterator(int pageSize) {
                 return new PagedIterator<GHGist>(root.retrieve().asIterator(getApiTailUrl("forks"), GHGist[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHGist[] page) {
-                        try {
-                            for (GHGist c : page)
-                                c.wrapUp(root);
-                        } catch (IOException e) {
-                            throw new Error(e);
-                        }
+                        for (GHGist c : page)
+                            c.wrapUp(root);
                     }
                 };
             }
diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java
@@ -54,16 +54,17 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import static java.util.Arrays.*;
-import static java.util.logging.Level.*;
-import static org.apache.commons.lang.StringUtils.*;
-import static org.kohsuke.github.GitHub.*;
+import static java.util.Arrays.asList;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.FINEST;
+import static java.util.logging.Level.INFO;
+import static org.apache.commons.lang.StringUtils.defaultString;
+import static org.kohsuke.github.GitHub.MAPPER;
 
 /**
  * A builder pattern for making HTTP call and parsing its output.
@@ -452,7 +453,7 @@ private boolean isMethodWithBody() {
         try {
             return new PagingIterator<T>(type, tailApiUrl, root.getApiURL(s.toString()));
         } catch (IOException e) {
-            throw new Error(e);
+            throw new GHException("Unable to build github Api URL",e);
         }
     }
 
@@ -513,7 +514,7 @@ private void fetch() {
                     }
                 }
             } catch (IOException e) {
-                throw new Error(e);
+                throw new GHException("Failed to retrieve "+url);
             }
         }
 
