BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-01 04:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java][Flexbuffers] Add API to add nullables into the buffer. (#7521)

Browse Source 
Fix #7517
This commit is contained in:
Paulo Pinheiro
2022-09-10 18:13:01 +02:00
committed by GitHub
parent 8cdc6a2885
commit b901598233
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/com/google/flatbuffers/FlexBuffersBuilder.java
View File

@@ -173,6 +173,21 @@ public class FlexBuffersBuilder {
return bb; return bb;
} }
/**
* Insert a null value into the buffer
*/
public void putNull() {
putNull(null);
}
/**
* Insert a null value into the buffer
* @param key key used to store element in map
*/
public void putNull(String key) {
stack.add(Value.nullValue(putKey(key)));
}
/** /**
* Insert a single boolean into the buffer * Insert a single boolean into the buffer
* @param val true or false * @param val true or false
@@ -675,6 +690,10 @@ public class FlexBuffersBuilder {
this.iValue = Long.MIN_VALUE; this.iValue = Long.MIN_VALUE;
} }
static Value nullValue(int key) {
return new Value(key, FBT_NULL, WIDTH_8, 0);
}
static Value bool(int key, boolean b) { static Value bool(int key, boolean b) {
return new Value(key, FBT_BOOL, WIDTH_8, b ? 1 : 0); return new Value(key, FBT_BOOL, WIDTH_8, b ? 1 : 0);
} }

15
tests/JavaTest.java
View File

@@ -959,9 +959,11 @@ class JavaTest {
int vecPos = b.startVector(); int vecPos = b.startVector();
b.putInt(99); b.putInt(99);
b.putString("wow"); b.putString("wow");
b.putNull();
int vecpos2 = b.startVector(); int vecpos2 = b.startVector();
b.putInt(99); b.putInt(99);
b.putString("wow"); b.putString("wow");
b.putNull();
b.endVector(null, vecpos2, false, false); b.endVector(null, vecpos2, false, false);
b.endVector(null, vecPos, false, false); b.endVector(null, vecPos, false, false);
b.finish(); b.finish();
@@ -969,11 +971,12 @@ class JavaTest {
FlexBuffers.Reference r = FlexBuffers.getRoot(b.getBuffer()); FlexBuffers.Reference r = FlexBuffers.getRoot(b.getBuffer());
TestEq(FlexBuffers.FBT_VECTOR, r.getType()); TestEq(FlexBuffers.FBT_VECTOR, r.getType());
FlexBuffers.Vector vec = FlexBuffers.getRoot(b.getBuffer()).asVector(); FlexBuffers.Vector vec = FlexBuffers.getRoot(b.getBuffer()).asVector();
TestEq(3, vec.size()); TestEq(4, vec.size());
TestEq(99, vec.get(0).asInt()); TestEq(99, vec.get(0).asInt());
TestEq("wow", vec.get(1).asString()); TestEq("wow", vec.get(1).asString());
TestEq("[ 99, \"wow\" ]", vec.get(2).toString()); TestEq(true, vec.get(2).isNull());
TestEq("[ 99, \"wow\", [ 99, \"wow\" ] ]", FlexBuffers.getRoot(b.getBuffer()).toString()); TestEq("[ 99, \"wow\", null ]", vec.get(3).toString());
TestEq("[ 99, \"wow\", null, [ 99, \"wow\", null ] ]", FlexBuffers.getRoot(b.getBuffer()).toString());
} }
public static void testSingleElementMap() { public static void testSingleElementMap() {
@@ -983,6 +986,7 @@ class JavaTest {
b.putInt("myInt", 0x7fffffbbbfffffffL); b.putInt("myInt", 0x7fffffbbbfffffffL);
b.putString("myString", "wow"); b.putString("myString", "wow");
b.putString("myString2", "incredible"); b.putString("myString2", "incredible");
b.putNull("myNull");
int start = b.startVector(); int start = b.startVector();
b.putInt(99); b.putInt(99);
b.putString("wow"); b.putString("wow");
@@ -995,14 +999,15 @@ class JavaTest {
FlexBuffers.Reference r = FlexBuffers.getRoot(b.getBuffer()); FlexBuffers.Reference r = FlexBuffers.getRoot(b.getBuffer());
TestEq(FlexBuffers.FBT_MAP, r.getType()); TestEq(FlexBuffers.FBT_MAP, r.getType());
FlexBuffers.Map map = FlexBuffers.getRoot(b.getBuffer()).asMap(); FlexBuffers.Map map = FlexBuffers.getRoot(b.getBuffer()).asMap();
TestEq(5, map.size()); TestEq(6, map.size());
TestEq(0x7fffffbbbfffffffL, map.get("myInt").asLong()); TestEq(0x7fffffbbbfffffffL, map.get("myInt").asLong());
TestEq("wow", map.get("myString").asString()); TestEq("wow", map.get("myString").asString());
TestEq("incredible", map.get("myString2").asString()); TestEq("incredible", map.get("myString2").asString());
TestEq(true, map.get("myNull").isNull());
TestEq(99, map.get("myVec").asVector().get(0).asInt()); TestEq(99, map.get("myVec").asVector().get(0).asInt());
TestEq("wow", map.get("myVec").asVector().get(1).asString()); TestEq("wow", map.get("myVec").asVector().get(1).asString());
TestEq(Double.compare(0x1.ffffbbbffffffP+1023, map.get("double").asFloat()), 0); TestEq(Double.compare(0x1.ffffbbbffffffP+1023, map.get("double").asFloat()), 0);
TestEq("{ \"double\" : 1.7976894783391937E308, \"myInt\" : 9223371743723257855, \"myString\" : \"wow\", \"myString2\" : \"incredible\", \"myVec\" : [ 99, \"wow\" ] }", TestEq("{ \"double\" : 1.7976894783391937E308, \"myInt\" : 9223371743723257855, \"myNull\" : null, \"myString\" : \"wow\", \"myString2\" : \"incredible\", \"myVec\" : [ 99, \"wow\" ] }",
FlexBuffers.getRoot(b.getBuffer()).toString()); FlexBuffers.getRoot(b.getBuffer()).toString());
} }