Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize variants of JsonGenerator#writeNumberField with JsonGenerator#writeNumber #566

Merged
merged 1 commit into from
Oct 5, 2019
Merged

Synchronize variants of JsonGenerator#writeNumberField with JsonGenerator#writeNumber #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,19 @@ public void writeNullField(String fieldName) throws IOException {
writeNull();
}

/**
* Convenience method for outputting a field entry ("member")
* that has the specified numeric value. Equivalent to:
*<pre>
* writeFieldName(fieldName);
* writeNumber(value);
*</pre>
*/
public void writeNumberField(String fieldName, short value) throws IOException {
writeFieldName(fieldName);
writeNumber(value);
}

/**
* Convenience method for outputting a field entry ("member")
* that has the specified numeric value. Equivalent to:
Expand All @@ -1248,6 +1261,19 @@ public void writeNumberField(String fieldName, long value) throws IOException {
writeNumber(value);
}

/**
* Convenience method for outputting a field entry ("member")
* that has the specified numeric value. Equivalent to:
*<pre>
* writeFieldName(fieldName);
* writeNumber(value);
*</pre>
*/
public void writeNumberField(String fieldName, BigInteger value) throws IOException {
writeFieldName(fieldName);
writeNumber(value);
}

/**
* Convenience method for outputting a field entry ("member")
* that has the specified numeric value. Equivalent to:
Expand Down
8 changes: 7 additions & 1 deletion src/test/java/com/fasterxml/jackson/core/json/GeneratorBasicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.fasterxml.jackson.core.*;

import java.io.*;
import java.math.BigDecimal;
import java.math.BigInteger;

/**
* Set of basic unit tests for verifying that the basic generator
Expand Down Expand Up @@ -162,13 +164,17 @@ public void testFieldValueWrites()
StringWriter sw = new StringWriter();
JsonGenerator gen = JSON_F.createGenerator(ObjectWriteContext.empty(), sw);
gen.writeStartObject();
gen.writeNumberField("short", (short) 3);
gen.writeNumberField("int", 3);
gen.writeNumberField("long", 3L);
gen.writeNumberField("big", new BigInteger("1707"));
gen.writeNumberField("double", 0.25);
gen.writeNumberField("float", -0.25f);
gen.writeNumberField("decimal", new BigDecimal("17.07"));
gen.writeEndObject();
gen.close();

assertEquals("{\"long\":3,\"double\":0.25,\"float\":-0.25}", sw.toString().trim());
assertEquals("{\"short\":3,\"int\":3,\"long\":3,\"big\":1707,\"double\":0.25,\"float\":-0.25,\"decimal\":17.07}", sw.toString().trim());
}

/**
Expand Down
56 changes: 51 additions & 5 deletions src/test/java/com/fasterxml/jackson/core/main/TestGeneratorObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import java.io.*;
import java.math.BigDecimal;
import java.math.BigInteger;

/**
* Set of basic unit tests for verifying that the Object write methods
Expand Down Expand Up @@ -114,14 +115,18 @@ public void testConvenienceMethods()
JsonGenerator gen = new JsonFactory().createGenerator(ObjectWriteContext.empty(), sw);
gen.writeStartObject();

final BigDecimal dec = new BigDecimal("0.1");
final String TEXT = "\"some\nString!\"";

gen.writeNullField("null");
gen.writeBooleanField("bt", true);
gen.writeBooleanField("bf", false);
gen.writeNumberField("int", -1289);
gen.writeNumberField("dec", dec);
gen.writeNumberField("short", (short) -12345);
gen.writeNumberField("int", Integer.MIN_VALUE + 1707);
gen.writeNumberField("long", Integer.MIN_VALUE - 1707L);
gen.writeNumberField("big", BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.valueOf(1707)));
gen.writeNumberField("float", 17.07F);
gen.writeNumberField("double", 17.07);
gen.writeNumberField("dec", new BigDecimal("0.1"));

gen.writeObjectFieldStart("ob");
gen.writeStringField("str", TEXT);
Expand All @@ -140,23 +145,59 @@ public void testConvenienceMethods()
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("null", jp.getText());
assertEquals(JsonToken.VALUE_NULL, jp.nextToken());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("bt", jp.getText());
assertEquals(JsonToken.VALUE_TRUE, jp.nextToken());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("bf", jp.getText());
assertEquals(JsonToken.VALUE_FALSE, jp.nextToken());

//Short parsed as int
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("short", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
assertEquals(JsonParser.NumberType.INT, jp.getNumberType());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("int", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
assertEquals(JsonParser.NumberType.INT, jp.getNumberType());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("long", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
assertEquals(JsonParser.NumberType.LONG, jp.getNumberType());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("big", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
assertEquals(JsonParser.NumberType.BIG_INTEGER, jp.getNumberType());

//All floating point types parsed as double
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("float", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_FLOAT, jp.nextToken());
assertEquals(JsonParser.NumberType.DOUBLE, jp.getNumberType());

//All floating point types parsed as double
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("double", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_FLOAT, jp.nextToken());
assertEquals(JsonParser.NumberType.DOUBLE, jp.getNumberType());

//All floating point types parsed as double
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("dec", jp.getText());
assertEquals(JsonToken.VALUE_NUMBER_FLOAT, jp.nextToken());
assertEquals(JsonParser.NumberType.DOUBLE, jp.getNumberType());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("ob", jp.getText());
assertEquals(JsonToken.START_OBJECT, jp.nextToken());
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());

assertEquals("str", jp.getText());
assertEquals(JsonToken.VALUE_STRING, jp.nextToken());
assertEquals(TEXT, getAndVerifyText(jp));
Expand All @@ -183,7 +224,8 @@ public void testConvenienceMethodsWithNulls()
gen.writeStartObject();

gen.writeStringField("str", null);
gen.writeNumberField("num", null);
gen.writeNumberField("big", (BigInteger) null);
gen.writeNumberField("dec", (BigDecimal) null);
gen.writeObjectField("obj", null);

gen.writeEndObject();
Expand All @@ -198,7 +240,11 @@ public void testConvenienceMethodsWithNulls()
assertEquals(JsonToken.VALUE_NULL, jp.nextToken());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("num", jp.currentName());
assertEquals("big", jp.currentName());
assertEquals(JsonToken.VALUE_NULL, jp.nextToken());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
assertEquals("dec", jp.currentName());
assertEquals(JsonToken.VALUE_NULL, jp.nextToken());

assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
Expand Down