diff --git a/pom.xml b/pom.xml index b484b6a71..7912f42e3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,9 +53,9 @@ - com.fasterxml.jackson.core + tools.jackson.core jackson-databind - 2.14.0 + 3.1.0 junit @@ -248,7 +248,7 @@ - 1.${java.release} + ${java.release} false ../pmd.xml @@ -269,7 +269,7 @@ - 7 + 17 6.51.0 diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookAccessTokenJsonExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookAccessTokenJsonExtractor.java index f51935436..6de376cb0 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookAccessTokenJsonExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookAccessTokenJsonExtractor.java @@ -1,6 +1,6 @@ package com.github.scribejava.apis.facebook; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; import com.github.scribejava.core.model.Response; import java.io.IOException; @@ -39,8 +39,11 @@ public void generateError(Response response) throws IOException { .readTree(response.getBody()) .get("error"); - throw new FacebookAccessTokenErrorResponse(errorNode.get("message").asText(), errorNode.get("type").asText(), - errorNode.get("code").asInt(), errorNode.get("fbtrace_id").asText(), response); + throw new FacebookAccessTokenErrorResponse(errorNode.get("message").asString(), + errorNode.get("type").asString(), + errorNode.get("code").asInt(), + errorNode.get("fbtrace_id").asString(), + response); } } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/fitbit/FitBitJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/fitbit/FitBitJsonTokenExtractor.java index 24ed6025a..59d7e61ed 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/fitbit/FitBitJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/fitbit/FitBitJsonTokenExtractor.java @@ -1,11 +1,12 @@ package com.github.scribejava.apis.fitbit; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; import com.github.scribejava.core.model.OAuth2AccessTokenErrorResponse; import com.github.scribejava.core.model.Response; import com.github.scribejava.core.oauth2.OAuth2Error; +import tools.jackson.core.JacksonException; + import java.io.IOException; public class FitBitJsonTokenExtractor extends OAuth2AccessTokenJsonExtractor { @@ -26,7 +27,7 @@ public static FitBitJsonTokenExtractor instance() { protected FitBitOAuth2AccessToken createToken(String accessToken, String tokenType, Integer expiresIn, String refreshToken, String scope, JsonNode response, String rawResponse) { return new FitBitOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope, - response.get("user_id").asText(), rawResponse); + response.get("user_id").asString(), rawResponse); } /** @@ -37,19 +38,19 @@ public void generateError(Response response) throws IOException { final JsonNode errorNode; try { errorNode = OAuth2AccessTokenJsonExtractor.OBJECT_MAPPER.readTree(response.getBody()).get("errors").get(0); - } catch (JsonProcessingException ex) { + } catch (JacksonException ex) { throw new OAuth2AccessTokenErrorResponse(null, null, null, response); } OAuth2Error errorCode; try { errorCode = OAuth2Error - .parseFrom(extractRequiredParameter(errorNode, "errorType", response.getBody()).asText()); + .parseFrom(extractRequiredParameter(errorNode, "errorType", response.getBody()).asString()); } catch (IllegalArgumentException iaE) { //non oauth standard error code errorCode = null; } - throw new OAuth2AccessTokenErrorResponse(errorCode, errorNode.get("message").asText(), null, response); + throw new OAuth2AccessTokenErrorResponse(errorCode, errorNode.get("message").asString(), null, response); } } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/instagram/InstagramAccessTokenJsonExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/instagram/InstagramAccessTokenJsonExtractor.java index 8f30b2e96..9cb9fe6ff 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/instagram/InstagramAccessTokenJsonExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/instagram/InstagramAccessTokenJsonExtractor.java @@ -1,7 +1,7 @@ package com.github.scribejava.apis.instagram; import java.io.IOException; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.apis.facebook.FacebookAccessTokenJsonExtractor; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; import com.github.scribejava.core.model.Response; @@ -45,9 +45,9 @@ public void generateError(Response response) throws IOException { FacebookAccessTokenJsonExtractor.instance().generateError(response); } else { throw new InstagramAccessTokenErrorResponse( - errorNode.get("error_type").asText(), + errorNode.get("error_type").asString(), errorNode.get("code").asInt(), - errorNode.get("error_message").asText(), + errorNode.get("error_message").asString(), response ); } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java index 1fc441a70..f342f4654 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java @@ -1,6 +1,6 @@ package com.github.scribejava.apis.openid; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; /** @@ -25,6 +25,6 @@ protected OpenIdOAuth2AccessToken createToken(String accessToken, String tokenTy String refreshToken, String scope, JsonNode response, String rawResponse) { final JsonNode idToken = response.get("id_token"); return new OpenIdOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope, - idToken == null ? null : idToken.asText(), rawResponse); + idToken == null ? null : idToken.asString(), rawResponse); } } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/polar/PolarJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/polar/PolarJsonTokenExtractor.java index 1258dfe59..4a0831456 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/polar/PolarJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/polar/PolarJsonTokenExtractor.java @@ -1,11 +1,12 @@ package com.github.scribejava.apis.polar; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; import com.github.scribejava.core.model.OAuth2AccessTokenErrorResponse; import com.github.scribejava.core.model.Response; import com.github.scribejava.core.oauth2.OAuth2Error; +import tools.jackson.core.JacksonException; + import java.io.IOException; /** @@ -29,7 +30,7 @@ public static PolarJsonTokenExtractor instance() { protected PolarOAuth2AccessToken createToken(String accessToken, String tokenType, Integer expiresIn, String refreshToken, String scope, JsonNode response, String rawResponse) { return new PolarOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope, - response.get("x_user_id").asText(), rawResponse); + response.get("x_user_id").asString(), rawResponse); } @Override @@ -37,19 +38,19 @@ public void generateError(Response response) throws IOException { final JsonNode errorNode; try { errorNode = OAuth2AccessTokenJsonExtractor.OBJECT_MAPPER.readTree(response.getBody()).get("errors").get(0); - } catch (JsonProcessingException ex) { + } catch (JacksonException ex) { throw new OAuth2AccessTokenErrorResponse(null, null, null, response); } OAuth2Error errorCode; try { errorCode = OAuth2Error - .parseFrom(extractRequiredParameter(errorNode, "errorType", response.getBody()).asText()); + .parseFrom(extractRequiredParameter(errorNode, "errorType", response.getBody()).asString()); } catch (IllegalArgumentException iaE) { //non oauth standard error code errorCode = null; } - throw new OAuth2AccessTokenErrorResponse(errorCode, errorNode.get("message").asText(), null, response); + throw new OAuth2AccessTokenErrorResponse(errorCode, errorNode.get("message").asString(), null, response); } } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/salesforce/SalesforceJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/salesforce/SalesforceJsonTokenExtractor.java index 62a3294cf..a48a07dd4 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/salesforce/SalesforceJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/salesforce/SalesforceJsonTokenExtractor.java @@ -1,6 +1,6 @@ package com.github.scribejava.apis.salesforce; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; /** @@ -25,6 +25,6 @@ public static SalesforceJsonTokenExtractor instance() { protected SalesforceToken createToken(String accessToken, String tokenType, Integer expiresIn, String refreshToken, String scope, JsonNode response, String rawResponse) { return new SalesforceToken(accessToken, tokenType, expiresIn, refreshToken, scope, - extractRequiredParameter(response, "instance_url", rawResponse).asText(), rawResponse); + extractRequiredParameter(response, "instance_url", rawResponse).asString(), rawResponse); } } diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/slack/SlackJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/slack/SlackJsonTokenExtractor.java index ca0be7587..ec12d0c3b 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/slack/SlackJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/slack/SlackJsonTokenExtractor.java @@ -1,6 +1,6 @@ package com.github.scribejava.apis.slack; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; public class SlackJsonTokenExtractor extends OAuth2AccessTokenJsonExtractor { @@ -25,7 +25,7 @@ protected SlackOAuth2AccessToken createToken(String accessToken, String tokenTyp if (userAccessTokenNode == null) { userAccessToken = ""; } else { - userAccessToken = userAccessTokenNode.asText(); + userAccessToken = userAccessTokenNode.asString(); } return new SlackOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope, userAccessToken, diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/vk/VKJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/vk/VKJsonTokenExtractor.java index a3d14aacf..a901384c0 100644 --- a/scribejava-apis/src/main/java/com/github/scribejava/apis/vk/VKJsonTokenExtractor.java +++ b/scribejava-apis/src/main/java/com/github/scribejava/apis/vk/VKJsonTokenExtractor.java @@ -1,6 +1,6 @@ package com.github.scribejava.apis.vk; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.extractors.OAuth2AccessTokenJsonExtractor; /** @@ -25,6 +25,6 @@ protected VKOAuth2AccessToken createToken(String accessToken, String tokenType, String refreshToken, String scope, JsonNode response, String rawResponse) { final JsonNode email = response.get("email"); return new VKOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope, - email == null ? null : email.asText(), rawResponse); + email == null ? null : email.asString(), rawResponse); } } diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XeroExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XeroExample.java index d66334e40..0b01aa95d 100644 --- a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XeroExample.java +++ b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XeroExample.java @@ -5,7 +5,7 @@ import java.util.Random; import java.util.Scanner; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import com.github.scribejava.apis.XeroApi20; import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.model.OAuth2AccessToken; diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractJsonExtractor.java b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractJsonExtractor.java index 4a592a706..7a8b11b9c 100644 --- a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractJsonExtractor.java +++ b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractJsonExtractor.java @@ -1,7 +1,7 @@ package com.github.scribejava.core.extractors; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import com.github.scribejava.core.exceptions.OAuthException; public abstract class AbstractJsonExtractor { diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractOAuth1JSONTokenExtractor.java b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractOAuth1JSONTokenExtractor.java index 5c42e812a..aa14e06ca 100644 --- a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractOAuth1JSONTokenExtractor.java +++ b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractOAuth1JSONTokenExtractor.java @@ -1,7 +1,7 @@ package com.github.scribejava.core.extractors; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import com.github.scribejava.core.exceptions.OAuthException; import com.github.scribejava.core.model.OAuth1Token; import com.github.scribejava.core.model.OAuthConstants; @@ -31,7 +31,7 @@ public T extract(Response response) throws IOException { + rawBody + '\'', null); } - return createToken(token.asText(), secret.asText(), rawBody); + return createToken(token.asString(), secret.asString(), rawBody); } protected abstract T createToken(String token, String secret, String response); diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/DeviceAuthorizationJsonExtractor.java b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/DeviceAuthorizationJsonExtractor.java index 5b4fa248b..c8fadd64d 100644 --- a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/DeviceAuthorizationJsonExtractor.java +++ b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/DeviceAuthorizationJsonExtractor.java @@ -2,7 +2,7 @@ import static com.github.scribejava.core.extractors.AbstractJsonExtractor.OBJECT_MAPPER; import static com.github.scribejava.core.extractors.AbstractJsonExtractor.extractRequiredParameter; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.github.scribejava.core.model.DeviceAuthorization; import java.io.IOException; import com.github.scribejava.core.model.Response; @@ -37,9 +37,9 @@ private DeviceAuthorization createDeviceAuthorization(String rawResponse) throws final JsonNode response = OBJECT_MAPPER.readTree(rawResponse); final DeviceAuthorization deviceAuthorization = new DeviceAuthorization( - extractRequiredParameter(response, "device_code", rawResponse).textValue(), - extractRequiredParameter(response, "user_code", rawResponse).textValue(), - extractRequiredParameter(response, getVerificationUriParamName(), rawResponse).textValue(), + extractRequiredParameter(response, "device_code", rawResponse).asString(), + extractRequiredParameter(response, "user_code", rawResponse).asString(), + extractRequiredParameter(response, getVerificationUriParamName(), rawResponse).asString(), extractRequiredParameter(response, "expires_in", rawResponse).intValue()); final JsonNode intervalSeconds = response.get("interval"); @@ -49,7 +49,7 @@ private DeviceAuthorization createDeviceAuthorization(String rawResponse) throws final JsonNode verificationUriComplete = response.get("verification_uri_complete"); if (verificationUriComplete != null) { - deviceAuthorization.setVerificationUriComplete(verificationUriComplete.asText()); + deviceAuthorization.setVerificationUriComplete(verificationUriComplete.asString()); } return deviceAuthorization; diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java index b9bfd6cba..a07043f6d 100644 --- a/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java +++ b/scribejava-core/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java @@ -1,7 +1,6 @@ package com.github.scribejava.core.extractors; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import java.io.IOException; import java.net.URI; import com.github.scribejava.core.model.OAuth2AccessToken; @@ -10,6 +9,7 @@ import com.github.scribejava.core.model.Response; import com.github.scribejava.core.oauth2.OAuth2Error; import com.github.scribejava.core.utils.Preconditions; +import tools.jackson.core.JacksonException; /** * JSON (default) implementation of {@link TokenExtractor} for OAuth 2.0 @@ -51,14 +51,14 @@ public void generateError(Response response) throws IOException { final JsonNode responseBodyJson; try { responseBodyJson = OBJECT_MAPPER.readTree(responseBody); - } catch (JsonProcessingException ex) { + } catch (JacksonException ex) { throw new OAuth2AccessTokenErrorResponse(null, null, null, response); } final JsonNode errorUriInString = responseBodyJson.get("error_uri"); URI errorUri; try { - errorUri = errorUriInString == null ? null : URI.create(errorUriInString.asText()); + errorUri = errorUriInString == null ? null : URI.create(errorUriInString.asString()); } catch (IllegalArgumentException iae) { errorUri = null; } @@ -66,7 +66,7 @@ public void generateError(Response response) throws IOException { OAuth2Error errorCode; try { errorCode = OAuth2Error - .parseFrom(extractRequiredParameter(responseBodyJson, "error", responseBody).asText()); + .parseFrom(extractRequiredParameter(responseBodyJson, "error", responseBody).asString()); } catch (IllegalArgumentException iaE) { //non oauth standard error code errorCode = null; @@ -74,8 +74,8 @@ public void generateError(Response response) throws IOException { final JsonNode errorDescription = responseBodyJson.get("error_description"); - throw new OAuth2AccessTokenErrorResponse(errorCode, errorDescription == null ? null : errorDescription.asText(), - errorUri, response); + throw new OAuth2AccessTokenErrorResponse(errorCode, errorDescription == null ? null + : errorDescription.asString(), errorUri, response); } private OAuth2AccessToken createToken(String rawResponse) throws IOException { @@ -87,9 +87,11 @@ private OAuth2AccessToken createToken(String rawResponse) throws IOException { final JsonNode scope = response.get(OAuthConstants.SCOPE); final JsonNode tokenType = response.get("token_type"); - return createToken(extractRequiredParameter(response, OAuthConstants.ACCESS_TOKEN, rawResponse).asText(), - tokenType == null ? null : tokenType.asText(), expiresInNode == null ? null : expiresInNode.asInt(), - refreshToken == null ? null : refreshToken.asText(), scope == null ? null : scope.asText(), response, + return createToken(extractRequiredParameter(response, OAuthConstants.ACCESS_TOKEN, rawResponse).asString(), + tokenType == null ? null : tokenType.asString(), + expiresInNode == null ? null : expiresInNode.asInt(), + refreshToken == null ? null : refreshToken.asString(), + scope == null ? null : scope.asString(), response, rawResponse); } diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java index 3e0024c6c..8b00c966a 100644 --- a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java +++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java @@ -1,7 +1,7 @@ package com.github.scribejava.core.oauth; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; import com.github.scribejava.core.base64.Base64; import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.model.OAuth2AccessToken; @@ -30,17 +30,17 @@ public void shouldProduceCorrectRequestSync() throws IOException, InterruptedExc final JsonNode response = OBJECT_MAPPER.readTree(token.getRawResponse()); - assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asText()); + assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asString()); assertEquals(OAuth20ServiceUnit.EXPIRES, response.get("expires_in").asInt()); final String authorize = Base64.encode( String.format("%s:%s", service.getApiKey(), service.getApiSecret()).getBytes(Charset.forName("UTF-8"))); - assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asText()); + assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asString()); - assertEquals("user1", response.get("query-username").asText()); - assertEquals("password1", response.get("query-password").asText()); - assertEquals("password", response.get("query-grant_type").asText()); + assertEquals("user1", response.get("query-username").asString()); + assertEquals("password1", response.get("query-password").asString()); + assertEquals("password", response.get("query-grant_type").asString()); } @Test @@ -55,17 +55,17 @@ public void shouldProduceCorrectRequestAsync() throws ExecutionException, Interr final JsonNode response = OBJECT_MAPPER.readTree(token.getRawResponse()); - assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asText()); + assertEquals(OAuth20ServiceUnit.TOKEN, response.get(OAuthConstants.ACCESS_TOKEN).asString()); assertEquals(OAuth20ServiceUnit.EXPIRES, response.get("expires_in").asInt()); final String authorize = Base64.encode( String.format("%s:%s", service.getApiKey(), service.getApiSecret()).getBytes(Charset.forName("UTF-8"))); - assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asText()); + assertEquals(OAuthConstants.BASIC + ' ' + authorize, response.get(OAuthConstants.HEADER).asString()); - assertEquals("user1", response.get("query-username").asText()); - assertEquals("password1", response.get("query-password").asText()); - assertEquals("password", response.get("query-grant_type").asText()); + assertEquals("user1", response.get("query-username").asString()); + assertEquals("password1", response.get("query-password").asString()); + assertEquals("password", response.get("query-grant_type").asString()); } @Test diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java index 2766b7f2b..d85a5a934 100644 --- a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java +++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java @@ -1,7 +1,6 @@ package com.github.scribejava.core.oauth; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import com.github.scribejava.core.builder.api.DefaultApi20; import com.github.scribejava.core.httpclient.HttpClient; import com.github.scribejava.core.httpclient.HttpClientConfig; @@ -10,6 +9,7 @@ import com.github.scribejava.core.model.OAuthConstants; import com.github.scribejava.core.model.OAuthRequest; import com.github.scribejava.core.model.Parameter; +import tools.jackson.core.JacksonException; import java.io.OutputStream; import java.util.HashMap; @@ -50,7 +50,7 @@ private String prepareRawResponse(OAuthRequest request) { try { return OBJECT_MAPPER.writeValueAsString(response); - } catch (JsonProcessingException ex) { + } catch (JacksonException ex) { throw new IllegalStateException("smth wrong with Jackson?"); } }