diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java index 926fa85cf..21a7bdd30 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java @@ -11,6 +11,7 @@ package org.springframework.ide.vscode.commons.jandex; +import java.util.List; import java.util.stream.Stream; import org.jboss.jandex.MethodInfo; @@ -23,6 +24,12 @@ import org.springframework.ide.vscode.commons.javadoc.IJavadoc; public class MethodImpl implements IMethod { + /** + * Test code may set this to manually inject test data to make up for some missing + * capabilities of Jandex (e.g. discovering the names of method parameters). + */ + public static TestDataProvider testDataProvider = null; + private static final String JANDEX_CONTRUCTOR_NAME = ""; private IType declaringType; @@ -109,4 +116,13 @@ public class MethodImpl implements IMethod { return method.toString(); } + @Override + public List getParameterNames() { + if (testDataProvider!=null) { + return testDataProvider.getParameterNames(this); + } else { + throw new UnsupportedOperationException("Not supported with jandex"); + } + } + } diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TestDataProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TestDataProvider.java new file mode 100644 index 000000000..8ece3aa1d --- /dev/null +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TestDataProvider.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.commons.jandex; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.ide.vscode.commons.java.IMethod; +import org.springframework.ide.vscode.commons.util.Assert; + +import com.google.common.collect.ImmutableList; + +public class TestDataProvider { + + private Map> methodParameters = new HashMap<>(); + + public List getParameterNames(IMethod method) { + String key = method.getBindingKey(); + List l = methodParameters.get(method.getBindingKey()); + Assert.isLegal(l!=null, "Test code should provide method parameter names for '"+key+"'");; + return l; + } + + public void methodParams(String bindingKey, String... names) { + methodParameters.put(bindingKey, ImmutableList.copyOf(names)); + } + +} diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java index f3469e4c6..7b536c51f 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java @@ -12,6 +12,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.commons.java; +import java.util.List; import java.util.stream.Stream; public interface IMethod extends IMember { @@ -71,4 +72,6 @@ public interface IMethod extends IMember { return getDeclaringType().classpathContainer(); } + List getParameterNames(); + } diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java index 300a1718f..292d003e7 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java @@ -333,6 +333,11 @@ public class Wrappers { return data.isConstructor(); } + @Override + public List getParameterNames() { + return data.getParameterNames(); + } + }; } diff --git a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/java/TypeData.java b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/java/TypeData.java index f5f50687a..259488a17 100644 --- a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/java/TypeData.java +++ b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/java/TypeData.java @@ -313,6 +313,7 @@ public class TypeData extends TypeDescriptorData { private boolean constructor; private JavaTypeData returnType; private List parameters; + private List parameterNames; private List annotations; public String getBindingKey() { @@ -346,7 +347,7 @@ public class TypeData extends TypeDescriptorData { public void setReturnType(JavaTypeData returnType) { this.returnType = returnType; } - + public List getParameters() { return parameters; } @@ -355,6 +356,14 @@ public class TypeData extends TypeDescriptorData { this.parameters = parameters; } + public List getParameterNames() { + return parameterNames; + } + + public void setParameterNames(List parameterNames) { + this.parameterNames = parameterNames; + } + @Override public int hashCode() { final int prime = 31; @@ -362,6 +371,7 @@ public class TypeData extends TypeDescriptorData { result = prime * result + ((annotations == null) ? 0 : annotations.hashCode()); result = prime * result + ((bindingKey == null) ? 0 : bindingKey.hashCode()); result = prime * result + (constructor ? 1231 : 1237); + result = prime * result + ((parameterNames == null) ? 0 : parameterNames.hashCode()); result = prime * result + ((parameters == null) ? 0 : parameters.hashCode()); result = prime * result + ((returnType == null) ? 0 : returnType.hashCode()); return result; @@ -388,6 +398,11 @@ public class TypeData extends TypeDescriptorData { return false; if (constructor != other.constructor) return false; + if (parameterNames == null) { + if (other.parameterNames != null) + return false; + } else if (!parameterNames.equals(other.parameterNames)) + return false; if (parameters == null) { if (other.parameters != null) return false; @@ -400,6 +415,5 @@ public class TypeData extends TypeDescriptorData { return false; return true; } - } } diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java index f633e5f45..2f911d249 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java @@ -237,6 +237,7 @@ public class JavaData { data.setBindingKey(method.getKey()); ImmutableList.Builder annotationsBuilder = ImmutableList.builder(); ImmutableList.Builder parametersBuilder = ImmutableList.builder(); + ImmutableList.Builder paramNamesBuilder = ImmutableList.builder(); try { data.setConstructor(method.isConstructor()); data.setReturnType(createFromSignature(type, method.getReturnType())); @@ -259,6 +260,14 @@ public class JavaData { } data.setAnnotations(annotationsBuilder.build()); data.setParameters(parametersBuilder.build()); + try { + String[] paramNames = method.getParameterNames(); + if (paramNames!=null) { + data.setParameterNames(ImmutableList.copyOf(paramNames)); + } + } catch (JavaModelException e) { + //ignore. + } return data; } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java index ffc51a5bc..8d6d33170 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java @@ -49,6 +49,7 @@ import org.springframework.ide.vscode.commons.java.Flags; import org.springframework.ide.vscode.commons.java.IField; import org.springframework.ide.vscode.commons.java.IJavaElement; import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.IJavaType; import org.springframework.ide.vscode.commons.java.IMethod; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.util.AlwaysFailingParser; @@ -666,6 +667,7 @@ public class TypeUtil { private static final Map VALUE_HINTERS = new HashMap<>(); private static final Object JL_OBJECT = Object.class.getName(); + private static final String CONSTRUCTOR_BINDING = "org.springframework.boot.context.properties.ConstructorBinding"; static { valueHints("java.nio.charset.Charset", new LazyProvider() { @@ -741,29 +743,57 @@ public class TypeUtil { if (typeFromIndex != null) { IJavaProject project = getJavaProject(); ArrayList properties = new ArrayList<>(); - getGetterMethods(typeFromIndex).forEach(m -> { - Deprecation deprecation = DeprecationUtil.extract(m); - Type propType = null; - try { - propType = Type.fromJavaType(m.getReturnType()); - } catch (Exception e) { - log.error("", e); + Optional constructorBinding = findConstructorBinding(typeFromIndex); + if (constructorBinding.isPresent()) { + IMethod c = constructorBinding.get(); + List types = c.parameters().collect(Collectors.toList()); + List params = c.getParameterNames(); + int len = Math.min(params.size(), types.size()); + for (int i = 0; i < len; i++) { + Deprecation deprecation = null; + properties.add(new TypedProperty( + StringUtil.camelCaseToHyphens(params.get(i)), + Type.fromJavaType(types.get(i)), + deprecation + )); } - if (beanMode.includesHyphenated()) { - properties.add(new TypedProperty(getterOrSetterNameToProperty(m.getElementName()), propType, - Renderables.lazy(() -> PropertyDocUtils.documentJavaElement(sourceLinks, project, m)), deprecation)); - } - if (beanMode.includesCamelCase()) { - properties.add(new TypedProperty(getterOrSetterNameToCamelName(m.getElementName()), propType, - Renderables.lazy(() -> PropertyDocUtils.documentJavaElement(sourceLinks, project, m)), deprecation)); - } - }); + return properties; + } else { + getGetterMethods(typeFromIndex).forEach(m -> { + Deprecation deprecation = DeprecationUtil.extract(m); + Type propType = null; + try { + propType = Type.fromJavaType(m.getReturnType()); + } catch (Exception e) { + log.error("", e); + } + if (beanMode.includesHyphenated()) { + properties.add(new TypedProperty(getterOrSetterNameToProperty(m.getElementName()), propType, + Renderables.lazy(() -> PropertyDocUtils.documentJavaElement(sourceLinks, project, m)), deprecation)); + } + if (beanMode.includesCamelCase()) { + properties.add(new TypedProperty(getterOrSetterNameToCamelName(m.getElementName()), propType, + Renderables.lazy(() -> PropertyDocUtils.documentJavaElement(sourceLinks, project, m)), deprecation)); + } + }); + } return properties; } } return null; } + private Optional findConstructorBinding(IType type) { + return type.getMethods() + .filter(m -> m.isConstructor()) + .filter(m -> m.getAnnotations() + .anyMatch(annotation -> + CONSTRUCTOR_BINDING.equals(annotation.getElementName())) + ) + .findFirst(); + } + + /** * Registers a strategy for providing value hints with a given typeName. */ 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 cae93b4a3..190216657 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 @@ -18,10 +18,13 @@ import static org.springframework.ide.vscode.boot.test.DefinitionLinkAsserts.met import static org.springframework.ide.vscode.languageserver.testharness.Editor.INDENTED_COMPLETION; import java.time.Duration; +import java.util.HashMap; import java.util.Optional; import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.DiagnosticSeverity; +import org.junit.After; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,6 +47,12 @@ import org.springframework.ide.vscode.languageserver.testharness.CodeAction; import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.test.context.junit4.SpringRunner; +import com.google.common.collect.ImmutableList; + +import org.springframework.ide.vscode.commons.jandex.MethodImpl; +import org.springframework.ide.vscode.commons.jandex.TestDataProvider; + + /** * This class is a placeholder where we will attempt to copy and port * as many tests a possible from @@ -68,8 +77,51 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { } } + @Before + public void setup() { + MethodImpl.testDataProvider = new TestDataProvider(); + } + + @After + public void cleanups() { + MethodImpl.testDataProvider = null; + } + //////////////////////////////////////////////////////////////////////////////////////// + @Test public void GH_404_ConsutructorBinding_support() throws Exception { + useProject(createPredefinedMavenProject("gh_404")); + Editor editor; + + MethodImpl.testDataProvider.methodParams("Ltest/NestedConfigProperties;.(Ljava/lang/String;)V", "dude"); + + editor = newEditor( + "someConfig:\n" + + " nested:\n" + + " <*>" + ); + editor.assertCompletionLabels("dude"); //Only the property from constructor binding, not the one from setter! + + editor = newEditor( + "some-config:\n" + + " nested:\n" + + " <*>" + ); + editor.assertCompletionLabels("dude"); //Only the property from constructor binding, not the one from setter! + + editor = newEditor( + "someConfig:\n" + + " nested:\n" + + " bob: bob\n" + + " dude: dude\n" + + " bogus: bad\n" + ); + editor.assertProblems( + "bob|Unknown", + "bogus|Unknown" + ); + } + @Test public void abbreviateLongPrefixCompletions() throws Exception { //See: https://github.com/spring-projects/sts4/issues/361 Editor editor; diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.gitignore new file mode 100644 index 000000000..a2a3040aa --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### 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/ + +### VS Code ### +.vscode/ diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/MavenWrapperDownloader.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 000000000..e76d1f324 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed 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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..2cc7d4a55 Binary files /dev/null and b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.jar differ diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..642d572ce --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/mvnw new file mode 100755 index 000000000..a16b5431b --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/mvnw @@ -0,0 +1,310 @@ +#!/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 /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="`which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ + -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/gh_404/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/mvnw.cmd new file mode 100644 index 000000000..c8d43372c --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/mvnw.cmd @@ -0,0 +1,182 @@ +@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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% + +exit /B %ERROR_CODE% diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/pom.xml new file mode 100644 index 000000000..6b2a92bf4 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.5.RELEASE + + + com.example + gh_404 + 0.0.1-SNAPSHOT + gh_404 + Demo project for Spring Boot + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/com/example/demo/Application.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/com/example/demo/Application.java new file mode 100644 index 000000000..9b21b255e --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/com/example/demo/Application.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/ConfigProperties.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/ConfigProperties.java new file mode 100644 index 000000000..839f32d61 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/ConfigProperties.java @@ -0,0 +1,17 @@ +package test; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.ConstructorBinding; + +@ConfigurationProperties(prefix = "some-config") +public class ConfigProperties { + + public final NestedConfigProperties n1; + public final NestedConfigProperties n2; + + @ConstructorBinding + public ConfigProperties(NestedConfigProperties nested, NestedConfigProperties nested2) { + this.n1 = nested; + this.n2 = nested; + } +} \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/NestedConfigProperties.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/NestedConfigProperties.java new file mode 100644 index 000000000..0097d63ad --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/java/test/NestedConfigProperties.java @@ -0,0 +1,28 @@ +package test; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.ConstructorBinding; + +@ConfigurationProperties +public class NestedConfigProperties { + + private String dude; + private String bob; + + @ConstructorBinding + public NestedConfigProperties(String dude) { + this.dude = dude; + } + + public String getBob() { + return bob; + } + + public void setBob(String bob) { + this.bob = bob; + } + + public String getDude() { + return dude; + } +} \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/resources/application.yml new file mode 100644 index 000000000..2463bfb52 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/main/resources/application.yml @@ -0,0 +1,4 @@ +some-config: + nested: + dude: hello + bob: bbbba diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/test/java/com/example/demo/ApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/test/java/com/example/demo/ApplicationTests.java new file mode 100644 index 000000000..70a27d2ce --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/gh_404/src/test/java/com/example/demo/ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +}