Commit3b0c0e1

committed

Merge branch 'master' ofhttps://github.com/bjournaud/scribejava into bjournaud-master

2 parents6007a9e +3f1cd63 commit3b0c0e1Copy full SHA for 3b0c0e1

File tree

+17

-1

lines changed

scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk
- JDKHttpClient.java
- JDKHttpClientConfig.java

+17

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,12 @@ public Response execute(String userAgent, Map<String, String> headers, Verb http`
`114`	`114`
`115`	`115`	`privateResponsedoExecute(StringuserAgent,Map<String,String>headers,VerbhttpVerb,StringcompleteUrl,`
`116`	`116`	`BodyTypebodyType,ObjectbodyContents)throwsIOException {`
`117`		`-finalHttpURLConnectionconnection = (HttpURLConnection)newURL(completeUrl).openConnection();`
	`117`	`+finalHttpURLConnectionconnection;`
	`118`	`+if (config.getProxy() ==null) {`
	`119`	`+connection = (HttpURLConnection)newURL(completeUrl).openConnection();`
	`120`	`+ }else {`
	`121`	`+connection = (HttpURLConnection)newURL(completeUrl).openConnection(config.getProxy());`
	`122`	`+ }`
`118`	`123`	`connection.setInstanceFollowRedirects(config.isFollowRedirects());`
`119`	`124`	`connection.setRequestMethod(httpVerb.name());`
`120`	`125`	`if (config.getConnectTimeout() !=null) {`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`packagecom.github.scribejava.core.httpclient.jdk;`
`2`	`2`
	`3`	`+importjava.net.Proxy;`
	`4`	`+`
`3`	`5`	`importcom.github.scribejava.core.httpclient.HttpClientConfig;`
`4`	`6`
`5`	`7`	`publicclassJDKHttpClientConfigimplementsHttpClientConfig {`
`6`	`8`
`7`	`9`	`privateIntegerconnectTimeout;`
`8`	`10`	`privateIntegerreadTimeout;`
`9`	`11`	`privatebooleanfollowRedirects =true;`
	`12`	`+privateProxyproxy;`
`10`	`13`
`11`	`14`	`@Override`
`12`	`15`	`publicJDKHttpClientConfigcreateDefaultConfig() {`
`@@ -37,6 +40,14 @@ public boolean isFollowRedirects() {`
`37`	`40`	`returnfollowRedirects;`
`38`	`41`	`}`
`39`	`42`
	`43`	`+publicvoidsetProxy(Proxyproxy) {`
	`44`	`+this.proxy =proxy;`
	`45`	`+ }`
	`46`	`+`
	`47`	`+publicProxygetProxy() {`
	`48`	`+returnproxy;`
	`49`	`+ }`
	`50`	`+`
`40`	`51`	`/**`
`41`	`52`	`* Sets whether the underlying Http Connection follows redirects or not.`
`42`	`53`	`*`

Comments

(0)