Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit ec36cec

Browse files
[ONOS-7957] Json output should not have quotes for int64/uint64 datatype
Change-Id: I63707d1bc41f6f5b42f899f4fb3d107cb1237d42
1 parent 9617999 commit ec36cec

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

serializers/json/src/main/java/org/onosproject/yang/serializers/json/DefaultJsonBuilder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ private void appendLeafValue(LeafType type, String v, String ns) {
106106
case INT32:
107107
case UINT16:
108108
case UINT32:
109+
case INT64:
110+
case UINT64:
109111
case BOOLEAN:
110112
treeString.append(v);
111113
break;

serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public class JsonSerializerTest {
7676

7777
private static String outputIdTestJson1 = "{\"jsonlist:c2\":{\"leaf1\":1,\"" +
7878
"leaf10\":\"-922337203685477580.8\",\"leaf2\":2,\"leaf3\":3," +
79-
"\"leaf4\":4,\"leaf5\":5,\"leaf6\":6,\"leaf7\":\"7\"," +
80-
"\"leaf8\":\"8\",\"leaf9\":true,\"leaflist1\":[\"a\",\"b\",\"c\"]," +
79+
"\"leaf4\":4,\"leaf5\":5,\"leaf6\":6,\"leaf7\":7," +
80+
"\"leaf8\":8,\"leaf9\":true,\"leaflist1\":[\"a\",\"b\",\"c\"]," +
8181
"\"ll1\":[1,10],\"ll10\":[\"-922337203685477580.8\",\"-922337203685477480.8\"]," +
8282
"\"ll2\":[2,20],\"ll3\":[3,30],\"ll4\":[4,40],\"ll5\":[5,50],\"ll6\":[6,60]," +
83-
"\"ll7\":[\"7\",\"70\"],\"ll8\":[\"8\",\"80\"],\"ll9\":[true,false]}}";
83+
"\"ll7\":[7,70],\"ll8\":[8,80],\"ll9\":[true,false]}}";
8484
@Rule
8585
public ExpectedException thrown = ExpectedException.none();
8686

serializers/json/src/test/resources/testinput1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"leaf4": 4,
1212
"leaf5": 5,
1313
"leaf6": 6,
14-
"leaf7": "7",
15-
"leaf8": "8",
14+
"leaf7": 7,
15+
"leaf8": 8,
1616
"leaf9": true,
1717
"leaf10": "-922337203685477580.8",
1818
"ll1": [
@@ -48,8 +48,8 @@
4848
80
4949
],
5050
"ll9": [
51-
"true",
52-
"false"
51+
true,
52+
false
5353
],
5454
"ll10": [
5555
"-922337203685477580.8",

0 commit comments

Comments
 (0)