nitweb: migrate to new json serialization API

Signed-off-by: Alexandre Terrasa <[email protected]>

src/web/api_metrics.nit

@@ -154,82 +154,74 @@ end
 redef class MetricSet
 	super Jsonable
 
-	fun json: JsonObject do
-		var obj = new JsonObject
+	redef fun core_serialize_to(v) do
 		for metric in metrics do
-			obj[metric.name] = metric
+			v.serialize_attribute(metric.name, metric)
 		end
-		return obj
 	end
-
-	redef fun serialize_to(v) do json.serialize_to(v)
 end
 
 redef class Metric
 	super Jsonable
 
-	fun json: JsonObject do
-		var obj = new JsonObject
-		obj["name"] = name
-		obj["desc"] = desc
-		obj["empty"] = values.is_empty
-		if values.not_empty then obj["avg"] = avg
-		if values.not_empty then obj["std_dev"] = std_dev
-		if values.not_empty then obj["threshold"] = threshold
-		return obj
+	redef fun core_serialize_to(v) do
+		v.serialize_attribute("name", name)
+		v.serialize_attribute("desc", desc)
+		v.serialize_attribute("empty", values.is_empty)
+		if values.not_empty then v.serialize_attribute("avg", avg)
+		if values.not_empty then v.serialize_attribute("std_dev", std_dev)
+		if values.not_empty then v.serialize_attribute("threshold", threshold)
 	end
-
-	redef fun serialize_to(v) do json.serialize_to(v)
 end
 
 redef class IntMetric
-	redef fun json do
-		var obj = super
-		if values.not_empty then obj["sum"] = sum
-		return obj
+	redef fun core_serialize_to(v) do
+		super
+		if values.not_empty then v.serialize_attribute("sum", sum)
 	end
 end
 
 redef class FloatMetric
-	redef fun json do
-		var obj = super
-		if values.not_empty then obj["sum"] = sum
-		return obj
+	redef fun core_serialize_to(v) do
+		super
+		if values.not_empty then v.serialize_attribute("sum", sum)
 	end
 end
 
 redef class MModuleMetric
-	redef fun json do
-		var obj = super
-		if values.not_empty then obj["min"] = min
-		if values.not_empty then obj["max"] = max
+	redef fun core_serialize_to(v) do
+		super
+		if values.not_empty then v.serialize_attribute("min", min)
+		if values.not_empty then v.serialize_attribute("max", max)
 		var values = new JsonObject
 		for value in sort do
-			var v = self[value]
-			var vobj = new JsonObject
-			vobj["mentity"] = value
-			vobj["value"] = if v isa Jsonable then v else v.to_s
-			values[value.full_name] = vobj
+			values[value.full_name] = new MetricEntry(value, self[value])
 		end
-		obj["values"] = values
-		return obj
+		v.serialize_attribute("values", values)
 	end
 end
 
 redef class MClassMetric
-	redef fun json do
-		var obj = super
-		if values.not_empty then obj["min"] = min
-		if values.not_empty then obj["max"] = max
+	redef fun core_serialize_to(v) do
+		super
+		if values.not_empty then v.serialize_attribute("min", min)
+		if values.not_empty then v.serialize_attribute("max", max)
 		var values = new JsonObject
 		for value in sort do
-			var v = self[value]
-			var vobj = new JsonObject
-			vobj["mentity"] = value
-			vobj["value"] = if v isa Jsonable then v else v.to_s
-			values[value.full_name] = vobj
+			values[value.full_name] = new MetricEntry(value, self[value])
 		end
-		obj["values"] = values
-		return obj
+		v.serialize_attribute("values", values)
+	end
+end
+
+private class MetricEntry
+	super Jsonable
+
+	var mentity: MEntity
+	var value: Object
+
+	redef fun core_serialize_to(v) do
+		v.serialize_attribute("mentity", mentity)
+		v.serialize_attribute("value", if value isa JsonObject then value else value.to_s)
 	end
 end

src/web/api_model.nit

@@ -132,7 +132,7 @@ class APIEntity
 	redef fun get(req, res) do
 		var mentity = mentity_from_uri(req, res)
 		if mentity == null then return
-		res.json mentity.api_json(self)
+		res.raw_json mentity.to_full_json
 	end
 end
 
@@ -164,7 +164,7 @@ class APIEntityLinearization
 			return
 		end
 		var mentities = new JsonArray
-		for e in lin do mentities.add e.full_json
+		for e in lin do mentities.add e
 		res.json mentities
 	end
 end

src/web/web_base.nit

@@ -102,29 +102,30 @@ redef class HttpResponse
 	fun api_error(status: Int, message: String) do
 		json(new APIError(status, message), status)
 	end
+
+	# Write data as JSON and set the right content type header.
+	fun raw_json(json: nullable String, status: nullable Int) do
+		header["Content-Type"] = media_types["json"].as(not null)
+		if json == null then
+			send(null, status)
+		else
+			send(json, status)
+		end
+	end
 end
 
 # An error returned by the API.
 #
 # Can be serialized to json.
 class APIError
 	super Jsonable
+	serialize
 
 	# Reponse status
 	var status: Int
 
 	# Response error message
 	var message: String
-
-	# Json Object for this error
-	var json: JsonObject is lazy do
-		var obj = new JsonObject
-		obj["status"] = status
-		obj["message"] = message
-		return obj
-	end
-
-	redef fun serialize_to(v) do json.serialize_to(v)
 end
 
 # Fullname representation that can be used to build decorated links
@@ -160,12 +161,10 @@ class NSRef
 	# The mentity to link to/
 	var mentity: MEntity
 
-	redef fun serialize_to(v) do
-		var obj = new JsonObject
-		obj["web_url"] = mentity.web_url
-		obj["api_url"] = mentity.api_url
-		obj["name"] = mentity.name
-		obj.serialize_to(v)
+	redef fun core_serialize_to(v) do
+		v.serialize_attribute("web_url", mentity.web_url)
+		v.serialize_attribute("api_url", mentity.api_url)
+		v.serialize_attribute("name", mentity.name)
 	end
 end
 
@@ -184,17 +183,13 @@ redef class MEntity
 	# URL to `self` within the JSON api.
 	fun api_url: String do return "/api/entity/" / full_name
 
-	redef fun json do
-		var obj = super
-		obj["namespace"] = namespace
-		obj["web_url"] = web_url
-		obj["api_url"] = api_url
-		return obj
+	redef fun core_serialize_to(v) do
+		super
+		v.serialize_attribute("namespace", namespace)
+		v.serialize_attribute("web_url", web_url)
+		v.serialize_attribute("api_url", api_url)
 	end
 
-	# Get the full json repesentation of `self` with MEntityRefs resolved.
-	fun api_json(handler: APIHandler): JsonObject do return full_json
-
 	# Return `self.full_name` as an object that can be serialized to json.
 	fun namespace: nullable Namespace do return null
 
@@ -203,47 +198,35 @@ redef class MEntity
 end
 
 redef class MEntityRef
-	redef fun json do
-		var obj = super
-		obj["namespace"] = mentity.namespace
-		obj["web_url"] = mentity.web_url
-		obj["api_url"] = mentity.api_url
-		obj["name"] = mentity.name
-		obj["mdoc"] = mentity.mdoc_or_fallback
-		obj["visibility"] = mentity.visibility
-		var modifiers = new JsonArray
-		for modifier in mentity.collect_modifiers do
-			modifiers.add modifier
-		end
-		obj["modifiers"] = modifiers
+	redef fun core_serialize_to(v) do
+		super
+		v.serialize_attribute("namespace", mentity.namespace)
+		v.serialize_attribute("web_url", mentity.web_url)
+		v.serialize_attribute("api_url", mentity.api_url)
+		v.serialize_attribute("name", mentity.name)
+		v.serialize_attribute("mdoc", mentity.mdoc_or_fallback)
+		v.serialize_attribute("visibility", mentity.visibility.to_s)
+		v.serialize_attribute("modifiers", mentity.collect_modifiers)
 		var mentity = self.mentity
 		if mentity isa MMethod then
-			obj["msignature"] = mentity.intro.msignature
+			v.serialize_attribute("msignature", mentity.intro.msignature)
 		else if mentity isa MMethodDef then
-			obj["msignature"] = mentity.msignature
+			v.serialize_attribute("msignature", mentity.msignature)
 		else if mentity isa MVirtualTypeProp then
-			obj["bound"] = to_mentity_ref(mentity.intro.bound)
+			v.serialize_attribute("bound", to_mentity_ref(mentity.intro.bound))
 		else if mentity isa MVirtualTypeDef then
-			obj["bound"] = to_mentity_ref(mentity.bound)
+			v.serialize_attribute("bound", to_mentity_ref(mentity.bound))
 		end
-		return obj
-	end
-
-	redef fun full_json do
-		var obj = super
-		obj["location"] = mentity.location
-		return obj
+		v.serialize_attribute("location", mentity.location)
 	end
 end
 
 redef class MDoc
 
 	# Add doc down processing
-	redef fun json do
-		var obj = new JsonObject
-		obj["html_synopsis"] = html_synopsis.write_to_string
-		obj["html_documentation"] = html_documentation.write_to_string
-		return obj
+	redef fun core_serialize_to(v) do
+		v.serialize_attribute("html_synopsis", html_synopsis.write_to_string)
+		v.serialize_attribute("html_documentation", html_documentation.write_to_string)
 	end
 end
 
@@ -355,16 +338,11 @@ end
 redef class POSetElement[E]
 	super Jsonable
 
-	# Return JSON representation of `self`.
-	fun json: JsonObject do
+	redef fun serialize_to(v) do
 		assert self isa POSetElement[MEntity]
-		var obj = new JsonObject
-		obj["greaters"] = to_mentity_refs(greaters)
-		obj["direct_greaters"] = to_mentity_refs(direct_greaters)
-		obj["direct_smallers"] = to_mentity_refs(direct_smallers)
-		obj["smallers"] = to_mentity_refs(smallers)
-		return obj
+		v.serialize_attribute("greaters", to_mentity_refs(greaters))
+		v.serialize_attribute("direct_greaters", to_mentity_refs(direct_greaters))
+		v.serialize_attribute("direct_smallers", to_mentity_refs(direct_smallers))
+		v.serialize_attribute("smallers", to_mentity_refs(smallers))
 	end
-
-	redef fun serialize_to(v) do json.serialize_to(v)
 end