SpringModelService minor refactoring and flattening

This commit is contained in:
aboyko
2023-05-10 11:55:04 -04:00
parent 98a4c9b3e7
commit a3a83eb70a
9 changed files with 38 additions and 39 deletions

View File

@@ -1,6 +1,6 @@
import { commands, Uri } from "vscode";
import { Emitter, LanguageClient } from "vscode-languageclient/node";
import {Bean, BeansParams, ExtensionAPI, SpringModel} from "./api";
import {Bean, BeansParams, ExtensionAPI, SpringIndex} from "./api";
import {
LiveProcess,
LiveProcessConnectedNotification,
@@ -8,7 +8,7 @@ import {
LiveProcessUpdatedNotification,
LiveProcessGcPausesMetricsUpdatedNotification,
LiveProcessMemoryMetricsUpdatedNotification,
SpringModelUpdatedNotification
SpringIndexUpdatedNotification
} from "./notification";
import VSCode from "vscode";
import {RequestType} from "vscode-languageclient";
@@ -20,7 +20,7 @@ export class ApiManager {
private onDidLiveProcessUpdateEmitter: Emitter<LiveProcess> = new Emitter<LiveProcess>();
private onDidLiveProcessGcPausesMetricsUpdateEmitter: Emitter<LiveProcess> = new Emitter<LiveProcess>();
private onDidLiveProcessMemoryMetricsUpdateEmitter: Emitter<LiveProcess> = new Emitter<LiveProcess>();
private onSpringModelUpdateEmitter: Emitter<void> = new Emitter<void>();
private onSpringIndexUpdateEmitter: Emitter<void> = new Emitter<void>();
public constructor(client: LanguageClient) {
const onDidLiveProcessConnect = this.onDidLiveProcessConnectEmitter.event;
@@ -28,7 +28,7 @@ export class ApiManager {
const onDidLiveProcessUpdate = this.onDidLiveProcessUpdateEmitter.event;
const onDidLiveProcessGcPausesMetricsUpdate = this.onDidLiveProcessGcPausesMetricsUpdateEmitter.event;
const onDidLiveProcessMemoryMetricsUpdate = this.onDidLiveProcessMemoryMetricsUpdateEmitter.event;
const onSpringModelUpdated = this.onSpringModelUpdateEmitter.event;
const onSpringIndexUpdated = this.onSpringIndexUpdateEmitter.event;
const COMMAND_LIVEDATA_GET = "sts/livedata/get";
const getLiveProcessData = async (query) => {
@@ -61,14 +61,15 @@ export class ApiManager {
client.onNotification(LiveProcessGcPausesMetricsUpdatedNotification.type, (process: LiveProcess) => this.onDidLiveProcessGcPausesMetricsUpdateEmitter.fire(process));
client.onNotification(LiveProcessMemoryMetricsUpdatedNotification.type, (process: LiveProcess) => this.onDidLiveProcessMemoryMetricsUpdateEmitter.fire(process));
client.onNotification(SpringModelUpdatedNotification.type, () => this.onSpringModelUpdateEmitter.fire());
client.onNotification(SpringIndexUpdatedNotification.type, () => this.onSpringIndexUpdateEmitter.fire());
const beansRequestType = new RequestType<BeansParams, Bean[], void>('spring/index/beans');
const beans = (params: BeansParams) => {
return client.sendRequest(beansRequestType, params);
}
const getSpringModel = () => ({
const getSpringIndex = () => ({
onSpringIndexUpdated,
beans
})
@@ -79,13 +80,12 @@ export class ApiManager {
onDidLiveProcessUpdate,
onDidLiveProcessMemoryMetricsUpdate,
onDidLiveProcessGcPausesMetricsUpdate,
onSpringModelUpdated,
getLiveProcessData,
refreshLiveProcessData,
getLiveProcessMetricsData,
refreshLiveProcessMetricsData,
listConnectedProcesses,
getSpringModel
getSpringIndex
};
}
}