-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add JSON RPC support from Rockets (resolve #284) #288
Conversation
e217657
to
c964c16
Compare
ping |
No comments? I would like to have a code review mainly. The approve I can get by just disabling the need for it :) I want you to know about the changes and the implications, also to avoid complaints about things that don't work anymore or differently. |
5fa5480
to
b81c3c0
Compare
Apologies for trusting your changes, that won't happen again ;-P I'll have a second look then. |
Never trust anybody, especially me :) I have some cleanups to push still to tomorrow. Maybe you also find something. No worries though. |
Sorry, I still do trust you! 🙂 But you're right, this needs proper review. Hopefully tomorrow. |
7e7256c
to
5cd4197
Compare
@@ -18,6 +18,21 @@ | |||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |||
*/ | |||
|
|||
#include "SDK.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rename this file to somehting like json_serialization or whatever. SDK doesn't have the right meaning here.
} | ||
} | ||
|
||
// for rockets::jsonrpc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is there a reason to place these two functions separately, outside of the brayns namespace?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, to make it compile :) rockets expects them to be free functions within no namespace
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh ok, but then the same does not apply to the other from/to_json above..?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interestingly not... I move them together.
tests/CMakeLists.txt
Outdated
@@ -13,6 +13,10 @@ else() | |||
list(APPEND EXCLUDE_FROM_TESTS braynsTestData.cpp) | |||
endif() | |||
if(NOT BRAYNS_OSPRAY_ENABLED) | |||
list(APPEND EXCLUDE_FROM_TESTS brayns.cpp braynsTestData.cpp) | |||
list(APPEND EXCLUDE_FROM_TESTS brayns.cpp braynsTestData.cpp SDK.cpp) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SDK renamed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch
* all websocket messages are now JSON RPC * new RPC methods added: inspect, reset-camera, quit * schemas are exposed for RPC methods under v1/<method>/schema
<method>
/schema