Ensure withPreview can be called multiple times

bitwiseman · bitwiseman · commit 7963fa82b58f · 2020-08-12T18:27:48.000-07:00
diff --git a/src/main/java/org/kohsuke/github/GitHubClient.java b/src/main/java/org/kohsuke/github/GitHubClient.java
@@ -405,7 +405,7 @@ public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull Gi
                         // Setting "Cache-Control" to "no-cache" stops the cache from supplying
                         // "If-Modified-Since" or "If-None-Match" values.
                         // This makes GitHub give us current data (not incorrectly cached data)
-                        request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();
+                        request = request.toBuilder().setHeader("Cache-Control", "no-cache").build();
                         continue;
                     }
                     if (!(isRateLimitResponse(responseInfo) || isAbuseLimitResponse(responseInfo))) {
diff --git a/src/main/java/org/kohsuke/github/GitHubRequest.java b/src/main/java/org/kohsuke/github/GitHubRequest.java
@@ -384,9 +384,11 @@ public B withApiUrl(String url) {
          *            the name
          * @param value
          *            the value
+         * @return the request builder
          */
-        public void setHeader(String name, String value) {
+        public B setHeader(String name, String value) {
             headers.put(name, value);
+            return (B) this;
         }
 
         /**
@@ -399,8 +401,11 @@ public void setHeader(String name, String value) {
          * @return the request builder
          */
         public B withHeader(String name, String value) {
-            setHeader(name, value);
-            return (B) this;
+            String oldValue = headers.get(name);
+            if (!StringUtils.isBlank(oldValue)) {
+                value = oldValue + ", " + value;
+            }
+            return setHeader(name, value);
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull Gi`
`405`	`405`	`// Setting "Cache-Control" to "no-cache" stops the cache from supplying`
`406`	`406`	`// "If-Modified-Since" or "If-None-Match" values.`
`407`	`407`	`// This makes GitHub give us current data (not incorrectly cached data)`
`408`		`- request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();`
	`408`	`+ request = request.toBuilder().setHeader("Cache-Control", "no-cache").build();`
`409`	`409`	`continue;`
`410`	`410`	`}`
`411`	`411`	`if (!(isRateLimitResponse(responseInfo) \|\| isAbuseLimitResponse(responseInfo))) {`