From 8e10a069e9ab35735ef2114fa85ca55a82f3088d Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 23 Feb 2018 18:42:38 +0100 Subject: [PATCH 01/12] disable lsp-based property editors for STS4 M9 build --- .../org.springframework.tooling.boot.ls/plugin.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml index ddfa01d79..42256a7a1 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml @@ -14,7 +14,7 @@ contentType="org.eclipse.jdt.core.javaSource" id="org.eclipse.languageserver.languages.springboot"> - @@ -23,9 +23,9 @@ contentType="org.springframework.boot.ide.properties.application.yml" id="org.eclipse.languageserver.languages.springboot" languageId="spring-boot-properties-yaml"> - + --> - + @@ -99,7 +99,7 @@ class="org.springframework.tooling.boot.ls.PrefsInitializer"> - + From 08e9df0f858dbe799210d0d7eddc0e4773ab7f6c Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 26 Feb 2018 10:08:55 +0100 Subject: [PATCH 02/12] removed Xverify:none option from distribution builds --- .../org.springframework.boot.ide.product | 3 +-- .../org.springframework.boot.ide.product | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product index a487d9e34..6b4564161 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product @@ -11,8 +11,7 @@ openFile -Dosgi.requiredJavaVersion=1.8 --add-modules=ALL-SYSTEM --Xms40m --Xverify:none +-Xms40m -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns -Xmx1200m diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product index a487d9e34..6b4564161 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product @@ -11,8 +11,7 @@ openFile -Dosgi.requiredJavaVersion=1.8 --add-modules=ALL-SYSTEM --Xms40m --Xverify:none +-Xms40m -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns -Xmx1200m From 2afcf168e40439034168549e6ecb2cc96c374c2a Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 26 Feb 2018 11:11:15 +0100 Subject: [PATCH 03/12] fix concourse content-type definitions for Eclipse --- .../org.springframework.tooling.concourse.ls/plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml index cd4a25b2b..87510270d 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml @@ -7,7 +7,7 @@ Date: Wed, 21 Feb 2018 12:14:10 +0100 Subject: [PATCH 04/12] initial test projects for webflux symbol support --- .../WebFluxMappingSymbolProviderTest.java | 70 ++++++ .../test-projects/test-webflux-project/mvnw | 233 ++++++++++++++++++ .../test-webflux-project/mvnw.cmd | 145 +++++++++++ .../test-webflux-project/pom.xml | 91 +++++++ .../src/main/java/org/test/Application.java | 17 ++ .../src/main/java/org/test/Quote.java | 61 +++++ .../main/java/org/test/QuoteGenerator.java | 67 +++++ .../src/main/java/org/test/QuoteHandler.java | 48 ++++ .../src/main/java/org/test/QuoteRouter.java | 28 +++ .../src/main/java/org/test/TradingUser.java | 72 ++++++ .../java/org/test/TradingUserRepository.java | 11 + .../main/java/org/test/UserController.java | 30 +++ 12 files changed, 873 insertions(+) create mode 100644 headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java create mode 100755 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java new file mode 100644 index 000000000..596971ee6 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java @@ -0,0 +1,70 @@ +/******************************************************************************* + * Copyright (c) 2018 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.requestmapping.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.lsp4j.SymbolInformation; +import org.junit.Before; +import org.junit.Test; +import org.springframework.ide.vscode.project.harness.BootJavaLanguageServerHarness; +import org.springframework.ide.vscode.project.harness.ProjectsHarness; + +/** + * @author Martin Lippert + */ +public class WebFluxMappingSymbolProviderTest { + + private BootJavaLanguageServerHarness harness; + + @Before + public void setup() throws Exception { + harness = BootJavaLanguageServerHarness.builder().build(); + } + + @Test + public void testSimpleRequestMappingSymbol() throws Exception { + harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI())); + File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI()); + + String docUri = directory.toPath().resolve("src/main/java/org/test/UserController.java").toUri().toString(); + List symbols = getSymbols(docUri); + assertEquals(4, symbols.size()); + assertTrue(containsSymbol(symbols, "@/users", docUri, 19, 1, 19, 74)); + assertTrue(containsSymbol(symbols, "@/users/{username}", docUri, 24, 1, 24, 85)); + } + + private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) { + for (Iterator iterator = symbols.iterator(); iterator.hasNext();) { + SymbolInformation symbol = iterator.next(); + + if (symbol.getName().equals(name) + && symbol.getLocation().getUri().equals(uri) + && symbol.getLocation().getRange().getStart().getLine() == startLine + && symbol.getLocation().getRange().getStart().getCharacter() == startCHaracter + && symbol.getLocation().getRange().getEnd().getLine() == endLine + && symbol.getLocation().getRange().getEnd().getCharacter() == endCharacter) { + return true; + } + } + + return false; + } + + private List getSymbols(String docUri) { + return harness.getServerWrapper().getComponents().getSpringIndexer().getSymbols(docUri); + } +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw new file mode 100755 index 000000000..a1ba1bf55 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw @@ -0,0 +1,233 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 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 + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + 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 Migwn, 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)`" + # TODO classpath? +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 + +# 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"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# 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} "$@" diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd new file mode 100644 index 000000000..2b934e89d --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd @@ -0,0 +1,145 @@ +@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 http://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 Maven2 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 key stroke 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 enable echoing my 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 + +set MAVEN_CMD_LINE_ARGS=%* + +@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="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +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% \ No newline at end of file diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml new file mode 100644 index 000000000..930b1a47c --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml @@ -0,0 +1,91 @@ + + + 4.0.0 + + com.example + test-webflux-project + 0.0.1-SNAPSHOT + jar + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.M1 + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-data-mongodb-reactive + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java new file mode 100644 index 000000000..bf2f6762a --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java @@ -0,0 +1,17 @@ +package org.test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + private static final Logger log = LoggerFactory.getLogger(Application.class); + + public static void main(String[] args) { + SpringApplication.run(Application.class); + } + +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java new file mode 100644 index 000000000..5e01b82c8 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java @@ -0,0 +1,61 @@ +package org.test; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.time.Instant; + +public class Quote { + + private static final MathContext MATH_CONTEXT = new MathContext(2); + + private String ticker; + + private BigDecimal price; + + private Instant instant; + + public Quote() { + } + + public Quote(String ticker, BigDecimal price) { + this.ticker = ticker; + this.price = price; + } + + public Quote(String ticker, Double price) { + this(ticker, new BigDecimal(price, MATH_CONTEXT)); + } + + public String getTicker() { + return ticker; + } + + public void setTicker(String ticker) { + this.ticker = ticker; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + public Instant getInstant() { + return instant; + } + + public void setInstant(Instant instant) { + this.instant = instant; + } + + @Override + public String toString() { + return "Quote{" + + "ticker='" + ticker + '\'' + + ", price=" + price + + ", instant=" + instant + + '}'; + } +} \ No newline at end of file diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java new file mode 100644 index 000000000..2d3450115 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java @@ -0,0 +1,67 @@ +package org.test; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.function.BiFunction; + +import reactor.core.publisher.Flux; +import reactor.core.publisher.SynchronousSink; + +import org.springframework.stereotype.Component; + +@Component +public class QuoteGenerator { + + private final MathContext mathContext = new MathContext(2); + + private final Random random = new Random(); + + private final List prices = new ArrayList<>(); + + /** + * Bootstraps the generator with tickers and initial prices + */ + public QuoteGenerator() { + this.prices.add(new Quote("CTXS", 82.26)); + this.prices.add(new Quote("DELL", 63.74)); + this.prices.add(new Quote("GOOG", 847.24)); + this.prices.add(new Quote("MSFT", 65.11)); + this.prices.add(new Quote("ORCL", 45.71)); + this.prices.add(new Quote("RHT", 84.29)); + this.prices.add(new Quote("VMW", 92.21)); + } + + + public Flux fetchQuoteStream(Duration period) { + + // We use here Flux.generate to create quotes, + // iterating on each stock starting at index 0 + return Flux.generate(() -> 0, + (BiFunction, Integer>) (index, sink) -> { + Quote updatedQuote = updateQuote(this.prices.get(index)); + sink.next(updatedQuote); + return ++index % this.prices.size(); + }) + // We want to emit them with a specific period; + // to do so, we zip that Flux with a Flux.interval + .zipWith(Flux.interval(period)).map(t -> t.getT1()) + // Because values are generated in batches, + // we need to set their timestamp after their creation + .map(quote -> { + quote.setInstant(Instant.now()); + return quote; + }) + .log("io.spring.workshop.stockquotes"); + } + + private Quote updateQuote(Quote quote) { + BigDecimal priceChange = quote.getPrice() + .multiply(new BigDecimal(0.05 * this.random.nextDouble()), this.mathContext); + return new Quote(quote.getTicker(), quote.getPrice().add(priceChange)); + } +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java new file mode 100644 index 000000000..e27ea5971 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java @@ -0,0 +1,48 @@ +package org.test; + +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.BodyInserters; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; + +import static java.time.Duration.ofMillis; +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.http.MediaType.APPLICATION_STREAM_JSON; +import static org.springframework.http.MediaType.TEXT_PLAIN; +import static org.springframework.web.reactive.function.server.ServerResponse.ok; + +@Component +public class QuoteHandler { + + private final Flux quoteStream; + + public QuoteHandler(QuoteGenerator quoteGenerator) { + this.quoteStream = quoteGenerator.fetchQuoteStream(ofMillis(200)).share(); + } + + public Mono hello(ServerRequest request) { + return ok().contentType(TEXT_PLAIN) + .body(BodyInserters.fromObject("Hello Spring!")); + } + + public Mono echo(ServerRequest request) { + return ok().contentType(TEXT_PLAIN) + .body(request.bodyToMono(String.class), String.class); + } + + public Mono streamQuotes(ServerRequest request) { + return ok() + .contentType(APPLICATION_STREAM_JSON) + .body(this.quoteStream, Quote.class); + } + + public Mono fetchQuotes(ServerRequest request) { + int size = Integer.parseInt(request.queryParam("size").orElse("10")); + return ok() + .contentType(APPLICATION_JSON) + .body(this.quoteStream.take(size), Quote.class); + } +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java new file mode 100644 index 000000000..a322a8cd4 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java @@ -0,0 +1,28 @@ +package org.test; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; +import org.springframework.web.reactive.function.server.ServerResponse; + +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.http.MediaType.APPLICATION_STREAM_JSON; +import static org.springframework.http.MediaType.TEXT_PLAIN; +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; +import static org.springframework.web.reactive.function.server.RequestPredicates.POST; +import static org.springframework.web.reactive.function.server.RequestPredicates.accept; +import static org.springframework.web.reactive.function.server.RequestPredicates.contentType; + +@Configuration +public class QuoteRouter { + + @Bean + public RouterFunction route(QuoteHandler quoteHandler) { + return RouterFunctions + .route(GET("/hello").and(accept(TEXT_PLAIN)), quoteHandler::hello) + .andRoute(POST("/echo").and(accept(TEXT_PLAIN).and(contentType(TEXT_PLAIN))), quoteHandler::echo) + .andRoute(GET("/quotes").and(accept(APPLICATION_JSON)), quoteHandler::fetchQuotes) + .andRoute(GET("/quotes").and(accept(APPLICATION_STREAM_JSON)), quoteHandler::streamQuotes); + } +} \ No newline at end of file diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java new file mode 100644 index 000000000..d25f38aa1 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java @@ -0,0 +1,72 @@ +package org.test; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class TradingUser { + + @Id + private String id; + + private String userName; + + private String fullName; + + public TradingUser() { + } + + public TradingUser(String id, String userName, String fullName) { + this.id = id; + this.userName = userName; + this.fullName = fullName; + } + + public TradingUser(String userName, String fullName) { + this.userName = userName; + this.fullName = fullName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + TradingUser that = (TradingUser) o; + + if (!id.equals(that.id)) return false; + return userName.equals(that.userName); + } + + @Override + public int hashCode() { + int result = id.hashCode(); + result = 31 * result + userName.hashCode(); + return result; + } +} + diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java new file mode 100644 index 000000000..2cf539025 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java @@ -0,0 +1,11 @@ +package org.test; + +import reactor.core.publisher.Mono; + +import org.springframework.data.mongodb.repository.ReactiveMongoRepository; + +public interface TradingUserRepository extends ReactiveMongoRepository { + + Mono findByUserName(String userName); + +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java new file mode 100644 index 000000000..64621ec86 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java @@ -0,0 +1,30 @@ +package org.test; + +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + private final TradingUserRepository tradingUserRepository; + + public UserController(TradingUserRepository tradingUserRepository) { + this.tradingUserRepository = tradingUserRepository; + } + + @GetMapping(path = "/users", produces = MediaType.APPLICATION_JSON_VALUE) + public Flux listUsers() { + return this.tradingUserRepository.findAll(); + } + + @GetMapping(path = "/users/{username}", produces = MediaType.APPLICATION_JSON_VALUE) + public Mono showUsers(@PathVariable String username) { + return this.tradingUserRepository.findByUserName(username); + } + +} \ No newline at end of file From 315d4286e9ab205f5441bf824d4bc616b1c86a21 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 21 Feb 2018 12:14:36 +0100 Subject: [PATCH 05/12] changes due to updated node and npm --- vscode-extensions/vscode-bosh/package.json | 4 ++-- vscode-extensions/vscode-concourse/package.json | 2 +- vscode-extensions/vscode-manifest-yaml/package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json index b097370f0..c7e1e589f 100644 --- a/vscode-extensions/vscode-bosh/package.json +++ b/vscode-extensions/vscode-bosh/package.json @@ -99,8 +99,8 @@ "vsce-package": "vsce package" }, "dependencies": { - "vscode-languageclient": "^3.4.2", - "commons-vscode": "0.1.4" + "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", + "vscode-languageclient": "^3.4.2" }, "devDependencies": { "vsce": "^1.36.1", diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json index c634840f5..34e86157f 100644 --- a/vscode-extensions/vscode-concourse/package.json +++ b/vscode-extensions/vscode-concourse/package.json @@ -90,7 +90,7 @@ "vsce-package": "vsce package" }, "dependencies": { - "commons-vscode": "0.1.4", + "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^3.4.2" }, "devDependencies": { diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index 58873fcae..4ba65a91f 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/vscode-extensions/vscode-manifest-yaml/package.json @@ -58,8 +58,8 @@ "vsce-package": "vsce package" }, "dependencies": { - "vscode-languageclient": "^3.4.2", - "commons-vscode": "0.1.4" + "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", + "vscode-languageclient": "^3.4.2" }, "devDependencies": { "vsce": "^1.36.1", From f381aa72d567ae0c7494b4313c85fca51a203d1b Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 22 Feb 2018 08:27:50 +0100 Subject: [PATCH 06/12] initial enhancements to support method body analysis for webflux symbol support, not yet finished --- .../BootJavaLanguageServerComponents.java | 2 + .../boot/java/beans/BeansSymbolProvider.java | 4 + .../java/beans/ComponentSymbolProvider.java | 6 ++ .../data/DataRepositorySymbolProvider.java | 6 ++ .../boot/java/handlers/SymbolProvider.java | 2 + .../RequestMappingSymbolProvider.java | 5 + .../WebfluxRouterSymbolProvider.java | 100 ++++++++++++++++++ .../vscode/boot/java/utils/SpringIndexer.java | 32 +++++- .../WebFluxMappingSymbolProviderTest.java | 12 +++ 9 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java index a4253d57c..68a4187fc 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java @@ -40,6 +40,7 @@ import org.springframework.ide.vscode.boot.java.livehover.ComponentInjectionsHov import org.springframework.ide.vscode.boot.java.requestmapping.LiveAppURLSymbolProvider; import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingHoverProvider; import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingSymbolProvider; +import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxRouterSymbolProvider; import org.springframework.ide.vscode.boot.java.scope.ScopeCompletionProcessor; import org.springframework.ide.vscode.boot.java.snippets.JavaSnippet; import org.springframework.ide.vscode.boot.java.snippets.JavaSnippetContext; @@ -281,6 +282,7 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent providers.put(Annotations.COMPONENT, new ComponentSymbolProvider()); providers.put(Annotations.REPOSITORY, new DataRepositorySymbolProvider()); + providers.put("", new WebfluxRouterSymbolProvider()); return new SpringIndexer(server, params, providers); } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java index 3878448ad..2937171a2 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java @@ -165,5 +165,9 @@ public class BeansSymbolProvider implements SymbolProvider { return false; } + @Override + public Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc) { + return null; + } } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java index a6829ff6a..9f2b6191e 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java @@ -16,6 +16,7 @@ import java.util.stream.Collectors; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.ITypeBinding; +import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.SymbolInformation; @@ -116,4 +117,9 @@ public class ComponentSymbolProvider implements SymbolProvider { return null; } + @Override + public Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc) { + return null; + } + } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java index b50524866..3f895e1d3 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.ITypeBinding; +import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.SymbolInformation; @@ -139,4 +140,9 @@ public class DataRepositorySymbolProvider implements SymbolProvider { } return beanName; } + + @Override + public Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc) { + return null; + } } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java index ff4802e26..2f8fc8b7f 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.ITypeBinding; +import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.SymbolInformation; import org.springframework.ide.vscode.commons.util.text.TextDocument; @@ -26,5 +27,6 @@ public interface SymbolProvider { Collection getSymbols(Annotation node, ITypeBinding typeBinding, Collection metaAnnotations, TextDocument doc); Collection getSymbols(TypeDeclaration typeDeclaration, TextDocument doc); + Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc); } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java index ec9d4d7a0..6e0d0ee58 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java @@ -181,4 +181,9 @@ public class RequestMappingSymbolProvider implements SymbolProvider { return null; } + @Override + public Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc) { + return null; + } + } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java new file mode 100644 index 000000000..60db3b12c --- /dev/null +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2018 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.requestmapping; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.Annotation; +import org.eclipse.jdt.core.dom.Block; +import org.eclipse.jdt.core.dom.IMethodBinding; +import org.eclipse.jdt.core.dom.ITypeBinding; +import org.eclipse.jdt.core.dom.MethodDeclaration; +import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.Type; +import org.eclipse.jdt.core.dom.TypeDeclaration; +import org.eclipse.lsp4j.SymbolInformation; +import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; +import org.springframework.ide.vscode.commons.util.text.TextDocument; + +/** + * @author Martin Lippert + */ +public class WebfluxRouterSymbolProvider implements SymbolProvider { + + private static final String ROUTER_FUNCTION_TYPE = "org.springframework.web.reactive.function.server.RouterFunction"; + private static final String ROUTER_FUNCTIONS_TYPE = "org.springframework.web.reactive.function.server.RouterFunctions"; + + @Override + public Collection getSymbols(Annotation node, ITypeBinding typeBinding, + Collection metaAnnotations, TextDocument doc) { + return null; + } + + @Override + public Collection getSymbols(TypeDeclaration typeDeclaration, TextDocument doc) { + return null; + } + + @Override + public Collection getSymbols(MethodDeclaration methodDeclaration, TextDocument doc) { + Type returnType = methodDeclaration.getReturnType2(); + if (returnType != null) { + ITypeBinding resolvedBinding = returnType.resolveBinding(); + if (resolvedBinding != null) { + if (ROUTER_FUNCTION_TYPE.equals(resolvedBinding.getBinaryName())) { + return getSymbolsForRouterFunction(methodDeclaration, doc); + } + } + } + return null; + } + + private Collection getSymbolsForRouterFunction(MethodDeclaration methodDeclaration, + TextDocument doc) { + List result = new ArrayList<>(); + + Block body = methodDeclaration.getBody(); + body.accept(new ASTVisitor() { + + @Override + public boolean visit(MethodInvocation node) { + IMethodBinding methodBinding = node.resolveMethodBinding(); + + if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName()) + && "route".equals(node.getName().toString())) { + extractMappingSymbol(node, doc, result); + } + else if (ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName()) + && "andRoute".equals(node.getName().toString())) { + extractMappingSymbol(node, doc, result); + } + + return super.visit(node); + } + + }); + + return result; + } + + protected void extractMappingSymbol(MethodInvocation node, TextDocument doc, List result) { + List arguments = node.arguments(); + if (arguments != null) { + for (Object argument : arguments) { + System.out.println(argument); + } + } + } + +} diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java index a9316a013..d97a73bbb 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java @@ -42,6 +42,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.FileASTRequestor; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MarkerAnnotation; +import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.NormalAnnotation; import org.eclipse.jdt.core.dom.SingleMemberAnnotation; import org.eclipse.jdt.core.dom.TypeDeclaration; @@ -346,7 +347,7 @@ public class SpringIndexer { parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true); parser.setBindingsRecovery(true); - parser.setResolveBindings(true); + parser.setResolveBindings(false); String[] sourceEntries = new String[] {}; parser.setEnvironment(classpathEntries, sourceEntries, null, true); @@ -377,7 +378,7 @@ public class SpringIndexer { parser.setStatementsRecovery(true); parser.setBindingsRecovery(true); parser.setResolveBindings(true); - parser.setIgnoreMethodBodies(true); + parser.setIgnoreMethodBodies(false); String[] sourceEntries = new String[] {}; parser.setEnvironment(classpathEntries, sourceEntries, null, true); @@ -408,6 +409,17 @@ public class SpringIndexer { return super.visit(node); } + @Override + public boolean visit(MethodDeclaration node) { + try { + extractSymbolInformation(node, docURI, docRef, content); + } + catch (Exception e) { + e.printStackTrace(); + } + return super.visit(node); + } + @Override public boolean visit(SingleMemberAnnotation node) { try { @@ -462,6 +474,22 @@ public class SpringIndexer { } } + private void extractSymbolInformation(MethodDeclaration methodDeclaration, String docURI, AtomicReference docRef, String content) throws Exception { + Collection providers = symbolProviders.getAll(); + if (!providers.isEmpty()) { + TextDocument doc = getTempTextDocument(docURI, docRef, content); + for (SymbolProvider provider : providers) { + Collection sbls = provider.getSymbols(methodDeclaration, doc); + if (sbls != null) { + sbls.forEach(symbol -> { + symbols.add(symbol); + symbolsByDoc.computeIfAbsent(docURI, s -> new ArrayList()).add(symbol); + }); + } + } + } + } + private void extractSymbolInformation(Annotation node, String docURI, AtomicReference docRef, String content) throws Exception { ITypeBinding typeBinding = node.resolveTypeBinding(); diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java index 596971ee6..dfe7c6409 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java @@ -47,6 +47,18 @@ public class WebFluxMappingSymbolProviderTest { assertTrue(containsSymbol(symbols, "@/users/{username}", docUri, 24, 1, 24, 85)); } + @Test + public void testRoutesMappingSymbols() throws Exception { + harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI())); + File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI()); + + String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString(); + List symbols = getSymbols(docUri); + assertEquals(6, symbols.size()); + assertTrue(containsSymbol(symbols, "@/hello", docUri, 22, 23, 22, 81)); + assertTrue(containsSymbol(symbols, "@/echo", docUri, 23, 1, 23, 85)); + } + private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) { for (Iterator iterator = symbols.iterator(); iterator.hasNext();) { SymbolInformation symbol = iterator.next(); From 6800c83c0d3bb0fd913e89c2cf3f61e22284ceb7 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 22 Feb 2018 17:02:28 +0100 Subject: [PATCH 07/12] finished first version of symbol support for webflux route definitions --- .../requestmapping/WebfluxPathFinder.java | 64 ++++++++++ .../WebfluxRouterSymbolProvider.java | 110 ++++++++++++++++-- .../WebFluxMappingSymbolProviderTest.java | 19 ++- .../src/main/java/org/test/NestedRouter.java | 33 ++++++ .../src/main/java/org/test/PersonHandler.java | 22 ++++ 5 files changed, 234 insertions(+), 14 deletions(-) create mode 100644 headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java create mode 100644 headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java new file mode 100644 index 000000000..1a5761cbf --- /dev/null +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2018 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.requestmapping; + +import org.eclipse.jdt.core.dom.ASTNode; +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.IMethodBinding; +import org.eclipse.jdt.core.dom.MethodInvocation; + +/** + * @author Martin Lippert + */ +public class WebfluxPathFinder extends ASTVisitor { + + private String path; + private ASTNode root; + + public WebfluxPathFinder(ASTNode root) { + this.root = root; + } + + public String getPath() { + return path; + } + + @Override + public boolean visit(MethodInvocation node) { + boolean visitChildren = true; + + if (node != this.root) { + IMethodBinding methodBinding = node.resolveMethodBinding(); + + if (WebfluxRouterSymbolProvider.REQUEST_PREDICATES_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if (name != null && WebfluxRouterSymbolProvider.REQUEST_PREDICATE_PATH_METHODS.contains(name)) { + path = WebfluxRouterSymbolProvider.extractPath(node); + } + } + + if (WebfluxRouterSymbolProvider.ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("route".equals(name)) { + visitChildren = false; + } + } + else if (WebfluxRouterSymbolProvider.ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("andRoute".equals(name)) { + visitChildren = false; + } + } + } + return visitChildren; + } + +} diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java index 60db3b12c..3fd355a3d 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java @@ -11,9 +11,13 @@ package org.springframework.ide.vscode.boot.java.requestmapping; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.ASTVisitor; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.Block; @@ -21,10 +25,14 @@ import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.StringLiteral; import org.eclipse.jdt.core.dom.Type; import org.eclipse.jdt.core.dom.TypeDeclaration; +import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.SymbolInformation; +import org.eclipse.lsp4j.SymbolKind; import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; +import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.text.TextDocument; /** @@ -32,8 +40,11 @@ import org.springframework.ide.vscode.commons.util.text.TextDocument; */ public class WebfluxRouterSymbolProvider implements SymbolProvider { - private static final String ROUTER_FUNCTION_TYPE = "org.springframework.web.reactive.function.server.RouterFunction"; - private static final String ROUTER_FUNCTIONS_TYPE = "org.springframework.web.reactive.function.server.RouterFunctions"; + public static final String ROUTER_FUNCTION_TYPE = "org.springframework.web.reactive.function.server.RouterFunction"; + public static final String ROUTER_FUNCTIONS_TYPE = "org.springframework.web.reactive.function.server.RouterFunctions"; + public static final String REQUEST_PREDICATES_TYPE = "org.springframework.web.reactive.function.server.RequestPredicates"; + + public static final Set REQUEST_PREDICATE_PATH_METHODS = new HashSet<>(Arrays.asList("path", "GET", "POST", "DELETE", "PUT", "PATCH", "HEAD", "OPTIONS")); @Override public Collection getSymbols(Annotation node, ITypeBinding typeBinding, @@ -71,13 +82,17 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { public boolean visit(MethodInvocation node) { IMethodBinding methodBinding = node.resolveMethodBinding(); - if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName()) - && "route".equals(node.getName().toString())) { - extractMappingSymbol(node, doc, result); + if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("route".equals(name)) { + extractMappingSymbol(node, doc, result); + } } - else if (ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName()) - && "andRoute".equals(node.getName().toString())) { - extractMappingSymbol(node, doc, result); + else if (ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("andRoute".equals(name)) { + extractMappingSymbol(node, doc, result); + } } return super.visit(node); @@ -89,12 +104,83 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { } protected void extractMappingSymbol(MethodInvocation node, TextDocument doc, List result) { - List arguments = node.arguments(); - if (arguments != null) { - for (Object argument : arguments) { - System.out.println(argument); + String foundPath = extractPathFromRouterFunction(node); + String path = extractPath(node, foundPath); + String httpMethod = extractMethod(node); + + int methodNameStart = node.getName().getStartPosition(); + int invocationStart = node.getStartPosition(); + + if (path != null && path.length() > 0) { + try { + Location location = new Location(doc.getUri(), doc.toRange(methodNameStart, node.getLength() - (methodNameStart - invocationStart))); + String label = "@" + (path.startsWith("/") ? path : ("/" + path)) + (httpMethod == null || httpMethod.isEmpty() ? "" : " -- " + httpMethod); + result.add(new SymbolInformation(label, SymbolKind.Interface, location)); + } catch (BadLocationException e) { + e.printStackTrace(); } } } + private String extractPathFromRouterFunction(MethodInvocation routerInvocation) { + WebfluxPathFinder pathFinder = new WebfluxPathFinder(routerInvocation); + routerInvocation.accept(pathFinder); + + String path = pathFinder.getPath(); + if (path == null) path = ""; + + return path; + } + + private String extractPath(ASTNode node, String path) { + if (node == null || node instanceof TypeDeclaration) { + return path; + } + + if (node instanceof MethodInvocation) { + MethodInvocation methodInvocation = (MethodInvocation) node; + IMethodBinding methodBinding = methodInvocation.resolveMethodBinding(); + + if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("nest".equals(name)) { + List arguments = methodInvocation.arguments(); + for (Object argument : arguments) { + if (argument instanceof MethodInvocation) { + MethodInvocation nestedMethod = (MethodInvocation) argument; + IMethodBinding nestedMethodBinding = nestedMethod.resolveMethodBinding(); + + String nestedMethodName = nestedMethodBinding.getName(); + if ("path".equals(nestedMethodName)) { + String additionalPath = extractPath(nestedMethod); + if (additionalPath != null && additionalPath.length() > 0) { + path = additionalPath + path; + } + } + } + + } + } + } + } + + return extractPath(node.getParent(), path); + } + + protected static String extractPath(MethodInvocation node) { + List arguments = node.arguments(); + if (arguments != null && arguments.size() > 0) { + Object object = arguments.get(0); + if (object instanceof StringLiteral) { + String path = ((StringLiteral) object).getLiteralValue(); + return path; + } + } + return null; + } + + private String extractMethod(MethodInvocation node) { + return null; + } + } diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java index dfe7c6409..1d1f72ae0 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java @@ -55,8 +55,23 @@ public class WebFluxMappingSymbolProviderTest { String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString(); List symbols = getSymbols(docUri); assertEquals(6, symbols.size()); - assertTrue(containsSymbol(symbols, "@/hello", docUri, 22, 23, 22, 81)); - assertTrue(containsSymbol(symbols, "@/echo", docUri, 23, 1, 23, 85)); + assertTrue(containsSymbol(symbols, "@/hello", docUri, 22, 5, 22, 70)); + assertTrue(containsSymbol(symbols, "@/echo", docUri, 23, 5, 23, 101)); + assertTrue(containsSymbol(symbols, "@/quotes", docUri, 24, 5, 24, 86)); + assertTrue(containsSymbol(symbols, "@/quotes", docUri, 25, 5, 25, 94)); + } + + @Test + public void testNestedRoutesMappingSymbols() throws Exception { + harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI())); + File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI()); + + String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter.java").toUri().toString(); + List symbols = getSymbols(docUri); + assertEquals(5, symbols.size()); + assertTrue(containsSymbol(symbols, "@/person/{id}", docUri, 27, 6, 27, 45)); + assertTrue(containsSymbol(symbols, "@/person/", docUri, 29, 6, 29, 83)); + assertTrue(containsSymbol(symbols, "@/person", docUri, 28, 7, 28, 60)); } private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) { diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java new file mode 100644 index 000000000..89d063b17 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java @@ -0,0 +1,33 @@ +package org.test; + +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; +import static org.springframework.web.reactive.function.server.RequestPredicates.POST; +import static org.springframework.web.reactive.function.server.RequestPredicates.accept; +import static org.springframework.web.reactive.function.server.RequestPredicates.contentType; +import static org.springframework.web.reactive.function.server.RequestPredicates.method; +import static org.springframework.web.reactive.function.server.RequestPredicates.path; +import static org.springframework.web.reactive.function.server.RouterFunctions.nest; +import static org.springframework.web.reactive.function.server.RouterFunctions.route; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerResponse; + +@Configuration +public class NestedRouter { + + @Bean + public RouterFunction routingFunction() { + PersonHandler handler = new PersonHandler(); + + return nest(path("/person"), + nest(accept(APPLICATION_JSON), + route(GET("/{id}"), handler::getPerson) + .andRoute(method(HttpMethod.GET), handler::listPeople) + ).andRoute(POST("/").and(contentType(APPLICATION_JSON)), handler::createPerson)); + } + +} diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java new file mode 100644 index 000000000..a1bdb96b4 --- /dev/null +++ b/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java @@ -0,0 +1,22 @@ +package org.test; + +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; + +import reactor.core.publisher.Mono; + +public class PersonHandler { + + public Mono getPerson(ServerRequest request) { + return ServerResponse.notFound().build(); + } + + public Mono createPerson(ServerRequest request) { + return ServerResponse.notFound().build(); + } + + public Mono listPeople(ServerRequest request) { + return ServerResponse.notFound().build(); + } + +} From 05c0c8a90130b33eeac4135a289da65db970bb82 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 23 Feb 2018 18:31:07 +0100 Subject: [PATCH 08/12] added http methods to test cases for webflux symbols --- .../test/WebFluxMappingSymbolProviderTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java index 1d1f72ae0..d7040c67a 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java @@ -55,10 +55,10 @@ public class WebFluxMappingSymbolProviderTest { String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString(); List symbols = getSymbols(docUri); assertEquals(6, symbols.size()); - assertTrue(containsSymbol(symbols, "@/hello", docUri, 22, 5, 22, 70)); - assertTrue(containsSymbol(symbols, "@/echo", docUri, 23, 5, 23, 101)); - assertTrue(containsSymbol(symbols, "@/quotes", docUri, 24, 5, 24, 86)); - assertTrue(containsSymbol(symbols, "@/quotes", docUri, 25, 5, 25, 94)); + assertTrue(containsSymbol(symbols, "@/hello -- GET", docUri, 22, 5, 22, 70)); + assertTrue(containsSymbol(symbols, "@/echo -- POST", docUri, 23, 5, 23, 101)); + assertTrue(containsSymbol(symbols, "@/quotes -- GET", docUri, 24, 5, 24, 86)); + assertTrue(containsSymbol(symbols, "@/quotes -- GET", docUri, 25, 5, 25, 94)); } @Test @@ -69,9 +69,9 @@ public class WebFluxMappingSymbolProviderTest { String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter.java").toUri().toString(); List symbols = getSymbols(docUri); assertEquals(5, symbols.size()); - assertTrue(containsSymbol(symbols, "@/person/{id}", docUri, 27, 6, 27, 45)); - assertTrue(containsSymbol(symbols, "@/person/", docUri, 29, 6, 29, 83)); - assertTrue(containsSymbol(symbols, "@/person", docUri, 28, 7, 28, 60)); + assertTrue(containsSymbol(symbols, "@/person/{id} -- GET", docUri, 27, 6, 27, 45)); + assertTrue(containsSymbol(symbols, "@/person/ -- POST", docUri, 29, 6, 29, 83)); + assertTrue(containsSymbol(symbols, "@/person -- GET", docUri, 28, 7, 28, 60)); } private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) { From 66290f0dca754128af4ee25e5105ac2fe615b264 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 26 Feb 2018 11:43:21 +0100 Subject: [PATCH 09/12] added http method support to webflux symbol provider --- .../requestmapping/WebfluxMethodFinder.java | 75 +++++++++++++++++++ .../requestmapping/WebfluxPathFinder.java | 20 ++--- .../WebfluxRouterSymbolProvider.java | 49 +++--------- .../java/requestmapping/WebfluxUtils.java | 69 +++++++++++++++++ 4 files changed, 161 insertions(+), 52 deletions(-) create mode 100644 headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java create mode 100644 headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java new file mode 100644 index 000000000..a8a48ef55 --- /dev/null +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java @@ -0,0 +1,75 @@ +/******************************************************************************* + * Copyright (c) 2018 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.requestmapping; + +import java.util.List; + +import org.eclipse.jdt.core.dom.ASTNode; +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.IMethodBinding; +import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.QualifiedName; + +/** + * @author Martin Lippert + */ +public class WebfluxMethodFinder extends ASTVisitor { + + private String method; + private ASTNode root; + + public WebfluxMethodFinder(ASTNode root) { + this.root = root; + } + + public String getMethod() { + return method; + } + + @Override + public boolean visit(MethodInvocation node) { + boolean visitChildren = true; + + if (node != this.root) { + IMethodBinding methodBinding = node.resolveMethodBinding(); + + if (WebfluxUtils.REQUEST_PREDICATES_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if (name != null && WebfluxUtils.REQUEST_PREDICATE_HTTPMETHOD_METHODS.contains(name)) { + method = name; + } + else if (name != null && WebfluxUtils.REQUEST_PREDICATE_METHOD_METHOD.equals(name)) { + method = extractMethodValue(node); + } + } + + if (WebfluxUtils.isRouteMethodInvocation(methodBinding)) { + visitChildren = false; + } + } + return visitChildren; + } + + private String extractMethodValue(MethodInvocation node) { + List arguments = node.arguments(); + if (arguments != null && arguments.size() > 0) { + Object object = arguments.get(0); + if (object instanceof QualifiedName) { + QualifiedName qualifiedName = (QualifiedName) object; + if (qualifiedName.getName() != null) { + return qualifiedName.getName().toString(); + } + } + } + return null; + } + +} diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java index 1a5761cbf..20260238f 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java @@ -38,25 +38,17 @@ public class WebfluxPathFinder extends ASTVisitor { if (node != this.root) { IMethodBinding methodBinding = node.resolveMethodBinding(); - if (WebfluxRouterSymbolProvider.REQUEST_PREDICATES_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + if (WebfluxUtils.REQUEST_PREDICATES_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { String name = methodBinding.getName(); - if (name != null && WebfluxRouterSymbolProvider.REQUEST_PREDICATE_PATH_METHODS.contains(name)) { - path = WebfluxRouterSymbolProvider.extractPath(node); + if (name != null && WebfluxUtils.REQUEST_PREDICATE_ALL_PATH_METHODS.contains(name)) { + path = WebfluxUtils.extractPath(node); } } - if (WebfluxRouterSymbolProvider.ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { - String name = methodBinding.getName(); - if ("route".equals(name)) { - visitChildren = false; - } - } - else if (WebfluxRouterSymbolProvider.ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { - String name = methodBinding.getName(); - if ("andRoute".equals(name)) { - visitChildren = false; - } + if (WebfluxUtils.isRouteMethodInvocation(methodBinding)) { + visitChildren = false; } + } return visitChildren; } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java index 3fd355a3d..db3af6d1f 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java @@ -11,11 +11,8 @@ package org.springframework.ide.vscode.boot.java.requestmapping; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.ASTVisitor; @@ -25,7 +22,6 @@ import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.MethodInvocation; -import org.eclipse.jdt.core.dom.StringLiteral; import org.eclipse.jdt.core.dom.Type; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.Location; @@ -40,12 +36,6 @@ import org.springframework.ide.vscode.commons.util.text.TextDocument; */ public class WebfluxRouterSymbolProvider implements SymbolProvider { - public static final String ROUTER_FUNCTION_TYPE = "org.springframework.web.reactive.function.server.RouterFunction"; - public static final String ROUTER_FUNCTIONS_TYPE = "org.springframework.web.reactive.function.server.RouterFunctions"; - public static final String REQUEST_PREDICATES_TYPE = "org.springframework.web.reactive.function.server.RequestPredicates"; - - public static final Set REQUEST_PREDICATE_PATH_METHODS = new HashSet<>(Arrays.asList("path", "GET", "POST", "DELETE", "PUT", "PATCH", "HEAD", "OPTIONS")); - @Override public Collection getSymbols(Annotation node, ITypeBinding typeBinding, Collection metaAnnotations, TextDocument doc) { @@ -63,7 +53,7 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { if (returnType != null) { ITypeBinding resolvedBinding = returnType.resolveBinding(); if (resolvedBinding != null) { - if (ROUTER_FUNCTION_TYPE.equals(resolvedBinding.getBinaryName())) { + if (WebfluxUtils.ROUTER_FUNCTION_TYPE.equals(resolvedBinding.getBinaryName())) { return getSymbolsForRouterFunction(methodDeclaration, doc); } } @@ -82,17 +72,8 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { public boolean visit(MethodInvocation node) { IMethodBinding methodBinding = node.resolveMethodBinding(); - if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { - String name = methodBinding.getName(); - if ("route".equals(name)) { - extractMappingSymbol(node, doc, result); - } - } - else if (ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { - String name = methodBinding.getName(); - if ("andRoute".equals(name)) { - extractMappingSymbol(node, doc, result); - } + if (WebfluxUtils.isRouteMethodInvocation(methodBinding)) { + extractMappingSymbol(node, doc, result); } return super.visit(node); @@ -141,7 +122,7 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { MethodInvocation methodInvocation = (MethodInvocation) node; IMethodBinding methodBinding = methodInvocation.resolveMethodBinding(); - if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + if (WebfluxUtils.ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { String name = methodBinding.getName(); if ("nest".equals(name)) { List arguments = methodInvocation.arguments(); @@ -152,7 +133,7 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { String nestedMethodName = nestedMethodBinding.getName(); if ("path".equals(nestedMethodName)) { - String additionalPath = extractPath(nestedMethod); + String additionalPath = WebfluxUtils.extractPath(nestedMethod); if (additionalPath != null && additionalPath.length() > 0) { path = additionalPath + path; } @@ -167,20 +148,12 @@ public class WebfluxRouterSymbolProvider implements SymbolProvider { return extractPath(node.getParent(), path); } - protected static String extractPath(MethodInvocation node) { - List arguments = node.arguments(); - if (arguments != null && arguments.size() > 0) { - Object object = arguments.get(0); - if (object instanceof StringLiteral) { - String path = ((StringLiteral) object).getLiteralValue(); - return path; - } - } - return null; - } - - private String extractMethod(MethodInvocation node) { - return null; + private String extractMethod(MethodInvocation routerInvocation) { + WebfluxMethodFinder methodFinder = new WebfluxMethodFinder(routerInvocation); + routerInvocation.accept(methodFinder); + + String method = methodFinder.getMethod(); + return method; } } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java new file mode 100644 index 000000000..6de785cda --- /dev/null +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2018 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.requestmapping; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.jdt.core.dom.IMethodBinding; +import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.StringLiteral; + +/** + * @author Martin Lippert + */ +public class WebfluxUtils { + + public static final String ROUTER_FUNCTION_TYPE = "org.springframework.web.reactive.function.server.RouterFunction"; + public static final String ROUTER_FUNCTIONS_TYPE = "org.springframework.web.reactive.function.server.RouterFunctions"; + public static final String REQUEST_PREDICATES_TYPE = "org.springframework.web.reactive.function.server.RequestPredicates"; + + public static final String REQUEST_PREDICATE_PATH_METHOD = "path"; + public static final String REQUEST_PREDICATE_METHOD_METHOD = "method"; + + public static final Set REQUEST_PREDICATE_HTTPMETHOD_METHODS = new HashSet<>(Arrays.asList("GET", "POST", "DELETE", "PUT", "PATCH", "HEAD", "OPTIONS")); + public static final Set REQUEST_PREDICATE_ALL_PATH_METHODS = new HashSet<>(Arrays.asList(REQUEST_PREDICATE_PATH_METHOD, "GET", "POST", "DELETE", "PUT", "PATCH", "HEAD", "OPTIONS")); + + + public static String extractPath(MethodInvocation node) { + List arguments = node.arguments(); + if (arguments != null && arguments.size() > 0) { + Object object = arguments.get(0); + if (object instanceof StringLiteral) { + String path = ((StringLiteral) object).getLiteralValue(); + return path; + } + } + return null; + } + + public static boolean isRouteMethodInvocation(IMethodBinding methodBinding) { + if (ROUTER_FUNCTIONS_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("route".equals(name)) { + return true; + } + } + else if (ROUTER_FUNCTION_TYPE.equals(methodBinding.getDeclaringClass().getBinaryName())) { + String name = methodBinding.getName(); + if ("andRoute".equals(name)) { + return true; + } + } + + return false; + + } + + +} From f0b2e36c87aaf629dbf3618b35a98993c002badd Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 26 Feb 2018 11:57:47 +0100 Subject: [PATCH 10/12] bugfix for not resolving bindings for individual source files anymore --- .../ide/vscode/boot/java/utils/SpringIndexer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java index d97a73bbb..4224bcf29 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java @@ -347,7 +347,8 @@ public class SpringIndexer { parser.setKind(ASTParser.K_COMPILATION_UNIT); parser.setStatementsRecovery(true); parser.setBindingsRecovery(true); - parser.setResolveBindings(false); + parser.setResolveBindings(true); + parser.setIgnoreMethodBodies(false); String[] sourceEntries = new String[] {}; parser.setEnvironment(classpathEntries, sourceEntries, null, true); From 77e61ac727ec90081764796eca3ede346cfe9b84 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 26 Feb 2018 15:26:16 +0100 Subject: [PATCH 11/12] added eclipse marketplace client to distribution build --- .../org.springframework.boot.ide.product | 1 + .../org.springframework.boot.ide.product | 1 + 2 files changed, 2 insertions(+) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product index 6b4564161..5c5de4e9f 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product @@ -66,6 +66,7 @@ openFile + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product index 6b4564161..5c5de4e9f 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product @@ -66,6 +66,7 @@ openFile + From d8e7ce177bfa44bda04590aa6a2ec999ebc45ecc Mon Sep 17 00:00:00 2001 From: Paul Verest Date: Tue, 27 Feb 2018 00:38:22 +0800 Subject: [PATCH 12/12] Name wording: Tools instead of Support Of course, it is for authors to name their creation. Nevertheless, there are now 2 VSCode extension with name "Spring Boot Support". And also current published version is the same version number as previous obsolete: 0.1.4 That make confusion. Also Tools is used in https://spring.io/tools4 and has been unique word on Eclipse marketplace. --- vscode-extensions/vscode-spring-boot/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index cdda6eccc..5a9e1321d 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -1,6 +1,6 @@ { "name": "vscode-spring-boot", - "displayName": "Spring Boot Support", + "displayName": "Spring Boot Tools", "description": "Provides validation and content assist for Spring Boot `application.properties`, `application.yml` properties files. As well as Boot-specific support for `.java` files.", "icon": "spring-boot-logo.png", "version": "0.1.5",