diff --git a/eclipse-language-servers/local-build.sh b/eclipse-language-servers/local-build.sh index 5801d0d8b..e276a8cef 100755 --- a/eclipse-language-servers/local-build.sh +++ b/eclipse-language-servers/local-build.sh @@ -5,4 +5,4 @@ cd ../headless-services ./mvnw clean install -Dmaven.test.skip=true cd $workdir -./mvnw -Psnapshot -Pe426 clean install -Dmaven.test.skip=true +./mvnw -Psnapshot -Pe428 clean install -Dmaven.test.skip=true diff --git a/headless-services/bosh-language-server/src/test/resources/logback-test.xml b/headless-services/bosh-language-server/src/test/resources/logback-test.xml index 6515417fc..ddb6827ea 100644 --- a/headless-services/bosh-language-server/src/test/resources/logback-test.xml +++ b/headless-services/bosh-language-server/src/test/resources/logback-test.xml @@ -1,17 +1,18 @@ - + + - - + + + + + System.err - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - \ No newline at end of file diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 0b91b967c..3ea966fcb 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0 + 3.1.1 @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-surefire-plugin - --add-opens app/app=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED diff --git a/headless-services/concourse-language-server/src/main/resources/application.properties b/headless-services/concourse-language-server/src/main/resources/application.properties index 48531ff45..f55e1cf53 100644 --- a/headless-services/concourse-language-server/src/main/resources/application.properties +++ b/headless-services/concourse-language-server/src/main/resources/application.properties @@ -1,5 +1,4 @@ languageserver.extension-id=vscode-concourse spring.main.banner-mode=off -logging.level.org.springframework.ide.vscode.commons.languageserver.util.CompletionServerCapabilityRegistration=debug languageserver.completion-trigger-characters.concourse-task-yaml=abcdefghijklmnopqrsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_ languageserver.completion-trigger-characters.concourse-pipeline-yaml=abcdefghijklmnopqrsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_ diff --git a/headless-services/concourse-language-server/src/test/resources/application.yml b/headless-services/concourse-language-server/src/test/resources/application.yml deleted file mode 100644 index 773896b2c..000000000 --- a/headless-services/concourse-language-server/src/test/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -logging: - level: - org: - springframework: - ide: - vscode: debug diff --git a/headless-services/concourse-language-server/src/test/resources/logback-test.xml b/headless-services/concourse-language-server/src/test/resources/logback-test.xml index 6515417fc..ddb6827ea 100644 --- a/headless-services/concourse-language-server/src/test/resources/logback-test.xml +++ b/headless-services/concourse-language-server/src/test/resources/logback-test.xml @@ -1,17 +1,18 @@ - + + - - + + + + + System.err - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - \ No newline at end of file diff --git a/headless-services/manifest-yaml-language-server/src/test/resources/logback-test.xml b/headless-services/manifest-yaml-language-server/src/test/resources/logback-test.xml index 6515417fc..ddb6827ea 100644 --- a/headless-services/manifest-yaml-language-server/src/test/resources/logback-test.xml +++ b/headless-services/manifest-yaml-language-server/src/test/resources/logback-test.xml @@ -1,17 +1,18 @@ - + + - - + + + + + System.err - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java index f41f2666d..cbb2144f3 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java @@ -53,18 +53,20 @@ public class PropertiesLoader { private ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder.create(); public ConfigurationMetadataRepository load(IClasspath classPath) { - try { - IClasspathUtil.getBinaryRoots(classPath, (cpe) -> !cpe.isSystem()).forEach(fileEntry -> { - if (fileEntry.exists()) { - if (fileEntry.isDirectory()) { - loadFromOutputFolder(fileEntry.toPath()); - } else { - loadFromJar(fileEntry.toPath()); + if (classPath != null) { + try { + IClasspathUtil.getBinaryRoots(classPath, (cpe) -> !cpe.isSystem()).forEach(fileEntry -> { + if (fileEntry.exists()) { + if (fileEntry.isDirectory()) { + loadFromOutputFolder(fileEntry.toPath()); + } else { + loadFromJar(fileEntry.toPath()); + } } - } - }); - } catch (Exception e) { - LOG.log(Level.SEVERE, "Failed to retrieve classpath", e); + }); + } catch (Exception e) { + LOG.log(Level.SEVERE, "Failed to retrieve classpath", e); + } } ConfigurationMetadataRepository repository = builder.build(); return repository; diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java index 61ac99f9e..00ab9fdc9 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java @@ -57,9 +57,9 @@ public class LoggerNameProviderTest { @BeforeEach public void setup() throws Exception { CachingValueProvider.TIMEOUT = Duration.ofSeconds(20); - System.out.println("Setting test up."); +// System.out.println("Setting test up."); project = projects.mavenProject("tricky-getters-boot-1.3.1-app"); - System.out.println("Done setting test up: "); +// System.out.println("Done setting test up: "); } @AfterEach @@ -69,7 +69,7 @@ public class LoggerNameProviderTest { @Test void directResults() throws Exception { - System.out.println("directResults() - start"); +// System.out.println("directResults() - start"); LoggerNameProvider p = create(); String query = "jboss"; List directQueryResults = getResults(p, query); @@ -81,12 +81,12 @@ public class LoggerNameProviderTest { */ // assertElements(directQueryResults, JBOSS_RESULTS); assertElementsAtLeast(directQueryResults, JBOSS_RESULTS); - System.out.println("directResults() - end"); +// System.out.println("directResults() - end"); } @Test void cachedResults() throws Exception { - System.out.println("cachedResults() - start"); +// System.out.println("cachedResults() - start"); LoggerNameProvider p = create(); for (int i = 0; i < 10; i++) { long startTime = System.currentTimeMillis(); @@ -100,14 +100,14 @@ public class LoggerNameProviderTest { assertElementsAtLeast(directQueryResults, JBOSS_RESULTS); long duration = System.currentTimeMillis() - startTime; - System.out.println(i + ": " + duration + " ms"); +// System.out.println(i + ": " + duration + " ms"); } - System.out.println("cachedResults() - end"); +// System.out.println("cachedResults() - end"); } @Test void incrementalResults() throws Exception { - System.out.println("incrementalResults() - start"); +// System.out.println("incrementalResults() - start"); String fullQuery = "jboss"; LoggerNameProvider p = create(); @@ -116,14 +116,14 @@ public class LoggerNameProviderTest { List results = getResults(p, query); // dumpResults(query, results); if (i == fullQuery.length()) { - System.out.println("Verifying final result!"); +// System.out.println("Verifying final result!"); //Not checking for exact equals because... quircks of JDT search engine means it // will actually finds less results than if we derive them by filtering incrementally. //If all works well, we should never find fewer results than Eclipse does. assertElementsAtLeast(results, JBOSS_RESULTS); } } - System.out.println("incrementalResults() - end"); +// System.out.println("incrementalResults() - end"); } private LoggerNameProvider create() { diff --git a/headless-services/spring-boot-language-server/src/test/resources/logback-test.xml b/headless-services/spring-boot-language-server/src/test/resources/logback-test.xml index b246bdc42..ddb6827ea 100644 --- a/headless-services/spring-boot-language-server/src/test/resources/logback-test.xml +++ b/headless-services/spring-boot-language-server/src/test/resources/logback-test.xml @@ -1,18 +1,18 @@ - + + - - + + + + + System.err - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - \ No newline at end of file