Skip to content

Commit 4eccabd

Browse files
kweinmeisterkweinmeister
authored
chore: update deprecated Base64 and JsonParser references (GoogleCloudPlatform#7968)
* chore: update deprecated references * fix linting and update several more assertThat * linting * linting * fix test failure
1 parent cf1cbba commit 4eccabd

File tree

50 files changed

+102
-112
lines changed

Some content is hidden

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

50 files changed

+102
-112
lines changed

‎aiplatform/src/main/java/aiplatform/PredictImageClassificationSample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
// [START aiplatform_predict_image_classification_sample]
2020

21-
import com.google.api.client.util.Base64;
2221
import com.google.cloud.aiplatform.util.ValueConverter;
2322
import com.google.cloud.aiplatform.v1.EndpointName;
2423
import com.google.cloud.aiplatform.v1.PredictResponse;
@@ -33,6 +32,7 @@
3332
import java.nio.file.Files;
3433
import java.nio.file.Paths;
3534
import java.util.ArrayList;
35+
import java.util.Base64;
3636
import java.util.List;
3737

3838
public class PredictImageClassificationSample {
@@ -60,7 +60,7 @@ static void predictImageClassification(String project, String fileName, String e
6060
String location = "us-central1";
6161
EndpointName endpointName = EndpointName.of(project, location, endpointId);
6262

63-
byte[] contents = Base64.encodeBase64(Files.readAllBytes(Paths.get(fileName)));
63+
byte[] contents = Base64.getEncoder().encode(Files.readAllBytes(Paths.get(fileName)));
6464
String content = new String(contents, StandardCharsets.UTF_8);
6565

6666
ImageClassificationPredictionInstance predictionInstance =

‎aiplatform/src/main/java/aiplatform/PredictImageObjectDetectionSample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
// [START aiplatform_predict_image_object_detection_sample]
2020

21-
import com.google.api.client.util.Base64;
2221
import com.google.cloud.aiplatform.util.ValueConverter;
2322
import com.google.cloud.aiplatform.v1.EndpointName;
2423
import com.google.cloud.aiplatform.v1.PredictResponse;
@@ -33,6 +32,7 @@
3332
import java.nio.file.Files;
3433
import java.nio.file.Paths;
3534
import java.util.ArrayList;
35+
import java.util.Base64;
3636
import java.util.List;
3737

3838
public class PredictImageObjectDetectionSample {
@@ -60,7 +60,7 @@ static void predictImageObjectDetection(String project, String fileName, String
6060
String location = "us-central1";
6161
EndpointName endpointName = EndpointName.of(project, location, endpointId);
6262

63-
byte[] contents = Base64.encodeBase64(Files.readAllBytes(Paths.get(fileName)));
63+
byte[] contents = Base64.getEncoder().encode(Files.readAllBytes(Paths.get(fileName)));
6464
String content = new String(contents, StandardCharsets.UTF_8);
6565

6666
ImageObjectDetectionPredictionParams params =

‎appengine-java8/datastore/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<dependency>
7474
<groupId>com.google.auto.value</groupId>
7575
<artifactId>auto-value-annotations</artifactId>
76-
<version>1.10.1</version>
7776
</dependency>
7877

7978
<dependency>

‎appengine-java8/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/MoveServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
4040
UserService userService = UserServiceFactory.getUserService();
4141
String currentUserId = userService.getCurrentUser().getUserId();
4242

43-
int cell = new Integer(request.getParameter("cell"));
43+
int cell = Integer.valueOf(request.getParameter("cell"));
4444
if (!game.makeMove(cell, currentUserId)) {
4545
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
4646
} else {

‎appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.example.appengine.mailjet;
2020

21+
import com.mailjet.client.ClientOptions;
2122
import com.mailjet.client.MailjetClient;
2223
import com.mailjet.client.MailjetRequest;
2324
import com.mailjet.client.MailjetResponse;
@@ -39,7 +40,9 @@ public class MailjetServlet extends HttpServlet {
3940

4041
private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
4142
private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
42-
private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY);
43+
ClientOptions options =
44+
ClientOptions.builder().apiKey(MAILJET_API_KEY).apiSecretKey(MAILJET_SECRET_KEY).build();
45+
private MailjetClient client = new MailjetClient(options);
4346

4447
@Override
4548
public void doPost(HttpServletRequest req, HttpServletResponse resp)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class PubSubAuthenticatedPush extends HttpServlet {
4848
.setAudience(Collections.singletonList("example.com"))
4949
.build();
5050
private final Gson gson = new Gson();
51-
private final JsonParser jsonParser = new JsonParser();
5251

5352
@Override
5453
public void doPost(HttpServletRequest req, HttpServletResponse resp)
@@ -101,7 +100,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
101100

102101
private Message getMessage(HttpServletRequest request) throws IOException {
103102
String requestBody = request.getReader().lines().collect(Collectors.joining("\n"));
104-
JsonElement jsonRoot = jsonParser.parse(requestBody);
103+
JsonElement jsonRoot = JsonParser.parseString(requestBody).getAsJsonObject();
105104
String messageStr = jsonRoot.getAsJsonObject().get("message").toString();
106105
Message message = gson.fromJson(messageStr, Message.class);
107106
// decode from base64

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
5555

5656
private Message getMessage(HttpServletRequest request) throws IOException {
5757
String requestBody = request.getReader().lines().collect(Collectors.joining("\n"));
58-
JsonElement jsonRoot = jsonParser.parse(requestBody);
58+
JsonElement jsonRoot = JsonParser.parseString(requestBody).getAsJsonObject();
5959
String messageStr = jsonRoot.getAsJsonObject().get("message").toString();
6060
Message message = gson.fromJson(messageStr, Message.class);
6161
// decode from base64
@@ -69,7 +69,6 @@ private String decode(String data) {
6969
}
7070

7171
private final Gson gson = new Gson();
72-
private final JsonParser jsonParser = new JsonParser();
7372
private MessageRepository messageRepository;
7473

7574
PubSubPush(MessageRepository messageRepository) {

‎appengine-java8/translate-pubsub/src/main/java/com/example/appengine/translatepubsub/PubSubPush.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
@WebServlet(value = "/pubsub/push")
3131
public class PubSubPush extends HttpServlet {
32-
private final JsonParser jsonParser = new JsonParser();
3332
private final Gson gson = new Gson();
3433
private MessageRepository messageRepository;
3534

@@ -65,7 +64,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
6564

6665
private Message getMessage(HttpServletRequest request) throws IOException {
6766
String requestBody = request.getReader().lines().collect(Collectors.joining("\n"));
68-
JsonObject jsonRoot = jsonParser.parse(requestBody).getAsJsonObject();
67+
JsonObject jsonRoot = JsonParser.parseString(requestBody).getAsJsonObject();
6968
JsonObject messageOb = jsonRoot.get("message").getAsJsonObject();
7069
Message message = gson.fromJson(jsonRoot.get("message").toString(), Message.class);
7170
JsonObject attributes = messageOb.get("attributes").getAsJsonObject();

‎asset/src/test/java/com/example/asset/RealTimeFeed.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.cloud.resourcemanager.ProjectInfo;
2424
import com.google.cloud.resourcemanager.ResourceManager;
2525
import com.google.cloud.resourcemanager.ResourceManagerOptions;
26-
import com.google.pubsub.v1.ProjectTopicName;
26+
import com.google.pubsub.v1.TopicName;
2727
import java.io.ByteArrayOutputStream;
2828
import java.io.PrintStream;
2929
import java.util.UUID;
@@ -48,7 +48,7 @@ public class RealTimeFeed {
4848
private final String projectNumber = getProjectNumber(projectId);
4949
private final String feedName = String.format("projects/%s/feeds/%s", projectNumber, feedId);
5050
private final String[] assetNames = {UUID.randomUUID().toString()};
51-
private static final ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
51+
private static final TopicName topicName = TopicName.of(projectId, topicId);
5252
private ByteArrayOutputStream bout;
5353
private PrintStream out;
5454
private PrintStream originalPrintStream;

‎bigtable/use-cases/fraudDetection/src/main/java/bigtable/fraud/beam/utils/AggregatedData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package bigtable.fraud.beam.utils;
1717

1818
import java.util.ArrayList;
19-
import org.apache.beam.sdk.coders.AvroCoder;
2019
import org.apache.beam.sdk.coders.DefaultCoder;
20+
import org.apache.beam.sdk.extensions.avro.coders.AvroCoder;
2121
import org.apache.hadoop.hbase.client.Result;
2222

2323
@DefaultCoder(AvroCoder.class)

0 commit comments

Comments
 (0)