lib/neo4j: fix conflict on `data` in custom implementations of post requests

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/neo4j/curl_json.nit b/lib/neo4j/curl_json.nit
index 17df2fc..03a7ca4 100644 (file)
--- a/lib/neo4j/curl_json.nit
+++ b/lib/neo4j/curl_json.nit
@@ -106,7 +106,7 @@ end
 class JsonPOST
        super JsonCurlRequest
 
-       var data: nullable Jsonable = null is writable
+       var json_data: nullable Jsonable = null is writable
 
        redef fun init_headers do
                super
@@ -117,8 +117,8 @@ class JsonPOST
                var err = self.curl.native.easy_setopt(new CURLOption.post, true)
                if not err.is_ok then return answer_failure(err.to_i, err.to_s)
 
-               if self.data != null then
-                       var postdatas = self.data.to_json
+               if self.json_data != null then
+                       var postdatas = self.json_data.to_json
                        err = self.curl.native.easy_setopt(new CURLOption.postfields, postdatas)
                        if not err.is_ok then return answer_failure(err.to_i, err.to_s)
                end
@@ -141,7 +141,7 @@ end
 class JsonPUT
        super JsonCurlRequest
 
-       var data: nullable Jsonable = null is writable
+       var json_data: nullable Jsonable = null is writable
 
        redef fun init_headers do
                super
@@ -152,8 +152,8 @@ class JsonPUT
                var err = self.curl.native.easy_setopt(new CURLOption.custom_request, "PUT")
                if not err.is_ok then return answer_failure(err.to_i, err.to_s)
 
-               if self.data != null then
-                       var postdatas = self.data.to_json
+               if self.json_data != null then
+                       var postdatas = self.json_data.to_json
                        err = self.curl.native.easy_setopt(new CURLOption.postfields, postdatas)
                        if not err.is_ok then return answer_failure(err.to_i, err.to_s)
                end

diff --git a/lib/neo4j/neo4j.nit b/lib/neo4j/neo4j.nit
index 9f96118..c6c005a 100644 (file)
--- a/lib/neo4j/neo4j.nit
+++ b/lib/neo4j/neo4j.nit
@@ -328,7 +328,7 @@ class Neo4jClient
        # POST `params` to `url`
        fun post(url: String, params: Jsonable): Jsonable do
                var request = new JsonPOST(url)
-               request.data = params
+               request.json_data = params
                var response = request.execute
                return parse_response(response)
        end
@@ -336,7 +336,7 @@ class Neo4jClient
        # PUT `params` at `url`
        fun put(url: String, params: Jsonable): Jsonable do
                var request = new JsonPUT(url)
-               request.data = params
+               request.json_data = params
                var response = request.execute
                return parse_response(response)
        end
@@ -916,7 +916,7 @@ class NeoBatch
                # request.headers["X-Stream"] = "true"
                var json_jobs = new JsonArray
                for job in jobs.values do json_jobs.add job.to_rest
-               request.data = json_jobs
+               request.json_data = json_jobs
                var response = request.execute
                var res = client.parse_response(response)
                return finalize_batch(res)