Skip to content

Commit bea052c

Browse files
committed
Add @CheckReturnValue to our packages.
...as threatened in #2676 (comment).
1 parent 6ebbc9d commit bea052c

File tree

14 files changed

+26
-18
lines changed

14 files changed

+26
-18
lines changed

extras/src/test/java/com/google/gson/typeadapters/PostConstructAdapterFactoryTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public class PostConstructAdapterFactoryTest {
3131
public void test() throws Exception {
3232
Gson gson =
3333
new GsonBuilder().registerTypeAdapterFactory(new PostConstructAdapterFactory()).create();
34-
gson.fromJson("{\"bread\": \"white\", \"cheese\": \"cheddar\"}", Sandwich.class);
34+
Sandwich unused =
35+
gson.fromJson("{\"bread\": \"white\", \"cheese\": \"cheddar\"}", Sandwich.class);
3536
try {
3637
gson.fromJson("{\"bread\": \"cheesey bread\", \"cheese\": \"swiss\"}", Sandwich.class);
3738
fail();

gson/src/main/java/com/google/gson/annotations/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
*
2020
* @author Inderjeet Singh, Joel Leitch
2121
*/
22+
@com.google.errorprone.annotations.CheckReturnValue
2223
package com.google.gson.annotations;

gson/src/main/java/com/google/gson/internal/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
*
2121
* @author Inderjeet Singh, Joel Leitch, Jesse Wilson
2222
*/
23+
@com.google.errorprone.annotations.CheckReturnValue
2324
package com.google.gson.internal;

gson/src/main/java/com/google/gson/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@
2424
*
2525
* @author Inderjeet Singh, Joel Leitch
2626
*/
27+
@com.google.errorprone.annotations.CheckReturnValue
2728
package com.google.gson;

gson/src/main/java/com/google/gson/reflect/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
*
2020
* @author Inderjeet Singh, Joel Leitch
2121
*/
22+
@com.google.errorprone.annotations.CheckReturnValue
2223
package com.google.gson.reflect;

gson/src/main/java/com/google/gson/stream/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
*/
1616

1717
/** This package provides classes for processing JSON in an efficient streaming way. */
18+
@com.google.errorprone.annotations.CheckReturnValue
1819
package com.google.gson.stream;

gson/src/test/java/com/google/gson/functional/DelegateTypeAdapterTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public void testDelegateInvoked() {
5454
bags.add(new BagOfPrimitives(i, i, i % 2 == 0, String.valueOf(i)));
5555
}
5656
String json = gson.toJson(bags);
57-
gson.fromJson(json, new TypeToken<List<BagOfPrimitives>>() {}.getType());
57+
List<BagOfPrimitives> unused =
58+
gson.fromJson(json, new TypeToken<List<BagOfPrimitives>>() {}.getType());
5859
// 11: 1 list object, and 10 entries. stats invoked on all 5 fields
5960
assertThat(stats.numReads).isEqualTo(51);
6061
assertThat(stats.numWrites).isEqualTo(51);
@@ -64,7 +65,7 @@ public void testDelegateInvoked() {
6465
public void testDelegateInvokedOnStrings() {
6566
String[] bags = {"1", "2", "3", "4"};
6667
String json = gson.toJson(bags);
67-
gson.fromJson(json, String[].class);
68+
String[] unused = gson.fromJson(json, String[].class);
6869
// 1 array object with 4 elements.
6970
assertThat(stats.numReads).isEqualTo(5);
7071
assertThat(stats.numWrites).isEqualTo(5);

gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public void write(JsonWriter out, A value) throws IOException {
251251

252252
@Override
253253
public A read(JsonReader in) throws IOException {
254-
in.nextString();
254+
String unused = in.nextString();
255255
return new A("jsonAdapter");
256256
}
257257
}
@@ -277,7 +277,7 @@ public void write(JsonWriter out, T value) throws IOException {
277277
@SuppressWarnings("unchecked")
278278
@Override
279279
public T read(JsonReader in) throws IOException {
280-
in.nextString();
280+
String unused = in.nextString();
281281
return (T) new C("jsonAdapterFactory");
282282
}
283283
};
@@ -329,7 +329,7 @@ public void write(JsonWriter out, User user) throws IOException {
329329
public User read(JsonReader in) throws IOException {
330330
// implement read: split name into firstName and lastName
331331
in.beginObject();
332-
in.nextName();
332+
String unused = in.nextName();
333333
List<String> nameParts = Splitter.on(" ").splitToList(in.nextString());
334334
in.endObject();
335335
return new User(nameParts.get(0), nameParts.get(1));
@@ -348,7 +348,7 @@ public void write(JsonWriter out, NullableClass value) throws IOException {
348348

349349
@Override
350350
public NullableClass read(JsonReader in) throws IOException {
351-
in.nextString();
351+
String unused = in.nextString();
352352
return new NullableClass();
353353
}
354354
}

gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public Object read(JsonReader in) throws IOException {
118118
private static JsonIOException assertInaccessibleException(String json, Class<?> toDeserialize) {
119119
Gson gson = new Gson();
120120
try {
121-
gson.fromJson(json, toDeserialize);
121+
Object unused = gson.fromJson(json, toDeserialize);
122122
throw new AssertionError(
123123
"Missing exception; test has to be run with `--illegal-access=deny`");
124124
} catch (JsonSyntaxException e) {

gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ class SubSubTypeToken2 extends SubTypeToken<Integer> {}
328328
}
329329

330330
private static <M> void createTypeTokenTypeVariable() {
331-
new TypeToken<M>() {};
331+
TypeToken<M> unused = new TypeToken<M>() {};
332332
}
333333

334334
/**

metrics/src/main/java/com/google/gson/metrics/BagOfPrimitivesDeserializationBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void setUp() throws Exception {
4848
/** Benchmark to measure Gson performance for deserializing an object */
4949
public void timeBagOfPrimitivesDefault(int reps) {
5050
for (int i = 0; i < reps; ++i) {
51-
gson.fromJson(json, BagOfPrimitives.class);
51+
BagOfPrimitives unused = gson.fromJson(json, BagOfPrimitives.class);
5252
}
5353
}
5454

metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void setUp() throws Exception {
5656
/** Benchmark to measure Gson performance for deserializing an object */
5757
public void timeCollectionsDefault(int reps) {
5858
for (int i = 0; i < reps; ++i) {
59-
gson.fromJson(json, LIST_TYPE_TOKEN);
59+
List<BagOfPrimitives> unused = gson.fromJson(json, LIST_TYPE_TOKEN);
6060
}
6161
}
6262

metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.caliper.Param;
3030
import com.google.gson.Gson;
3131
import com.google.gson.GsonBuilder;
32+
import com.google.gson.JsonElement;
3233
import com.google.gson.JsonParser;
3334
import com.google.gson.annotations.SerializedName;
3435
import com.google.gson.reflect.TypeToken;
@@ -195,19 +196,19 @@ private static void readToken(JsonReader reader) throws IOException {
195196
reader.endObject();
196197
break;
197198
case NAME:
198-
reader.nextName();
199+
String unusedName = reader.nextName();
199200
break;
200201
case BOOLEAN:
201-
reader.nextBoolean();
202+
boolean unusedBoolean = reader.nextBoolean();
202203
break;
203204
case NULL:
204205
reader.nextNull();
205206
break;
206207
case NUMBER:
207-
reader.nextLong();
208+
long unusedLong = reader.nextLong();
208209
break;
209210
case STRING:
210-
reader.nextString();
211+
String unusedString = reader.nextString();
211212
break;
212213
case END_DOCUMENT:
213214
return;
@@ -274,7 +275,7 @@ public void parse(char[] data, Document document) throws Exception {
274275
private static class GsonDomParser implements Parser {
275276
@Override
276277
public void parse(char[] data, Document document) throws Exception {
277-
JsonParser.parseReader(new CharArrayReader(data));
278+
JsonElement unused = JsonParser.parseReader(new CharArrayReader(data));
278279
}
279280
}
280281

@@ -284,7 +285,7 @@ private static class GsonBindParser implements Parser {
284285

285286
@Override
286287
public void parse(char[] data, Document document) throws Exception {
287-
gson.fromJson(new CharArrayReader(data), document.gsonType);
288+
Object unused = gson.fromJson(new CharArrayReader(data), document.gsonType);
288289
}
289290
}
290291

metrics/src/main/java/com/google/gson/metrics/SerializationBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void setUp() throws Exception {
4545

4646
public void timeObjectSerialization(int reps) {
4747
for (int i = 0; i < reps; ++i) {
48-
gson.toJson(bag);
48+
String unused = gson.toJson(bag);
4949
}
5050
}
5151
}

0 commit comments

Comments
 (0)