Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit d6e97f0

Browse files
blakeli0diegomarquezp
authored andcommitted
tests: Remove unnecessary null check for protobuf lists (#2723)
ErrorProne will complain ImpossibleNullComparison once protobuf runtime is upgraded to 4.x. See the downstream tests in sdk-platform-java.
1 parent d2373a2 commit d6e97f0

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,20 +285,20 @@ public void test() throws Exception {
285285

286286
private static boolean expectsError(ReadChangeStreamTest testCase) {
287287
List<ReadChangeStreamTest.Result> results = testCase.getResultsList();
288-
return results != null && !results.isEmpty() && results.get(results.size() - 1).getError();
288+
return !results.isEmpty() && results.get(results.size() - 1).getError();
289289
}
290290

291291
private static List<ReadChangeStreamTest.Result> getNonExceptionResults(
292292
ReadChangeStreamTest testCase) {
293293
List<ReadChangeStreamTest.Result> results = testCase.getResultsList();
294294
List<ReadChangeStreamTest.Result> response = new ArrayList<>();
295-
if (results != null) {
296-
for (ReadChangeStreamTest.Result result : results) {
297-
if (!result.getError()) {
298-
response.add(result);
299-
}
295+
296+
for (ReadChangeStreamTest.Result result : results) {
297+
if (!result.getError()) {
298+
response.add(result);
300299
}
301300
}
301+
302302
return response;
303303
}
304304
}

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,20 @@ public void test() throws Exception {
142142

143143
private static boolean expectsError(ReadRowsTest rrt) {
144144
List<ReadRowsTest.Result> results = rrt.getResultsList();
145-
return results != null && !results.isEmpty() && results.get(results.size() - 1).getError();
145+
return !results.isEmpty() && results.get(results.size() - 1).getError();
146146
}
147147

148148
private static List<ReadRowsTest.Result> getNonExceptionResults(ReadRowsTest rrt) {
149149
List<ReadRowsTest.Result> results = rrt.getResultsList();
150150

151151
List<ReadRowsTest.Result> response = new ArrayList<>();
152-
if (results != null) {
153-
for (ReadRowsTest.Result result : results) {
154-
if (!result.getError()) {
155-
response.add(result);
156-
}
152+
153+
for (ReadRowsTest.Result result : results) {
154+
if (!result.getError()) {
155+
response.add(result);
157156
}
158157
}
158+
159159
return response;
160160
}
161161
}

0 commit comments

Comments
 (0)