From 5e9670190b3d1d63e6ee8dd96606782155bbce51 Mon Sep 17 00:00:00 2001 From: Ajay Date: Mon, 10 Dec 2018 18:11:24 -0500 Subject: [PATCH 1/2] fix #342 JsonGenerator and JsonParser should implement Closeable (and Flushable) --- .../main/java/com/google/api/client/json/JsonGenerator.java | 4 +++- .../src/main/java/com/google/api/client/json/JsonParser.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java b/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java index a58760281..b37ac6ced 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java @@ -22,6 +22,8 @@ import com.google.api.client.util.Preconditions; import com.google.api.client.util.Types; +import java.io.Closeable; +import java.io.Flushable; import java.io.IOException; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -39,7 +41,7 @@ * @since 1.3 * @author Yaniv Inbar */ -public abstract class JsonGenerator { +public abstract class JsonGenerator implements Closeable, Flushable { /** Returns the JSON factory from which this generator was created. */ public abstract JsonFactory getFactory(); diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java index 0c3a5b249..4763acad0 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java @@ -24,6 +24,8 @@ import com.google.api.client.util.Sets; import com.google.api.client.util.Types; +import java.io.Closeable; +import java.io.Flushable; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -60,7 +62,7 @@ * @since 1.3 * @author Yaniv Inbar */ -public abstract class JsonParser { +public abstract class JsonParser implements Closeable, Flushable { /** * Maps a polymorphic {@link Class} to its {@link Field} with the {@link JsonPolymorphicTypeMap} From d07aabe336a5301a363a110517ccf3559ede1e14 Mon Sep 17 00:00:00 2001 From: Ajay Date: Mon, 10 Dec 2018 18:28:06 -0500 Subject: [PATCH 2/2] remove flushable from JsonParser --- .../src/main/java/com/google/api/client/json/JsonParser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java index 4763acad0..e91c71306 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java @@ -25,7 +25,6 @@ import com.google.api.client.util.Types; import java.io.Closeable; -import java.io.Flushable; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -62,7 +61,7 @@ * @since 1.3 * @author Yaniv Inbar */ -public abstract class JsonParser implements Closeable, Flushable { +public abstract class JsonParser implements Closeable { /** * Maps a polymorphic {@link Class} to its {@link Field} with the {@link JsonPolymorphicTypeMap}