Skip to content

Commit c7e9503

Browse files
elharoelharo
authored
fix: switch to GSON (#531)
* switch to GSON * format
1 parent 842a4f5 commit c7e9503

9 files changed

Lines changed: 25 additions & 31 deletions

File tree

‎google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/ClientId.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public static ClientId of(String clientId, String clientSecret) {
7272
/**
7373
* Constructs a Client ID from JSON from a downloaded file.
7474
*
75-
* @param json The JSON from the downloaded file.
76-
* @return the ClientId instance based on the JSON.
77-
* @throws IOException The JSON could not be parsed.
75+
* @param json the JSON from the downloaded file
76+
* @return the ClientId instance based on the JSON
77+
* @throws IOException the JSON could not be parsed
7878
*/
7979
public static ClientId fromJson(Map<String, Object> json) throws IOException {
8080
Object rawDetail = null;
@@ -105,9 +105,9 @@ public static ClientId fromJson(Map<String, Object> json) throws IOException {
105105
/**
106106
* Constructs a Client ID from JSON file stored as a resource.
107107
*
108-
* @param relativeClass A class in the same namespace as the resource.
109-
* @param resourceName The name of the resource
110-
* @return The constructed ClientID instance based on the JSON in the resource.
108+
* @param relativeClass a class in the same namespace as the resource
109+
* @param resourceName the name of the resource
110+
* @return the constructed ClientID instance based on the JSON in the resource
111111
* @throws IOException The JSON could not be loaded or parsed.
112112
*/
113113
public static ClientId fromResource(Class<?> relativeClass, String resourceName)
@@ -119,9 +119,9 @@ public static ClientId fromResource(Class<?> relativeClass, String resourceName)
119119
/**
120120
* Constructs a Client ID from JSON file stream.
121121
*
122-
* @param stream Stream of the downloaded JSON file.
123-
* @return The constructed ClientID instance based on the JSON in the stream.
124-
* @throws IOException The JSON could not be read or parsed.
122+
* @param stream the downloaded JSON file
123+
* @return the constructed ClientID instance based on the JSON in the stream
124+
* @throws IOException the JSON could not be read or parsed
125125
*/
126126
public static ClientId fromStream(InputStream stream) throws IOException {
127127
Preconditions.checkNotNull(stream);

‎google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/OAuth2Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import com.google.api.client.json.GenericJson;
3838
import com.google.api.client.json.JsonFactory;
3939
import com.google.api.client.json.JsonObjectParser;
40-
import com.google.api.client.json.jackson2.JacksonFactory;
40+
import com.google.api.client.json.gson.GsonFactory;
4141
import com.google.auth.http.AuthHttpConstants;
4242
import com.google.auth.http.HttpTransportFactory;
4343
import com.google.common.io.ByteStreams;
@@ -66,7 +66,7 @@ class OAuth2Utils {
6666

6767
static final HttpTransportFactory HTTP_TRANSPORT_FACTORY = new DefaultHttpTransportFactory();
6868

69-
static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
69+
static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
7070

7171
static final Charset UTF_8 = Charset.forName("UTF-8");
7272

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/TestUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import com.google.api.client.json.GenericJson;
3838
import com.google.api.client.json.JsonFactory;
39-
import com.google.api.client.json.jackson2.JacksonFactory;
39+
import com.google.api.client.json.gson.GsonFactory;
4040
import com.google.auth.http.AuthHttpConstants;
4141
import com.google.common.base.Splitter;
4242
import com.google.common.collect.Lists;
@@ -54,7 +54,7 @@ public class TestUtils {
5454

5555
public static final String UTF_8 = "UTF-8";
5656

57-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
57+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
5858

5959
public static void assertContainsBearerToken(Map<String, List<String>> metadata, String token) {
6060
assertNotNull(metadata);

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ClientIdTest.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import static org.junit.Assert.assertEquals;
3535
import static org.junit.Assert.assertNull;
36-
import static org.junit.Assert.fail;
3736

3837
import com.google.api.client.json.GenericJson;
3938
import com.google.auth.TestUtils;
@@ -156,7 +155,7 @@ public void fromStream() throws IOException {
156155
}
157156

158157
@Test
159-
public void fromStream_invalidJson_throws() {
158+
public void fromStream_invalidJson_doesNotThrow() throws IOException {
160159
String invalidJson =
161160
"{"
162161
+ "\"web\": {"
@@ -169,12 +168,7 @@ public void fromStream_invalidJson_throws() {
169168
+ "}"; // No closing brace
170169
InputStream stream = TestUtils.stringToInputStream(invalidJson);
171170

172-
try {
173-
ClientId.fromStream(stream);
174-
fail();
175-
} catch (IOException expected) {
176-
// Expected
177-
}
171+
ClientId.fromStream(stream);
178172
}
179173

180174
private GenericJson writeClientIdJson(String type, String clientId, String clientSecret) {

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ImpersonatedCredentialsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.google.api.client.json.GenericJson;
4444
import com.google.api.client.json.JsonFactory;
4545
import com.google.api.client.json.JsonGenerator;
46-
import com.google.api.client.json.jackson2.JacksonFactory;
46+
import com.google.api.client.json.gson.GsonFactory;
4747
import com.google.api.client.json.webtoken.JsonWebToken.Payload;
4848
import com.google.api.client.testing.http.MockLowLevelHttpRequest;
4949
import com.google.api.client.util.Clock;
@@ -111,7 +111,7 @@ public class ImpersonatedCredentialsTest extends BaseSerializationTest {
111111
private static final String ACCESS_TOKEN = "1/MkSJoj1xsli0AccessToken_NKPY2";
112112
private static final int VALID_LIFETIME = 300;
113113
private static final int INVALID_LIFETIME = 43210;
114-
private static JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
114+
private static JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
115115

116116
private static final String RFC3339 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
117117

@@ -693,7 +693,7 @@ private String generateErrorJson(
693693
int errorCode, String errorMessage, String errorDomain, String errorReason)
694694
throws IOException {
695695

696-
JsonFactory factory = new JacksonFactory();
696+
JsonFactory factory = new GsonFactory();
697697
ByteArrayOutputStream bout = new ByteArrayOutputStream();
698698
JsonGenerator generator = factory.createJsonGenerator(bout, Charset.defaultCharset());
699699
generator.enablePrettyPrint();

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/JwtCredentialsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static org.junit.Assert.fail;
3939

4040
import com.google.api.client.json.JsonFactory;
41-
import com.google.api.client.json.jackson2.JacksonFactory;
41+
import com.google.api.client.json.gson.GsonFactory;
4242
import com.google.api.client.json.webtoken.JsonWebSignature;
4343
import com.google.api.client.util.Clock;
4444
import com.google.auth.http.AuthHttpConstants;
@@ -69,7 +69,7 @@ public class JwtCredentialsTest extends BaseSerializationTest {
6969
+ "==\n-----END PRIVATE KEY-----\n";
7070
private static final String JWT_ACCESS_PREFIX =
7171
ServiceAccountJwtAccessCredentials.JWT_ACCESS_PREFIX;
72-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
72+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
7373

7474
static PrivateKey getPrivateKey() {
7575
try {

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/MockTokenServerTransport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.google.api.client.json.GenericJson;
3737
import com.google.api.client.json.Json;
3838
import com.google.api.client.json.JsonFactory;
39-
import com.google.api.client.json.jackson2.JacksonFactory;
39+
import com.google.api.client.json.gson.GsonFactory;
4040
import com.google.api.client.json.webtoken.JsonWebSignature;
4141
import com.google.api.client.testing.http.MockHttpTransport;
4242
import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -54,7 +54,7 @@
5454
public class MockTokenServerTransport extends MockHttpTransport {
5555

5656
static final String EXPECTED_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
57-
static final JsonFactory JSON_FACTORY = new JacksonFactory();
57+
static final JsonFactory JSON_FACTORY = new GsonFactory();
5858
int buildRequestCount;
5959
final Map<String, String> clients = new HashMap<String, String>();
6060
final Map<String, String> refreshTokens = new HashMap<String, String>();

‎google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountJwtAccessCredentialsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import static org.junit.Assert.fail;
4343

4444
import com.google.api.client.json.JsonFactory;
45-
import com.google.api.client.json.jackson2.JacksonFactory;
45+
import com.google.api.client.json.gson.GsonFactory;
4646
import com.google.api.client.json.webtoken.JsonWebSignature;
4747
import com.google.api.client.util.Clock;
4848
import com.google.auth.Credentials;
@@ -92,7 +92,7 @@ public class ServiceAccountJwtAccessCredentialsTest extends BaseSerializationTes
9292
private static final String JWT_ACCESS_PREFIX =
9393
ServiceAccountJwtAccessCredentials.JWT_ACCESS_PREFIX;
9494
private static final URI CALL_URI = URI.create("http://googleapis.com/testapi/v1/foo");
95-
private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
95+
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
9696
private static final String QUOTA_PROJECT = "sample-quota-project-id";
9797

9898
@Test

‎google-auth-library-java/oauth2_http/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>com.google.http-client</groupId>
83-
<artifactId>google-http-client-jackson2</artifactId>
83+
<artifactId>google-http-client-gson</artifactId>
8484
</dependency>
8585
<dependency>
8686
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)