[JAVA-327] fixes json parsing issue with int/long values

Author: scotthernandez

src/main/com/mongodb/util/JSON.java

@@ -2,12 +2,12 @@
 
 package com.mongodb.util;
 
-import java.lang.reflect.*;
-import java.text.*;
+import java.lang.reflect.Array;
+import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.*;
+import java.util.regex.Pattern;
 
-import org.bson.*;
+import org.bson.BSONCallback;
 import org.bson.types.*;
 
 import com.mongodb.*;
@@ -584,7 +584,11 @@ public Number parseNumber() {
 
         if (isDouble)
           return Double.valueOf(s.substring(start, pos));
-        return Long.valueOf(s.substring(start, pos));
+        
+        Long val = Long.valueOf(s.substring(start, pos));
+        if (val <= Integer.MAX_VALUE)
+            return val.intValue();
+        return val;
     }
 
     /** 

src/main/com/mongodb/util/JSONCallback.java

@@ -2,9 +2,10 @@
 
 package com.mongodb.util;
 
-import java.text.*;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.*;
+import java.util.regex.Pattern;
 
 import org.bson.*;
 import org.bson.types.*;
@@ -61,8 +62,8 @@ public Object objectDone(){
 		    setRoot(o);
 		}
 	    } else if ( b.containsField( "$ts" ) ) {
-                Long ts = (Long) b.get("$ts");
-                Long inc = (Long) b.get("$inc");
+                Long ts = ((Number)b.get("$ts")).longValue();
+                Long inc = ((Number)b.get("$inc")).longValue();
 		o = new BSONTimestamp(ts.intValue(), inc.intValue());
 		if (!isStackEmpty()) {
 		    cur().put( name, o );

src/test/com/mongodb/JavaClientTest.java

@@ -17,14 +17,14 @@
 
 package com.mongodb;
 
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.regex.*;
+import java.util.regex.Pattern;
 
-import org.bson.*;
+import org.bson.Transformer;
 import org.bson.types.*;
-import org.testng.annotations.*;
+import org.testng.annotations.Test;
 
 import com.mongodb.util.*;
 
@@ -635,7 +635,7 @@ public void testWriteResult(){
         assertEquals( 1 , res.getN() );
         assertFalse( res.isLazy() );
     }
-    
+
     @Test
     public void testWriteResultMethodLevelWriteConcern(){
         DBCollection c = _db.getCollection( "writeresult2" );

src/test/com/mongodb/util/JSONTest.java

@@ -18,19 +18,16 @@
 
 package com.mongodb.util;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 
-import java.util.regex.*;
-
-import java.text.*;
-
-import org.bson.types.*;
-
-import com.mongodb.*;
 import org.bson.BSON;
 import org.bson.BasicBSONObject;
+import org.bson.types.*;
 
-import org.testng.annotations.Test;
+import com.mongodb.*;
 
 public class JSONTest extends com.mongodb.util.TestCase {
 
@@ -195,7 +192,7 @@ public void testBasic(){
         assertEquals(threw, false);
         threw = false;
 
-        assertEquals( 4L , JSON.parse( "4" ) );
+        assertEquals( 4 , JSON.parse( "4" ) );
     }
 
     @org.testng.annotations.Test    
@@ -304,10 +301,11 @@ public void testDate() {
 
     @org.testng.annotations.Test
     public void testJSONEncoding() throws ParseException {
-        String json = "{ 'str' : 'asdfasd' , 'long' : 5 , 'float' : 0.4 , 'bool' : false , 'date' : { '$date' : '2011-05-18T18:56:00Z'} , 'pat' : { '$regex' : '.*' , '$options' : ''} , 'oid' : { '$oid' : '4d83ab3ea39562db9c1ae2ae'} , 'ref' : { '$ref' : 'test.test' , '$id' : { '$oid' : '4d83ab59a39562db9c1ae2af'}} , 'code' : { '$code' : 'asdfdsa'} , 'codews' : { '$code' : 'ggggg' , '$scope' : { }} , 'ts' : { '$ts' : 1300474885 , '$inc' : 10} , 'null' :  null, 'uuid' : { '$uuid' : '60f65152-6d4a-4f11-9c9b-590b575da7b5' }}";
+        String json = "{ 'str' : 'asdfasd' , 'long' : 123123123123 , 'int' : 5 , 'float' : 0.4 , 'bool' : false , 'date' : { '$date' : '2011-05-18T18:56:00Z'} , 'pat' : { '$regex' : '.*' , '$options' : ''} , 'oid' : { '$oid' : '4d83ab3ea39562db9c1ae2ae'} , 'ref' : { '$ref' : 'test.test' , '$id' : { '$oid' : '4d83ab59a39562db9c1ae2af'}} , 'code' : { '$code' : 'asdfdsa'} , 'codews' : { '$code' : 'ggggg' , '$scope' : { }} , 'ts' : { '$ts' : 1300474885 , '$inc' : 10} , 'null' :  null, 'uuid' : { '$uuid' : '60f65152-6d4a-4f11-9c9b-590b575da7b5' }}";
         BasicDBObject a = (BasicDBObject) JSON.parse(json);
         assert (a.get("str").equals("asdfasd"));
-        assert (a.get("long").equals(5L));
+        assert (a.get("int").equals(5));
+        assert (a.get("long").equals(123123123123L));
         assert (a.get("float").equals(0.4d));
         assert (a.get("bool").equals(false));
         SimpleDateFormat format =