Merge pull request alibaba#139 from pepov/master

wenshao · wenshao · commit 60131610c945 · 2014-09-30T04:26:42.000+08:00
Fix number parsing in objects
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@
 /.project
 /.settings
 /.classpath
+/.idea
+*.iml
+
diff --git a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java
@@ -402,7 +402,7 @@ public final Object parseObject(final Map object, Object fieldName) {
                     if (lexer.token() == JSONToken.LITERAL_INT) {
                         value = lexer.integerValue();
                     } else {
-                        value = lexer.numberValue();
+                        value = lexer.decimalValue(isEnabled(Feature.UseBigDecimal));
                     }
 
                     object.put(key, value);
diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java b/src/main/java/com/alibaba/fastjson/parser/JSONLexer.java
@@ -54,6 +54,7 @@ public interface JSONLexer {
 
     void scanString();
 
+    @Deprecated
     Number numberValue();
 
     int intValue();
diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java b/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java
@@ -2931,6 +2931,7 @@ public final BigDecimal decimalValue() {
         return new BigDecimal(numberString());
     }
 
+    @Deprecated
     public final Number numberValue() {
         char type = charAt(np + sp - 1);
 
diff --git a/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java b/src/test/java/com/alibaba/json/bvt/DefaultJSONParserTest.java
@@ -16,6 +16,7 @@
 package com.alibaba.json.bvt;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.Assert;
 import junit.framework.TestCase;
@@ -34,6 +35,14 @@ public void test_double() {
 		Assert.assertEquals(3.4D, result);
 	}
 
+	public void test_double_in_object() {
+		DefaultJSONParser parser = new DefaultJSONParser("{\"double\":3.4}");
+		parser.config(Feature.UseBigDecimal, false);
+		Assert.assertEquals("{\"double\":3.4}", parser.getInput());
+		Object result = parser.parse();
+		Assert.assertEquals(3.4D, ((Map) result).get("double"));
+	}
+
 	public void test_error() {
 		Exception error = null;
 		try {

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public final Object parseObject(final Map object, Object fieldName) {`
`402`	`402`	`if (lexer.token() == JSONToken.LITERAL_INT) {`
`403`	`403`	`value = lexer.integerValue();`
`404`	`404`	`} else {`
`405`		`- value = lexer.numberValue();`
	`405`	`+ value = lexer.decimalValue(isEnabled(Feature.UseBigDecimal));`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`object.put(key, value);`
Original file line number	Diff line number	Diff line change
`@@ -2931,6 +2931,7 @@ public final BigDecimal decimalValue() {`
`2931`	`2931`	`return new BigDecimal(numberString());`
`2932`	`2932`	`}`
`2933`	`2933`
	`2934`	`+ @Deprecated`
`2934`	`2935`	`public final Number numberValue() {`
`2935`	`2936`	`char type = charAt(np + sp - 1);`
`2936`	`2937`