Fix depreated imports. (#239)

Signed-off-by: counter2015 <voidcounter@gmail.com>

Author: counter2015

templates/backend/backend-module.ts

@@ -1,4 +1,4 @@
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
+import { ConnectionHandler, RpcConnectionHandler } from '@theia/core';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { BackendClient, HelloBackendWithClientService, HelloBackendService, HELLO_BACKEND_PATH, HELLO_BACKEND_WITH_CLIENT_PATH } from '../common/protocol';
 import { HelloBackendWithClientServiceImpl } from './hello-backend-with-client-service';
@@ -7,14 +7,14 @@ import { HelloBackendServiceImpl } from './hello-backend-service';
 export default new ContainerModule(bind => {
     bind(HelloBackendService).to(HelloBackendServiceImpl).inSingletonScope()
     bind(ConnectionHandler).toDynamicValue(ctx =>
-        new JsonRpcConnectionHandler(HELLO_BACKEND_PATH, () => {
+        new RpcConnectionHandler(HELLO_BACKEND_PATH, () => {
             return ctx.container.get<HelloBackendService>(HelloBackendService);
         })
     ).inSingletonScope();
 
     bind(HelloBackendWithClientService).to(HelloBackendWithClientServiceImpl).inSingletonScope()
     bind(ConnectionHandler).toDynamicValue(ctx =>
-        new JsonRpcConnectionHandler<BackendClient>(HELLO_BACKEND_WITH_CLIENT_PATH, client => {
+        new RpcConnectionHandler<BackendClient>(HELLO_BACKEND_WITH_CLIENT_PATH, client => {
             const server = ctx.container.get<HelloBackendWithClientServiceImpl>(HelloBackendWithClientService);
             server.setClient(client);
             client.onDidCloseConnection(() => server.dispose());

templates/backend/frontend-module.ts

@@ -1,22 +1,23 @@
 import { CommandContribution} from '@theia/core';
-import { WebSocketConnectionProvider } from '@theia/core/lib/browser';
+import { RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser';
 import { ContainerModule, injectable } from '@theia/core/shared/inversify';
 import { BackendClient, HelloBackendWithClientService, HelloBackendService, HELLO_BACKEND_PATH, HELLO_BACKEND_WITH_CLIENT_PATH } from '../common/protocol';
 import { <%= params.extensionPrefix %>CommandContribution} from './<%= params.extensionPath %>-contribution';
 
 export default new ContainerModule(bind => {
     bind(CommandContribution).to(<%= params.extensionPrefix %>CommandContribution).inSingletonScope();
     bind(BackendClient).to(BackendClientImpl).inSingletonScope();
+    bind(ServiceConnectionProvider).toSelf().inSingletonScope();
 
     bind(HelloBackendService).toDynamicValue(ctx => {
-        const connection = ctx.container.get(WebSocketConnectionProvider);
-        return connection.createProxy<HelloBackendService>(HELLO_BACKEND_PATH);
+        const connection = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
+        return connection.createProxy(HELLO_BACKEND_PATH);
     }).inSingletonScope();
 
     bind(HelloBackendWithClientService).toDynamicValue(ctx => {
-        const connection = ctx.container.get(WebSocketConnectionProvider);
+        const connection = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
         const backendClient: BackendClient = ctx.container.get(BackendClient);
-        return connection.createProxy<HelloBackendWithClientService>(HELLO_BACKEND_WITH_CLIENT_PATH, backendClient);
+        return connection.createProxy(HELLO_BACKEND_WITH_CLIENT_PATH, backendClient);
     }).inSingletonScope();
 });
 

templates/backend/protocol.ts

@@ -1,4 +1,4 @@
-import { JsonRpcServer } from '@theia/core/lib/common/messaging';
+import { RpcServer } from '@theia/core/lib/common/messaging';
 
 export const HelloBackendService = Symbol('HelloBackendService');
 export const HELLO_BACKEND_PATH = '/services/helloBackend';
@@ -9,7 +9,7 @@ export interface HelloBackendService {
 export const HelloBackendWithClientService = Symbol('BackendWithClient');
 export const HELLO_BACKEND_WITH_CLIENT_PATH = '/services/withClient';
 
-export interface HelloBackendWithClientService extends JsonRpcServer<BackendClient> {
+export interface HelloBackendWithClientService extends RpcServer<BackendClient> {
     greet(): Promise<string>
 }
 export const BackendClient = Symbol('BackendClient');