While a use of custom HttpConnector is clever, it doesn't fit the current idiom of this library.

This commit is contained in:
Kohsuke Kawaguchi
2016-08-05 20:44:10 -07:00
parent 07b527a0f2
commit 70f0f5714a
2 changed files with 0 additions and 82 deletions

View File

@@ -1,67 +0,0 @@
/*
* Copyright $year slavinson
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.kohsuke.github.extras;
import org.kohsuke.github.HttpConnector;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
public class PreviewHttpConnector implements HttpConnector {
private final HttpConnector base;
private final int readTimeout, connectTimeout;
/**
* @param connectTimeout HTTP connection timeout in milliseconds
* @param readTimeout HTTP read timeout in milliseconds
*/
public PreviewHttpConnector(HttpConnector base, int connectTimeout, int readTimeout) {
this.base = base;
this.connectTimeout = connectTimeout;
this.readTimeout = readTimeout;
}
public PreviewHttpConnector(HttpConnector base, int timeout) {
this(base, timeout, timeout);
}
public PreviewHttpConnector(HttpConnector base) {
this(base, ImpatientHttpConnector.CONNECT_TIMEOUT, ImpatientHttpConnector.READ_TIMEOUT);
}
public PreviewHttpConnector() {
this(new HttpConnector() {
public HttpURLConnection connect(URL url) throws IOException {
return (HttpURLConnection) url.openConnection();
}
}, ImpatientHttpConnector.CONNECT_TIMEOUT, ImpatientHttpConnector.READ_TIMEOUT);
}
public HttpURLConnection connect(URL url) throws IOException {
HttpURLConnection con = base.connect(url);
con.setConnectTimeout(connectTimeout);
con.setReadTimeout(readTimeout);
con.addRequestProperty("Accept", PREVIEW_MEDIA_TYPE);
return con;
}
/**
* Default connection timeout in milliseconds
*/
public static final String PREVIEW_MEDIA_TYPE = "application/vnd.github.drax-preview+json";
}

View File

@@ -44,7 +44,6 @@ public class GHLicenseTest extends Assert {
public void setUp() throws Exception {
gitHub = new GitHubBuilder()
.fromCredentials()
.withConnector(new PreviewHttpConnector())
.build();
}
@@ -203,18 +202,4 @@ public class GHLicenseTest extends Assert {
fail("Expected the license to be Base64 encoded but instead it was " + content.getEncoding());
}
}
/**
* Accesses the 'kohsuke/github-api' repo using {@link GitHub#getRepository(String)}
* but without using {@link PreviewHttpConnector} and ensures that the {@link GHRepository#getLicense()}
* call just returns null rather than raising an exception. This should indicate that
* non-preview connection requests aren't affected by the change in functionality
*
* @throws IOException
*/
@Test
public void checkRepositoryLicenseWithoutPreviewConnection() throws IOException {
GHRepository repo = GitHub.connect().getRepository("kohsuke/github-api");
assertNull(repo.getLicense());
}
}