diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java index 8d5faaf25..6338b280f 100644 --- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java @@ -331,9 +331,12 @@ public class MavenProjectParser { public static List getMavenPoms(Path projectDir, ExecutionContext ctx, Function parserInputProvider) { return getSources(projectDir, ctx, parserInputProvider, "pom.xml").stream().filter(p -> { - String pathStr = p.getPath().toString(); - return p.getPath().getFileName().toString().equals("pom.xml") && !pathStr.contains("/src/") - && !pathStr.contains("/bin/") && !pathStr.contains("/target/"); + Path relativeToProject = projectDir.relativize(p.getPath()); + String relativePathStr = relativeToProject.toString(); + return relativeToProject.getFileName().toString().equals("pom.xml") + && !relativePathStr.contains("/src/") && !relativePathStr.startsWith("src/") + && !relativePathStr.contains("/bin/") && !relativePathStr.startsWith("bin/") + && !relativePathStr.contains("/target/") && !relativePathStr.startsWith("target/"); }).collect(Collectors.toList()); } diff --git a/headless-services/commons/commons-rewrite/src/test/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParserTest.java b/headless-services/commons/commons-rewrite/src/test/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParserTest.java new file mode 100644 index 000000000..64fa218b0 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParserTest.java @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright (c) 2023 VMware, 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: + * VMware, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.commons.rewrite.maven; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.Test; +import org.openrewrite.InMemoryExecutionContext; +import org.openrewrite.SourceFile; +import org.openrewrite.java.JavaParser; +import org.openrewrite.java.marker.JavaSourceSet; +import org.openrewrite.java.tree.JavaSourceFile; +import org.openrewrite.maven.MavenParser; +import org.openrewrite.properties.tree.Properties; +import org.openrewrite.text.PlainText; +import org.openrewrite.yaml.tree.Yaml; + +public class MavenProjectParserTest { + + @Test + void parseResources() throws Exception { + URL resource = getClass().getResource("/test-projects/test-maven-project-parser"); + Path testProjectPath = Paths.get(resource.toURI()); + MavenParser.Builder mavenParserBuilder = MavenParser.builder() + .mavenConfig(testProjectPath.resolve(".mvn/maven.config")); + + MavenProjectParser parser = new MavenProjectParser(mavenParserBuilder, JavaParser.fromJavaVersion(), new InMemoryExecutionContext(), null); + + List sources = parser.parse(testProjectPath, Collections.emptyList()); + + assertEquals(12, sources.size()); + + // java sources + assertEquals(6, sources.stream().filter(JavaSourceFile.class::isInstance).collect(Collectors.toList()).size()); + + // java sources from main + assertEquals(5, sources.stream().filter(JavaSourceFile.class::isInstance).map(JavaSourceFile.class::cast).filter(j -> { + String sourceSetName = j.getMarkers().findFirst(JavaSourceSet.class).map(js -> js.getName()).orElse(null); + return MavenProjectParser.MAIN.equals(sourceSetName); + }).collect(Collectors.toList()).size()); + + // java sources from test + assertEquals(1, sources.stream().filter(JavaSourceFile.class::isInstance).map(JavaSourceFile.class::cast).filter(j -> { + String sourceSetName = j.getMarkers().findFirst(JavaSourceSet.class).map(js -> js.getName()).orElse(null); + return MavenProjectParser.TEST.equals(sourceSetName); + }).collect(Collectors.toList()).size()); + + // properties files + assertEquals(1, sources.stream().filter(Properties.File.class::isInstance).collect(Collectors.toList()).size()); + + // application properties + assertEquals(1, sources.stream().filter(Properties.File.class::isInstance).filter(f -> f.getSourcePath().getFileName().toString().equals("application.properties")).collect(Collectors.toList()).size()); + + // yaml files + assertEquals(2, sources.stream().filter(Yaml.Documents.class::isInstance).collect(Collectors.toList()).size()); + + // application yaml + assertEquals(2, sources.stream().filter(Yaml.Documents.class::isInstance).filter(f -> f.getSourcePath().getFileName().toString().equals("application.yml")).collect(Collectors.toList()).size()); + + // plain text files + assertEquals(2, sources.stream().filter(PlainText.class::isInstance).collect(Collectors.toList()).size()); + + // .factories files + assertEquals(2, sources.stream().filter(PlainText.class::isInstance).filter(f -> f.getSourcePath().getFileName().toString().endsWith(".factories")).collect(Collectors.toList()).size()); + + } + +} diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.gitignore b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.gitignore new file mode 100644 index 000000000..f75fb4133 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.gitignore @@ -0,0 +1,5 @@ +/.apt_generated/ +.project +.factorypath +.classpath +.settings \ No newline at end of file diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..c6feb8bb6 Binary files /dev/null and b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.jar differ diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..6637cedb2 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip \ No newline at end of file diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw new file mode 100755 index 000000000..f13e1380f --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw @@ -0,0 +1,236 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# 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 + +# 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" + +# 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 + +# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@ +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/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw.cmd b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw.cmd new file mode 100644 index 000000000..bb9bb461e --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/mvnw.cmd @@ -0,0 +1,146 @@ +@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 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=%MAVEN_CONFIG% %* + +@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 + +# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %* +%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/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/pom.xml b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/pom.xml new file mode 100644 index 000000000..005f0b724 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + com.example + test-maven-project-parser + 0.0.1-SNAPSHOT + jar + + demo + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + + + + + UTF-8 + 17 + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + + + diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/DemoApplication.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/DemoApplication.java new file mode 100644 index 000000000..6fce78941 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/DemoApplication.java @@ -0,0 +1,12 @@ +package com.example; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/Runner.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/Runner.java new file mode 100644 index 000000000..c419abba1 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/Runner.java @@ -0,0 +1,37 @@ +package com.example; + +import java.util.Map.Entry; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +import com.wellsfargo.lendingplatform.web.config.TestObjectWithList; + +@Component +public class Runner implements CommandLineRunner { + + @Autowired + TestMap props; + + @Override + public void run(String... arg0) throws Exception { + p(">>> test map"); + for (Entry e : props.getTestMap().entrySet()) { + p(e.getKey() + " -> "); + String[] strings = e.getValue().getStringList(); + if (strings==null) { + p(" null"); + } else { + for (String string : strings) { + p(" '"+string+"'"); + } + } + } + } + + private void p(String string) { + System.out.println(string); + } + +} diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/TestMap.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/TestMap.java new file mode 100644 index 000000000..f896c9f18 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/example/TestMap.java @@ -0,0 +1,25 @@ +package com.example; + +import java.util.LinkedHashMap; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import com.wellsfargo.lendingplatform.web.config.TestObjectWithList; + +@Component +@ConfigurationProperties +public class TestMap { + + private LinkedHashMap testMap; + + public LinkedHashMap getTestMap() { + return testMap; + } + + public void setTestMap(LinkedHashMap testMap) { + this.testMap = testMap; + } + +} + diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java new file mode 100644 index 000000000..d808bd990 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java @@ -0,0 +1,5 @@ +package com.wellsfargo.lendingplatform.web.config; + +public enum Color { + RED, GREEN, BLUE +} diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java new file mode 100644 index 000000000..d73447268 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java @@ -0,0 +1,33 @@ +package com.wellsfargo.lendingplatform.web.config; + +import java.util.List; + +public class TestObjectWithList { + private String[] stringList; + private Color[] colorList; + private List list; + + public String[] getStringList() { + return stringList; + } + + public void setStringList(String[] stringList) { + this.stringList = stringList; + } + + public Color[] getColorList() { + return colorList; + } + + public void setColorList(Color[] colorList) { + this.colorList = colorList; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} \ No newline at end of file diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.properties b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.properties new file mode 100644 index 000000000..73b813d27 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.properties @@ -0,0 +1,4 @@ +test-map.test-list-object.string-list[0]=not-a-color +test-map.test-list-object.string-list[1]=RED +test-map.test-list-object.string-list[2]=GREEN +test-map.some-key.list[0]=something diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.yml b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.yml new file mode 100644 index 000000000..5697ab735 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 6574 \ No newline at end of file diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/more.factories b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/more.factories new file mode 100644 index 000000000..e69de29bb diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/spring.factories b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/main/resources/spring.factories new file mode 100644 index 000000000..e69de29bb diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/java/com/example/DemoApplicationTests.java b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/java/com/example/DemoApplicationTests.java new file mode 100644 index 000000000..c900efbde --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/java/com/example/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/resources/application.yml b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/resources/application.yml new file mode 100644 index 000000000..57d009930 --- /dev/null +++ b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 3243 \ No newline at end of file diff --git a/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/resources/spring.factories b/headless-services/commons/commons-rewrite/src/test/resources/test-projects/test-maven-project-parser/src/test/resources/spring.factories new file mode 100644 index 000000000..e69de29bb