And then replacing/removing JsonGenerationException with StreamWriteException where possible

cowtowncoder · cowtowncoder · commit 0793e87fba05 · 2021-01-21T11:46:58.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamReadException;
+import com.fasterxml.jackson.core.exc.StreamWriteException;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
 import com.fasterxml.jackson.core.type.ResolvedType;
@@ -3106,7 +3107,7 @@ public JsonNode readTree(URL source) throws IOException
      */
     @Override
     public void writeValue(JsonGenerator g, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _assertNotNull("g", g);
         SerializationConfig config = getSerializationConfig();
@@ -3679,7 +3680,7 @@ public <T> T readValue(DataInput src, JavaType valueType) throws IOException
      * JSON output, written to File provided.
      */
     public void writeValue(File resultFile, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(resultFile, JsonEncoding.UTF8), value);
     }
@@ -3696,7 +3697,7 @@ public void writeValue(File resultFile, Object value)
      * is closed).
      */
     public void writeValue(OutputStream out, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(out, JsonEncoding.UTF8), value);
     }
@@ -3720,7 +3721,7 @@ public void writeValue(DataOutput out, Object value) throws IOException
      * is closed).
      */
     public void writeValue(Writer w, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(w), value);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectWriter.java b/src/main/java/com/fasterxml/jackson/databind/ObjectWriter.java
@@ -8,6 +8,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.exc.StreamWriteException;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
 import com.fasterxml.jackson.core.io.SerializedString;
@@ -1021,7 +1022,7 @@ public void writeValue(JsonGenerator g, Object value) throws IOException
      * JSON output, written to File provided.
      */
     public void writeValue(File resultFile, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(resultFile, JsonEncoding.UTF8), value);
     }
@@ -1038,7 +1039,7 @@ public void writeValue(File resultFile, Object value)
      * is closed).
      */
     public void writeValue(OutputStream out, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(out, JsonEncoding.UTF8), value);
     }
@@ -1054,7 +1055,7 @@ public void writeValue(OutputStream out, Object value)
      * is closed).
      */
     public void writeValue(Writer w, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(w), value);
     }
@@ -1063,7 +1064,7 @@ public void writeValue(Writer w, Object value)
      * @since 2.8
      */
     public void writeValue(DataOutput out, Object value)
-        throws IOException
+        throws IOException, StreamWriteException, JsonMappingException
     {
         _writeValueAndClose(createGenerator(out), value);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/DOMSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ext/DOMSerializer.java
@@ -33,7 +33,7 @@ public DOMSerializer() {
     
     @Override
     public void serialize(Node value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+        throws IOException
     {
         if (_domImpl == null) throw new IllegalStateException("Could not find DOM LS");    	
         LSSerializer writer = _domImpl.createLSSerializer();
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
@@ -797,11 +797,10 @@ protected void serializeFields(Object bean, JsonGenerator gen, SerializerProvide
      */
     protected void serializeFieldsFiltered(Object bean, JsonGenerator gen,
             SerializerProvider provider)
-        throws IOException, JsonGenerationException
+        throws IOException
     {
-        /* note: almost verbatim copy of "serializeFields"; copied (instead of merged)
-         * so that old method need not add check for existence of filter.
-         */
+        // note: almost verbatim copy of "serializeFields"; copied (instead of merged)
+        // so that old method need not add check for existence of filter.
         final BeanPropertyWriter[] props;
         if (_filteredProps != null && provider.getActiveView() != null) {
             props = _filteredProps;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java
@@ -63,7 +63,7 @@ public static class AtomicBooleanSerializer
         public AtomicBooleanSerializer() { super(AtomicBoolean.class, false); }
     
         @Override
-        public void serialize(AtomicBoolean value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {
+        public void serialize(AtomicBoolean value, JsonGenerator gen, SerializerProvider provider) throws IOException {
             gen.writeBoolean(value.get());
         }
     
@@ -84,7 +84,7 @@ public static class AtomicIntegerSerializer
         public AtomicIntegerSerializer() { super(AtomicInteger.class, false); }
     
         @Override
-        public void serialize(AtomicInteger value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {
+        public void serialize(AtomicInteger value, JsonGenerator gen, SerializerProvider provider) throws IOException {
             gen.writeNumber(value.get());
         }
     
@@ -106,7 +106,7 @@ public static class AtomicLongSerializer
         public AtomicLongSerializer() { super(AtomicLong.class, false); }
     
         @Override
-        public void serialize(AtomicLong value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {
+        public void serialize(AtomicLong value, JsonGenerator gen, SerializerProvider provider) throws IOException {
             gen.writeNumber(value.get());
         }
     

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import java.util.concurrent.atomic.AtomicReference;`
`9`	`9`
`10`	`10`	`import com.fasterxml.jackson.core.*;`
	`11`	`+import com.fasterxml.jackson.core.exc.StreamWriteException;`
`11`	`12`	`import com.fasterxml.jackson.core.io.CharacterEscapes;`
`12`	`13`	`import com.fasterxml.jackson.core.io.SegmentedStringWriter;`
`13`	`14`	`import com.fasterxml.jackson.core.io.SerializedString;`
`@@ -1021,7 +1022,7 @@ public void writeValue(JsonGenerator g, Object value) throws IOException`
`1021`	`1022`	`* JSON output, written to File provided.`
`1022`	`1023`	`*/`
`1023`	`1024`	`public void writeValue(File resultFile, Object value)`
`1024`		`- throws IOException, JsonGenerationException, JsonMappingException`
	`1025`	`+ throws IOException, StreamWriteException, JsonMappingException`
`1025`	`1026`	`{`
`1026`	`1027`	`_writeValueAndClose(createGenerator(resultFile, JsonEncoding.UTF8), value);`
`1027`	`1028`	`}`
`@@ -1038,7 +1039,7 @@ public void writeValue(File resultFile, Object value)`
`1038`	`1039`	`* is closed).`
`1039`	`1040`	`*/`
`1040`	`1041`	`public void writeValue(OutputStream out, Object value)`
`1041`		`- throws IOException, JsonGenerationException, JsonMappingException`
	`1042`	`+ throws IOException, StreamWriteException, JsonMappingException`
`1042`	`1043`	`{`
`1043`	`1044`	`_writeValueAndClose(createGenerator(out, JsonEncoding.UTF8), value);`
`1044`	`1045`	`}`
`@@ -1054,7 +1055,7 @@ public void writeValue(OutputStream out, Object value)`
`1054`	`1055`	`* is closed).`
`1055`	`1056`	`*/`
`1056`	`1057`	`public void writeValue(Writer w, Object value)`
`1057`		`- throws IOException, JsonGenerationException, JsonMappingException`
	`1058`	`+ throws IOException, StreamWriteException, JsonMappingException`
`1058`	`1059`	`{`
`1059`	`1060`	`_writeValueAndClose(createGenerator(w), value);`
`1060`	`1061`	`}`
`@@ -1063,7 +1064,7 @@ public void writeValue(Writer w, Object value)`
`1063`	`1064`	`* @since 2.8`
`1064`	`1065`	`*/`
`1065`	`1066`	`public void writeValue(DataOutput out, Object value)`
`1066`		`- throws IOException`
	`1067`	`+ throws IOException, StreamWriteException, JsonMappingException`
`1067`	`1068`	`{`
`1068`	`1069`	`_writeValueAndClose(createGenerator(out), value);`
`1069`	`1070`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public DOMSerializer() {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public void serialize(Node value, JsonGenerator jgen, SerializerProvider provider)`
`36`		`- throws IOException, JsonGenerationException`
	`36`	`+ throws IOException`
`37`	`37`	`{`
`38`	`38`	`if (_domImpl == null) throw new IllegalStateException("Could not find DOM LS");`
`39`	`39`	`LSSerializer writer = _domImpl.createLSSerializer();`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static class AtomicBooleanSerializer`
`63`	`63`	`public AtomicBooleanSerializer() { super(AtomicBoolean.class, false); }`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public void serialize(AtomicBoolean value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {`
	`66`	`+ public void serialize(AtomicBoolean value, JsonGenerator gen, SerializerProvider provider) throws IOException {`
`67`	`67`	`gen.writeBoolean(value.get());`
`68`	`68`	`}`
`69`	`69`
`@@ -84,7 +84,7 @@ public static class AtomicIntegerSerializer`
`84`	`84`	`public AtomicIntegerSerializer() { super(AtomicInteger.class, false); }`
`85`	`85`
`86`	`86`	`@Override`
`87`		`- public void serialize(AtomicInteger value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {`
	`87`	`+ public void serialize(AtomicInteger value, JsonGenerator gen, SerializerProvider provider) throws IOException {`
`88`	`88`	`gen.writeNumber(value.get());`
`89`	`89`	`}`
`90`	`90`
`@@ -106,7 +106,7 @@ public static class AtomicLongSerializer`
`106`	`106`	`public AtomicLongSerializer() { super(AtomicLong.class, false); }`
`107`	`107`
`108`	`108`	`@Override`
`109`		`- public void serialize(AtomicLong value, JsonGenerator gen, SerializerProvider provider) throws IOException, JsonGenerationException {`
	`109`	`+ public void serialize(AtomicLong value, JsonGenerator gen, SerializerProvider provider) throws IOException {`
`110`	`110`	`gen.writeNumber(value.get());`
`111`	`111`	`}`
`112`	`112`