Clean up request method calls

hub4j · Dec 16, 2019 · 6ba9a3d · 6ba9a3d
1 parent 0f94828
commit 6ba9a3d
Show file tree

Hide file tree

Showing 28 changed files with 65 additions and 96 deletions.
diff --git a/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java b/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java
@@ -23,7 +23,7 @@ public class GHAppCreateTokenBuilder {
     GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
         this.root = root;
         this.apiUrlTail = apiUrlTail;
-        this.builder = root.retrieve().method("POST");
+        this.builder = root.retrieve();
         withPermissions(builder, permissions);
     }
 

diff --git a/src/main/java/org/kohsuke/github/GHAsset.java b/src/main/java/org/kohsuke/github/GHAsset.java
@@ -135,7 +135,7 @@ public String getBrowserDownloadUrl() {
     }
 
     private void edit(String key, Object value) throws IOException {
-        root.retrieve().method("POST").with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
+        root.retrieve().with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHBlobBuilder.java b/src/main/java/org/kohsuke/github/GHBlobBuilder.java
@@ -13,7 +13,7 @@ public class GHBlobBuilder {
 
     GHBlobBuilder(GHRepository repo) {
         this.repo = repo;
-        req = repo.root.retrieve().method("POST");
+        req = repo.root.retrieve();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHBranchProtection.java b/src/main/java/org/kohsuke/github/GHBranchProtection.java
@@ -87,7 +87,7 @@ public RequiredReviews getRequiredReviews() {
     @Preview
     @Deprecated
     public boolean getRequiredSignatures() throws IOException {
-        return requester().method("GET").withUrlPath(url + REQUIRE_SIGNATURES_URI).to(RequiredSignatures.class).enabled;
+        return requester().withUrlPath(url + REQUIRE_SIGNATURES_URI).to(RequiredSignatures.class).enabled;
     }
 
     /**
@@ -123,7 +123,7 @@ GHBranchProtection wrap(GHBranch branch) {
     }
 
     private Requester requester() {
-        return root.retrieve().method("POST").withPreview(ZZZAX);
+        return root.retrieve().withPreview(ZZZAX);
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java b/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java
@@ -353,7 +353,7 @@ private StatusChecks getStatusChecks() {
     }
 
     private Requester requester() {
-        return branch.getRoot().retrieve().method("POST").withPreview(LUKE_CAGE);
+        return branch.getRoot().retrieve().withPreview(LUKE_CAGE);
     }
 
     private static class Restrictions {

diff --git a/src/main/java/org/kohsuke/github/GHCommitComment.java b/src/main/java/org/kohsuke/github/GHCommitComment.java
@@ -113,12 +113,7 @@ public GHCommit getCommit() throws IOException {
      *             the io exception
      */
     public void update(String body) throws IOException {
-        owner.root.retrieve()
-                .method("POST")
-                .with("body", body)
-                .method("PATCH")
-                .withUrlPath(getApiTail())
-                .to(GHCommitComment.class);
+        owner.root.retrieve().method("PATCH").with("body", body).withUrlPath(getApiTail()).to(GHCommitComment.class);
         this.body = body;
     }
 

diff --git a/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java b/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java
@@ -16,7 +16,7 @@ public class GHCreateRepositoryBuilder {
     GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
         this.root = root;
         this.apiUrlTail = apiUrlTail;
-        this.builder = root.retrieve().method("POST");
+        this.builder = root.retrieve();
         this.builder.with("name", name);
     }
 

diff --git a/src/main/java/org/kohsuke/github/GHGist.java b/src/main/java/org/kohsuke/github/GHGist.java
@@ -203,7 +203,7 @@ public void unstar() throws IOException {
      *             the io exception
      */
     public boolean isStarred() throws IOException {
-        return root.retrieve().asHttpStatusCode(getApiTailUrl("star")) / 100 == 2;
+        return root.retrieve().withUrlPath(getApiTailUrl("star")).asHttpStatusCode() / 100 == 2;
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHGistUpdater.java b/src/main/java/org/kohsuke/github/GHGistUpdater.java
@@ -16,7 +16,7 @@ public class GHGistUpdater {
 
     GHGistUpdater(GHGist base) {
         this.base = base;
-        this.builder = base.root.retrieve().method("POST");
+        this.builder = base.root.retrieve();
 
         files = new LinkedHashMap<>();
     }

diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java
@@ -239,11 +239,11 @@ public GHIssueComment comment(String message) throws IOException {
     }
 
     private void edit(String key, Object value) throws IOException {
-        root.retrieve().method("POST").with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
+        root.retrieve().with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
     }
 
     private void editIssue(String key, Object value) throws IOException {
-        root.retrieve().method("POST").with(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).to();
+        root.retrieve().with(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).to();
     }
 
     /**
@@ -520,12 +520,7 @@ public void setAssignees(GHUser... assignees) throws IOException {
      *             the io exception
      */
     public void setAssignees(Collection<GHUser> assignees) throws IOException {
-        root.retrieve()
-                .method("POST")
-                .with(ASSIGNEES, getLogins(assignees))
-                .method("PATCH")
-                .withUrlPath(getIssuesApiRoute())
-                .to();
+        root.retrieve().method("PATCH").with(ASSIGNEES, getLogins(assignees)).withUrlPath(getIssuesApiRoute()).to();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHIssueComment.java b/src/main/java/org/kohsuke/github/GHIssueComment.java
@@ -108,12 +108,7 @@ public GHCommentAuthorAssociation getAuthorAssociation() {
      *             the io exception
      */
     public void update(String body) throws IOException {
-        owner.root.retrieve()
-                .method("POST")
-                .with("body", body)
-                .method("PATCH")
-                .withUrlPath(getApiRoute())
-                .to(GHIssueComment.class);
+        owner.root.retrieve().method("PATCH").with("body", body).withUrlPath(getApiRoute()).to(GHIssueComment.class);
         this.body = body;
     }
 

diff --git a/src/main/java/org/kohsuke/github/GHMilestone.java b/src/main/java/org/kohsuke/github/GHMilestone.java
@@ -159,7 +159,7 @@ public void delete() throws IOException {
     }
 
     private void edit(String key, Object value) throws IOException {
-        root.retrieve().method("POST").with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
+        root.retrieve().with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHNotificationStream.java b/src/main/java/org/kohsuke/github/GHNotificationStream.java
@@ -102,7 +102,6 @@ public GHNotificationStream nonBlocking(boolean v) {
     public Iterator<GHThread> iterator() {
         // capture the configuration setting here
         final Requester req = root.retrieve()
-                .method("GET")
                 .with("all", all)
                 .with("participating", participating)
                 .with("since", since);
@@ -236,7 +235,7 @@ public void markAsRead(long timestamp) throws IOException {
         final Requester req = root.retrieve().method("PUT");
         if (timestamp >= 0)
             req.with("last_read_at", GitHub.printDate(new Date(timestamp)));
-        req.asHttpStatusCode(apiUrl);
+        req.withUrlPath(apiUrl).asHttpStatusCode();
     }
 
     private static final GHThread[] EMPTY_ARRAY = new GHThread[0];

diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java
@@ -397,7 +397,7 @@ public GHTeam createTeam(String name, Permission p, Collection<GHRepository> rep
             repo_names.add(login + "/" + r.getName());
         }
         post.with("repo_names", repo_names);
-        return post.method("POST").withUrlPath("/orgs/" + login + "/teams").to(GHTeam.class).wrapUp(this);
+        return post.withUrlPath("/orgs/" + login + "/teams").to(GHTeam.class).wrapUp(this);
     }
 
     /**
@@ -438,7 +438,7 @@ public GHTeam createTeam(String name, Collection<GHRepository> repositories) thr
             repo_names.add(login + "/" + r.getName());
         }
         post.with("repo_names", repo_names);
-        return post.method("POST").withUrlPath("/orgs/" + login + "/teams").to(GHTeam.class).wrapUp(this);
+        return post.withUrlPath("/orgs/" + login + "/teams").to(GHTeam.class).wrapUp(this);
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHProject.java b/src/main/java/org/kohsuke/github/GHProject.java
@@ -177,10 +177,9 @@ public GHProject wrap(GitHub root) {
 
     private void edit(String key, Object value) throws IOException {
         root.retrieve()
-                .method("POST")
+            .method("PATCH")
                 .withPreview(INERTIA)
                 .with(key, value)
-                .method("PATCH")
                 .withUrlPath(getApiRoute())
                 .to();
     }
@@ -276,7 +275,7 @@ public void setPublic(boolean isPublic) throws IOException {
      *             the io exception
      */
     public void delete() throws IOException {
-        root.retrieve().method("POST").withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
+        root.retrieve().withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHProjectCard.java b/src/main/java/org/kohsuke/github/GHProjectCard.java
@@ -199,10 +199,9 @@ public void setArchived(boolean archived) throws IOException {
 
     private void edit(String key, Object value) throws IOException {
         root.retrieve()
-                .method("POST")
+            .method("PATCH")
                 .withPreview(INERTIA)
                 .with(key, value)
-                .method("PATCH")
                 .withUrlPath(getApiRoute())
                 .to();
     }
@@ -223,6 +222,6 @@ protected String getApiRoute() {
      *             the io exception
      */
     public void delete() throws IOException {
-        root.retrieve().method("POST").withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
+        root.retrieve().withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
     }
 }
diff --git a/src/main/java/org/kohsuke/github/GHProjectColumn.java b/src/main/java/org/kohsuke/github/GHProjectColumn.java
@@ -106,13 +106,7 @@ public void setName(String name) throws IOException {
     }
 
     private void edit(String key, Object value) throws IOException {
-        root.retrieve()
-                .method("POST")
-                .withPreview(INERTIA)
-                .with(key, value)
-                .method("PATCH")
-                .withUrlPath(getApiRoute())
-                .to();
+        root.retrieve().method("PATCH").withPreview(INERTIA).with(key, value).withUrlPath(getApiRoute()).to();
     }
 
     /**
@@ -131,7 +125,7 @@ protected String getApiRoute() {
      *             the io exception
      */
     public void delete() throws IOException {
-        root.retrieve().method("POST").withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
+        root.retrieve().withPreview(INERTIA).method("DELETE").withUrlPath(getApiRoute()).to();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java
@@ -615,7 +615,7 @@ public enum MergeMethod {
 
     private void fetchIssue() throws IOException {
         if (!fetchedIssueDetails) {
-            root.retrieve().method("GET").withUrlPath(getIssuesApiRoute()).to(this);
+            root.retrieve().withUrlPath(getIssuesApiRoute()).to(this);
             fetchedIssueDetails = true;
         }
     }

diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java
@@ -17,7 +17,7 @@ public class GHPullRequestReviewBuilder {
 
     GHPullRequestReviewBuilder(GHPullRequest pr) {
         this.pr = pr;
-        this.builder = pr.root.retrieve().method("POST");
+        this.builder = pr.root.retrieve();
     }
 
     // public GHPullRequestReview createReview(@Nullable String commitId, String body, GHPullRequestReviewEvent event,

diff --git a/src/main/java/org/kohsuke/github/GHRef.java b/src/main/java/org/kohsuke/github/GHRef.java
@@ -67,10 +67,9 @@ public void updateTo(String sha) throws IOException {
      */
     public void updateTo(String sha, Boolean force) throws IOException {
         root.retrieve()
-                .method("POST")
+            .method("PATCH")
                 .with("sha", sha)
                 .with("force", force)
-                .method("PATCH")
                 .withUrlPath(url)
                 .to(GHRef.class)
                 .wrap(root);

diff --git a/src/main/java/org/kohsuke/github/GHRelease.java b/src/main/java/org/kohsuke/github/GHRelease.java
@@ -256,9 +256,9 @@ public GHAsset uploadAsset(String filename, InputStream stream, String contentTy
      *             the io exception
      */
     public List<GHAsset> getAssets() throws IOException {
-        Requester builder = owner.root.retrieve().method("POST");
+        Requester builder = owner.root.retrieve();
 
-        GHAsset[] assets = builder.method("GET").withUrlPath(getApiTailUrl("assets")).toArray(GHAsset[].class);
+        GHAsset[] assets = builder.withUrlPath(getApiTailUrl("assets")).toArray(GHAsset[].class);
         return Arrays.asList(GHAsset.wrap(assets, this));
     }
 

diff --git a/src/main/java/org/kohsuke/github/GHReleaseUpdater.java b/src/main/java/org/kohsuke/github/GHReleaseUpdater.java
@@ -14,7 +14,7 @@ public class GHReleaseUpdater {
 
     GHReleaseUpdater(GHRelease base) {
         this.base = base;
-        this.builder = base.root.retrieve().method("POST");
+        this.builder = base.root.retrieve();
     }
 
     /**

diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -419,7 +419,6 @@ public GHRef createRef(String name, String sha) throws IOException {
                 .method("POST")
                 .with("ref", name)
                 .with("sha", sha)
-                .method("POST")
                 .withUrlPath(getApiTailUrl("git/refs"))
                 .to(GHRef.class)
                 .wrap(root);
@@ -764,7 +763,7 @@ public PagedIterable<GHUser> listAssignees() throws IOException {
      *             the io exception
      */
     public boolean hasAssignee(GHUser u) throws IOException {
-        return root.retrieve().asHttpStatusCode(getApiTailUrl("assignees/" + u.getLogin())) / 100 == 2;
+        return root.retrieve().withUrlPath(getApiTailUrl("assignees/" + u.getLogin())).asHttpStatusCode() / 100 == 2;
     }
 
     /**
@@ -901,7 +900,7 @@ public void setEmailServiceHook(String address) throws IOException {
     }
 
     private void edit(String key, String value) throws IOException {
-        Requester requester = root.retrieve().method("POST");
+        Requester requester = root.retrieve();
         if (!key.equals("name"))
             requester.with("name", name); // even when we don't change the name, we need to send it in
         requester.with(key, value).method("PATCH").withUrlPath(getApiTailUrl("")).to();
@@ -1556,7 +1555,10 @@ public GHBlobBuilder createBlob() {
      */
     public InputStream readBlob(String blobSha) throws IOException {
         String target = getApiTailUrl("git/blobs/" + blobSha);
-        return root.retrieve().withHeader("Accept", "application/vnd.github.VERSION.raw").asStream(target);
+        return root.retrieve()
+                .withHeader("Accept", "application/vnd.github.VERSION.raw")
+                .withUrlPath(target)
+                .toStream();
     }
 
     /**
@@ -2280,7 +2282,6 @@ public GHMilestone createMilestone(String title, String description) throws IOEx
                 .method("POST")
                 .with("title", title)
                 .with("description", description)
-                .method("POST")
                 .withUrlPath(getApiTailUrl("milestones"))
                 .to(GHMilestone.class)
                 .wrap(this);
@@ -2302,7 +2303,6 @@ public GHDeployKey addDeployKey(String title, String key) throws IOException {
                 .method("POST")
                 .with("title", title)
                 .with("key", key)
-                .method("POST")
                 .withUrlPath(getApiTailUrl("keys"))
                 .to(GHDeployKey.class)
                 .wrap(this);
@@ -2372,10 +2372,9 @@ public GHRepository getParent() throws IOException {
      */
     public GHSubscription subscribe(boolean subscribed, boolean ignored) throws IOException {
         return root.retrieve()
-                .method("POST")
+                .method("PUT")
                 .with("subscribed", subscribed)
                 .with("ignored", ignored)
-                .method("PUT")
                 .withUrlPath(getApiTailUrl("subscription"))
                 .to(GHSubscription.class)
                 .wrapUp(this);
@@ -2517,7 +2516,8 @@ public Reader renderMarkdown(String text, MarkdownMode mode) throws IOException
                         .with("text", text)
                         .with("mode", mode == null ? null : mode.toString())
                         .with("context", getFullName())
-                        .asStream("/markdown"),
+                        .withUrlPath("/markdown")
+                        .toStream(),
                 "UTF-8");
     }
 
@@ -2628,8 +2628,11 @@ public List<String> listTopics() throws IOException {
      *             the io exception
      */
     public void setTopics(List<String> topics) throws IOException {
-        Requester requester = root.retrieve().method("POST");
-        requester.with("names", topics);
-        requester.method("PUT").withPreview(MERCY).withUrlPath(getApiTailUrl("topics")).to();
+        root.retrieve()
+                .method("PUT")
+                .with("names", topics)
+                .withPreview(MERCY)
+                .withUrlPath(getApiTailUrl("topics"))
+                .to();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,7 @@ public String getBrowserDownloadUrl() { @@
         }
         private void edit(String key, Object value) throws IOException {
-            root.retrieve().method("POST").with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
+            root.retrieve().with(key, value).method("PATCH").withUrlPath(getApiRoute()).to();
         }
         /**
@@ Expand Down @@