From fa219f40e7599b525a2db1b6db153bc48153d9e3 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 14 Feb 2018 21:31:15 -0500 Subject: [PATCH] Re-enable test. Comment out synchronized suppliers for Jandex index --- .../ide/vscode/boot/java/utils/test/SpringIndexerTest.java | 3 +-- .../ide/vscode/commons/jandex/JandexClasspath.java | 2 +- .../springframework/ide/vscode/commons/jandex/JandexIndex.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java index fd01a1f10..b18edf4db 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java @@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.eclipse.lsp4j.SymbolInformation; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.ide.vscode.boot.java.Annotations; import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents; @@ -332,7 +331,7 @@ public class SpringIndexerTest { return false; } - @Ignore @Test + @Test public void testRefreshOnProjectChange() throws Exception { harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI())); diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java index ed33d4ec0..49abb18d4 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java @@ -46,7 +46,7 @@ public abstract class JandexClasspath implements IClasspath { private Supplier javaIndex; public JandexClasspath() { - this.javaIndex = Suppliers.synchronizedSupplier(Suppliers.memoize(() -> createIndex())); + this.javaIndex = /*Suppliers.synchronizedSupplier(*/Suppliers.memoize(() -> createIndex())/*)*/; } protected JandexIndex createIndex() { diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java index 20690cdb2..8ea193074 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java @@ -127,7 +127,7 @@ public class JandexIndex { this.knownPackages = new HashMap<>(); this.javadocProviderFactory = javadocProviderFactory; classpathEntries.forEach(file -> { - index.put(file, Suppliers.synchronizedSupplier(Suppliers.memoize(() -> createIndex(file, indexFileFinder)))); + index.put(file, /*Suppliers.synchronizedSupplier(*/Suppliers.memoize(() -> createIndex(file, indexFileFinder))/*)*/); knownTypes.put(file, Suppliers.memoize(() -> getKnownTypesStream(file).collect(Collectors.toList()))); knownPackages.put(file, Suppliers.memoize(() -> getKnownPackages(file).collect(Collectors.toList()))); });