Skip to content
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

Refactor remaining everrest websocket endpoints to use Json RPC #8388

Merged
merged 8 commits into from
Jan 24, 2018

Conversation

mshaposhnik
Copy link
Contributor

What does this PR do?

Refactors organization & system websocket channels to use Json RPC. Refactor CLI client in part of graceful shutdown. Remove utility classes used for everrest websockets.

What issues does this PR fix or reference?

#5357

Release Notes

Refactored organization & system websocket channels to use Json RPC

Docs PR

N/A

@mshaposhnik mshaposhnik removed the request for review from vparfonov January 22, 2018 08:27
@benoitf benoitf added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/enhancement A feature request - must adhere to the feature request template. labels Jan 22, 2018
@@ -15,7 +15,7 @@ import {Websocket} from "../../../spi/websocket/websocket";
import {HttpJsonRequest} from "../../../spi/http/default-http-json-request";
import {DefaultHttpJsonRequest} from "../../../spi/http/default-http-json-request";
import {HttpJsonResponse} from "../../../spi/http/default-http-json-request";
import {MessageBus} from "../../../spi/websocket/messagebus";
import {JsonRpcBus} from "../../../spi/websocket/json-rpc-bus";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now, we can get rid of MessageBus class as well and all references to it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -113,6 +113,8 @@ export class System {
});
return messageBus.subscribeAsync(channelToListen, callbackSubscriber);
}).then((subscribed: string) => {
return this.delay(2000);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a comment why it's required

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Contributor

@riuvshin riuvshin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please test CLI carefully after these changes

@@ -22,7 +21,5 @@
@DynaModule
public class WsAgentServletModule extends ServletModule {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this class at all?

@mshaposhnik mshaposhnik merged commit 2902fc7 into master Jan 24, 2018
@mshaposhnik mshaposhnik deleted the fix_websockets branch January 24, 2018 14:17
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Jan 24, 2018
@benoitf benoitf added this to the 6.0.0-M5 milestone Jan 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement A feature request - must adhere to the feature request template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants