Update release notes, add bit more testing, for #757

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -27,6 +27,8 @@ JSON library.
  (contributed by @pjfanning)
 #753: Add `NumberInput.parseFloat()`
  (contributed by @pjfanning)
+$757: Update ParserBase to support floats directly
+ (contributed by @pjfanning)
 
 2.13.3 (not yet released)
 

src/test/java/com/fasterxml/jackson/core/BaseTest.java

@@ -318,7 +318,7 @@ protected JsonParser createParser(int mode, byte[] doc) throws IOException {
         return createParser(JSON_FACTORY, mode, doc);
     }
 
-    protected JsonParser createParser(JsonFactory f, int mode, String doc) throws IOException
+    protected JsonParser createParser(TokenStreamFactory f, int mode, String doc) throws IOException
     {
         switch (mode) {
         case MODE_INPUT_STREAM:
@@ -337,7 +337,7 @@ protected JsonParser createParser(JsonFactory f, int mode, String doc) throws IO
         throw new RuntimeException("internal error");
     }
 
-    protected JsonParser createParser(JsonFactory f, int mode, byte[] doc) throws IOException
+    protected JsonParser createParser(TokenStreamFactory f, int mode, byte[] doc) throws IOException
     {
         switch (mode) {
         case MODE_INPUT_STREAM:
@@ -361,7 +361,7 @@ protected JsonParser createParserUsingReader(String input) throws IOException
         return createParserUsingReader(new JsonFactory(), input);
     }
 
-    protected JsonParser createParserUsingReader(JsonFactory f, String input)
+    protected JsonParser createParserUsingReader(TokenStreamFactory f, String input)
         throws IOException
     {
         return f.createParser(new StringReader(input));
@@ -373,7 +373,7 @@ protected JsonParser createParserUsingStream(String input, String encoding)
         return createParserUsingStream(new JsonFactory(), input, encoding);
     }
 
-    protected JsonParser createParserUsingStream(JsonFactory f,
+    protected JsonParser createParserUsingStream(TokenStreamFactory f,
             String input, String encoding)
         throws IOException
     {
@@ -393,7 +393,7 @@ protected JsonParser createParserUsingStream(JsonFactory f,
         return f.createParser(is);
     }
 
-    protected JsonParser createParserForDataInput(JsonFactory f,
+    protected JsonParser createParserForDataInput(TokenStreamFactory f,
             DataInput input)
         throws IOException
     {

src/test/java/com/fasterxml/jackson/core/read/FloatParsingTest.java

@@ -0,0 +1,52 @@
+package com.fasterxml.jackson.core.read;
+
+import com.fasterxml.jackson.core.BaseTest;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.TokenStreamFactory;
+
+// for [core#755]
+public class FloatParsingTest extends BaseTest
+{
+    private final byte[] FLOATS_DOC = readResource("/data/floats-755.json");
+    
+    public void testFloatArrayViaInputStream() throws Exception
+    {
+        _testFloatArray(MODE_INPUT_STREAM);
+        _testFloatArray(MODE_INPUT_STREAM_THROTTLED);
+    }
+
+    public void testFloatArrayViaReader() throws Exception {
+        _testFloatArray(MODE_READER);
+    }
+
+    public void testFloatArrayViaDataInput() throws Exception {
+       _testFloatArray(MODE_DATA_INPUT);
+    }
+
+    private void _testFloatArray(int mode) throws Exception
+    {
+        // construct new instance to reduce buffer recycling etc:
+        TokenStreamFactory jsonF = newStreamFactory();
+
+        JsonParser p = createParser(jsonF, mode, FLOATS_DOC);
+
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        
+        assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        assertEquals(7.038531e-26f, p.getFloatValue());
+
+        assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        assertEquals(1.199999988079071f, p.getFloatValue());
+
+        assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        assertEquals(3.4028235677973366e38f, p.getFloatValue());
+
+        assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        assertEquals(7.006492321624086e-46f, p.getFloatValue());
+
+        assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        
+        p.close();
+    }
+}

src/test/resources/data/floats-755.json

@@ -0,0 +1,6 @@
+[7.038531e-26,
+ 1.199999988079071,
+ 3.4028235677973366e38,
+ 7.006492321624086e-46,
+ 0.1498724,
+ -0.1297519,0.0201204,0.169992,-0.10963,0.0402,0.19,-0.08,6.036146E7,2.10233856E8,-6.9390464E7,8.0481904E7,-1.99142E8,-4.926E7,1.006E8,-1.79E8,-2.0E7,1.20722915E17,-1.58901403E17,-9.029E-5,0.001408434,-0.0013878,1.109E-4,0.001609,-0.00118,3.0E-4,1810843.8,-985399.5,513324.5,2012048.0,-784190.0,714500.0,-2081000.0,-580000.0,900000.0,-1.88050888E15,-3.81784877E14,1.11693913E15,-1.67930403E15,-1.8058E-6,1.3181E-5,-1.478E-5,2.0E-7,1.5E-5,-12768.943,2218.297,17205.537,-10756.89,4230.3,19217.0,-8740.0,6200.0,21000.0,-6.7327974E12,8.2544427E12,-1.9707988E13,-4.72074E12,1.02664E13,-1.7695001E13,-2.7E-8,1.22E-7,-1.5E-7,-6.9665174,142.90588,-136.71843,13.1539,163.026,-116.59,33.2,183.0,-90.0,5.339494E10,2.03267342E11,-7.6356968E10,7.3515401E10,-2.06108E11,-5.6229999E10,9.3599998E10,-1.85000002E11,-3.0E-10,1.1375641,-1.6586792,-0.1599551,1.338768,-1.45747,0.0412,1.539,-1.25,0.2,1.74117862E9,-1.05506464E9,4.43659392E8,1.94238298E9,-8.5384998E8,6.448E8,2.14300006E9,-6.5E8,8.0E8,-1.95017409E18,-0.0045145005,0.010472739,-0.01748969,-0.0025024,0.012484,-0.01547,-4.0E-4,0.014,-1.3465595E7,1521645.2,1.6508885E7,-1.145354E7,3533600.0,1.852E7,-9440000.0,5500000.0,2.0E7,-7.4294495E15,7.5577911E15,-2.04046402E16,-5.4174E-5,9.5698E-5,-1.8392E-4,-3.4E-5,1.15E-4,-1.6E-4,-13933.034,135939.38,-143684.95,6187.4,156059.0,-123560.0,26300.0,176000.0,-100000.0,4.6428425E13,1.96300826E14,-8.332349E13,6.6548899E13,-2.13075005E14,-6.32E-7,8.66E-7,-1.92E-6,-4.0E-7,1067.8988,-1728.3444,-229.6203,1269.103,-1527.13,-28.4,1470.0,-1320.0,100.0,1.67151337E12,-1.12472988E12,3.73994193E11,1.87271794E12,-9.2352001E11,5.7510003E11,2.07300002E12,-7.2E-9,7.0E-9,-20.198393,-5.211152,9.776088,-18.18634,-3.1991,11.788,-16.17,-1.1,13.0,-1.41622467E10,8.2499347E8,1.58122342E10,-1.21501901E10,2.83699994E9,1.7824E10,-1.01299999E10,4.8E9,1.90000005E10,-0.08126101,0.06861139,-0.21101291,-0.0611405,0.088731,-0.19089,-0.041,0.108,-0.17,-2.0899552E7,1.28972856E8,-1.50651472E8,-779000.0,1.49092992E8,-1.3053E8,1.93E7,1.69E8,-1.1E8,3.9461906E16,1.89334305E17,-9.029001E-4,5.95823E-4,0.00209454,-7.016E-4,7.97E-4,-0.00199,-5.0E-4,998233.7,-1798009.6,-299285.5,1199438.0,-1596800.0,-98000.0,1400000.0,-1390000.0,100000.0,1.60184818E15,-1.19439497E15,3.04329001E14,1.80305304E15,-9.9319E-6,5.055E-6,2.004E-5,-7.9E-6,7.0E-6,-20895.045,-5907.804,9079.436,-18882.99,-3895.7,11091.0,-16870.0,-1800.0,13000.0,-1.48588986E13,1.28341803E11,1.51155817E13,-1.28468501E13,2.14029998E12,1.7127E13,-1.083E-7,4.1E-8,1.9E-7,-88.22753,61.64488,211.51727,-68.107,81.765,-197.85,-47.9,101.0,-170.0,-2.7866069E10,1.2200634E11,-1.57617979E11,-7.7455002E9,1.42126006E11,-1.37490006E11,1.23000003E10,1.61999995E11,-1.1E-9,0.32495388,1.8236779,-0.9725652,0.526158,2.02488,-0.7713,0.727,-2.06,-0.5,9.2856851E8,-1.86767475E9,-3.68950688E8,1.12977306E9,-1.66646003E9,-1.677E8,1.33E9,-1.46E9,0.0,1.53218306E18,-0.012640602,0.002346638,0.01733387,-0.0106285,0.004358,0.01934,-0.0086,0.006,2.1357976E7,-6604455.5,8382784.0,-1.957964E7,-4592400.0,1.0394E7,-1.756E7,-2500000.0,1.2E7,-1.55555501E16,-5.6830987E14,1.441893E16,-1.35435E-4,1.4437E-5,1.643E-4,-1.153E-4,3.4E-5,1.8E-4,-95194.05,54678.36,204550.77,-75073.5,74798.0,-204820.0,-54900.0,94000.0,-180000.0,-3.48325874E13,1.15039818E14,-1.64584506E14,-1.47121001E13,1.35160004E14,-1.4446E-6,5.4E-8,1.55E-6,-1.2E-6,255.28873,1754.0128,-1042.2303,456.493,1955.21,-841.0,657.0,-2130.0,-600.0,8.5890328E11,-1.93733997E12,-4.38615802E11,1.06010798E12,-1.73613004E12,-2.37399998E11,1.26100007E12,-1.53E-8,0.0,14.625179,-13.337254,1.649987,16.63722,-11.3252,3.662,18.64,-9.3,5.0,2.06613258E10,-7.3011077E9,7.6861332E9,-2.02762895E10,-5.2889999E9,9.6979999E9,-1.82600008E10,-3.2E9,1.10000005E10,-0.16252202,-0.012649616,0.13722278,-0.1424015,0.00747,0.15734,-0.1222,0.027,0.17,-1.0216056E8,4.771184E7,1.9758424E8,-8.204E7,6.7832E7,-2.1179E8,-6.19E7,8.7E7,-1.9E8,-4.1799103E16,1.080733E17,-0.0017155102,-2.16786E-4,0.00128193,-0.0015143,-1.5E-5,0.00148,-0.0013,185623.55,1684347.6,-1111895.6,386828.0,1885550.0,-910600.0,588000.0,2080000.0,-700000.0,7.8923816E14,-2.00700507E15,-5.08280992E14,9.9044301E14,-1.8058E-5,-3.07E-6,1.191E-5,-1.6E-5,-1.0E-6,13928.527,-14033.905,953.335,15940.57,-12021.8,2965.0,17950.0,-10000.0,4000.0,1.99646731E13,-7.9977592E12,6.989481E12,-2.09729503E13,-5.9857002E12,9.0010005E12,-1.896E-7,-3.9E-8,1.1E-7,-169.48854,-19.616133,130.25627,-149.368,0.504,150.37,-129.2,20.0,170.0,-1.09127082E11,4.0745325E10,1.90617731E11,-8.9006498E10,6.0864999E10,2.10729992E11,-6.8800004E10,8.0E10,-1.9E-9,-0.4876562,1.0110679,-1.7851754,-0.286451,1.21227,-1.5839,-0.085,1.41,-1.3,1.15958376E8,1.61468237E9,-1.18156083E9,3.17163008E8,1.81587994E9,-9.8030003E8,5.18E8,2.01E9,-7.0E8,7.1957298E17,-0.020766703,-0.005779462,0.00920777,-0.0187546,-0.003767,0.01121,-0.0167,-0.001,1.3231876E7,-1.4730557E7,256683.0,1.524392E7,-1.27185E7,2268000.0,1.725E7,-1.07E7,4000000.0,1.92680222E16,-8.6944107E15,6.2928288E15,2.128007E-4,-6.6823E-5,8.304E-5,-1.965E-4,-4.6E-5,1.0E-4,-176455.06,-26582.65,123289.75,-156334.5,-6462.0,143410.0,-136200.0,13000.0,160000.0,-1.16093595E14,3.37788084E13,1.83651208E14,-9.5973099E13,5.3899E13,2.0377E-6,-7.58E-7,7.4E-7,-2.0E-6,-557.3214,941.40265,-1854.8405,-356.116,1142.6,-1653.6,-154.0,1340.0,-1400.0,4.6293205E10,1.54501723E12,-1.25122589E12,2.47497998E11,1.74621996E12,-1.05000003E12,4.48E11,1.94E-8,-8.0E-9,6.499078,-21.463354,-6.476113,8.51112,-19.4513,-4.464,10.52,-17.4,-2.0,1.25352243E10,-1.54272082E10,-4.39968E8,1.45472696E10,-1.34151004E10,1.572E9,1.65499996E10,-1.13999995E10,3.0E9,0.1857137,-0.09391063,0.05596177,0.2058341,-0.07379,0.07608,-0.2035,-0.053,0.09,-1.83421568E8,-3.3549168E7,1.16323232E8,-1.63300992E8,-1.3428E7,1.3644E8,-1.431E8,6000000.0,1.5E8,-1.23060116E17,2.6812289E16,0.0017668469,-0.001029396,4.6932E-4,0.001968,-8.28E-4,6.7E-4,-0.0021,-626986.56,871737.5,-1924505.8,-425781.0,1072940.0,-1723300.0,-224000.0,1270000.0,-1500000.0,-2.33719684E13,1.47535214E15,-1.32089115E15,1.77831997E14,1.67655E-5,-1.1196E-5,3.79E-6,1.87E-5,-9.0E-6,5802.4263,20789.666,-7172.765,7814.47,-20147.9,-5160.0,9820.0,-18100.0,-3000.0,1.18385719E13,-1.61238598E13,-1.13661903E12,1.38506205E13,-1.41117998E13,8.7499997E11,1.586E-7,-1.2E-7,2.0E-8,178.74718,-100.877144,48.99526,198.8676,-80.756,69.11,-210.5,-60.0,80.0,-1.90388093E11,-4.0515686E10,1.09356712E11,-1.70267607E11,-2.03949998E10,1.29469997E11,-1.50100001E11,0.0,1.4E-9,-1.3002663,0.19845773,1.6971817,-1.099061,0.39966,1.8983,-0.897,0.6,2.0,-6.9665171E8,8.0207232E8,-1.99417088E9,-4.95446016E8,1.00327002E9,-1.79289997E9,-2.94E8,1.2E9,-1.5E9,-9.3037143E16,0.014056869,-0.013905563,0.00108167,0.0160689,-0.011893,0.00309,0.018,-0.009,5105774.5,2.0093016E7,-7869417.0,7117820.0,-2.08446E7,-5857000.0,9120000.0,-1.88E7,-3000000.0,1.11419204E16,-1.68205125E16,-1.83327095E15,1.315396E-4,-1.48084E-4,1.78E-6,1.516E-4,-1.27E-4,2.0E-5,171780.66,-107843.664,42028.74,191901.1,-87723.0,62140.0,212000.0,-67000.0,80000.0,-1.97354603E14,-4.7482201E13,1.023902E14,-1.77234107E14,-2.7360999E13,1.2251E-6,-1.571E-6,-7.0E-8,1.4E-6,-1369.9315,128.79256,1627.5166,-1168.726,329.99,1828.7,-967.0,530.0,2000.0,-7.663169E11,7.3240714E11,-2.06383599E12,-5.6511201E11,9.3361E11,-1.86259997E12,-3.63000005E11,1.13E-8,-1.6E-8,-1.6270231,13.360217,-14.602215,0.38502,15.3722,-12.59,2.39,17.3,-10.0,4.4091228E9,1.93963622E10,-8.5660692E9,6.4211702E9,2.14083994E10,-6.5539999E9,8.4300001E9,-1.94999992E10,-4.0E9,0.104452685,-0.17517164,-0.02529923,0.1245731,-0.155051,-0.00517,0.1446,-0.134,0.01,1.64814144E8,-1.14810176E8,3.506222E7,1.84934592E8,-9.4689E7,5.518E7,2.05E8,-7.4E7,7.0E7,-2.04321129E17,-5.4448722E16,9.542368E-4,-0.001842006,-3.4328E-4,0.0011554,-0.00164,-1.4E-4,0.0013,-1439596.6,59127.38,1557851.4,-1238391.0,260330.0,1759000.0,-1037000.0,460000.0,1900000.0,-8.359821E14,6.6274198E14,-2.13350125E15,-6.3477697E14,8.6394E-6,-1.9322E-5,-4.33E-6,1.06E-5,-1.7E-5,-2323.6748,12663.565,-15298.866,-311.62,14675.6,-13286.0,1700.0,16600.0,-11000.0,3.71247101E12,1.86997109E13,-9.2627198E12,5.7245098E12,2.07116996E13,-7.2500002E12,7.73E-8,-2.02E-7,-5.0E-8,97.48617,-182.13815,-32.26574,117.6066,-162.017,-12.14,137.7,-141.0,0.0,1.57847634E11,-1.21776693E11,2.8095701E10,1.77968103E11,-1.01656003E11,4.8210002E10,1.98000001E11,-8.0999997E10,6.0E-10,-2.1128764,-0.6141524,0.8845716,-1.911671,-0.41294,1.0857,-1.71,-0.21,1.2,-1.50926182E9,-1.053778E7,1.48818624E9,-1.30805606E9,1.9066E8,1.68929997E9,-1.106E9,3.9E8,1.8E9,-9.0564725E17,0.005930768,0.020918008,-0.00704442,0.0079428,-0.020019,-0.00503,0.0099,-0.018,-3020326.5,1.1966914E7,-1.5995518E7,-1008270.0,1.39789E7,-1.3983E7,1000000.0,1.59E7,-1.1E7,3.0158192E15,1.80030598E16,-9.959372E15,5.02786E-5,2.00151E-4,-7.947E-5,7.03E-5,-2.09E-4,-5.0E-5,90519.65,-189104.67,-39232.26,110640.1,-168984.0,-19110.0,130700.0,-148000.0,0.0,1.50881111E14,-1.28743213E14,2.11291902E13,1.71001506E14,-1.08621996E14,4.124E-7,1.911E-6,-8.8E-7,6.0E-7,2112.4258,-683.81757,814.9065,-1981.336,-482.61,1016.1,-1780.0,-280.0,1200.0,-1.578927E12,-8.0202949E10,1.41852095E12,-1.37772204E12,1.21000002E11,1.61969996E12,-1.176E12,3.2E-9,1.8E-8,-9.753124,5.234116,20.221355,-7.74107,7.2461,-20.716,-5.72,9.2,-18.0,-3.71697843E9,1.12702618E10,-1.66921697E10,-1.70492006E9,1.32822999E10,-1.46800005E10,3.0E8,1.52E10,-1.2E10,0.023191676,0.17306408,-0.10656024,0.0433121,0.193184,-0.08643,0.0634,0.213,-0.06,8.3553136E7,-1.96071184E8,-4.619878E7,1.036736E8,-1.7595E8,-2.607E7,1.237E8,-1.55E8,0.0,1.43914596E17,-1.35709731E17,1.416267E-4,0.00164035,-0.00115589,3.428E-4,0.001841,-9.5E-4,5.0E-4,2042760.5,-753482.75,745241.3,-2051001.0,-552270.0,946400.0,-1849000.0,-350000.0,1100000.0,-1.64859219E15,-1.49868136E14,1.34885595E15,-1.44738693E15,5.133E-7,1.55E-5,-1.246E-5,2.5E-6,1.7E-5,-10449.776,4537.4644,19524.705,-8437.72,6549.5,-21412.0,-6420.0,8500.0,-19000.0,-4.4136299E12,1.05736107E13,-1.7388821E13,-2.40158009E12,1.25855995E13,-1.53759997E13,-3.8E-9,1.45E-7,-1.3E-7,16.225159,166.09756,-113.52676,36.3456,186.218,-93.4,56.4,206.0,-70.0,7.6586615E10,-2.03037704E11,-5.3165302E10,9.6707101E10,-1.82917005E11,-3.3039999E10,1.16799996E11,-1.61999995E11,-1.0E-10,1.3694807,-1.4267625,0.0719615,1.570685,-1.22555,0.2731,1.771,-1.02,0.4,1.9730953E9,-8.231479E8,6.7557613E8,-2.12066701E9,-6.2193997E8,8.7670003E8,-1.91900006E9,-4.2E8,1.0E9,-1.7182574E18,-0.002195333]