From 7830ebb980f4c6350d575fc38d1df35c580d3eb4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 1 Sep 2014 12:27:15 +0200 Subject: [PATCH] Kill trailing whitespace Change-Id: If8e0ee748fb3f595f2e3e39ef40800fd35d317d8 Signed-off-by: Robert Varga --- .../resources/complexjson/complex-json.json | 20 ++--- .../complexjson/yang/complexjson.yang | 87 +++++++++---------- 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json b/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json index 8ecaa37e4f..fd4538833b 100644 --- a/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json +++ b/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json @@ -5,37 +5,37 @@ "anyxml-in-data":"foo" } ], - + "lf13-any":{ "anyxml-in-data":"foo" }, - + "lf14-any":"anyxml data", - + "lflst11":["lflst11 value1","lflst11 value2"], - + "lst11":[ - { + { "key111":"key111 value", "lf112":"/complexjson:cont1/complexjson:lflst11", "lf113":"lf113 value", "lf111":"lf111 value" } - ], + ], "lf11" : "453", "lf12_1" : "lf12 value", - "lf13" : "lf13 value", + "lf13" : "lf13 value", "complexjson-augmentation:lf15_11" : "lf15_11 value from augmentation", "complexjson-augmentation:lf15_12" : "lf15_12 value from augmentation", "lf15_11" : "one two", "lf15_12" : "complexjson:lf11", "lf15_21" : "lf15_21 value", - "lf17" : "lf17 value", - + "lf17" : "lf17 value", + "lst12":[ { "lf121":"lf121 value" } ] } -} \ No newline at end of file +} diff --git a/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang b/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang index 6c07d656da..de0858d667 100644 --- a/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang +++ b/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang @@ -2,26 +2,26 @@ module complexjson { namespace "ns:complex:json"; prefix cj; - revision "2014-08-11" { + revision "2014-08-11" { } - - + + identity ident; - + container cont1 { - + anyxml lf12-any; anyxml lf13-any; anyxml lf14-any; - + leaf lf11 { type int32; } - + leaf-list lflst11 { type string; } - + list lst11 { key "key111 lf111"; leaf key111 { @@ -37,7 +37,7 @@ module complexjson { type string; } } - + list lst12 { leaf lf121 { type string; @@ -46,8 +46,8 @@ module complexjson { type string; } } - - + + choice choc11 { case c11A { leaf lf13 { @@ -64,77 +64,74 @@ module complexjson { } } } - - + augment "/cont1/choc12" { case c12B { leaf lf17 { type string; } } - } - - + } + augment "/cont1" { container cont11 { leaf lf111 { type string; } - } + } } - + augment "/cont1" { leaf lf12_1 { - type string; - } + type string; + } leaf lf12_2 { type string; } } - + augment "/cont1" { leaf lf12_3 { - type string; - } + type string; + } } - - + augment "/cont1/choc11" { case c11B { leaf lf14_1 { - type string; - } + type string; + } } } - + augment "/cont1/choc11" { case c11C { leaf lf14_2 { - type string; - } + type string; + } } } - + augment "/cont1/choc11/c11A" { leaf lf15_11 { - type bits { - bit one; - bit two; - bit three; - } - } + type bits { + bit one; + bit two; + bit three; + } + } leaf lf15_12 { - type identityref { - base ident; - } - } - + type identityref { + base ident; + } + } + } - + augment "/cont1/choc11/c11A" { leaf lf15_21 { - type string; - } + type string; + } } } -- 2.36.6