[apisix] branch master updated: chore: ngx.req.get_body_data -> req_get_body_data (#3255)

[tokers]

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new aff1a90  chore: ngx.req.get_body_data -> req_get_body_data (#3255)
aff1a90 is described below

commit aff1a907a3671bd6610b304a54ebef47022ca6cf
Author: Yousa <snowfly1...@gmail.com>
AuthorDate: Thu Jan 21 09:35:10 2021 +0800

    chore: ngx.req.get_body_data -> req_get_body_data (#3255)
---
 apisix/admin/init.lua                 | 3 ++-
 apisix/plugins/request-validation.lua | 3 ++-
 apisix/plugins/wolf-rbac.lua          | 6 ++++--
 apisix/utils/log-util.lua             | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apisix/admin/init.lua b/apisix/admin/init.lua
index 5f92da4..e67e420 100644
--- a/apisix/admin/init.lua
+++ b/apisix/admin/init.lua
@@ -30,6 +30,7 @@ local ipairs = ipairs
 local error = error
 local type = type
 local req_read_body = ngx.req.read_body
+local req_get_body_data = ngx.req.get_body_data
 
 local events
 local MAX_REQ_BODY = 1024 * 1024 * 1.5      -- 1.5 MiB
@@ -220,7 +221,7 @@ local function run_stream()
     end
 
     req_read_body()
-    local req_body = ngx.req.get_body_data()
+    local req_body = req_get_body_data()
 
     if req_body then
         local data, err = core.json.decode(req_body)
diff --git a/apisix/plugins/request-validation.lua 
b/apisix/plugins/request-validation.lua
index 77742a9..a2af3cb 100644
--- a/apisix/plugins/request-validation.lua
+++ b/apisix/plugins/request-validation.lua
@@ -19,6 +19,7 @@ local plugin_name   = "request-validation"
 local ngx           = ngx
 local io           = io
 local req_read_body = ngx.req.read_body
+local req_get_body_data = ngx.req.get_body_data
 
 local schema = {
     type = "object",
@@ -88,7 +89,7 @@ function _M.rewrite(conf)
     if conf.body_schema then
         req_read_body()
         local req_body, error
-        local body = ngx.req.get_body_data()
+        local body = req_get_body_data()
 
         if not body then
             local filename = ngx.req.get_body_file()
diff --git a/apisix/plugins/wolf-rbac.lua b/apisix/plugins/wolf-rbac.lua
index 7c25462..1756004 100644
--- a/apisix/plugins/wolf-rbac.lua
+++ b/apisix/plugins/wolf-rbac.lua
@@ -31,6 +31,7 @@ local type     = type
 local string   = string
 local req_read_body = ngx.req.read_body
 local req_get_post_args = ngx.req.get_post_args
+local req_get_body_data = ngx.req.get_body_data
 
 local plugin_name = "wolf-rbac"
 
@@ -332,9 +333,10 @@ local function get_args()
     req_read_body()
     if string.find(ctx.var.http_content_type or "","application/json",
                    1, true) then
-        args, err = json.decode(ngx.req.get_body_data())
+        local req_body = req_get_body_data()
+        args, err = json.decode(req_body)
         if err then
-            core.log.error("json.decode(", ngx.req.get_body_data(), ") failed! 
", err)
+            core.log.error("json.decode(", req_body, ") failed! ", err)
         end
     else
         args = req_get_post_args()
diff --git a/apisix/utils/log-util.lua b/apisix/utils/log-util.lua
index 131d9b2..883184c 100644
--- a/apisix/utils/log-util.lua
+++ b/apisix/utils/log-util.lua
@@ -17,6 +17,7 @@
 local core = require("apisix.core")
 local ngx  = ngx
 local pairs = pairs
+local req_get_body_data = ngx.req.get_body_data
 
 local _M = {}
 
@@ -61,7 +62,7 @@ local function get_full_log(ngx, conf)
     }
 
     if conf.include_req_body then
-        local body = ngx.req.get_body_data()
+        local body = req_get_body_data()
         if body then
             log.request.body = body
         else