From f4711d3c9c9bdab7a5745a3ef3b6de64b2fe7dc0 Mon Sep 17 00:00:00 2001 From: Cory Rivera Date: Fri, 28 Oct 2022 15:37:59 -0700 Subject: [PATCH] Remove unused ClientSession members. (#21031) --- .../workbench/contrib/notebook/test/stubs.ts | 42 ---------- .../notebook/browser/models/clientSession.ts | 76 ------------------ .../browser/models/modelInterfaces.ts | 79 ------------------- .../notebook/browser/models/notebookModel.ts | 8 -- 4 files changed, 205 deletions(-) diff --git a/src/sql/workbench/contrib/notebook/test/stubs.ts b/src/sql/workbench/contrib/notebook/test/stubs.ts index 7de00fa018..27473715c1 100644 --- a/src/sql/workbench/contrib/notebook/test/stubs.ts +++ b/src/sql/workbench/contrib/notebook/test/stubs.ts @@ -60,9 +60,6 @@ export class NotebookModelStub implements INotebookModel { get kernelChanged(): vsEvent.Event { throw new Error('method not implemented.'); } - get kernelsChanged(): vsEvent.Event { - throw new Error('method not implemented.'); - } get layoutChanged(): vsEvent.Event { throw new Error('method not implemented.'); } @@ -357,21 +354,9 @@ export class ClientSessionStub implements IClientSession { shutdown(): Promise { throw new Error('Method not implemented.'); } - selectKernel(): Promise { - throw new Error('Method not implemented.'); - } restart(): Promise { throw new Error('Method not implemented.'); } - setPath(path: string): Promise { - throw new Error('Method not implemented.'); - } - setName(name: string): Promise { - throw new Error('Method not implemented.'); - } - setType(type: string): Promise { - throw new Error('Method not implemented.'); - } updateConnection(connection: IConnectionProfile): Promise { throw new Error('Method not implemented.'); } @@ -381,36 +366,12 @@ export class ClientSessionStub implements IClientSession { dispose(): void { throw new Error('Method not implemented.'); } - get terminated(): vsEvent.Event { - throw new Error('Method not implemented.'); - } - get kernelChanged(): vsEvent.Event { - throw new Error('Method not implemented.'); - } - get statusChanged(): vsEvent.Event { - throw new Error('Method not implemented.'); - } - get iopubMessage(): vsEvent.Event { - throw new Error('Method not implemented.'); - } - get unhandledMessage(): vsEvent.Event { - throw new Error('Method not implemented.'); - } - get propertyChanged(): vsEvent.Event<'path' | 'name' | 'type'> { - throw new Error('Method not implemented.'); - } get kernel(): nb.IKernel | null { throw new Error('Method not implemented.'); } get notebookUri(): URI { throw new Error('Method not implemented.'); } - get name(): string { - throw new Error('Method not implemented.'); - } - get type(): string { - throw new Error('Method not implemented.'); - } get status(): nb.KernelStatus { throw new Error('Method not implemented.'); } @@ -423,9 +384,6 @@ export class ClientSessionStub implements IClientSession { get kernelChangeCompleted(): Promise { throw new Error('Method not implemented.'); } - get kernelDisplayName(): string { - throw new Error('Method not implemented.'); - } get errorMessage(): string { throw new Error('Method not implemented.'); } diff --git a/src/sql/workbench/services/notebook/browser/models/clientSession.ts b/src/sql/workbench/services/notebook/browser/models/clientSession.ts index e0f26bf11c..d6dba0a306 100644 --- a/src/sql/workbench/services/notebook/browser/models/clientSession.ts +++ b/src/sql/workbench/services/notebook/browser/models/clientSession.ts @@ -7,7 +7,6 @@ import { nb } from 'azdata'; import { URI } from 'vs/base/common/uri'; -import { Event, Emitter } from 'vs/base/common/event'; import { localize } from 'vs/nls'; import { getErrorMessage } from 'vs/base/common/errors'; @@ -23,19 +22,10 @@ type KernelChangeHandler = (kernel: nb.IKernelChangedArgs) => Promise; */ export class ClientSession implements IClientSession { //#region private fields with public accessors - private _terminatedEmitter = new Emitter(); - private _kernelChangedEmitter = new Emitter(); - private _statusChangedEmitter = new Emitter(); - private _iopubMessageEmitter = new Emitter(); - private _unhandledMessageEmitter = new Emitter(); - private _propertyChangedEmitter = new Emitter<'path' | 'name' | 'type'>(); private _notebookUri: URI; - private _type: string = ''; - private _name: string = ''; private _isReady: boolean; private _ready: Deferred; private _kernelChangeCompleted: Deferred; - private _kernelDisplayName: string = ''; private _errorMessage: string = ''; private _cachedKernelSpec: nb.IKernelSpec | undefined; private _kernelChangeHandlers: KernelChangeHandler[] = []; @@ -130,7 +120,6 @@ export class ClientSession implements IClientSession { } this._session = session; await this.runKernelConfigActions(kernelSpec.name); - this._statusChangedEmitter.fire(session); } private async runKernelConfigActions(kernelName: string): Promise { @@ -153,42 +142,17 @@ export class ClientSession implements IClientSession { //#region IClientSession Properties - public get terminated(): Event { - return this._terminatedEmitter.event; - } - public get kernelChanged(): Event { - return this._kernelChangedEmitter.event; - } - public onKernelChanging(changeHandler: (kernel: nb.IKernelChangedArgs) => Promise): void { if (changeHandler) { this._kernelChangeHandlers.push(changeHandler); } } - public get statusChanged(): Event { - return this._statusChangedEmitter.event; - } - public get iopubMessage(): Event { - return this._iopubMessageEmitter.event; - } - public get unhandledMessage(): Event { - return this._unhandledMessageEmitter.event; - } - public get propertyChanged(): Event<'path' | 'name' | 'type'> { - return this._propertyChangedEmitter.event; - } public get kernel(): nb.IKernel | undefined { return this._session ? this._session.kernel : undefined; } public get notebookUri(): URI { return this._notebookUri; } - public get name(): string { - return this._name; - } - public get type(): string { - return this._type; - } public get status(): nb.KernelStatus { if (!this.isReady) { return 'starting'; @@ -204,9 +168,6 @@ export class ClientSession implements IClientSession { public get kernelChangeCompleted(): Promise { return this._kernelChangeCompleted.promise; } - public get kernelDisplayName(): string { - return this._kernelDisplayName; - } public get errorMessage(): string { return this._errorMessage; } @@ -256,7 +217,6 @@ export class ClientSession implements IClientSession { await Promise.all(changePromises); // Wait on connection configuration to complete before resolving full kernel change this._kernelChangeCompleted.resolve(); - this._kernelChangedEmitter.fire(changeArgs); } private async updateCachedKernelSpec(): Promise { @@ -313,13 +273,6 @@ export class ClientSession implements IClientSession { } } - /** - * Select a kernel for the session. - */ - selectKernel(): Promise { - throw new Error('Not implemented'); - } - /** * Restart the session. * @@ -345,34 +298,5 @@ export class ClientSession implements IClientSession { }); return restartCompleted.promise; } - - /** - * Change the session path. - * - * @param path - The new session path. - * - * @returns A promise that resolves when the session has renamed. - * - * #### Notes - * This uses the Jupyter REST API, and the response is validated. - * The promise is fulfilled on a valid response and rejected otherwise. - */ - setPath(path: string): Promise { - throw new Error('Not implemented'); - } - - /** - * Change the session name. - */ - setName(name: string): Promise { - throw new Error('Not implemented'); - } - - /** - * Change the session type. - */ - setType(type: string): Promise { - throw new Error('Not implemented'); - } //#endregion } diff --git a/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts b/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts index 21a0a5e76c..0ba7f4308c 100644 --- a/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts +++ b/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts @@ -55,36 +55,6 @@ export interface IClientSessionOptions { * kernel, and can start a new kernel at any time. */ export interface IClientSession extends IDisposable { - /** - * A signal emitted when the session is shut down. - */ - readonly terminated: Event; - - /** - * A signal emitted when the kernel changes. - */ - readonly kernelChanged: Event; - - /** - * A signal emitted when the kernel status changes. - */ - readonly statusChanged: Event; - - /** - * A signal emitted for a kernel messages. - */ - readonly iopubMessage: Event; - - /** - * A signal emitted for an unhandled kernel message. - */ - readonly unhandledMessage: Event; - - /** - * A signal emitted when a session property changes. - */ - readonly propertyChanged: Event<'path' | 'name' | 'type'>; - /** * The current kernel associated with the document. */ @@ -95,16 +65,6 @@ export interface IClientSession extends IDisposable { */ readonly notebookUri: URI; - /** - * The current name associated with the client session. - */ - readonly name: string; - - /** - * The type of the client session. - */ - readonly type: string; - /** * The current status of the client session. */ @@ -134,11 +94,6 @@ export interface IClientSession extends IDisposable { */ readonly kernelChangeCompleted: Promise; - /** - * The display name of the kernel. - */ - readonly kernelDisplayName: string; - readonly cachedKernelSpec: nb.IKernelSpec | undefined; /** @@ -171,11 +126,6 @@ export interface IClientSession extends IDisposable { */ shutdown(): Promise; - /** - * Select a kernel for the session. - */ - selectKernel(): Promise; - /** * Restart the session. * @@ -188,29 +138,6 @@ export interface IClientSession extends IDisposable { */ restart(): Promise; - /** - * Change the session path. - * - * @param path - The new session path. - * - * @returns A promise that resolves when the session has renamed. - * - * #### Notes - * This uses the Jupyter REST API, and the response is validated. - * The promise is fulfilled on a valid response and rejected otherwise. - */ - setPath(path: string): Promise; - - /** - * Change the session name. - */ - setName(name: string): Promise; - - /** - * Change the session type. - */ - setType(type: string): Promise; - /** * Updates the connection */ @@ -272,12 +199,6 @@ export interface INotebookModel { */ readonly layoutChanged: Event; - /** - * Event fired on first initialization of the kernels and - * on subsequent change events - */ - readonly kernelsChanged: Event; - /** * Default kernel */ diff --git a/src/sql/workbench/services/notebook/browser/models/notebookModel.ts b/src/sql/workbench/services/notebook/browser/models/notebookModel.ts index a0c0cf9ec3..ba85042ee3 100644 --- a/src/sql/workbench/services/notebook/browser/models/notebookModel.ts +++ b/src/sql/workbench/services/notebook/browser/models/notebookModel.ts @@ -83,7 +83,6 @@ export class NotebookModel extends Disposable implements INotebookModel { private _contextsChangedEmitter = new Emitter(); private _contextsLoadingEmitter = new Emitter(); private _contentChangedEmitter = new Emitter(); - private _kernelsChangedEmitter = new Emitter(); private _kernelsAddedEmitter = new Emitter(); private _kernelChangedEmitter = new Emitter(); private _viewModeChangedEmitter = new Emitter(); @@ -264,10 +263,6 @@ export class NotebookModel extends Disposable implements INotebookModel { return this._kernelChangedEmitter.event; } - public get kernelsChanged(): Event { - return this._kernelsChangedEmitter.event; - } - /** * Event that gets fired when new kernels are added to the model from new notebook providers in the registry. */ @@ -1031,9 +1026,6 @@ export class NotebookModel extends Disposable implements INotebookModel { clientSession.onKernelChanging(async (e) => { await this.loadActiveContexts(e); }); - clientSession.statusChanged(async (session) => { - this._kernelsChangedEmitter.fire(session.kernel); - }); await clientSession.initialize().then(() => { this._sessionLoadFinished.resolve(); });