GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — deprecate ScribeJavaConfig and ForceTypeOfHttpRequest · ront/scribejava@840dbeb

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

scribejava-apis/src/test/java/com/github/scribejava/apis/examples
scribejava-core/src
- main/java/com/github/scribejava/core
  - model
  - oauth
    - OAuthService.java
- test/java/com/github/scribejava/core/model
  - ForceTypeOfHttpRequestTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java‎`

Copy file name to clipboardExpand all lines: scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,9 @@`
`7`	`7`	`import java.util.concurrent.ExecutionException;`
`8`	`8`	`import com.github.scribejava.apis.FacebookApi;`
`9`	`9`	`import com.github.scribejava.core.builder.ServiceBuilder;`
`10`		`-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;`
`11`	`10`	`import com.github.scribejava.core.model.OAuth2AccessToken;`
`12`	`11`	`import com.github.scribejava.core.model.OAuthRequestAsync;`
`13`	`12`	`import com.github.scribejava.core.model.Response;`
`14`		`-import com.github.scribejava.core.model.ScribeJavaConfig;`
`15`	`13`	`import com.github.scribejava.core.model.Verb;`
`16`	`14`	`import com.github.scribejava.core.oauth.OAuth20Service;`
`17`	`15`	`import java.io.IOException;`
`@@ -29,7 +27,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx`
`29`	`27`	`final String clientId = "your client id";`
`30`	`28`	`final String clientSecret = "your client secret";`
`31`	`29`	`final String secretState = "secret" + new Random().nextInt(999_999);`
`32`		`- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);`
`33`	`30`	`final NingHttpClientConfig clientConfig = new NingHttpClientConfig(new AsyncHttpClientConfig.Builder()`
`34`	`31`	`.setMaxConnections(5)`
`35`	`32`	`.setRequestTimeout(10_000)`

Collapse file

`‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java‎`

Copy file name to clipboardExpand all lines: scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,10 @@`
`5`	`5`	`import com.github.scribejava.apis.GoogleApi20;`
`6`	`6`	`import com.github.scribejava.httpclient.ahc.AhcHttpClientConfig;`
`7`	`7`	`import com.github.scribejava.core.builder.ServiceBuilder;`
`8`		`-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;`
`9`	`8`	`import com.github.scribejava.core.httpclient.HttpClientConfig;`
`10`	`9`	`import com.github.scribejava.core.model.OAuth2AccessToken;`
`11`	`10`	`import com.github.scribejava.core.model.OAuthRequestAsync;`
`12`	`11`	`import com.github.scribejava.core.model.Response;`
`13`		`-import com.github.scribejava.core.model.ScribeJavaConfig;`
`14`	`12`	`import com.github.scribejava.core.model.Verb;`
`15`	`13`	`import com.github.scribejava.core.oauth.OAuth20Service;`
`16`	`14`	`import java.io.IOException;`
`@@ -32,7 +30,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx`
`32`	`30`	`final String clientId = "your client id";`
`33`	`31`	`final String clientSecret = "your client secret";`
`34`	`32`	`final String secretState = "secret" + new Random().nextInt(999_999);`
`35`		`- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);`
`36`	`33`	`final HttpClientConfig clientConfig = new AhcHttpClientConfig(new DefaultAsyncHttpClientConfig.Builder()`
`37`	`34`	`.setMaxConnections(5)`
`38`	`35`	`.setRequestTimeout(10_000)`

Collapse file

`‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java‎`

Copy file name to clipboardExpand all lines: scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,8 @@`
`11`	`11`	`import com.github.scribejava.apis.salesforce.SalesforceToken;`
`12`	`12`	`import com.github.scribejava.httpclient.ning.NingHttpClientConfig;`
`13`	`13`	`import com.github.scribejava.core.builder.ServiceBuilder;`
`14`		`-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;`
`15`	`14`	`import com.github.scribejava.core.model.OAuthRequestAsync;`
`16`	`15`	`import com.github.scribejava.core.model.Response;`
`17`		`-import com.github.scribejava.core.model.ScribeJavaConfig;`
`18`	`16`	`import com.github.scribejava.core.model.Verb;`
`19`	`17`	`import com.github.scribejava.core.oauth.OAuth20Service;`
`20`	`18`	`import com.ning.http.client.AsyncHttpClientConfig;`
`@@ -35,7 +33,6 @@ public static void main(String... args) throws InterruptedException, ExecutionEx`
`35`	`33`	`final String clientId = "your client id";`
`36`	`34`	`final String clientSecret = "your client secret";`
`37`	`35`
`38`		`- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);`
`39`	`36`	`final NingHttpClientConfig clientConfig = new NingHttpClientConfig(new AsyncHttpClientConfig.Builder()`
`40`	`37`	`.setMaxConnections(5)`
`41`	`38`	`.setRequestTimeout(10_000)`

Collapse file

`‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java‎`

Copy file name to clipboardExpand all lines: scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java

-3Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,9 @@`
`3`	`3`	`import java.util.Scanner;`
`4`	`4`	`import com.github.scribejava.core.builder.ServiceBuilder;`
`5`	`5`	`import com.github.scribejava.apis.VkontakteApi;`
`6`		`-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;`
`7`	`6`	`import com.github.scribejava.core.model.OAuth2AccessToken;`
`8`	`7`	`import com.github.scribejava.core.model.OAuthRequestAsync;`
`9`	`8`	`import com.github.scribejava.core.model.Response;`
`10`		`-import com.github.scribejava.core.model.ScribeJavaConfig;`
`11`	`9`	`import com.github.scribejava.core.model.Verb;`
`12`	`10`	`import com.github.scribejava.core.oauth.OAuth20Service;`
`13`	`11`	`import com.github.scribejava.httpclient.ahc.AhcHttpClient;`
`@@ -28,7 +26,6 @@ public static void main(String... args) throws IOException, InterruptedException`
`28`	`26`	`// Replace these with your client id and secret`
`29`	`27`	`final String clientId = "your client id";`
`30`	`28`	`final String clientSecret = "your client secret";`
`31`		`- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);`
`32`	`29`
`33`	`30`	`//create any http client externally`
`34`	`31`	`final DefaultAsyncHttpClientConfig httpClientConfig = new DefaultAsyncHttpClientConfig.Builder()`

Collapse file

`‎scribejava-core/src/main/java/com/github/scribejava/core/model/ForceTypeOfHttpRequest.java‎`

Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/model/ForceTypeOfHttpRequest.java

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`package com.github.scribejava.core.model;`
`2`	`2`
	`3`	`+/**`
	`4`	`+ *`
	`5`	`+ * @deprecated unused anymore. Have no sense and impaction`
	`6`	`+ */`
	`7`	`+@Deprecated`
`3`	`8`	`public enum ForceTypeOfHttpRequest {`
`4`	`9`
`5`	`10`	`NONE,`

Collapse file

`‎scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java‎`

Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java

-9Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`import java.net.URL;`
`6`	`6`	`import java.util.Map;`
`7`	`7`	`import com.github.scribejava.core.exceptions.OAuthConnectionException;`
`8`		`-import com.github.scribejava.core.exceptions.OAuthException;`
`9`	`8`	`import com.github.scribejava.core.oauth.OAuthService;`
`10`	`9`	`import java.io.File;`
`11`	`10`
`@@ -30,14 +29,6 @@ public OAuthRequest(Verb verb, String url, OAuthConfig config) {`
`30`	`29`	`* @throws RuntimeException if the connection cannot be created.`
`31`	`30`	`*/`
`32`	`31`	`public Response send() {`
`33`		`- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();`
`34`		`-`
`35`		`- if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`36`		`- throw new OAuthException("Cannot use sync operations, only async");`
`37`		`- }`
`38`		`- if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`39`		`- config.log("Cannot use sync operations, only async");`
`40`		`- }`
`41`	`32`	`try {`
`42`	`33`	`createConnection();`
`43`	`34`	`return doSend();`

Collapse file

`‎scribejava-core/src/main/java/com/github/scribejava/core/model/ScribeJavaConfig.java‎`

Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/model/ScribeJavaConfig.java

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`package com.github.scribejava.core.model;`
`2`	`2`
	`3`	`+/**`
	`4`	`+ *`
	`5`	`+ * @deprecated unused anymore. Have no sense and impaction`
	`6`	`+ */`
	`7`	`+@Deprecated`
`3`	`8`	`public abstract class ScribeJavaConfig {`
`4`	`9`
`5`	`10`	`private static ForceTypeOfHttpRequest forceTypeOfHttpRequests = ForceTypeOfHttpRequest.NONE;`

Collapse file

`‎scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java‎`

Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java

-25Lines changed: 0 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,14 @@`
`1`	`1`	`package com.github.scribejava.core.oauth;`
`2`	`2`
`3`		`-import com.github.scribejava.core.exceptions.OAuthException;`
`4`	`3`	`import com.github.scribejava.core.httpclient.HttpClientProvider;`
`5`	`4`	`import com.github.scribejava.core.model.AbstractRequest;`
`6`		`-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;`
`7`	`5`	`import com.github.scribejava.core.httpclient.HttpClient;`
`8`	`6`	`import com.github.scribejava.core.httpclient.HttpClientConfig;`
`9`	`7`	`import com.github.scribejava.core.model.OAuthAsyncRequestCallback;`
`10`	`8`	`import com.github.scribejava.core.model.OAuthConfig;`
`11`	`9`	`import com.github.scribejava.core.model.OAuthRequest;`
`12`	`10`	`import com.github.scribejava.core.model.OAuthRequestAsync;`
`13`	`11`	`import com.github.scribejava.core.model.Response;`
`14`		`-import com.github.scribejava.core.model.ScribeJavaConfig;`
`15`	`12`	`import com.github.scribejava.core.model.Token;`
`16`	`13`	`import java.io.File;`
`17`	`14`
`@@ -32,26 +29,12 @@ public abstract class OAuthService<T extends Token> {`
`32`	`29`
`33`	`30`	`public OAuthService(OAuthConfig config) {`
`34`	`31`	`this.config = config;`
`35`		`- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();`
`36`	`32`	`final HttpClientConfig httpClientConfig = config.getHttpClientConfig();`
`37`	`33`	`final HttpClient externalHttpClient = config.getHttpClient();`
`38`	`34`
`39`	`35`	`if (httpClientConfig == null && externalHttpClient == null) {`
`40`		`- if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`41`		`- throw new OAuthException("Cannot use sync operations, only async");`
`42`		`- }`
`43`		`- if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`44`		`- config.log("Cannot use sync operations, only async");`
`45`		`- }`
`46`	`36`	`httpClient = null;`
`47`	`37`	`} else {`
`48`		`- if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`49`		`- throw new OAuthException("Cannot use async operations, only sync");`
`50`		`- }`
`51`		`- if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`52`		`- config.log("Cannot use async operations, only sync");`
`53`		`- }`
`54`		`-`
`55`	`38`	`httpClient = externalHttpClient == null ? getClient(httpClientConfig) : externalHttpClient;`
`56`	`39`	`}`
`57`	`40`	`}`
`@@ -86,14 +69,6 @@ public OAuthConfig getConfig() {`
`86`	`69`	`public <T> Future<T> execute(OAuthRequestAsync request, OAuthAsyncRequestCallback<T> callback,`
`87`	`70`	`OAuthRequestAsync.ResponseConverter<T> converter) {`
`88`	`71`
`89`		`- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();`
`90`		`- if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`91`		`- throw new OAuthException("Cannot use async operations, only sync");`
`92`		`- }`
`93`		`- if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {`
`94`		`- config.log("Cannot use async operations, only sync");`
`95`		`- }`
`96`		`-`
`97`	`72`	`final File filePayload = request.getFilePayload();`
`98`	`73`	`if (filePayload != null) {`
`99`	`74`	`return httpClient.executeAsync(config.getUserAgent(), request.getHeaders(), request.getVerb(),`

Collapse file

`‎scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java‎`

Copy file name to clipboardExpand all lines: scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java

-47Lines changed: 0 additions & 47 deletions

This file was deleted.

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.