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

Upgrade to latest rewrite. Boot 3 upgrade handler fixes

Browse Source
This commit is contained in:
BoykoAlex
2022-05-11 22:08:31 -04:00
parent 873f1cb985
commit 71cfedc452
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/UpgradeToBoot3Handler.java
View File

@@ -18,6 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.lsp4e.LanguageServiceAccessor;
@@ -27,34 +28,40 @@ import org.eclipse.ui.handlers.HandlerUtil;
import org.springsource.ide.eclipse.commons.livexp.util.Log;
public class UpgradeToBoot3Handler extends AbstractHandler {
private static final String UPGRADE_TO_BOOT_3_COMMAND_ID = "sts/rewrite/recipe/org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0";
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IStructuredSelection selection = HandlerUtil.getCurrentStructuredSelection(event);
Object o = selection.getFirstElement();
IProject project = null;
if (o instanceof IResource) {
IProject project = ((IResource) o).getProject();
if (project != null) {
List<@NonNull LanguageServer> usedLanguageServers = LanguageServiceAccessor.getActiveLanguageServers(serverCapabilities -> true);
project = ((IResource) o).getProject();
} else if (o instanceof IProject) {
project = (IProject) o;
} else if (o instanceof IAdaptable) {
project = ((IAdaptable) o).getAdapter(IProject.class);
}
if (project != null) {
List<@NonNull LanguageServer> usedLanguageServers = LanguageServiceAccessor
.getActiveLanguageServers(serverCapabilities -> true);
if (!usedLanguageServers.isEmpty()) {
ExecuteCommandParams commandParams = new ExecuteCommandParams();
commandParams.setCommand(UPGRADE_TO_BOOT_3_COMMAND_ID);
commandParams.setArguments(List.of(project.getLocationURI().toString()));
if (!usedLanguageServers.isEmpty()) {
ExecuteCommandParams commandParams = new ExecuteCommandParams();
commandParams.setCommand(UPGRADE_TO_BOOT_3_COMMAND_ID);
commandParams.setArguments(List.of(project.getLocationURI().toString()));
try {
CompletableFuture.allOf(usedLanguageServers.stream().map(ls ->
ls.getWorkspaceService().executeCommand(commandParams)).toArray(CompletableFuture[]::new));
}
catch (Exception e) {
Log.log(e);
}
try {
CompletableFuture.allOf(usedLanguageServers.stream()
.map(ls -> ls.getWorkspaceService().executeCommand(commandParams))
.toArray(CompletableFuture[]::new));
} catch (Exception e) {
Log.log(e);
}
}
}
return null;
}

4
headless-services/commons/pom.xml
View File

@@ -108,8 +108,8 @@
<commons-codec-version>1.13</commons-codec-version>
<!-- Rewrite specific properties -->
<rewrite-version>7.21.3</rewrite-version>
<rewrite-spring-version>4.19.3</rewrite-spring-version>
<rewrite-version>7.23.0</rewrite-version>
<rewrite-spring-version>4.21.0</rewrite-spring-version>
<rewrite-jackson.version>2.13.2</rewrite-jackson.version>
<signing.skip>true</signing.skip>

2
headless-services/spring-boot-language-server/pom.xml
View File

@@ -133,7 +133,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${rewrite-jackson.version}</version>
<version>2.13.2.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>