Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SpringModelService minor refactoring and flattening

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/STS4LanguageClient.java
View File

@@ -28,14 +28,14 @@ import org.springframework.ide.vscode.commons.protocol.java.JavaSearchParams;
import org.springframework.ide.vscode.commons.protocol.java.JavaTypeHierarchyParams;
import org.springframework.ide.vscode.commons.protocol.java.TypeData;
import org.springframework.ide.vscode.commons.protocol.java.TypeDescriptorData;
import org.springframework.ide.vscode.commons.protocol.spring.SpringModelLanguageClient;
import org.springframework.ide.vscode.commons.protocol.spring.SpringIndexLanguageClient;
/**
* Some 'custom' extensions to standard LSP {@link LanguageClient}.
*
* @author Kris De Volder
*/
public interface STS4LanguageClient extends LanguageClient, SpringModelLanguageClient {
public interface STS4LanguageClient extends LanguageClient, SpringIndexLanguageClient {
@JsonNotification("sts/liveprocess/connected")
void liveProcessConnected(LiveProcessSummary processKey);

14
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageServer.java → headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringIndex.java
View File

@@ -10,15 +10,11 @@
*******************************************************************************/
package org.springframework.ide.vscode.commons.protocol.spring;
import org.eclipse.lsp4j.jsonrpc.services.JsonDelegate;
import org.eclipse.lsp4j.services.LanguageServer;
import java.util.List;
import java.util.concurrent.CompletableFuture;
public interface SpringModelLanguageServer extends LanguageServer {
/**
* Provides access to the spring model services.
*/
@JsonDelegate
SpringModelService getSpringModelService();
public interface SpringIndex {
CompletableFuture<List<Bean>> beans(BeansParams params);
}

2
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageClient.java → headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringIndexLanguageClient.java
View File

@@ -13,7 +13,7 @@ package org.springframework.ide.vscode.commons.protocol.spring;
import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
import org.eclipse.lsp4j.services.LanguageClient;
public interface SpringModelLanguageClient extends LanguageClient {
public interface SpringIndexLanguageClient extends LanguageClient {
@JsonNotification("spring/index/updated")
void indexUpdated();

9
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelService.java → headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringIndexLanguageServer.java
View File

@@ -14,12 +14,11 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
import org.eclipse.lsp4j.services.LanguageServer;
@JsonSegment("spring/index")
public interface SpringModelService {
@JsonRequest
public interface SpringIndexLanguageServer extends LanguageServer {
@JsonRequest("spring/index/beans")
default CompletableFuture<List<Bean>> beans(BeansParams params) {
throw new UnsupportedOperationException();
}