My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 55 attachment: flexxb_xsinil_patch.txt (17.7 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
### Eclipse Workspace Patch 1.0
#P FlexXB-MP
Index: FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as
===================================================================
--- FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as (revision 733)
+++ FlexXBTest/src/main/flex/com/googlecode/flexxb/XmlSerializerTest.as (working copy)
@@ -27,6 +27,7 @@
import com.googlecode.testData.Mock;
import com.googlecode.testData.Mock2;
import com.googlecode.testData.Mock3;
+ import com.googlecode.testData.RequiredMembersData;
import com.googlecode.testData.VectoredElement;
import com.googlecode.testData.XmlPathObject;
import com.googlecode.testData.XmlTypedObj;
@@ -40,6 +41,7 @@
import com.googlecode.testData.xsi.ItemA;
import com.googlecode.testData.xsi.ItemB;
import com.googlecode.testData.xsi.Main;
+ import com.googlecode.testData.xsi.nil.NillableData;

import flash.net.registerClassAlias;

@@ -401,5 +403,118 @@
assertNotNull(copy.list);
assertThat(copy.list.length, equalTo(0));
}
+
+ [Test]
+ public function xsiNilTest() : void
+ {
+ var item : NillableData = new NillableData();
+ var engine : IFlexXB = new FxBEngine().getXmlSerializer();
+ var xml : XML = FlexXBEngine.instance.serialize(item);
+
+ /*
+ <data>
+ <elementRequired/>
+ <elementNillableRequired xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+ <elementNillable xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+ <nested>
+ <elementRequired/>
+ <elementNillableRequired xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+ <elementNillable xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+ </nested>
+ </data>
+ */
+
+ assertNotNull(xml.elementNillable[0]);
+ assertThat(xml.elementNillable[0].@[XmlUtils.xsiNil], equalTo("true"));
+ assertNull(xml.elementNormal[0]);
+ assertNotNull(xml.elementRequired[0]);
+ assertNull(xml.elementRequired[0].@[XmlUtils.xsiNil][0]);
+ assertTrue(xml.elementRequired[0].hasSimpleContent());
+ assertNotNull(xml.elementNillableRequired[0]);
+ assertThat(xml.elementNillableRequired[0].@[XmlUtils.xsiNil], equalTo("true"));
+
+ assertNotNull(xml.nested.elementNillable[0]);
+ assertThat(xml.nested.elementNillable[0].@[XmlUtils.xsiNil], equalTo("true"));
+ assertNull(xml.nested.elementNormal[0]);
+ assertNotNull(xml.nested.elementRequired[0]);
+ assertNull(xml.nested.elementRequired[0].@[XmlUtils.xsiNil][0]);
+ assertTrue(xml.nested.elementRequired[0].hasSimpleContent());
+ assertNotNull(xml.nested.elementNillableRequired[0]);
+ assertThat(xml.nested.elementNillableRequired[0].@[XmlUtils.xsiNil], equalTo("true"));
+
+ item.elementNillable = "nillable";
+ item.elementNormal = "normal";
+ item.elementRequired = "required";
+ item.elementNillableRequired = "nillable required";
+ item.nestedElementNillbable = "nested nillable";
+ item.nestedElementNormal = "nested normal";
+ item.nestedElementRequired = "nested required";
+ item.nestedElementNillableRequired = "nested nillable required";
+
+ xml = FlexXBEngine.instance.serialize(item);
+
+ /*
+ <data>
+ <elementNormal>normal</elementNormal>
+ <elementRequired>required</elementRequired>
+ <elementNillableRequired>nillable required</elementNillableRequired>
+ <elementNillable>nillable</elementNillable>
+ <nested>
+ <elementNormal>nested normal</elementNormal>
+ <elementRequired>nested required</elementRequired>
+ <elementNillableRequired>nested nillable required</elementNillableRequired>
+ <elementNillable>nested nillable</elementNillable>
+ </nested>
+ </data>
+ */
+
+ assertNull(xml.elementNillable[0].@[XmlUtils.xsiNil][0]);
+ assertThat(xml.elementNillable[0].text(), equalTo("nillable"));
+ assertThat(xml.elementNormal[0].text(), equalTo("normal"));
+ assertThat(xml.elementRequired[0].text(), equalTo("required"));
+ assertNull(xml.elementNillableRequired[0].@[XmlUtils.xsiNil][0]);
+ assertThat(xml.elementNillableRequired[0].text(), equalTo("nillable required"));
+
+ assertNull(xml.nested.elementNillable[0].@[XmlUtils.xsiNil][0]);
+ assertThat(xml.nested.elementNillable[0].text(), equalTo("nested nillable"));
+ assertThat(xml.nested.elementNormal[0].text(), equalTo("nested normal"));
+ assertThat(xml.nested.elementRequired[0].text(), equalTo("nested required"));
+ assertNull(xml.nested.elementNillableRequired[0].@[XmlUtils.xsiNil][0]);
+ assertThat(xml.nested.elementNillableRequired[0].text(), equalTo("nested nillable required"));
+ }
+
+ [Test]
+ public function requiredMembersTest() : void
+ {
+ var item : RequiredMembersData = new RequiredMembersData();
+ var engine : IFlexXB = new FxBEngine().getXmlSerializer();
+ var xml : XML = FlexXBEngine.instance.serialize(item);
+
+ /*
+ <data requiredAttr="">
+ <optionalArray/>
+ <nested requiredAttr="">
+ <requiredArray/>
+ <optionalArray/>
+ <requiredElement/>
+ </nested>
+ <requiredElement/>
+ <requiredArray/>
+ </data>
+ */
+ assertNotNull(xml.@requiredAttr[0]);
+ assertNotNull(xml.requiredElement[0]);
+ assertNotNull(xml.requiredArray[0]);
+ assertNotNull(xml.nested.@requiredAttr[0]);
+ assertNotNull(xml.nested.requiredElement[0]);
+ assertNotNull(xml.nested.requiredArray[0]);
+
+ assertNull(xml.@optionalAttr[0]);
+ assertNull(xml.optionalElement[0]);
+ assertNull(xml.optionalArray[0]);
+ assertNull(xml.nested.@optionalAttr[0]);
+ assertNull(xml.nested.optionalElement[0]);
+ assertNull(xml.nested.optionalArray[0]);
+ }
}
}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlMember.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlMember.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlMember.as (working copy)
@@ -105,6 +105,11 @@
*/
private var _isIDRef : Boolean;
/**
+ * @private
+ */
+ private var _isRequired : Boolean;
+
+ /**
* Constructor
* @param descriptor xml descriptor of the class field
* @param _class owner XmlClass entity
@@ -208,6 +213,15 @@
public function get isIDRef() : Boolean{
return _isIDRef;
}
+
+ /**
+ * Get the required flag
+ * @return
+ *
+ */
+ public function get isRequired() : Boolean{
+ return _isRequired;
+ }

/**
* Get the owner XmlClass entity
@@ -254,6 +268,7 @@
setOrder(descriptor.attributes[Constants.ORDER]);
_default = descriptor.attributes[Constants.DEFAULT];
_isIDRef = descriptor.getBoolean(Constants.IDREF);
+ _isRequired = descriptor.getBoolean(Constants.REQUIRED);
}
/**
* @private
Index: FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/BaseMember.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/BaseMember.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/BaseMember.as (working copy)
@@ -37,6 +37,8 @@

private var _isIDRef : Boolean;

+ private var _isRequired : Boolean;
+
private var _accessorType : AccessorType;

private var _classAnnotation : IClassAnnotation;
@@ -81,7 +83,11 @@
public function get isIDRef() : Boolean{
return _isIDRef;
}
-
+
+ public function get isRequired() : Boolean{
+ return _isRequired;
+ }
+
protected override function parse(descriptor : MetaDescriptor) : void{
super.parse(descriptor);
_classAnnotation = descriptor.owner;
@@ -91,6 +97,7 @@
_ignoreOn = Stage.fromString(descriptor.attributes[Constants.IGNORE_ON]);
setOrder(descriptor.attributes[Constants.ORDER]);
_isIDRef = descriptor.getBoolean(Constants.IDREF);
+ _isRequired = descriptor.getBoolean(Constants.REQUIRED);
}

private function setOrder(value : String) : void {
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlConstants.as (working copy)
@@ -81,6 +81,10 @@
*/
public static const SET_XSI_TYPE : String = "setXsiType";
/**
+ *
+ */
+ public static const NILLABLE : String = "nillable";
+ /**
*
*/
public static const TYPE : String = "type";
Index: FlexXBTest/src/main/flex/com/googlecode/testData/xsi/nil/NillableData.as
===================================================================
--- FlexXBTest/src/main/flex/com/googlecode/testData/xsi/nil/NillableData.as (revision 0)
+++ FlexXBTest/src/main/flex/com/googlecode/testData/xsi/nil/NillableData.as (revision 0)
@@ -0,0 +1,36 @@
+package com.googlecode.testData.xsi.nil
+{
+ import com.googlecode.testData.Mock3;
+
+ [XmlClass(alias="data")]
+ public class NillableData
+ {
+ [XmlElement(nillable="true")]
+ public var elementNillable:String;
+
+ [XmlElement]
+ public var elementNormal:String;
+
+ [XmlElement(required="true")]
+ public var elementRequired:String;
+
+ [XmlElement(required="true", nillable="true")]
+ public var elementNillableRequired:String;
+
+ [XmlElement(alias="nested/elementNillable", nillable="true")]
+ public var nestedElementNillbable:String;
+
+ [XmlElement(alias="nested/elementNormal")]
+ public var nestedElementNormal:String;
+
+ [XmlElement(alias="nested/elementRequired", required="true")]
+ public var nestedElementRequired:String;
+
+ [XmlElement(alias="nested/elementNillableRequired", nillable="true")]
+ public var nestedElementNillableRequired:String;
+
+ public function NillableData()
+ {
+ }
+ }
+}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/util/XmlUtils.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/util/XmlUtils.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/util/XmlUtils.as (working copy)
@@ -10,6 +10,10 @@
*/
public static const xsiType : QName = new QName(xsiNamespace, "type");
/**
+ * Qualified name of the xml schema nil attribute
+ */
+ public static const xsiNil : QName = new QName(xsiNamespace, "nil");
+ /**
*
* @param ns
* @param xml
Index: FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/Constants.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/Constants.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/Constants.as (working copy)
@@ -63,7 +63,13 @@
* Id reference
*/
public static const IDREF : String = "idref";
+
/**
+ * Required reference
+ */
+ public static const REQUIRED : String = "required";
+
+ /**
* @private
*
*/
Index: FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/IMemberAnnotation.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/IMemberAnnotation.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/annotation/contract/IMemberAnnotation.as (working copy)
@@ -82,5 +82,11 @@
*
*/
function get isIDRef() : Boolean;
+
+ /**
+ * Flag used to signal if current field is manditory for serialization
+ * @return true if required, false otherwise
+ */
+ function get isRequired() : Boolean;
}
}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/api/schema/FlexXB-XML.xsd (working copy)
@@ -48,6 +48,7 @@
<xs:attribute name="getFromCache" type="xs:boolean" use="optional" default="false" />
<xs:attribute name="serializePartialElement" type="xs:boolean" use="optional" default="false" />
<xs:attribute name="getRuntimeType" type="xs:boolean" use="optional" default="false" />
+ <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/serializer/XmlElementSerializer.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/serializer/XmlElementSerializer.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/serializer/XmlElementSerializer.as (working copy)
@@ -50,7 +50,16 @@

protected override function serializeObject(object : Object, annotation : XmlMember, parentXml : XML, serializer : SerializationCore) : void {
var child : XML = <xml />;
- if (isComplexType(object) && !(object is Class)) {
+
+ if(object == null)
+ {
+ if(XmlElement(annotation).nillable)
+ {
+ child.addNamespace(XmlUtils.xsiNamespace);
+ child.@[XmlUtils.xsiNil] = "true";
+ }
+ }
+ else if (isComplexType(object) && !(object is Class)) {
if(annotation.isIDRef){
child.appendChild(serializer.getObjectId(object));
}else{
Index: FlexXB/src/main/flex/com/googlecode/flexxb/core/Configuration.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/core/Configuration.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/core/Configuration.as (working copy)
@@ -56,6 +56,7 @@
* Set this flag to true in order to ignore missing values and not set null into the appropiate fields.
*/
public var ignoreMissingContent : Boolean = false;
+
/**
* Constructor
*
Index: FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlElement.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlElement.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/xml/annotation/XmlElement.as (working copy)
@@ -48,8 +48,12 @@
* @private
*/
protected var _setXsiType : Boolean;
-
/**
+ * @private
+ */
+ protected var _nillable : Boolean;
+
+ /**
* Constructor
* @param descriptor
* @param xmlClass
@@ -83,6 +87,25 @@
public function get setXsiType() : Boolean{
return _setXsiType;
}
+
+ /**
+ *
+ * @return
+ *
+ */
+ public function get nillable() : Boolean{
+ return _nillable;
+ }
+
+
+ /**
+ * Returns required if nillable is true
+ * @return
+ *
+ */
+ override public function get isRequired() : Boolean{
+ return super.isRequired || nillable;
+ }

/**
* Get getFromCache flag
@@ -99,6 +122,7 @@
_getFromCache = metadata.getBoolean(XmlConstants.GET_FROM_CACHE);
_getRuntimeType = metadata.getBoolean(XmlConstants.GET_RUNTIME_TYPE);
_setXsiType = metadata.getBoolean(XmlConstants.SET_XSI_TYPE);
+ _nillable = metadata.getBoolean(XmlConstants.NILLABLE);
}

public override function get annotationName() : String {
Index: FlexXBTest/src/main/flex/com/googlecode/testData/RequiredMembersData.as
===================================================================
--- FlexXBTest/src/main/flex/com/googlecode/testData/RequiredMembersData.as (revision 0)
+++ FlexXBTest/src/main/flex/com/googlecode/testData/RequiredMembersData.as (revision 0)
@@ -0,0 +1,46 @@
+package com.googlecode.testData
+{
+ [XmlClass(alias="data")]
+ public class RequiredMembersData
+ {
+ [XmlAttribute(required="true")]
+ public var requiredAttr:String;
+
+ [XmlAttribute(required="false")]
+ public var optionalAttr:String;
+
+ [XmlElement(required="true")]
+ public var requiredElement:String;
+
+ [XmlElement(required="false")]
+ public var optionalElement:String;
+
+ [XmlArray(required="true", memberName="item")]
+ public var requiredArray:Array;
+
+ [XmlArray(required="false", memberName="item")]
+ public var optionalArray:Array;
+
+ [XmlAttribute(alias="nested/requiredAttr", required="true")]
+ public var requiredNestedAttr:String;
+
+ [XmlAttribute(alias="nested/optionalAttr", required="false")]
+ public var optionalNestedAttr:String;
+
+ [XmlElement(alias="nested/requiredElement", required="true")]
+ public var requiredNestedElement:String;
+
+ [XmlElement(alias="nested/optionalElement", required="false")]
+ public var optionalNestedElement:String;
+
+ [XmlArray(alias="nested/requiredArray", required="true", memberName="item")]
+ public var requiredNestedArray:Array;
+
+ [XmlArray(alias="nested/optionalArray", required="false", memberName="item")]
+ public var optionalNestedArray:Array;
+
+ public function RequiredMembersData()
+ {
+ }
+ }
+}
\ No newline at end of file
Index: FlexXB/src/main/flex/com/googlecode/flexxb/core/SerializationCore.as
===================================================================
--- FlexXB/src/main/flex/com/googlecode/flexxb/core/SerializationCore.as (revision 733)
+++ FlexXB/src/main/flex/com/googlecode/flexxb/core/SerializationCore.as (working copy)
@@ -180,7 +180,8 @@
}
var serializer : BaseSerializer = mappingModel.factory.getSerializer(annotation);
var target : Object = object[annotation.name];
- if (target != null) {
+
+ if (target != null || (annotation is IMemberAnnotation && IMemberAnnotation(annotation).isRequired)) {
serializer.serialize(target, annotation, serializedData, this);
}
}
Powered by Google Project Hosting