From 2e1a5869b0dc460253a0c7d4bdbdb4a310853aa7 Mon Sep 17 00:00:00 2001 From: SimonIT Date: Fri, 17 Jan 2025 16:44:17 +0100 Subject: [PATCH] Put DataItems via MapEntryBuilder --- .../java/co/nstant/in/cbor/builder/MapEntryBuilder.java | 4 ++++ .../java/co/nstant/in/cbor/builder/MapBuilderTest.java | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/co/nstant/in/cbor/builder/MapEntryBuilder.java b/src/main/java/co/nstant/in/cbor/builder/MapEntryBuilder.java index 7b95ee13..5a1eb18b 100644 --- a/src/main/java/co/nstant/in/cbor/builder/MapEntryBuilder.java +++ b/src/main/java/co/nstant/in/cbor/builder/MapEntryBuilder.java @@ -10,6 +10,10 @@ public MapEntryBuilder(T parent, DataItem key) { this.key = key; } + public T value(DataItem value) { + return put(key, value); + } + public T value(boolean value) { return put(key, convert(value)); } diff --git a/src/test/java/co/nstant/in/cbor/builder/MapBuilderTest.java b/src/test/java/co/nstant/in/cbor/builder/MapBuilderTest.java index 953ce7e9..070388ca 100644 --- a/src/test/java/co/nstant/in/cbor/builder/MapBuilderTest.java +++ b/src/test/java/co/nstant/in/cbor/builder/MapBuilderTest.java @@ -5,14 +5,10 @@ import java.util.List; +import co.nstant.in.cbor.model.*; import org.junit.Test; import co.nstant.in.cbor.CborBuilder; -import co.nstant.in.cbor.model.ByteString; -import co.nstant.in.cbor.model.DataItem; -import co.nstant.in.cbor.model.Map; -import co.nstant.in.cbor.model.UnicodeString; -import co.nstant.in.cbor.model.UnsignedInteger; public class MapBuilderTest { @@ -52,6 +48,7 @@ public void testMapBuilder() { .addKey("28").value(1.0f) .addKey("29").value(1L) .addKey("30").value("value") + .addKey("31").value(SimpleValue.NULL) .end() .startMap() .startArray(1).end() @@ -61,7 +58,7 @@ public void testMapBuilder() { assertEquals(2, dataItems.size()); assertTrue(dataItems.get(0) instanceof Map); Map map = (Map) dataItems.get(0); - assertEquals(31, map.getKeys().size()); + assertEquals(32, map.getKeys().size()); } @Test