Skip to content

Commit f24e2c3

Browse files
kweinmeisterkweinmeister
authored
chore: migrate from JacksonFactory to GsonFactory (GoogleCloudPlatform#7970)
1 parent 5795403 commit f24e2c3

File tree

84 files changed

+197
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+197
-197
lines changed

‎appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubAuthenticatedPush.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
2020
import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
22-
import com.google.api.client.json.jackson2.JacksonFactory;
22+
import com.google.api.client.json.gson.GsonFactory;
2323
import com.google.gson.Gson;
2424
import com.google.gson.JsonElement;
2525
import com.google.gson.JsonParser;
@@ -39,7 +39,7 @@ public class PubSubAuthenticatedPush extends HttpServlet {
3939
private final String pubsubVerificationToken = System.getenv("PUBSUB_VERIFICATION_TOKEN");
4040
private final MessageRepository messageRepository;
4141
private final GoogleIdTokenVerifier verifier =
42-
new GoogleIdTokenVerifier.Builder(new NetHttpTransport(), new JacksonFactory())
42+
new GoogleIdTokenVerifier.Builder(new NetHttpTransport(), new GsonFactory())
4343
/**
4444
* Please change example.com to match with value you are providing while creating
4545
* subscription as provided in @see <a

‎functions/slack/src/main/java/functions/SlackSlashCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package functions;
1818

1919
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
20-
import com.google.api.client.json.jackson2.JacksonFactory;
20+
import com.google.api.client.json.gson.GsonFactory;
2121
import com.google.api.services.kgsearch.v1.Kgsearch;
2222
import com.google.cloud.functions.HttpFunction;
2323
import com.google.cloud.functions.HttpRequest;
@@ -63,7 +63,7 @@ public SlackSlashCommand() throws IOException, GeneralSecurityException {
6363
this.verifier = verifier;
6464
this.apiKey = apiKey;
6565
this.kgClient = new Kgsearch.Builder(
66-
GoogleNetHttpTransport.newTrustedTransport(), new JacksonFactory(), null).build();
66+
GoogleNetHttpTransport.newTrustedTransport(), new GsonFactory(), null).build();
6767
}
6868

6969
// Avoid ungraceful deployment failures due to unset environment variables.

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetCreate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -33,7 +33,7 @@
3333

3434
public class DatasetCreate {
3535
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
36-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
36+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3737
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3838

3939
public static void datasetCreate(String projectId, String regionId, String datasetId)

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetDeIdentify.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -37,7 +37,7 @@
3737

3838
public class DatasetDeIdentify {
3939
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
40-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
40+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
4141
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
4242

4343
public static void datasetDeIdentify(String srcDatasetName, String destDatasetName)

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetDelete.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -31,7 +31,7 @@
3131

3232
public class DatasetDelete {
3333
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
34-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
34+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3535
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3636

3737
public static void datasetDelete(String datasetName) throws IOException {

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetGet.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -32,7 +32,7 @@
3232

3333
public class DatasetGet {
3434
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
35-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
35+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3636
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3737

3838
public static void datasetGet(String datasetName) throws IOException {

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetGetIamPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -32,7 +32,7 @@
3232

3333
public class DatasetGetIamPolicy {
3434
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
35-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
35+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3636
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3737

3838
public static void datasetGetIamPolicy(String datasetName) throws IOException {

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetList.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -34,7 +34,7 @@
3434
import java.util.List;
3535

3636
public class DatasetList {
37-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
37+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3838
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3939

4040
public static void datasetList(String projectId, String regionId) throws IOException {

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetPatch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -32,7 +32,7 @@
3232

3333
public class DatasetPatch {
3434
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
35-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
35+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3636
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
3737

3838
public static void datasetPatch(String datasetName) throws IOException {

‎healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetSetIamPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.api.client.http.HttpRequestInitializer;
2121
import com.google.api.client.http.javanet.NetHttpTransport;
2222
import com.google.api.client.json.JsonFactory;
23-
import com.google.api.client.json.jackson2.JacksonFactory;
23+
import com.google.api.client.json.gson.GsonFactory;
2424
import com.google.api.services.healthcare.v1.CloudHealthcare;
2525
import com.google.api.services.healthcare.v1.CloudHealthcare.Projects.Locations.Datasets;
2626
import com.google.api.services.healthcare.v1.CloudHealthcareScopes;
@@ -35,7 +35,7 @@
3535

3636
public class DatasetSetIamPolicy {
3737
private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
38-
private static final JsonFactory JSON_FACTORY = new JacksonFactory();
38+
private static final JsonFactory JSON_FACTORY = new GsonFactory();
3939
private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
4040

4141
public static void datasetSetIamPolicy(String datasetName) throws IOException {

0 commit comments

Comments
 (0)