From 52de79878904cc8dc61ce23d700da5f169445118 Mon Sep 17 00:00:00 2001 From: azerr Date: Wed, 10 Jul 2024 11:23:15 +0200 Subject: [PATCH] feat: Qute: add support for template records Fixes #956 Signed-off-by: azerr --- .../projects/maven/qute-record/.classpath | 40 +++ .../projects/maven/qute-record/.dockerignore | 5 + .../projects/maven/qute-record/.gitignore | 43 +++ .../maven/qute-record/.mvn/wrapper/.gitignore | 1 + .../.mvn/wrapper/MavenWrapperDownloader.java | 98 ++++++ .../.mvn/wrapper/maven-wrapper.properties | 18 + .../projects/maven/qute-record/.project | 23 ++ .../projects/maven/qute-record/README.md | 66 ++++ .../projects/maven/qute-record/mvnw | 308 ++++++++++++++++++ .../projects/maven/qute-record/mvnw.cmd | 205 ++++++++++++ .../projects/maven/qute-record/pom.xml | 121 +++++++ .../src/main/docker/Dockerfile.jvm | 97 ++++++ .../src/main/docker/Dockerfile.legacy-jar | 93 ++++++ .../src/main/docker/Dockerfile.native | 27 ++ .../src/main/docker/Dockerfile.native-micro | 30 ++ .../java/org/acme/sample/HelloResource.java | 22 ++ .../main/java/org/acme/sample/SomePage.java | 29 ++ .../src/main/resources/application.properties | 0 .../src/main/resources/templates/Hello.html | 11 + .../src/main/resources/templates/Hello2.html | 0 .../main/resources/templates/page.qute.html | 30 ++ .../com/redhat/qute/jdt/QuteProjectTest.java | 6 +- .../TemplateGetDataModelProjectTest.java | 33 ++ qute.jdt/com.redhat.qute.jdt/plugin.xml | 3 +- .../qute/jdt/QuteSupportForTemplate.java | 84 +++-- .../qute/jdt/internal/QuteJavaConstants.java | 2 + .../AbstractQuteTemplateLinkCollector.java | 52 ++- .../java/QuteJavaCodeLensCollector.java | 3 +- .../java/QuteJavaDiagnosticsCollector.java | 3 +- .../java/QuteJavaDocumentLinkCollector.java | 3 +- .../datamodel/CheckedTemplateSupport.java | 4 +- .../datamodel/TemplateFieldSupport.java | 5 +- .../datamodel/TemplateRecordsSupport.java | 110 +++++++ .../datamodel/AbstractDataModelProvider.java | 14 + ...erfaceImplementationDataModelProvider.java | 86 +++++ .../redhat/qute/services/QuteCodeLens.java | 17 +- 36 files changed, 1640 insertions(+), 52 deletions(-) create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.classpath create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.dockerignore create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.gitignore create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/.gitignore create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/maven-wrapper.properties create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.project create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/README.md create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw.cmd create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/pom.xml create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.jvm create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.legacy-jar create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native-micro create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/HelloResource.java create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/SomePage.java create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/application.properties create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello.html create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello2.html create mode 100644 qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/page.qute.html create mode 100644 qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateRecordsSupport.java create mode 100644 qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/template/datamodel/AbstractInterfaceImplementationDataModelProvider.java diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.classpath b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.classpath new file mode 100644 index 000000000..d2a08ebbb --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.classpath @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.dockerignore b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.dockerignore new file mode 100644 index 000000000..94810d006 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.dockerignore @@ -0,0 +1,5 @@ +* +!target/*-runner +!target/*-runner.jar +!target/lib/* +!target/quarkus-app/* \ No newline at end of file diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.gitignore b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.gitignore new file mode 100644 index 000000000..726d8ae39 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.gitignore @@ -0,0 +1,43 @@ +#Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +release.properties +.flattened-pom.xml + +# Eclipse +#.project +#.classpath +.settings/ +bin/ + +# IntelliJ +.idea +*.ipr +*.iml +*.iws + +# NetBeans +nb-configuration.xml + +# Visual Studio Code +.vscode +.factorypath + +# OSX +.DS_Store + +# Vim +*.swp +*.swo + +# patch +*.orig +*.rej + +# Local environment +.env + +# Plugin directory +/.quarkus/cli/plugins/ diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/.gitignore b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/.gitignore new file mode 100644 index 000000000..e72f5e8b7 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/.gitignore @@ -0,0 +1 @@ +maven-wrapper.jar diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/MavenWrapperDownloader.java b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 000000000..84d1e60d8 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,98 @@ +/* + * 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. + */ + +import java.io.IOException; +import java.io.InputStream; +import java.net.Authenticator; +import java.net.PasswordAuthentication; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public final class MavenWrapperDownloader +{ + private static final String WRAPPER_VERSION = "3.2.0"; + + private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) ); + + public static void main( String[] args ) + { + log( "Apache Maven Wrapper Downloader " + WRAPPER_VERSION ); + + if ( args.length != 2 ) + { + System.err.println( " - ERROR wrapperUrl or wrapperJarPath parameter missing" ); + System.exit( 1 ); + } + + try + { + log( " - Downloader started" ); + final URL wrapperUrl = new URL( args[0] ); + final String jarPath = args[1].replace( "..", "" ); // Sanitize path + final Path wrapperJarPath = Paths.get( jarPath ).toAbsolutePath().normalize(); + downloadFileFromURL( wrapperUrl, wrapperJarPath ); + log( "Done" ); + } + catch ( IOException e ) + { + System.err.println( "- Error downloading: " + e.getMessage() ); + if ( VERBOSE ) + { + e.printStackTrace(); + } + System.exit( 1 ); + } + } + + private static void downloadFileFromURL( URL wrapperUrl, Path wrapperJarPath ) + throws IOException + { + log( " - Downloading to: " + wrapperJarPath ); + if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) + { + final String username = System.getenv( "MVNW_USERNAME" ); + final char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); + Authenticator.setDefault( new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication( username, password ); + } + } ); + } + try ( InputStream inStream = wrapperUrl.openStream() ) + { + Files.copy( inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING ); + } + log( " - Downloader complete" ); + } + + private static void log( String msg ) + { + if ( VERBOSE ) + { + System.out.println( msg ); + } + } + +} diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/maven-wrapper.properties b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..11f586804 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.project b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.project new file mode 100644 index 000000000..8a16b06e1 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/.project @@ -0,0 +1,23 @@ + + + qute-record + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/README.md b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/README.md new file mode 100644 index 000000000..08a658eb0 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/README.md @@ -0,0 +1,66 @@ +# qute-record + +This project uses Quarkus, the Supersonic Subatomic Java Framework. + +If you want to learn more about Quarkus, please visit its website: . + +## Running the application in dev mode + +You can run your application in dev mode that enables live coding using: + +```shell script +./mvnw compile quarkus:dev +``` + +> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at . + +## Packaging and running the application + +The application can be packaged using: + +```shell script +./mvnw package +``` + +It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory. +Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory. + +The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`. + +If you want to build an _über-jar_, execute the following command: + +```shell script +./mvnw package -Dquarkus.package.jar.type=uber-jar +``` + +The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`. + +## Creating a native executable + +You can create a native executable using: + +```shell script +./mvnw package -Dnative +``` + +Or, if you don't have GraalVM installed, you can run the native executable build in a container using: + +```shell script +./mvnw package -Dnative -Dquarkus.native.container-build=true +``` + +You can then execute your native executable with: `./target/qute-record-1.0.0-SNAPSHOT-runner` + +If you want to learn more about building native executables, please consult . + +## Related Guides + +- REST Qute ([guide](https://quarkus.io/guides/qute-reference#rest_integration)): Qute integration for Quarkus REST. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it. + +## Provided Code + +### REST Qute + +Create your web page using Quarkus REST and Qute + +[Related guide section...](https://quarkus.io/guides/qute#type-safe-templates) diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw new file mode 100644 index 000000000..8d937f4c1 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw @@ -0,0 +1,308 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$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 + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw.cmd b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw.cmd new file mode 100644 index 000000000..c4586b564 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/mvnw.cmd @@ -0,0 +1,205 @@ +@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 Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/pom.xml b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/pom.xml new file mode 100644 index 000000000..a25ff9fd5 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + org.acme.sample + qute-record + 1.0.0-SNAPSHOT + + + 3.13.0 + 21 + UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 3.12.1 + true + 3.2.5 + + + + + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + + + + + io.quarkus + quarkus-rest-qute + + + io.quarkus + quarkus-arc + + + io.quarkus + quarkus-junit5 + test + + + + + + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus.platform.version} + true + + + + build + generate-code + generate-code-tests + native-image-agent + + + + + + maven-compiler-plugin + ${compiler-plugin.version} + + + -parameters + + + + + maven-surefire-plugin + ${surefire-plugin.version} + + + org.jboss.logmanager.LogManager + ${maven.home} + + + + + maven-failsafe-plugin + ${surefire-plugin.version} + + + + integration-test + verify + + + + + + ${project.build.directory}/${project.build.finalName}-runner + org.jboss.logmanager.LogManager + ${maven.home} + + + + + + + + + native + + + native + + + + false + true + + + + diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.jvm b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.jvm new file mode 100644 index 000000000..e2247ea0a --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.jvm @@ -0,0 +1,97 @@ +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode +# +# Before building the container image run: +# +# ./mvnw package +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/qute-record-jvm . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record-jvm +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005. +# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005 +# when running the container +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record-jvm +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") +# +### +FROM registry.access.redhat.com/ubi8/openjdk-21:1.19 + +ENV LANGUAGE='en_US:en' + + +# We make four distinct layers so if there are application changes the library layers can be re-used +COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ +COPY --chown=185 target/quarkus-app/*.jar /deployments/ +COPY --chown=185 target/quarkus-app/app/ /deployments/app/ +COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ + +EXPOSE 8080 +USER 185 +ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + +ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] + diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.legacy-jar b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.legacy-jar new file mode 100644 index 000000000..210aba354 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.legacy-jar @@ -0,0 +1,93 @@ +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode +# +# Before building the container image run: +# +# ./mvnw package -Dquarkus.package.jar.type=legacy-jar +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/qute-record-legacy-jar . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record-legacy-jar +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005. +# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005 +# when running the container +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record-legacy-jar +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") +# +### +FROM registry.access.redhat.com/ubi8/openjdk-21:1.19 + +ENV LANGUAGE='en_US:en' + + +COPY target/lib/* /deployments/lib/ +COPY target/*-runner.jar /deployments/quarkus-run.jar + +EXPOSE 8080 +USER 185 +ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + +ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native new file mode 100644 index 000000000..bb876f924 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native @@ -0,0 +1,27 @@ +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. +# +# Before building the container image run: +# +# ./mvnw package -Dnative +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.native -t quarkus/qute-record . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record +# +### +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 +WORKDIR /work/ +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + +EXPOSE 8080 +USER 1001 + +ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native-micro b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native-micro new file mode 100644 index 000000000..879ebe10e --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/docker/Dockerfile.native-micro @@ -0,0 +1,30 @@ +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. +# It uses a micro base image, tuned for Quarkus native executables. +# It reduces the size of the resulting container image. +# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image. +# +# Before building the container image run: +# +# ./mvnw package -Dnative +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/qute-record . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/qute-record +# +### +FROM quay.io/quarkus/quarkus-micro-image:2.0 +WORKDIR /work/ +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + +EXPOSE 8080 +USER 1001 + +ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/HelloResource.java b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/HelloResource.java new file mode 100644 index 000000000..6d97383ef --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/HelloResource.java @@ -0,0 +1,22 @@ +package org.acme.sample; + +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + +import io.quarkus.qute.TemplateInstance; + +@Path("hello") +public class HelloResource { + + record Hello(String name) implements TemplateInstance {} + + @GET + @Produces(MediaType.TEXT_PLAIN) + public TemplateInstance get(@QueryParam("name") String name) { + return new Hello(name).data("foo", 100); + } +} diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/SomePage.java b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/SomePage.java new file mode 100644 index 000000000..691fd7f46 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/java/org/acme/sample/SomePage.java @@ -0,0 +1,29 @@ +package org.acme.sample; + +import io.quarkus.qute.Template; +import io.quarkus.qute.TemplateInstance; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; + +import static java.util.Objects.requireNonNull; + +@Path("/some-page") +public class SomePage { + + private final Template page; + + public SomePage(Template page) { + this.page = requireNonNull(page, "page is required"); + } + + @GET + @Produces(MediaType.TEXT_HTML) + public TemplateInstance get(@QueryParam("name") String name) { + return page.data("name", name); + } + +} diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/application.properties b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/application.properties new file mode 100644 index 000000000..e69de29bb diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello.html b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello.html new file mode 100644 index 000000000..e74b9aef1 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello.html @@ -0,0 +1,11 @@ +{name} +{foo} + + + + + + + + + diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello2.html b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/Hello2.html new file mode 100644 index 000000000..e69de29bb diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/page.qute.html b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/page.qute.html new file mode 100644 index 000000000..203bd4b37 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-record/src/main/resources/templates/page.qute.html @@ -0,0 +1,30 @@ + + + + + Hello {name ?: "Qute"} + + + +

Hello {name ?: "Qute"}

+ +

Create your web page using Quarkus RESTEasy & Qute

+ + diff --git a/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/QuteProjectTest.java b/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/QuteProjectTest.java index 4d9ff3760..099655454 100644 --- a/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/QuteProjectTest.java +++ b/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/QuteProjectTest.java @@ -60,13 +60,11 @@ public static class QuteMavenProjectName { public static String quarkus3 = "quarkus3"; public static String quarkus_renarde_todo = "quarkus-renarde-todo"; - public static String qute_java17 = "qute-java17"; - public static String qute_messages = "qute-messages"; - public static String qute_quickstart = "qute-quickstart"; - + public static String qute_record = "qute-record"; + } @BeforeClass diff --git a/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java b/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java index 482f7cd65..6376463d0 100644 --- a/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java +++ b/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java @@ -378,4 +378,37 @@ public void quarkus3() throws Exception { assertValueResolver("inject", "org.acme.Bean2", "org.acme.Bean2", resolvers); } + @Test + public void quteRecord() throws Exception { + loadMavenProject(QuteMavenProjectName.qute_record); + + QuteDataModelProjectParams params = new QuteDataModelProjectParams(QuteMavenProjectName.qute_record); + DataModelProject> project = QuteSupportForTemplate.getInstance() + .getDataModelProject(params, getJDTUtils(), new NullProgressMonitor()); + Assert.assertNotNull(project); + + // public class HelloResource { + // record Hello(String name) implements TemplateInstance {} + + // Hello + DataModelTemplate helloTemplate = project + .findDataModelTemplate("src/main/resources/templates/Hello"); + Assert.assertNotNull(helloTemplate); + Assert.assertEquals("src/main/resources/templates/Hello", helloTemplate.getTemplateUri()); + Assert.assertEquals("org.acme.sample.HelloResource$Hello", helloTemplate.getSourceType()); + Assert.assertNull(helloTemplate.getSourceField()); + Assert.assertNull(helloTemplate.getSourceMethod()); + + List helloParameters = helloTemplate.getParameters(); + Assert.assertNotNull(helloParameters); + + Assert.assertEquals(2, helloParameters.size()); + + // record Hello(String name) implements TemplateInstance {} + assertParameter("name", "java.lang.String", false, helloParameters, 0); + + // public TemplateInstance get(@QueryParam("name") String name) { + // return new Hello(name).data("foo", 100); + assertParameter("foo", "int", true, helloParameters, 1); + } } diff --git a/qute.jdt/com.redhat.qute.jdt/plugin.xml b/qute.jdt/com.redhat.qute.jdt/plugin.xml index 6e95ae033..6a3e6e2f0 100644 --- a/qute.jdt/com.redhat.qute.jdt/plugin.xml +++ b/qute.jdt/com.redhat.qute.jdt/plugin.xml @@ -35,9 +35,10 @@ + + - diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/QuteSupportForTemplate.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/QuteSupportForTemplate.java index 488d7d4c7..8d26f7f87 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/QuteSupportForTemplate.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/QuteSupportForTemplate.java @@ -235,48 +235,68 @@ public Location getJavaDefinition(QuteJavaDefinitionParams params, IJDTUtils uti String parameterName = params.getSourceParameter(); boolean dataMethodInvocation = parameterName != null && params.isDataMethodInvocation(); - String fieldName = params.getSourceField(); - if (fieldName != null) { - IField field = type.getField(fieldName); - if (field == null || !field.exists()) { - // The field doesn't exist - return null; - } - + if (type.isRecord()) { + // The source type is a record if (dataMethodInvocation) { - // returns the location of "data" method invocation with the given parameter - // name - return TemplateDataSupport.getDataMethodInvocationLocation(field, parameterName, utils, monitor); - } - // returns field location - return utils.toLocation(field); - } - - String sourceMethod = params.getSourceMethod(); - if (sourceMethod != null) { - IMethod method = findMethod(type, sourceMethod); - if (method == null || !method.exists()) { - // The method doesn't exist - return null; + // returns the location of "data" method invocation with the given parameter + // name + return TemplateDataSupport.getDataMethodInvocationLocation(type, parameterName, utils, + monitor); + + } else { + // Search field of the record + IField recordField = type.getRecordComponent(parameterName); + if (recordField != null && recordField.exists()) { + // returns the record field location + return utils.toLocation(recordField); + } } + } else { + // The source type is a class + String fieldName = params.getSourceField(); + if (fieldName != null) { + IField field = type.getField(fieldName); + if (field == null || !field.exists()) { + // The field doesn't exist + return null; + } - if (parameterName != null) { if (dataMethodInvocation) { // returns the location of "data" method invocation with the given parameter // name - return TemplateDataSupport.getDataMethodInvocationLocation(method, parameterName, utils, monitor); + return TemplateDataSupport.getDataMethodInvocationLocation(field, parameterName, utils, monitor); } - ILocalVariable[] parameters = method.getParameters(); - for (ILocalVariable parameter : parameters) { - if (parameterName.equals(parameter.getElementName())) { - // returns the method parameter location - return utils.toLocation(parameter); + // returns field location + return utils.toLocation(field); + } + + String sourceMethod = params.getSourceMethod(); + if (sourceMethod != null) { + IMethod method = findMethod(type, sourceMethod); + if (method == null || !method.exists()) { + // The method doesn't exist + return null; + } + + if (parameterName != null) { + if (dataMethodInvocation) { + // returns the location of "data" method invocation with the given parameter + // name + return TemplateDataSupport.getDataMethodInvocationLocation(method, parameterName, utils, + monitor); + } + ILocalVariable[] parameters = method.getParameters(); + for (ILocalVariable parameter : parameters) { + if (parameterName.equals(parameter.getElementName())) { + // returns the method parameter location + return utils.toLocation(parameter); + } } + return null; } - return null; + // returns method location + return utils.toLocation(method); } - // returns method location - return utils.toLocation(method); } // returns Java type location return utils.toLocation(type); diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/QuteJavaConstants.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/QuteJavaConstants.java index e21422909..bcbf0368f 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/QuteJavaConstants.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/QuteJavaConstants.java @@ -28,6 +28,8 @@ public class QuteJavaConstants { public static final String TEMPLATE_CLASS = "io.quarkus.qute.Template"; + public static final String TEMPLATE_INSTANCE_INTERFACE = "io.quarkus.qute.TemplateInstance"; + public static final String ENGINE_BUILDER_CLASS = "io.quarkus.qute.EngineBuilder"; public static final String VALUE_ANNOTATION_NAME = "value"; diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/AbstractQuteTemplateLinkCollector.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/AbstractQuteTemplateLinkCollector.java index a9fc0f4af..fb8e99635 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/AbstractQuteTemplateLinkCollector.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/AbstractQuteTemplateLinkCollector.java @@ -27,11 +27,13 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.Expression; import org.eclipse.jdt.core.dom.FieldDeclaration; import org.eclipse.jdt.core.dom.MethodDeclaration; +import org.eclipse.jdt.core.dom.RecordDeclaration; import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.SimpleType; import org.eclipse.jdt.core.dom.StringLiteral; @@ -55,6 +57,7 @@ *
    *
  • declared methods which have class annotated with @CheckedTemplate.
    • *
  • declared field which have Template as type.
    • + *
  • declared record which implements TemplateInstance.
    • *
* * @author Angelo ZERR @@ -92,6 +95,17 @@ public boolean visit(CompilationUnit node) { return super.visit(node); } + /** + * Support for "Template Fields" + * + *

+ * private Template items; + *

+ * + * @see Quarkus + * Integration + */ @Override public boolean visit(FieldDeclaration node) { Type type = node.getType(); @@ -141,6 +155,19 @@ private AnnotationLocationSupport getAnnotationLocationSupport() { return annotationLocationSupport; } + /** + * Support for "TypeSafe Templates" + * + *

+ * + * @CheckedTemplate public static class Templates { public static native + * TemplateInstance book(Book book); + *

+ * + * @see TypeSafe + * Templates + */ @SuppressWarnings("rawtypes") @Override public boolean visit(TypeDeclaration node) { @@ -167,6 +194,20 @@ public boolean visit(TypeDeclaration node) { return super.visit(node); } + /** + * Support for "Template Records" + * + * @see Template + * Records + */ + @Override + public boolean visit(RecordDeclaration node) { + String recordName = node.getName().getIdentifier(); + collectTemplateLink(node, null, node, null, recordName, false); + return super.visit(node); + } + /** * Returns true if @CheckedTemplate annotation declares that fragment must be * ignored and false otherwise. @@ -217,8 +258,8 @@ private void collectTemplateLink(MethodDeclaration methodDeclaration, TypeDeclar collectTemplateLink(methodDeclaration, null, type, className, methodName, ignoreFragment); } - private void collectTemplateLink(ASTNode fieldOrMethod, StringLiteral locationAnnotation, TypeDeclaration type, - String className, String fieldOrMethodName, boolean ignoreFragment) { + private void collectTemplateLink(ASTNode fieldOrMethod, StringLiteral locationAnnotation, + AbstractTypeDeclaration type, String className, String fieldOrMethodName, boolean ignoreFragment) { try { String location = locationAnnotation != null ? locationAnnotation.getLiteralValue() : null; IProject project = typeRoot.getJavaProject().getProject(); @@ -256,12 +297,17 @@ protected Range createRange(ASTNode fieldOrMethod) throws JavaModelException { SimpleName methodName = method.getName(); return utils.toRange(typeRoot, methodName.getStartPosition(), methodName.getLength()); } + case ASTNode.RECORD_DECLARATION: { + RecordDeclaration recordDecl = (RecordDeclaration) fieldOrMethod; + SimpleName recordName = recordDecl.getName(); + return utils.toRange(typeRoot, recordName.getStartPosition(), recordName.getLength()); + } default: return utils.toRange(typeRoot, fieldOrMethod.getStartPosition(), fieldOrMethod.getLength()); } } - protected abstract void collectTemplateLink(ASTNode node, ASTNode locationAnnotation, TypeDeclaration type, + protected abstract void collectTemplateLink(ASTNode node, ASTNode locationAnnotation, AbstractTypeDeclaration type, String className, String fieldOrMethodName, String location, IFile templateFile, TemplatePathInfo templatePathInfo) throws JavaModelException; diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaCodeLensCollector.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaCodeLensCollector.java index fa50edc56..08b0fed07 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaCodeLensCollector.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaCodeLensCollector.java @@ -22,6 +22,7 @@ import org.eclipse.jdt.core.ITypeRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.ASTNode; +import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.SingleVariableDeclaration; @@ -66,7 +67,7 @@ public QuteJavaCodeLensCollector(ITypeRoot typeRoot, List lenses, IJDT } @Override - protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, TypeDeclaration type, + protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, AbstractTypeDeclaration type, String className, String fieldOrMethodName, String location, IFile templateFile, TemplatePathInfo templatePathInfo) throws JavaModelException { if (!templatePathInfo.isValid()) { diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDiagnosticsCollector.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDiagnosticsCollector.java index 0663b19d2..bea9771b9 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDiagnosticsCollector.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDiagnosticsCollector.java @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.ITypeRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.ASTNode; +import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.Diagnostic; @@ -52,7 +53,7 @@ public QuteJavaDiagnosticsCollector(ITypeRoot typeRoot, List diagnos } @Override - protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, TypeDeclaration type, + protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, AbstractTypeDeclaration type, String className, String fieldOrMethodName, String location, IFile templateFile, TemplatePathInfo templatePathInfo) throws JavaModelException { QuteErrorCode error = getQuteErrorCode(templatePathInfo, templateFile); diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDocumentLinkCollector.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDocumentLinkCollector.java index 842ffae0a..509c565af 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDocumentLinkCollector.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/java/QuteJavaDocumentLinkCollector.java @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.ITypeRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.ASTNode; +import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.lsp4j.DocumentLink; import org.eclipse.lsp4j.Range; @@ -52,7 +53,7 @@ public QuteJavaDocumentLinkCollector(ITypeRoot typeRoot, List link } @Override - protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, TypeDeclaration type, + protected void collectTemplateLink(ASTNode fieldOrMethod, ASTNode locationAnnotation, AbstractTypeDeclaration type, String className, String fieldOrMethodName, String location, IFile templateFile, TemplatePathInfo templatePathInfo) throws JavaModelException { if (!templatePathInfo.isValid()) { diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/CheckedTemplateSupport.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/CheckedTemplateSupport.java index 51f47d42d..05c6c7779 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/CheckedTemplateSupport.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/CheckedTemplateSupport.java @@ -65,7 +65,9 @@ * } * * - * + * @see TypeSafe + * Templates * @author Angelo ZERR * */ diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateFieldSupport.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateFieldSupport.java index f24da8b45..cf4b06f95 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateFieldSupport.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateFieldSupport.java @@ -58,7 +58,10 @@ * return hello.data("name", name); * } * - * + * + * @see Quarkus + * Integration * @author Angelo ZERR * */ diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateRecordsSupport.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateRecordsSupport.java new file mode 100644 index 000000000..0f9c05b42 --- /dev/null +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/internal/template/datamodel/TemplateRecordsSupport.java @@ -0,0 +1,110 @@ +/******************************************************************************* +* Copyright (c) 2024 Red Hat Inc. and others. +* All rights reserved. This program and the accompanying materials +* which accompanies this distribution, and is available at +* http://www.eclipse.org/legal/epl-v20.html +* +* SPDX-License-Identifier: EPL-2.0 +* +* Contributors: +* Red Hat Inc. - initial API and implementation +*******************************************************************************/ +package com.redhat.qute.jdt.internal.template.datamodel; + +import static com.redhat.qute.jdt.internal.QuteJavaConstants.TEMPLATE_INSTANCE_INTERFACE; +import static com.redhat.qute.jdt.utils.JDTQuteProjectUtils.getTemplatePath; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; + +import com.redhat.qute.commons.datamodel.DataModelParameter; +import com.redhat.qute.commons.datamodel.DataModelTemplate; +import com.redhat.qute.jdt.internal.resolver.ITypeResolver; +import com.redhat.qute.jdt.internal.template.TemplateDataSupport; +import com.redhat.qute.jdt.template.datamodel.AbstractInterfaceImplementationDataModelProvider; +import com.redhat.qute.jdt.template.datamodel.SearchContext; + +/** + * Template Records support for template files: + * + * + * public class HelloResource { + + * record Hello(String name) implements TemplateInstance {} + * + * ... + * + * + * @GET + * @Produces(MediaType.TEXT_PLAIN) + * public TemplateInstance get(@QueryParam("name") String name) { + * return new Hello(name).data("bar", 100); + * } + * + * + * @see Template + * Records + * @author Angelo ZERR + * + */ +public class TemplateRecordsSupport extends AbstractInterfaceImplementationDataModelProvider { + + private static final String[] INTERFACE_NAMES = { TEMPLATE_INSTANCE_INTERFACE }; + + @Override + protected String[] getInterfaceNames() { + return INTERFACE_NAMES; + } + + @Override + protected void processType(IType type, SearchContext context, IProgressMonitor monitor) throws JavaModelException { + if (!type.isRecord()) { + return; + } + ITypeResolver typeResolver = context.getTypeResolver(type); + collectDataModelTemplateForTemplateRecord(type, typeResolver, context.getDataModelProject().getTemplates(), + monitor); + } + + private static void collectDataModelTemplateForTemplateRecord(IType type, ITypeResolver typeResolver, + List> templates, IProgressMonitor monitor) throws JavaModelException { + DataModelTemplate template = createTemplateDataModel(type, typeResolver, monitor); + templates.add(template); + } + + private static DataModelTemplate createTemplateDataModel(IType type, ITypeResolver typeResolver, + IProgressMonitor monitor) throws JavaModelException { + + String recordName = type.getElementName(); + // src/main/resources/templates/${recordName}.qute.html + String templateUri = getTemplatePath(null, recordName, true).getTemplateUri(); + + // Create template data model with: + // - template uri : Qute template file which must be bind with data model. + // - source type : the record class which defines Templates + // - + DataModelTemplate template = new DataModelTemplate(); + template.setParameters(new ArrayList<>()); + template.setTemplateUri(templateUri); + template.setSourceType(type.getFullyQualifiedName()); + + // Collect data parameters from the record fields + for (IField field : type.getRecordComponents()) { + DataModelParameter parameter = new DataModelParameter(); + parameter.setKey(field.getElementName()); + parameter.setSourceType(typeResolver.resolveTypeSignature(field.getTypeSignature())); + template.getParameters().add(parameter); + } + + // Collect data parameters for the given template + TemplateDataSupport.collectParametersFromDataMethodInvocation(type, template, monitor); + return template; + } + +} diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/template/datamodel/AbstractDataModelProvider.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/template/datamodel/AbstractDataModelProvider.java index 3f3c2a67d..b319485cd 100644 --- a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/template/datamodel/AbstractDataModelProvider.java +++ b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/template/datamodel/AbstractDataModelProvider.java @@ -106,6 +106,20 @@ protected static SearchPattern createFieldDeclarationTypeReferenceSearchPattern( IJavaSearchConstants.FIELD_DECLARATION_TYPE_REFERENCE, SearchPattern.R_EXACT_MATCH); } + /** + * Create a search pattern to retrieve IType which implement the given + * interfaceNameinterfaceName