Skip to content

Migrate from Jackson2 to Jackson3 #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonesbusy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate from Jackson2 to Jackson3 #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -248,7 +248,7 @@
</dependency>
</dependencies>
<configuration>
<targetJdk>1.${java.release}</targetJdk>
<targetJdk>${java.release}</targetJdk>
<linkXRef>false</linkXRef>
<rulesets>
<ruleset>../pmd.xml</ruleset>
Expand All @@ -269,7 +269,7 @@
</build>

<properties>
<java.release>7</java.release>
<java.release>17</java.release>
<pmdVersion>6.51.0</pmdVersion>
</properties>

Expand Down
9 changes: 6 additions & 3 deletions ...s/src/main/java/com/github/scribejava/apis/facebook/FacebookAccessTokenJsonExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}

}
13 changes: 7 additions & 6 deletions ...bejava-apis/src/main/java/com/github/scribejava/apis/fitbit/FitBitJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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);
}

/**
Expand All @@ -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);
}
}
6 changes: 3 additions & 3 deletions ...src/main/java/com/github/scribejava/apis/instagram/InstagramAccessTokenJsonExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
);
}
Expand Down
4 changes: 2 additions & 2 deletions ...bejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand All @@ -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);
}
}
13 changes: 7 additions & 6 deletions scribejava-apis/src/main/java/com/github/scribejava/apis/polar/PolarJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand All @@ -29,27 +30,27 @@ 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
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);
}
}
4 changes: 2 additions & 2 deletions ...pis/src/main/java/com/github/scribejava/apis/salesforce/SalesforceJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand All @@ -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);
}
}
4 changes: 2 additions & 2 deletions scribejava-apis/src/main/java/com/github/scribejava/apis/slack/SlackJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions scribejava-apis/src/main/java/com/github/scribejava/apis/vk/VKJsonTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand All @@ -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);
}
}
2 changes: 1 addition & 1 deletion scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XeroExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ejava-core/src/main/java/com/github/scribejava/core/extractors/AbstractJsonExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/com/github/scribejava/core/extractors/AbstractOAuth1JSONTokenExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions ...src/main/java/com/github/scribejava/core/extractors/DeviceAuthorizationJsonExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand All @@ -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;
Expand Down
22 changes: 12 additions & 10 deletions ...e/src/main/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -51,31 +51,31 @@ 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;
}

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;
}

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 {
Expand All @@ -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);
}

Expand Down
Loading