Fixed FasterXML#184

Author: cowtowncoder

release-notes/CREDITS

@@ -39,3 +39,7 @@ Shay Banon
 Alex Soto: (lordofthejars@github)
   * Reported #173: An exception is thrown for a valid JsonPointer expression
 
+Derek Clarkson (drekka@github)
+  * Reported #184: WRITE_NUMBERS_AS_STRINGS disables WRITE_BIGDECIMAL_AS_PLAIN
+   (2.4.6 / 2.5.2)
+

release-notes/VERSION

@@ -13,6 +13,11 @@ json-specificity (naming due to historical reasons).
 === Releases ===
 ------------------------------------------------------------------------
 
+2.4.6 (not released yet)
+
+#184: WRITE_NUMBERS_AS_STRINGS disables WRITE_BIGDECIMAL_AS_PLAIN
+ (reported by Derek C)
+
 2.4.5 (13-Jan-2015)
 
 No changes since 2.4.4.

src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java

@@ -5,6 +5,7 @@
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonGenerator.Feature;
 import com.fasterxml.jackson.core.io.*;
 
 public class UTF8JsonGenerator
@@ -844,7 +845,7 @@ public void writeNumber(BigInteger value)
         if (value == null) {
             _writeNull();
         } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
+            _writeQuotedRaw(value.toString());
         } else {
             writeRaw(value.toString());
         }
@@ -892,7 +893,8 @@ public void writeNumber(BigDecimal value)
         if (value == null) {
             _writeNull();
         } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
+            String raw = isEnabled(Feature.WRITE_BIGDECIMAL_AS_PLAIN) ? value.toPlainString() : value.toString();
+            _writeQuotedRaw(raw);
         } else if (isEnabled(Feature.WRITE_BIGDECIMAL_AS_PLAIN)) {
             writeRaw(value.toPlainString());
         } else {
@@ -912,13 +914,13 @@ public void writeNumber(String encodedValue)
         }
     }
 
-    private final void _writeQuotedRaw(Object value) throws IOException
+    private final void _writeQuotedRaw(String value) throws IOException
     {
         if (_outputTail >= _outputEnd) {
             _flushBuffer();
         }
         _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        writeRaw(value.toString());
+        writeRaw(value);
         if (_outputTail >= _outputEnd) {
             _flushBuffer();
         }

src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java

@@ -642,7 +642,7 @@ public void writeNumber(BigInteger value) throws IOException
         if (value == null) {
             _writeNull();
         } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
+            _writeQuotedRaw(value.toString());
         } else {
             writeRaw(value.toString());
         }
@@ -685,7 +685,8 @@ public void writeNumber(BigDecimal value) throws IOException
         if (value == null) {
             _writeNull();
         } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
+            String raw = isEnabled(Feature.WRITE_BIGDECIMAL_AS_PLAIN) ? value.toPlainString() : value.toString();
+            _writeQuotedRaw(raw);
         } else if (isEnabled(Feature.WRITE_BIGDECIMAL_AS_PLAIN)) {
             writeRaw(value.toPlainString());
         } else {
@@ -704,13 +705,13 @@ public void writeNumber(String encodedValue) throws IOException
         }
     }
 
-    private void _writeQuotedRaw(Object value) throws IOException
+    private void _writeQuotedRaw(String value) throws IOException
     {
         if (_outputTail >= _outputEnd) {
             _flushBuffer();
         }
         _outputBuffer[_outputTail++] = '"';
-        writeRaw(value.toString());
+        writeRaw(value);
         if (_outputTail >= _outputEnd) {
             _flushBuffer();
         }

src/test/java/com/fasterxml/jackson/core/json/TestJsonGeneratorFeatures.java

@@ -84,6 +84,28 @@ public void testBigDecimalAsPlain() throws IOException
         jg.close();
         assertEquals("100", sw.toString());
     }
+
+    // [issue#184]
+    public void testBigDecimalAsPlainString() throws Exception
+    {
+        JsonFactory jf = new JsonFactory();
+        BigDecimal ENG = new BigDecimal("1E+2");
+        jf.enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN);
+        jf.enable(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS);
+
+        StringWriter sw = new StringWriter();
+        JsonGenerator jg = jf.createGenerator(sw);
+        jg.writeNumber(ENG);
+        jg.close();
+        assertEquals(quote("100"), sw.toString());
+
+        // also, as bytes
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        jg = jf.createGenerator(bos);
+        jg.writeNumber(ENG);
+        jg.close();
+        assertEquals(quote("100"), bos.toString("UTF-8"));
+    }
 
     private String _writeNumbers(JsonFactory jf) throws IOException
     {