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

added more advanced caching strategy for calculating live hovers after live hover hints already got created

Browse Source
This commit is contained in:
Martin Lippert
2018-08-23 09:57:23 +02:00
parent 88e8e65b45
commit bff10fa51a
5 changed files with 112 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootAppCache.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017 Pivotal, Inc.
* Copyright (c) 2017, 2018 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,17 +15,22 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.springframework.ide.vscode.commons.util.MemoizingProxy;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.sun.tools.attach.VirtualMachine;
import com.sun.tools.attach.VirtualMachineDescriptor;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
public class LocalSpringBootAppCache {
private static final Duration EXPIRE_AFTER = Duration.ofMillis(500); //Limits rate at which we refresh list of apps
private long nextRefreshAfter = Long.MIN_VALUE;
private ImmutableMap<VirtualMachineDescriptor, LocalSpringBootApp> apps = ImmutableMap.of();
private ImmutableMap<VirtualMachineDescriptor, SpringBootApp> apps = ImmutableMap.of();
public synchronized Collection<SpringBootApp> getAllRunningJavaApps() {
if (System.currentTimeMillis()>=nextRefreshAfter) {
@@ -36,14 +41,17 @@ public class LocalSpringBootAppCache {
private void refresh() {
List<VirtualMachineDescriptor> currentVms = VirtualMachine.list();
ImmutableMap.Builder<VirtualMachineDescriptor, LocalSpringBootApp> newAppsBuilder = ImmutableMap.builder();
ImmutableMap.Builder<VirtualMachineDescriptor, SpringBootApp> newAppsBuilder = ImmutableMap.builder();
for (VirtualMachineDescriptor vm : currentVms) {
LocalSpringBootApp existingApp = apps.get(vm);
SpringBootApp existingApp = apps.get(vm);
if (existingApp!=null) {
newAppsBuilder.put(vm, existingApp);
} else {
try {
newAppsBuilder.put(vm, new LocalSpringBootApp(vm));
LocalSpringBootApp localApp = new LocalSpringBootApp(vm);
MethodInterceptor handler = new MemoizingProxy.MemoizingProxyHandler(localApp, Duration.ofMillis(4500));
SpringBootApp proxiedLocalApp = (SpringBootApp) Enhancer.create(SpringBootApp.class, handler);
newAppsBuilder.put(vm, proxiedLocalApp);
} catch (Exception e) {
//Ignore problems attaching to a VM. We will try again on next polling loop, if vm still exists.
//The most likely cause is that the VM already died since we obtained a reference to it.
@@ -51,7 +59,7 @@ public class LocalSpringBootAppCache {
}
}
HashSet<VirtualMachineDescriptor> oldVms = new HashSet<>(apps.keySet());
ImmutableMap<VirtualMachineDescriptor, LocalSpringBootApp> newApps = newAppsBuilder.build();
ImmutableMap<VirtualMachineDescriptor, SpringBootApp> newApps = newAppsBuilder.build();
oldVms.removeAll(newApps.keySet());
for (VirtualMachineDescriptor oldVm : oldVms) {
apps.get(oldVm).dispose();

10
headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RemoteSpringBootApp.java
View File

@@ -40,12 +40,12 @@ public class RemoteSpringBootApp extends AbstractSpringBootApp {
@Override
public String getPort() throws Exception {
return port!=null ? port : super.getPort();
return port != null ? port : super.getPort();
}
@Override
public String getHost() throws Exception {
if (host!=null) {
if (host != null) {
return host;
}
return super.getHost();
@@ -66,7 +66,7 @@ public class RemoteSpringBootApp extends AbstractSpringBootApp {
public boolean isSpringBootApp() {
//For now, let's assume that, if its not a boot app, then we won't create a RemoteSpringBootApp instance for it.
//The check that is here really only determines whether there's a process reachable at the remote jmx url.
return getProcessID()!=null;
return getProcessID() != null;
}
@Override
@@ -82,9 +82,9 @@ public class RemoteSpringBootApp extends AbstractSpringBootApp {
public String getProcessName() throws Exception {
try {
String command = getJavaCommand();
if (command!=null) {
if (command != null) {
int space = command.indexOf(' ');
if (space>=0) {
if (space >= 0) {
command = command.substring(0, space);
}
command = command.trim();