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

Reverted faulty test debug changes. Fixed faulty test

Browse Source
This commit is contained in:
BoykoAlex
2018-02-15 23:05:29 -05:00
parent cdd84293d1
commit 178a469d2c
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
View File

@@ -90,19 +90,19 @@ public class SpringIndexer {
@Override
public void created(IJavaProject project) {
log.info("project created event: {}", project.getElementName());
log.debug("project created event: {}", project.getElementName());
refresh();
}
@Override
public void changed(IJavaProject project) {
log.info("project changed event: {}", project.getElementName());
log.debug("project changed event: {}", project.getElementName());
refresh();
}
@Override
public void deleted(IJavaProject project) {
log.info("project deleted event: {}", project.getElementName());
log.debug("project deleted event: {}", project.getElementName());
refresh();
}
@@ -140,7 +140,7 @@ public class SpringIndexer {
updateWorker.start();
getWorkspaceService().onDidChangeWorkspaceFolders(evt -> {
log.info("workspace roots have changed event arrived - added: " + evt.getEvent().getAdded() + " - removed: " + evt.getEvent().getRemoved());
log.debug("workspace roots have changed event arrived - added: " + evt.getEvent().getAdded() + " - removed: " + evt.getEvent().getRemoved());
refresh();
});
@@ -208,7 +208,7 @@ public class SpringIndexer {
symbolsByDoc.clear();
Collection<WorkspaceFolder> roots = server.getWorkspaceRoots();
log.info("refresh spring indexer for roots: {}", roots.toString());
log.debug("refresh spring indexer for roots: {}", roots.toString());
initialize(roots);
}
}
@@ -552,7 +552,7 @@ public class SpringIndexer {
private final CompletableFuture<Void> future;
public InitializeItem(WorkspaceFolder[] workspaceRoots) {
log.info("initialze spring indexer task created for roots: " + Arrays.toString(workspaceRoots));
log.debug("initialze spring indexer task created for roots: " + Arrays.toString(workspaceRoots));
this.workspaceRoots = workspaceRoots;
this.future = new CompletableFuture<Void>();
@@ -566,18 +566,18 @@ public class SpringIndexer {
@Override
public void run() {
if (!future.isCancelled()) {
log.info("initialze spring indexer task started for roots: " + Arrays.toString(workspaceRoots));
log.debug("initialze spring indexer task started for roots: " + Arrays.toString(workspaceRoots));
for (WorkspaceFolder root : workspaceRoots) {
SpringIndexer.this.scanFiles(root);
}
log.info("initialze spring indexer task completed for roots: " + Arrays.toString(workspaceRoots));
log.debug("initialze spring indexer task completed for roots: " + Arrays.toString(workspaceRoots));
future.complete(null);
}
else {
log.info("initialze spring indexer task canceled for roots: " + Arrays.toString(workspaceRoots));
log.debug("initialze spring indexer task canceled for roots: " + Arrays.toString(workspaceRoots));
}
}
}

24
headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java
View File

@@ -28,8 +28,6 @@ import org.apache.commons.io.FileUtils;
import org.eclipse.lsp4j.SymbolInformation;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.boot.java.Annotations;
import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider;
@@ -41,16 +39,11 @@ import org.springframework.ide.vscode.languageserver.testharness.LanguageServerH
import org.springframework.ide.vscode.project.harness.BootJavaLanguageServerHarness;
import org.springframework.ide.vscode.project.harness.ProjectsHarness;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
/**
* @author Martin Lippert
*/
public class SpringIndexerTest {
private static Supplier<Logger> LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(SpringIndexerTest.class));
private Map<String, SymbolProvider> symbolProviders;
private LanguageServerHarness<ComposableLanguageServer<BootJavaLanguageServerComponents>> harness;
@@ -340,7 +333,6 @@ public class SpringIndexerTest {
@Test
public void testRefreshOnProjectChange() throws Exception {
LOG.get().info("testRefreshOnProjectChange STARTED");
harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()));
File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI());
@@ -348,19 +340,23 @@ public class SpringIndexerTest {
List<? extends SymbolInformation> allSymbols = indexer().getAllSymbols("");
assertEquals(6, allSymbols.size());
File pomFile = directory.toPath().resolve(MavenCore.POM_XML).toFile();
// Delete some symbols
String deletedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
CompletableFuture<Void> deleteFuture = indexer().deleteDocument(deletedDocURI);
deleteFuture.get(5, TimeUnit.SECONDS);
// check for updated index in all symbols
allSymbols = indexer().getAllSymbols("");
assertEquals(4, allSymbols.size());
File pomFile = directory.toPath().resolve(MavenCore.POM_XML).toFile();
assertFalse(indexer().isInitializing());
harness.changeFile(pomFile.toURI().toString());
// Refresh in progress
LOG.get().info("testRefreshOnProjectChange - FILE CHANGED HANLED");
assertTrue(indexer().isInitializing());
LOG.get().info("testRefreshOnProjectChange - INDEX INIT in PROGRESS");
// Everything is expected to be re-indexed hence "fake" deleted document should be indexed now
allSymbols = indexer().getAllSymbols("");
assertFalse(indexer().isInitializing());
assertEquals(6, allSymbols.size());
LOG.get().info("testRefreshOnProjectChange - FINISHED");
}
}

11
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/AbstractFileToProjectCache.java
View File

@@ -18,15 +18,10 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
import org.springframework.ide.vscode.commons.languageserver.Sts4LanguageServer;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
/**
* Cache for java projects. The key for the cache is a "project" specific file
*
@@ -36,8 +31,6 @@ import com.google.common.base.Suppliers;
*/
public abstract class AbstractFileToProjectCache<P extends IJavaProject> extends AbstractJavaProjectCache<File, P> {
private static final Supplier<Logger> LOG = Suppliers.memoize(() -> LoggerFactory.getLogger(AbstractFileToProjectCache.class));
private List<String> subscriptions;
protected boolean asyncUpdate;
protected final Path projectCacheFolder;
@@ -89,14 +82,10 @@ public abstract class AbstractFileToProjectCache<P extends IJavaProject> extends
progressService.progressEvent(taskId, "Updating data for project `" + project.getElementName() + "'");
}
if (async) {
LOG.get().info("Started updating project " + project.getElementName() + " in ASYNC mode");
CompletableFuture.supplyAsync(() -> update(project)).thenAccept((changed) -> afterUpdate(project, changed, notify, taskId));
LOG.get().info("Finished updating project " + project.getElementName() + " in ASYNC mode");
} else {
LOG.get().info("Started updating project " + project.getElementName() + " in SYNC mode");
boolean changed = update(project);
afterUpdate(project, changed, notify, taskId);
LOG.get().info("Finished updating project " + project.getElementName() + " in SYNC mode");
}
}