diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java new file mode 100644 index 000000000..6468af78a --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java @@ -0,0 +1,120 @@ +/******************************************************************************* + * Copyright (c) 2020 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 + * https://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.app; + +import static org.springframework.ide.vscode.boot.common.CommonLanguageTools.getValueType; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory; +import org.springframework.ide.vscode.boot.java.value.ValuePropertyKeyProposal; +import org.springframework.ide.vscode.boot.metadata.CachingValueProvider; +import org.springframework.ide.vscode.boot.metadata.PropertyInfo; +import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider; +import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry; +import org.springframework.ide.vscode.boot.metadata.hints.StsValueHint; +import org.springframework.ide.vscode.boot.metadata.hints.ValueHintHoverInfo; +import org.springframework.ide.vscode.commons.java.IClasspathUtil; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; +import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; +import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.languageserver.util.LanguageSpecific; +import org.springframework.ide.vscode.commons.languageserver.util.PrefixFinder; +import org.springframework.ide.vscode.commons.util.BadLocationException; +import org.springframework.ide.vscode.commons.util.FuzzyMatcher; +import org.springframework.ide.vscode.commons.util.FuzzyMap.Match; +import org.springframework.ide.vscode.commons.util.text.LanguageId; +import org.springframework.ide.vscode.commons.util.text.TextDocument; +import org.springframework.stereotype.Component; + +import com.google.common.collect.ImmutableList; + +import reactor.core.publisher.Flux; + +@Component +public class ClasspathResourceCompletionProvider implements ICompletionEngine, LanguageSpecific { + + private static String[] CLASSPATH_PREFIXES = { + "classpath:", + "classpath*:" + }; + + private static PrefixFinder PREFIX_FINDER = new PrefixFinder() { + @Override + protected boolean isPrefixChar(char c) { + return Character.isJavaIdentifierPart(c) || c=='-' || c=='.' || c=='/' || c==':' || c=='*'; + } + }; + private static final Collection LANGUAGES = ImmutableList.of( + LanguageId.BOOT_PROPERTIES, + LanguageId.BOOT_PROPERTIES_YAML + ); + + @Autowired JavaProjectFinder projectFinder; + + public ClasspathResourceCompletionProvider(BootLanguageServerParams params) { + } + + private static class ClasspathHints extends CachingValueProvider { + @Override + protected Flux getValuesAsync(IJavaProject javaProject, String query) { + return Flux.fromStream( + IClasspathUtil.getClasspathResources(javaProject.getClasspath()).stream() + .distinct().map(r -> r.replaceAll("\\\\", "/")) + .map(StsValueHint::create) + ); + } + } + + private ClasspathHints classpathHints = new ClasspathHints(); + private PropertyCompletionFactory completionFactory = new PropertyCompletionFactory(); + + @Override + public Collection getCompletions(TextDocument doc, int offset) { + ImmutableList.Builder proposals = ImmutableList.builder(); + IJavaProject jp = projectFinder.find(doc.getId()).orElse(null); + if (jp!=null) { + String prefix = PREFIX_FINDER.getPrefix(doc, offset); + for (String CLASSPATH : CLASSPATH_PREFIXES) { + if (prefix.startsWith(CLASSPATH)) { + String query = prefix.substring(CLASSPATH.length()); + Flux valueHints = classpathHints.getValues(jp, query); + valueHints.toStream().forEach(hint -> { + String valueCandidate = hint.getValue(); + int startOfValue = offset - query.length(); + double score = FuzzyMatcher.matchScore(query, valueCandidate); + if (score != 0) { + DocumentEdits edits = new DocumentEdits(doc, false); + edits.delete(startOfValue, offset); + edits.insert(offset, valueCandidate); + proposals.add(completionFactory.valueProposal(valueCandidate, query, "String", + score, edits, ValueHintHoverInfo.create(hint)) + ); + } + }); + } + } + } + return proposals.build(); + } + + @Override + public Collection supportedLanguages() { + return LANGUAGES; + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java index 2d0c0cddb..bf6db57a1 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java @@ -43,13 +43,6 @@ public class ResourceHintProvider implements ValueProviderStrategy { @Override public Flux getValues(IJavaProject javaProject, String query) { - for (String prefix : CLASSPATH_PREFIXES) { - if (query.startsWith(prefix)) { - return classpathHints - .getValues(javaProject, query.substring(prefix.length())) - .map((hint) -> hint.prefixWith(prefix)); - } - } return Flux.fromIterable(urlPrefixHints); } @@ -59,18 +52,4 @@ public class ResourceHintProvider implements ValueProviderStrategy { .collect(Collectors.toList()) ); - private ClasspathHints classpathHints = new ClasspathHints(); - - private static class ClasspathHints extends CachingValueProvider { - @Override - protected Flux getValuesAsync(IJavaProject javaProject, String query) { - return Flux.fromStream( - IClasspathUtil.getClasspathResources(javaProject.getClasspath()).stream() - .distinct().map(r -> r.replaceAll("\\\\", "/")) - .map(StsValueHint::create) - ); - } - } - - } diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java index 35d4b42c7..3486bb7a5 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java @@ -79,6 +79,23 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { projectContents.createFile("src/main/resources/application.yml", ""); }; + @Test public void configImportClasspathCompletions() throws Exception { + MavenJavaProject p = createPredefinedMavenProject("demo-conf-import"); + useProject(p); + +// assertCompletions("spring.config.import=<*>", +// // ==> +// "spring.config.import=classpath:<*>", +// "spring.config.import=configtree:<*>", +// "spring.config.import=file:<*>" +// ); + + assertCompletions("spring.config.import=classpath:ex<*>", + // ==> + "spring.config.import=classpath:extra.properties<*>" + ); + } + @Test public void reconcilesWithMultiDocuments() throws Exception { //See: https://github.com/spring-projects/sts4/issues/533 @@ -1601,8 +1618,8 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionsDisplayString( "my.nice.resource=classpath:app<*>\n" ,// => - "classpath:application.properties", - "classpath:application.yml" + "application.properties", + "application.yml" ); //Test 'list item' context: @@ -1620,14 +1637,14 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionsDisplayString( "my.nice.list[0]=classpath:app<*>\n" ,// => - "classpath:application.properties", - "classpath:application.yml" + "application.properties", + "application.yml" ); assertCompletionWithLabel( "my.nice.list[0]=classpath:app<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my.nice.list[0]=classpath:application.yml<*>\n" ); @@ -1635,7 +1652,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionWithLabel( "my.nice.list[0]= classpath:app<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my.nice.list[0]= classpath:application.yml<*>\n" ); @@ -1643,7 +1660,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionWithLabel( "my.nice.list[0]=classpath:<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my.nice.list[0]=classpath:application.yml<*>\n" ); @@ -1654,7 +1671,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionWithLabel( "my.nice.resource=classpath:word<*>\n" ,//=============== - "classpath:stuff/wordlist.txt" + "stuff/wordlist.txt" ,// => "my.nice.resource=classpath:stuff/wordlist.txt<*>\n" ); @@ -1671,7 +1688,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionWithLabel( "my.nice."+kind+"=classpath:<*>" ,//=========== - "classpath:stuff/wordlist.txt" + "stuff/wordlist.txt" ,//=> "my.nice."+kind+"=classpath:stuff/wordlist.txt<*>" ); @@ -1689,7 +1706,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { assertCompletionWithLabel( "my.nice."+kind+"=classpath:stuff/wordlist.txt,classpath:app<*>" ,//=========== - "classpath:application.yml" + "application.yml" ,//=> "my.nice."+kind+"=classpath:stuff/wordlist.txt,classpath:application.yml<*>" ); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java index c08f3df10..bf4a03c28 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java @@ -4064,7 +4064,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " list:\n"+ " - classpath:<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my:\n" + " nice:\n" + @@ -4089,8 +4089,8 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " nice:\n" + " resource: classpath:app<*>\n" ,// => - "classpath:application.properties", - "classpath:application.yml" + "application.properties", + "application.yml" ); //Test 'list item' context: @@ -4101,8 +4101,8 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " list:\n"+ " - classpath:app<*>\n" ,// => - "classpath:application.properties", - "classpath:application.yml" + "application.properties", + "application.yml" ); assertCompletionWithLabel( @@ -4111,7 +4111,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " list:\n"+ " - classpath:app<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my:\n" + " nice:\n" + @@ -4125,7 +4125,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " list:\n"+ " - classpath:<*>\n" ,// ========== - "classpath:application.yml" + "application.yml" , // => "my:\n" + " nice:\n" + @@ -4141,8 +4141,8 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " resource:\n"+ " classpath:app<*>\n" ,// => - "classpath:application.properties", - "classpath:application.yml" + "application.properties", + "application.yml" ); assertCompletionWithLabel( @@ -4151,7 +4151,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " resource:\n"+ " classpath:app<*>\n" ,//=============== - "classpath:application.properties" + "application.properties" ,// => "my:\n" + " nice:\n" + @@ -4165,7 +4165,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " resource:\n"+ " classpath:<*>\n" ,//=============== - "classpath:application.properties" + "application.properties" ,// => "my:\n" + " nice:\n" + @@ -4180,7 +4180,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " resource:\n"+ " classpath:word<*>\n" ,//=============== - "classpath:stuff/wordlist.txt" + "stuff/wordlist.txt" ,// => "my:\n" + " nice:\n" + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..c1dd12f17 Binary files /dev/null and b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.jar differ diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b7cb93e70 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw new file mode 100644 index 000000000..8a8fb2282 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/pom.xml new file mode 100644 index 000000000..8ffe89ca7 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.3 + + + com.example + demo-conf-import + 0.0.1-SNAPSHOT + demo-conf-import + Demo project for Spring Boot + + 1.8 + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/java/com/example/demo/DemoConfImportApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/java/com/example/demo/DemoConfImportApplication.java new file mode 100644 index 000000000..f41919625 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/java/com/example/demo/DemoConfImportApplication.java @@ -0,0 +1,23 @@ +package com.example.demo; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoConfImportApplication implements CommandLineRunner { + + @Value("some.extra.stuff") + String prop; + + public static void main(String[] args) { + SpringApplication.run(DemoConfImportApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + System.out.println("prop = "+prop); + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/application.properties new file mode 100644 index 000000000..75adcbeb3 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.config.import=classpath:extra.properties diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/extra.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/extra.properties new file mode 100644 index 000000000..ef0188565 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/main/resources/extra.properties @@ -0,0 +1,2 @@ +some.extra.stuff=great + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/test/java/com/example/demo/DemoConfImportApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/test/java/com/example/demo/DemoConfImportApplicationTests.java new file mode 100644 index 000000000..c1da6171f --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/demo-conf-import/src/test/java/com/example/demo/DemoConfImportApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoConfImportApplicationTests { + + @Test + void contextLoads() { + } + +}