Avoid generating json value for Void objects

Author: jocelyn

library/converter/cj_arrayed_list_json_converter.e

@@ -42,23 +42,17 @@ feature -- Conversion
 
     to_json (o: like object): detachable JSON_ARRAY
         local
-            c: ITERATION_CURSOR [detachable ANY]
-            jv: detachable JSON_VALUE
 			failed: BOOLEAN
         do
             create Result.make_array
-            from
-            	c := o.new_cursor
-            until
-                c.after
+            across
+            	o as c
             loop
-                jv := json.value (c.item)
-            	if jv /= Void then
+            	if attached json.value (c.item) as jv then
             		Result.add (jv)
             	else
 					failed := True
             	end
-				c.forth
             end
 			if failed then
 				Result := Void

library/converter/cj_collection_json_converter.e

@@ -105,11 +105,21 @@ feature -- Conversion
 			create l_collection.make
 			l_collection.put (json.value (o.version), version_key)
 			l_collection.put (json.value (o.href), href_key)
-			l_collection.put (json.value (o.links), links_key)
-			l_collection.put (json.value (o.items), items_key)
-			l_collection.put (json.value (o.queries), queries_key)
-			l_collection.put (json.value (o.template), template_key)
-			l_collection.put (json.value (o.error), error_key)
+			if attached o.links as o_links then
+				l_collection.put (json.value (o_links), links_key)
+			end
+			if attached o.items as o_items then
+				l_collection.put (json.value (o_items), items_key)
+			end
+			if attached o.queries as o_queries then
+				l_collection.put (json.value (o_queries), queries_key)
+			end
+			if attached o.template as o_template then
+				l_collection.put (json.value (o_template), template_key)
+			end
+			if attached o.error as o_error then
+				l_collection.put (json.value (o_error), error_key)
+			end
 
 			create Result.make
 			Result.put (l_collection, collection_key)

library/converter/cj_data_json_converter.e

@@ -27,42 +27,33 @@ feature -- Access
 feature -- Conversion
 
 	from_json (j: like to_json): detachable like object
-		local
-			l_name: detachable STRING_32
-			l_prompt: detachable STRING_32
-			l_value: detachable STRING_32
 		do
-			if attached {STRING_32} json_to_object (j.item (name_key), Void) as l_ucs then
-				l_name := l_ucs
-			end
-			if attached {STRING_32} json_to_object (j.item (prompt_key), Void) as l_ucs then
-				l_prompt := l_ucs
-			end
-			if attached {STRING_32} json_to_object (j.item (value_key), Void) as l_ucs then
-				l_value := l_ucs
-			end
-			--|TODO improve this code
-			--|is there a better way to write this?
-			--|is a good idea create the Result object at the first line and then set the value
-			--|if it is attached?
 			create Result.make
-			if l_name /= Void then
+			if attached {STRING_32} json_to_object (j.item (name_key), Void) as l_name then
 				Result.set_name (l_name)
 			end
-			if l_prompt /= Void then
+			if attached {STRING_32} json_to_object (j.item (prompt_key), Void) as l_prompt then
 				Result.set_prompt (l_prompt)
 			end
-			if l_value /= Void then
+			if attached {STRING_32} json_to_object (j.item (value_key), Void) as l_value then
 				Result.set_value (l_value)
 			end
+			--|TODO improve this code
+			--|is there a better way to write this?
+			--|is a good idea create the Result object at the first line and then set the value
+			--|if it is attached?
 		end
 
 	to_json (o: like object): JSON_OBJECT
 		do
 			create Result.make
-			Result.put (json.value (o.prompt), prompt_key)
 			Result.put (json.value (o.name), name_key)
-			Result.put (json.value (o.value), value_key)
+			if attached o.prompt as o_prompt then
+				Result.put (json.value (o_prompt), prompt_key)
+			end
+			if attached o.value as o_value then
+				Result.put (json.value (o_value), value_key)
+			end
 		end
 
 feature {NONE} -- Implementation

library/converter/cj_item_json_converter.e

@@ -66,8 +66,12 @@ feature -- Conversion
 		do
 			create Result.make
 			Result.put (json.value (o.href), href_key)
-			Result.put (json.value (o.data), data_key)
-			Result.put (json.value (o.links), links_key)
+			if attached o.data as o_data then
+				Result.put (json.value (o_data), data_key)
+			end
+			if attached o.links as o_links then
+				Result.put (json.value (o_links), links_key)
+			end
 		end
 
 feature {NONE} -- Implementation

test/test_cj_suite.e

@@ -223,7 +223,7 @@ feature -- Test routines
 		local
 			l_doc : detachable CJ_TEMPLATE
 		do
-			l_doc := json_to_cjtempalte ("write_representation.json")
+			l_doc := json_to_cj_template ("write_representation.json")
 			assert ("Not Void", l_doc /= Void)
 			if attached {CJ_TEMPLATE } l_doc  as ll_doc then
 					assert ("Expect 4 elements", ll_doc.data.count = 4)
@@ -234,7 +234,7 @@ feature -- Test routines
 feature -- Implementation
 
 
-	json_to_cjtempalte (fn: STRING): detachable CJ_TEMPLATE
+	json_to_cj_template (fn: STRING): detachable CJ_TEMPLATE
 		local
 			dc: CJ_DATA_JSON_CONVERTER
 			tc: CJ_TEMPLATE_JSON_CONVERTER