From 7270030807297f74b7c72b617e0efadd78d328f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 13 May 2016 14:04:56 -0400 Subject: [PATCH] contrib: update clients of `to_json_string` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/benitlux/src/benitlux_controller.nit | 8 ++++---- contrib/tinks/src/client/linux_client.nit | 3 +-- contrib/tnitter/src/action.nit | 4 ++-- contrib/tnitter/src/push.nit | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/contrib/benitlux/src/benitlux_controller.nit b/contrib/benitlux/src/benitlux_controller.nit index 5f5513a..dbb0974 100644 --- a/contrib/benitlux/src/benitlux_controller.nit +++ b/contrib/benitlux/src/benitlux_controller.nit @@ -348,7 +348,7 @@ redef class HttpResponse init ok(data: Serializable) do init 200 - body = data.to_json_string + body = data.serialize_to_json end # Respond with a `BenitluxError` in JSON and a code 403 @@ -356,7 +356,7 @@ redef class HttpResponse do init 403 var error = new BenitluxTokenError("Forbidden", "Invalid or outdated token.") - body = error.to_json_string + body = error.serialize_to_json end # Respond with a `BenitluxError` in JSON and a code 400 @@ -364,7 +364,7 @@ redef class HttpResponse do init 400 var error = new BenitluxError("Bad Request", "Application error, or it needs to be updated.") - body = error.to_json_string + body = error.serialize_to_json end # Respond with a `BenitluxError` in JSON and a code 500 @@ -372,6 +372,6 @@ redef class HttpResponse do init 500 var error = new BenitluxError("Internal Server Error", "Server error, try again later.") - body = error.to_json_string + body = error.serialize_to_json end end diff --git a/contrib/tinks/src/client/linux_client.nit b/contrib/tinks/src/client/linux_client.nit index 6ef6b15..bd60702 100644 --- a/contrib/tinks/src/client/linux_client.nit +++ b/contrib/tinks/src/client/linux_client.nit @@ -54,8 +54,7 @@ redef class App # Save the default config to pretty Json var cc = new ClientConfig - var json = cc.to_plain_json - json = json.replace(",", ",\n") + var json = cc.serialize_to_json(plain=true, pretty=true) json.write_to_file config_path return cc diff --git a/contrib/tnitter/src/action.nit b/contrib/tnitter/src/action.nit index ad41a71..60ee384 100644 --- a/contrib/tnitter/src/action.nit +++ b/contrib/tnitter/src/action.nit @@ -266,14 +266,14 @@ class TnitterREST db.close var response = new HttpResponse(200) - response.body = posts.to_json_string + response.body = posts.serialize_to_json return response end # Format not recognized var error = new Error("Bad Request") var response = new HttpResponse(400) - response.body = error.to_json_string + response.body = error.serialize_to_json return response end end diff --git a/contrib/tnitter/src/push.nit b/contrib/tnitter/src/push.nit index cdb2945..bc47789 100644 --- a/contrib/tnitter/src/push.nit +++ b/contrib/tnitter/src/push.nit @@ -46,7 +46,7 @@ redef class DB # Everyone gets the same response var posts = list_posts(0, 16) var response = new HttpResponse(400) - response.body = posts.to_json_string + response.body = posts.serialize_to_json for conn in push_connections do # Complete the answer to `conn` -- 1.7.9.5