godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make JSONRPC constants uppercase for consistency with other classes

This commit is contained in:
Hugo Locurcio 2019-09-01 23:48:03 +02:00
parent aa06f515e0
commit 7e01986ce1
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/jsonrpc/jsonrpc.cpp
View File

@ -47,11 +47,11 @@ void JSONRPC::_bind_methods() {
ClassDB::bind_method(D_METHOD("make_notification", "method", "params"), &JSONRPC::make_notification); ClassDB::bind_method(D_METHOD("make_notification", "method", "params"), &JSONRPC::make_notification);
ClassDB::bind_method(D_METHOD("make_response_error", "code", "message", "id"), &JSONRPC::make_response_error, DEFVAL(Variant())); ClassDB::bind_method(D_METHOD("make_response_error", "code", "message", "id"), &JSONRPC::make_response_error, DEFVAL(Variant()));
BIND_ENUM_CONSTANT(ParseError) BIND_ENUM_CONSTANT(PARSE_ERROR)
BIND_ENUM_CONSTANT(InvalidRequest) BIND_ENUM_CONSTANT(INVALID_REQUEST)
BIND_ENUM_CONSTANT(MethodNotFound) BIND_ENUM_CONSTANT(METHOD_NOT_FOUND)
BIND_ENUM_CONSTANT(InvalidParams) BIND_ENUM_CONSTANT(INVALID_PARAMS)
BIND_ENUM_CONSTANT(InternalError) BIND_ENUM_CONSTANT(INTERNAL_ERROR)
} }
Dictionary JSONRPC::make_response_error(int p_code, const String &p_message, const Variant &p_id) const { Dictionary JSONRPC::make_response_error(int p_code, const String &p_message, const Variant &p_id) const {
@ -120,7 +120,7 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
} }
if (object == NULL || !object->has_method(method)) { if (object == NULL || !object->has_method(method)) {
ret = make_response_error(JSONRPC::MethodNotFound, "Method not found", id); ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found", id);
} else { } else {
Variant call_ret = object->callv(method, args); Variant call_ret = object->callv(method, args);
if (id.get_type() != Variant::NIL) { if (id.get_type() != Variant::NIL) {
@ -138,10 +138,10 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
} }
ret = arr_ret; ret = arr_ret;
} else { } else {
ret = make_response_error(JSONRPC::InvalidRequest, "Invalid Request"); ret = make_response_error(JSONRPC::INVALID_REQUEST, "Invalid Request");
} }
} else { } else {
ret = make_response_error(JSONRPC::InvalidRequest, "Invalid Request"); ret = make_response_error(JSONRPC::INVALID_REQUEST, "Invalid Request");
} }
return ret; return ret;
} }
@ -155,7 +155,7 @@ String JSONRPC::process_string(const String &p_input) {
String err_message; String err_message;
int err_line; int err_line;
if (OK != JSON::parse(p_input, input, err_message, err_line)) { if (OK != JSON::parse(p_input, input, err_message, err_line)) {
ret = make_response_error(JSONRPC::ParseError, "Parse error"); ret = make_response_error(JSONRPC::PARSE_ERROR, "Parse error");
} else { } else {
ret = process_action(input, true); ret = process_action(input, true);
} }

10
modules/jsonrpc/jsonrpc.h
View File

@ -47,11 +47,11 @@ public:
~JSONRPC(); ~JSONRPC();
enum ErrorCode { enum ErrorCode {
ParseError = -32700, PARSE_ERROR = -32700,
InvalidRequest = -32600, INVALID_REQUEST = -32600,
MethodNotFound = -32601, METHOD_NOT_FOUND = -32601,
InvalidParams = -32602, INVALID_PARAMS = -32602,
InternalError = -32603, INTERNAL_ERROR = -32603,
}; };
Dictionary make_response_error(int p_code, const String &p_message, const Variant &p_id = Variant()) const; Dictionary make_response_error(int p_code, const String &p_message, const Variant &p_id = Variant()) const;