jlengrand/github-api
1
0
Fork 0
mirror of https://github.com/jlengrand/github-api.git synced 2026-04-05 08:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make withUrlPath() overwrite instead of append

Browse Source 
I had some ideas about having multiple calls to  apend to build up paths,
but it turns out that idea is pretty bad.  `with*()` methods should
overwrite when called for the same field.

If we want to create and , we can do that later.
This commit is contained in:
Liam Newman
2020-07-27 13:12:41 -07:00
parent 9c7de767e9
commit fb1adbd1ef
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/kohsuke/github/GHRepository.java
View File

@@ -980,12 +980,13 @@ public class GHRepository extends GHObject {
private void modifyCollaborators(@NonNull Collection<GHUser> users,
@NonNull String method,
@CheckForNull GHOrganization.Permission permission) throws IOException {
Requester requester = root.createRequest().method(method);
if (permission != null) {
requester = requester.with("permission", permission).inBody();
}
// Make sure that the users collection doesn't have any duplicates
for (GHUser user : new LinkedHashSet<GHUser>(users)) {
Requester requester = root.createRequest().method(method);
if (permission != null) {
requester = requester.with("permission", permission).inBody();
}
requester.withUrlPath(getApiTailUrl("collaborators/" + user.getLogin())).send();
}
}

8
src/main/java/org/kohsuke/github/GitHubRequest.java
View File

@@ -671,13 +671,9 @@ class GitHubRequest {
tailUrlPath += "/" + String.join("/", urlPathItems);
}
if (this.urlPath.endsWith("/")) {
tailUrlPath = StringUtils.stripStart(tailUrlPath, "/");
} else {
tailUrlPath = StringUtils.prependIfMissing(tailUrlPath, "/");
}
tailUrlPath = StringUtils.prependIfMissing(tailUrlPath, "/");
this.urlPath += urlPathEncode(tailUrlPath);
this.urlPath = urlPathEncode(tailUrlPath);
return (B) this;
}