From c04aade997a8fcc1dde1c745f04e957b875443a5 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Sat, 25 Jul 2020 12:06:54 +0200 Subject: [PATCH] added spel syntax validation for xml spring config files --- .../SpringXMLLanguageServerComponents.java | 15 ++ .../boot/xml/SpringXMLReconcileEngine.java | 99 ++++++++ .../vscode/boot/xml/XMLElementReconciler.java | 74 ++++++ .../vscode/boot/xml/XmlConfigConstants.java | 1 + .../test/XMLSpelExpressionValidationTest.java | 175 +++++++++++++ .../test-projects/test-xml-validations/mvnw | 233 ++++++++++++++++++ .../test-xml-validations/mvnw.cmd | 145 +++++++++++ .../test-xml-validations/pom.xml | 158 ++++++++++++ .../src/main/java/u/t/r/HomeController.java | 39 +++ .../src/main/java/u/t/r/SimpleObj.java | 5 + .../src/main/java/u/t/r/SuperTestBean.java | 15 ++ .../src/main/java/u/t/r/TestBean.java | 35 +++ .../webapp/WEB-INF/spring/root-context.xml | 14 ++ .../src/main/webapp/WEB-INF/web.xml | 33 +++ 14 files changed, 1041 insertions(+) create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLReconcileEngine.java create mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XMLElementReconciler.java create mode 100644 headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/XMLSpelExpressionValidationTest.java create mode 100755 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw.cmd create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/pom.xml create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/HomeController.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SimpleObj.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SuperTestBean.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/TestBean.java create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/spring/root-context.xml create mode 100644 headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/web.xml diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java index cf9cd46ec..a1a474603 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.xml; +import java.util.Optional; import java.util.Set; import org.slf4j.Logger; @@ -20,6 +21,7 @@ import org.springframework.ide.vscode.boot.app.SpringSymbolIndex; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; import org.springframework.ide.vscode.commons.languageserver.composable.LanguageServerComponents; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.util.HoverHandler; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.util.text.LanguageId; @@ -40,6 +42,8 @@ public class SpringXMLLanguageServerComponents implements LanguageServerComponen private final JavaProjectFinder projectFinder; private final SpringSymbolIndex symbolIndex; private final SpringXMLCompletionEngine completionEngine; + private final SpringXMLReconcileEngine reconcileEngine; + public SpringXMLLanguageServerComponents( SimpleLanguageServer server, @@ -56,6 +60,12 @@ public class SpringXMLLanguageServerComponents implements LanguageServerComponen server.onShutdown(this::shutdown); this.completionEngine = new SpringXMLCompletionEngine(this, server, projectFinder, symbolIndex, config); + this.reconcileEngine = new SpringXMLReconcileEngine(projectFinder); + + config.addListener(ignore -> { + reconcileEngine.setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled()); + }); + } @Override @@ -67,6 +77,11 @@ public class SpringXMLLanguageServerComponents implements LanguageServerComponen public ICompletionEngine getCompletionEngine() { return this.completionEngine; } + + @Override + public Optional getReconcileEngine() { + return Optional.of(this.reconcileEngine); + } @Override public HoverHandler getHoverProvider() { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLReconcileEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLReconcileEngine.java new file mode 100644 index 000000000..0c782ace0 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLReconcileEngine.java @@ -0,0 +1,99 @@ +/******************************************************************************* + * Copyright (c) 2020 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.xml; + +import static org.springframework.ide.vscode.boot.xml.XmlConfigConstants.BEANS_NAMESPACE; +import static org.springframework.ide.vscode.boot.xml.XmlConfigConstants.BEAN_ELEMENT; +import static org.springframework.ide.vscode.boot.xml.XmlConfigConstants.VALUE_ATTRIBUTE; +import static org.springframework.ide.vscode.boot.xml.XmlConfigConstants.PROPERTY_ELEMENT; + +import java.net.URI; + +import org.eclipse.lemminx.dom.DOMDocument; +import org.eclipse.lemminx.dom.DOMNode; +import org.eclipse.lemminx.dom.DOMParser; +import org.eclipse.lsp4j.TextDocumentIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ide.vscode.boot.java.handlers.SpelExpressionReconciler; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; +import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine; +import org.springframework.ide.vscode.commons.util.text.IDocument; + +/** + * @author Martin Lippert + */ +public class SpringXMLReconcileEngine implements IReconcileEngine { + + private static final Logger log = LoggerFactory.getLogger(SpringXMLReconcileEngine.class); + + private final JavaProjectFinder projectFinder; + private final SpelExpressionReconciler spelExpressionReconciler; + private final XMLElementReconciler[] reconcilers; + + public SpringXMLReconcileEngine(JavaProjectFinder projectFinder) { + this.projectFinder = projectFinder; + + this.spelExpressionReconciler = new SpelExpressionReconciler(); + + this.reconcilers = new XMLElementReconciler[] { + + new XMLElementReconciler(new XMLElementKey(BEANS_NAMESPACE, BEAN_ELEMENT, PROPERTY_ELEMENT, VALUE_ATTRIBUTE), "#{", "}", spelExpressionReconciler) + + }; + } + + public void setSpelExpressionSyntaxValidationEnabled(boolean spelExpressionValidationEnabled) { + this.spelExpressionReconciler.setEnabled(spelExpressionValidationEnabled); + } + + @Override + public void reconcile(final IDocument doc, final IProblemCollector problemCollector) { + IJavaProject project = projectFinder.find(new TextDocumentIdentifier(doc.getUri())).orElse(null); + URI uri = URI.create(doc.getUri()); + + if (project != null) { + + try { + problemCollector.beginCollecting(); + reconcileXML(doc, problemCollector); + } + finally { + problemCollector.endCollecting(); + } + } + } + + private void reconcileXML(final IDocument doc, final IProblemCollector problemCollector) { + String content = doc.get(); + + DOMParser parser = DOMParser.getInstance(); + DOMDocument dom = parser.parse(content, "", null); + reconcileNode(dom, problemCollector); + } + + private void reconcileNode(DOMNode node, IProblemCollector problemCollector) { + reconcile(node, problemCollector); + + for (DOMNode domNode : node.getChildren()) { + reconcileNode(domNode, problemCollector); + } + } + + private void reconcile(DOMNode node, IProblemCollector problemCollector) { + for (int i = 0; i < reconcilers.length; i++) { + reconcilers[i].visit(node, problemCollector); + } + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XMLElementReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XMLElementReconciler.java new file mode 100644 index 000000000..c10903615 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XMLElementReconciler.java @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2020 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.xml; + +import java.util.List; + +import org.eclipse.lemminx.dom.DOMAttr; +import org.eclipse.lemminx.dom.DOMNode; +import org.springframework.ide.vscode.boot.java.handlers.Reconciler; +import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; + +/** + * @author mlippert + */ +public class XMLElementReconciler { + + private final XMLElementKey xmlElementKey; + private final String prefix; + private final String postfix; + private final Reconciler reconciler; + + public XMLElementReconciler(XMLElementKey xmlElementKey, String prefix, String postfix, Reconciler reconciler) { + this.xmlElementKey = xmlElementKey; + this.prefix = prefix; + this.postfix = postfix; + this.reconciler = reconciler; + } + + public void visit(DOMNode node, IProblemCollector problemCollector) { + if (!this.xmlElementKey.getNamespaceURI().equals(node.getNamespaceURI())) { + return; + } + + if (!this.xmlElementKey.getElementName().equals(node.getLocalName())) { + return; + } + + if (this.xmlElementKey.getParentNodeName() != null && node.getParentNode() != null && !this.xmlElementKey.getParentNodeName().equals(node.getParentNode().getLocalName())) { + return; + } + + if (this.xmlElementKey.getAttributeName() == null) { + return; + } + + List attributeNodes = node.getAttributeNodes(); + for (DOMAttr attributeNode : attributeNodes) { + if (this.xmlElementKey.getAttributeName().equals(attributeNode.getLocalName())) { + visitAttributeNode(attributeNode, problemCollector); + } + } + } + + private void visitAttributeNode(DOMAttr attributeNode, IProblemCollector problemCollector) { + DOMNode valueNode = attributeNode.getNodeAttrValue(); + int start = valueNode.getStart(); + + String value = attributeNode.getNodeValue(); + + if (value != null && value.startsWith(prefix) && value.endsWith(postfix)) { + String valueToReconcile = value.substring(prefix.length(), value.length() - postfix.length()); + reconciler.reconcile(valueToReconcile, start + prefix.length() + 1, problemCollector); + } + } + +} diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java index 5cffc51eb..8a06a3018 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java @@ -42,6 +42,7 @@ public class XmlConfigConstants { public static final String VALUE_REF_ATTRIBUTE = "value-ref"; public static final String KEY_REF_ATTRIBUTE = "key-ref"; public static final String LOCAL_ATTRIBUTE = "local"; + public static final String VALUE_ATTRIBUTE = "value"; public static final String CONTEXT_NAMESPACE = "http://www.springframework.org/schema/context"; diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/XMLSpelExpressionValidationTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/XMLSpelExpressionValidationTest.java new file mode 100644 index 000000000..6cf0ed83b --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/XMLSpelExpressionValidationTest.java @@ -0,0 +1,175 @@ +/******************************************************************************* + * Copyright (c) 2020 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.value.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.io.IOUtils; +import org.eclipse.lsp4j.DidChangeConfigurationParams; +import org.eclipse.lsp4j.DidCloseTextDocumentParams; +import org.eclipse.lsp4j.DidOpenTextDocumentParams; +import org.eclipse.lsp4j.TextDocumentIdentifier; +import org.eclipse.lsp4j.TextDocumentItem; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; +import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; +import org.springframework.ide.vscode.boot.bootiful.XmlBeansTestConf; +import org.springframework.ide.vscode.boot.xml.SpringXMLReconcileEngine; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; +import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject; +import org.springframework.ide.vscode.commons.util.text.LanguageId; +import org.springframework.ide.vscode.commons.util.text.TextDocument; +import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness; +import org.springframework.ide.vscode.project.harness.ProjectsHarness; +import org.springframework.test.context.junit4.SpringRunner; + +import com.google.gson.Gson; + +/** + * @author Martin Lippert + */ +@RunWith(SpringRunner.class) +@BootLanguageServerTest +@Import(XmlBeansTestConf.class) +public class XMLSpelExpressionValidationTest { + + @Autowired private BootLanguageServerHarness harness; + @Autowired private SimpleLanguageServer server; + @Autowired private JavaProjectFinder projectFinder; + + private ProjectsHarness projects = ProjectsHarness.INSTANCE; + private MavenJavaProject project; + private SpringXMLReconcileEngine reconcileEngine; + private File directory; + private String docUri; + private TestProblemCollector problemCollector; + + @Before + public void setup() throws Exception { + harness.intialize(null); + + Map supportXML = new HashMap<>(); + supportXML.put("on", true); + supportXML.put("hyperlinks", true); + supportXML.put("scan-folders", "/src/main/"); + Map bootJavaObj = new HashMap<>(); + bootJavaObj.put("support-spring-xml-config", supportXML); + Map settings = new HashMap<>(); + settings.put("boot-java", bootJavaObj); + + harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings))); + + project = projects.mavenProject("test-xml-validations"); + harness.useProject(project); + + directory = new File(ProjectsHarness.class.getResource("/test-projects/test-xml-validations/").toURI()); + docUri = directory.toPath().resolve("src/main/webapp/WEB-INF/spring/root-context.xml").toUri().toString(); + + problemCollector = new TestProblemCollector(); + reconcileEngine = new SpringXMLReconcileEngine(projectFinder); + } + + @After + public void closeDoc() throws Exception { + TextDocumentIdentifier identifier = new TextDocumentIdentifier(docUri); + DidCloseTextDocumentParams closeParams = new DidCloseTextDocumentParams(identifier); + server.getTextDocumentService().didClose(closeParams); + server.getAsync().waitForAll(); + } + + @Test + public void testNoSpelExpressionFound() throws Exception { + TextDocument doc = prepareDocument("", "something"); + assertNotNull(doc); + + reconcileEngine.reconcile(doc, problemCollector); + + List problems = problemCollector.getCollectedProblems(); + assertEquals(0, problems.size()); + } + + @Test + public void testCorrectSpelExpressionFound() throws Exception { + TextDocument doc = prepareDocument("", "#{new String('hello world').toUpperCase()}"); + assertNotNull(doc); + + reconcileEngine.reconcile(doc, problemCollector); + + List problems = problemCollector.getCollectedProblems(); + assertEquals(0, problems.size()); + } + + @Test + public void testIncorrectSpelExpressionFound() throws Exception { + TextDocument doc = prepareDocument("", "#{new String('hello world).toUpperCase()}"); + assertNotNull(doc); + + reconcileEngine.reconcile(doc, problemCollector); + + List problems = problemCollector.getCollectedProblems(); + assertEquals(1, problems.size()); + } + + private TextDocument prepareDocument(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception { + String content = IOUtils.toString(new URI(docUri)); + + TextDocumentItem docItem = new TextDocumentItem(docUri, LanguageId.XML.toString(), 0, content); + DidOpenTextDocumentParams openParams = new DidOpenTextDocumentParams(docItem); + server.getTextDocumentService().didOpen(openParams); + server.getAsync().waitForAll(); + + TextDocument doc = server.getTextDocumentService().get(docUri); + + int position = content.indexOf(selectedAnnotation); + doc.replace(position, selectedAnnotation.length(), annotationStatementBeforeTest); + + return doc; + } + + public static class TestProblemCollector implements IProblemCollector { + + private List problems = new ArrayList<>(); + + @Override + public void beginCollecting() { + } + + @Override + public void endCollecting() { + } + + @Override + public void accept(ReconcileProblem problem) { + problems.add(problem); + } + + protected List getCollectedProblems() { + return problems; + } + + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw new file mode 100755 index 000000000..02217b1ec --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/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 +# +# 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 + +# 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/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/mvnw.cmd new file mode 100644 index 000000000..4b98b78c4 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/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 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=%* + +@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/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/pom.xml new file mode 100644 index 000000000..9a6d9c23c --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/pom.xml @@ -0,0 +1,158 @@ + + + 4.0.0 + u.t + test-xml-validations + test-xml-validations + war + 1.0.0-BUILD-SNAPSHOT + + 1.8 + 3.1.1.RELEASE + 1.6.10 + 1.6.6 + + + + + org.springframework + spring-context + ${org.springframework-version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${org.springframework-version} + + + + + org.aspectj + aspectjrt + ${org.aspectj-version} + + + + + org.slf4j + slf4j-api + ${org.slf4j-version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j-version} + runtime + + + org.slf4j + slf4j-log4j12 + ${org.slf4j-version} + runtime + + + log4j + log4j + 1.2.15 + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + + + + + javax.inject + javax.inject + 1 + + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + jstl + 1.2 + + + + + junit + junit + 4.7 + test + + + + + + maven-eclipse-plugin + 2.9 + + + org.springframework.ide.eclipse.core.springnature + + + org.springframework.ide.eclipse.core.springbuilder + + true + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + -Xlint:all + true + true + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + org.test.int1.Main + + + + + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/HomeController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/HomeController.java new file mode 100644 index 000000000..175525533 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/HomeController.java @@ -0,0 +1,39 @@ +package u.t.r; + +import java.text.DateFormat; +import java.util.Date; +import java.util.Locale; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * Handles requests for the application home page. + */ +@Controller +public class HomeController { + + private static final Logger logger = LoggerFactory.getLogger(HomeController.class); + + /** + * Simply selects the home view to render by returning its name. + */ + @RequestMapping(value = "/", method = RequestMethod.GET) + public String home(Locale locale, Model model) { + logger.info("Welcome home! The client locale is {}.", locale); + + Date date = new Date(); + DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, locale); + + String formattedDate = dateFormat.format(date); + + model.addAttribute("serverTime", formattedDate ); + + return "home"; + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SimpleObj.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SimpleObj.java new file mode 100644 index 000000000..937d84573 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SimpleObj.java @@ -0,0 +1,5 @@ +package u.t.r; + +public class SimpleObj { + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SuperTestBean.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SuperTestBean.java new file mode 100644 index 000000000..f75695412 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/SuperTestBean.java @@ -0,0 +1,15 @@ +package u.t.r; + +public class SuperTestBean { + + private String message; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/TestBean.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/TestBean.java new file mode 100644 index 000000000..8746b7d9b --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/java/u/t/r/TestBean.java @@ -0,0 +1,35 @@ +package u.t.r; + +public class TestBean extends SuperTestBean { + + private int age = 5; + + private TestBean spouse; + + private SimpleObj simple; + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public TestBean getSpouse() { + return spouse; + } + + public void setSpouse(TestBean spouse) { + this.spouse = spouse; + } + + public SimpleObj getSimple() { + return simple; + } + + public void setSimple(SimpleObj simple) { + this.simple = simple; + } + +} diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/spring/root-context.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/spring/root-context.xml new file mode 100644 index 000000000..8dbde3464 --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/spring/root-context.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/web.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..c9975d53c --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,33 @@ + + + + + + contextConfigLocation + /WEB-INF/spring/root-context.xml + + + + + org.springframework.web.context.ContextLoaderListener + + + + + appServlet + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/spring/appServlet/servlet-context.xml + + 1 + + + + appServlet + / + + +