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

Search main type jobs limited number and low priority

Browse Source
This commit is contained in:
BoykoAlex
2021-07-20 12:42:55 -04:00
parent 36066b835d
commit 7155f72569
4 changed files with 100 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/BootProjectDashElement.java
View File

@@ -12,6 +12,8 @@ package org.springframework.ide.eclipse.boot.dash.model;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobGroup;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.core.IJavaElement;
@@ -53,6 +55,8 @@ import com.google.common.collect.ImmutableSortedSet;
@SuppressWarnings("restriction")
public class BootProjectDashElement extends AbstractLaunchConfigurationsDashElement<IProject> implements BootDashElement, LiveDataCapableElement {
private static final JobGroup mainMethodJobGroup = new JobGroup("Find 'main' methods in spring boot projects...", 5, 5);
private static final boolean DEBUG = DebugUtil.isDevelopment();
private static void debug(String string) {
@@ -67,29 +71,35 @@ public class BootProjectDashElement extends AbstractLaunchConfigurationsDashElem
private ObservableSet<BootDashElement> children;
private ObservableSet<Integer> ports;
private LiveExpression<Boolean> hasMainMethod = new AsyncLiveExpression<Boolean>(false) {
private AsyncLiveExpression<Boolean> hasMainMethod = new AsyncLiveExpression<Boolean>(
false,
"Search main' method in project " + (getProject() != null && getProject().getName() != null ? "'" + getProject().getName() + "'": "UNKNOWQN"),
null,
job -> {
job.setPriority(Job.DECORATE);
job.setJobGroup(mainMethodJobGroup);
}) {
@Override
protected Boolean compute() {
IProject p = getProject();
Log.info("Has main method computation for project '" + p.getName() + "'");
if (p != null && p.exists()) {
IJavaProject jp = JavaCore.create(p);
if (jp != null) {
IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(new IJavaElement[]{jp}, IJavaSearchScope.SOURCES);
MainMethodSearchEngine engine = new MainMethodSearchEngine();
IType[] types = null;
try {
types = engine.searchMainMethods(new NullProgressMonitor(), searchScope, false);
return types != null && types.length > 0;
}
catch (Exception e) {
Log.log(e);
@Override
protected Boolean compute() {
IProject p = getProject();
if (p != null && p.exists()) {
IJavaProject jp = JavaCore.create(p);
if (jp != null) {
IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(new IJavaElement[]{jp}, IJavaSearchScope.SOURCES);
MainMethodSearchEngine engine = new MainMethodSearchEngine();
IType[] types = null;
try {
types = engine.searchMainMethods(new NullProgressMonitor(), searchScope, false);
return types != null && types.length > 0;
}
catch (Exception e) {
Log.log(e);
}
}
}
return false;
}
}
return false;
}
};
@@ -145,7 +155,7 @@ public class BootProjectDashElement extends AbstractLaunchConfigurationsDashElem
private ObservableSet<Integer> getLivePortsExp() {
if (ports==null) {
ports = createSortedLiveSummary((BootDashElement element) -> {
int port = element.getLivePort();
int port = CollectionUtils.getAnyOr(getLivePorts(), -1);;
if (port>0) {
return port;
}

57
eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/LocalBootDashModel.java
View File

@@ -12,13 +12,22 @@ package org.springframework.ide.eclipse.boot.dash.model;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IJavaProject;
import org.osgi.framework.Bundle;
@@ -141,6 +150,7 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
if (event.getBundle() == bundle && event.getType() == BundleEvent.STARTED) {
try {
updateElementsFromWorkspace();
applications.getValue().stream().forEach(e -> e.refreshHasMainMethod());
} catch (Throwable t) {
Log.log(t);
} finally {
@@ -173,6 +183,31 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
this.devtoolsPortRefresher = new DevtoolsPortRefresher(this, projectElementFactory);
final IResourceChangeListener workspaceBuildListener = new IResourceChangeListener() {
@Override
public void resourceChanged(IResourceChangeEvent event) {
if (event.getSource() != null) {
BuildDetectorVisitor visitor = new BuildDetectorVisitor();
try {
event.getDelta().accept(visitor);
for (IProject p : visitor.getProjects()) {
Optional<BootProjectDashElement> found = applications.getValue().stream()
.filter(e -> p.equals(e.getProject())).findFirst();
found.ifPresent(bde -> bde.refreshHasMainMethod());
}
} catch (CoreException e) {
Log.log(e);
}
}
}
};
IWorkspace workspace = ResourcesPlugin.getWorkspace();
workspace.addResourceChangeListener(workspaceBuildListener, IResourceChangeEvent.POST_BUILD);
addDisposableChild(() -> workspace.removeResourceChangeListener(workspaceBuildListener));
addDisposableChild(getViewModel().getToggleFilters().getSelectedFilters().onChange((e, v) -> {
if (e.getValue().contains(ToggleFiltersModel.FILTER_CHOICE_HIDE_NOT_RUNNABLE_APPS)) {
for (BootProjectDashElement a : applications.getValue()) {
@@ -183,6 +218,26 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
}
}
private static class BuildDetectorVisitor implements IResourceDeltaVisitor {
private Set<IProject> projects = new HashSet<>();
@Override
public boolean visit(IResourceDelta delta) throws CoreException {
IResource resource = delta.getResource();
if (resource instanceof IProject) {
projects.add((IProject) resource);
return false;
}
return true;
}
public Set<IProject> getProjects() {
return projects;
}
}
/**
* When no longer needed the model should be disposed, otherwise it will continue
* listening for changes to the workspace in order to keep itself in synch.
@@ -238,7 +293,6 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
.map(projectElementFactory::createOrGet)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
newElements.stream().forEach(e -> e.refreshHasMainMethod());
apps.replaceAll(newElements);
projectElementFactory.disposeAllExcept(newElements);
}
@@ -259,6 +313,7 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
*/
public void refresh(UserInteractions ui) {
updateElementsFromWorkspace();
applications.getValue().stream().forEach(e -> e.refreshHasMainMethod());
localServices.refresh();
}