@@ -18,7 +18,7 @@ object UserAPI {
18
18
private val r0 : Array [String ] = Array (" name" )
19
19
private val r1 : Array [String ] = Array (" id" , " model" )
20
20
21
- def nullValue : User = null
21
+ val nullValue : User = null
22
22
23
23
def decodeValue (in : JsonReader , default : User ): User = d0(in, default)
24
24
@@ -93,15 +93,14 @@ object UserAPI {
93
93
else in.requiredKeyError(r0, Array (req0))
94
94
} else in.readNullOrTokenError(default, '{' )
95
95
96
- private def e2 (x : Device , out : JsonWriter ): Unit =
97
- if (x ne null ) {
98
- out.writeObjectStart()
99
- out.writeNonEscapedAsciiKey(" id" )
100
- out.writeVal(x.id)
101
- out.writeNonEscapedAsciiKey(" model" )
102
- out.writeVal(x.model)
103
- out.writeObjectEnd()
104
- } else out.writeNull()
96
+ private def e2 (x : Device , out : JsonWriter ): Unit = {
97
+ out.writeObjectStart()
98
+ out.writeNonEscapedAsciiKey(" id" )
99
+ out.writeVal(x.id)
100
+ out.writeNonEscapedAsciiKey(" model" )
101
+ out.writeVal(x.model)
102
+ out.writeObjectEnd()
103
+ }
105
104
106
105
private def e1 (x : Seq [Device ], out : JsonWriter ): Unit = {
107
106
out.writeArrayStart()
@@ -112,17 +111,16 @@ object UserAPI {
112
111
out.writeArrayEnd()
113
112
}
114
113
115
- private def e0 (x : User , out : JsonWriter ): Unit =
116
- if (x ne null ) {
117
- out.writeObjectStart()
118
- out.writeNonEscapedAsciiKey(" name" )
119
- out.writeVal(x.name)
120
- val v = x.devices
121
- if ((v ne null ) && ! v.isEmpty) {
122
- out.writeNonEscapedAsciiKey(" devices" )
123
- e1(v, out)
124
- }
125
- out.writeObjectEnd()
126
- } else out.writeNull()
114
+ private def e0 (x : User , out : JsonWriter ): Unit = {
115
+ out.writeObjectStart()
116
+ out.writeNonEscapedAsciiKey(" name" )
117
+ out.writeVal(x.name)
118
+ val v = x.devices
119
+ if (! v.isEmpty) {
120
+ out.writeNonEscapedAsciiKey(" devices" )
121
+ e1(v, out)
122
+ }
123
+ out.writeObjectEnd()
124
+ }
127
125
}
128
126
}
0 commit comments