From 03bad58086919b40b246bf75ba36d60b2a77a507 Mon Sep 17 00:00:00 2001 From: azerr Date: Mon, 4 Sep 2023 03:26:40 +0200 Subject: [PATCH] feat: Support for Qute Type-safe Message Bundles Fixes #1139 Signed-off-by: azerr --- .../projects/maven/qute-messages/.classpath | 32 ++ .../projects/maven/qute-messages/.gitignore | 40 +++ .../qute-messages/.mvn/wrapper/.gitignore | 1 + .../.mvn/wrapper/MavenWrapperDownloader.java | 142 ++++++++ .../.mvn/wrapper/maven-wrapper.properties | 18 + .../projects/maven/qute-messages/.project | 23 ++ .../projects/maven/qute-messages/README.md | 61 ++++ .../qute/projects/maven/qute-messages/mvnw | 316 ++++++++++++++++++ .../projects/maven/qute-messages/mvnw.cmd | 188 +++++++++++ .../qute/projects/maven/qute-messages/pom.xml | 120 +++++++ .../src/main/java/org/acme/App2Messages.java | 14 + .../src/main/java/org/acme/AppMessages.java | 20 ++ .../src/main/java/org/acme/SomePage.java | 28 ++ .../resources/META-INF/resources/index.html | 284 ++++++++++++++++ .../src/main/resources/application.properties | 0 .../main/resources/messages/msg.properties | 4 + .../main/resources/messages/msg_fr.properties | 4 + .../main/resources/templates/page.qute.html | 67 ++++ .../qute/psi/internal/QuteJavaConstants.java | 6 + .../TemplateGlobalAnnotationSupport.java | 20 +- .../TypeSafeMessageBundlesSupport.java | 142 ++++++++ src/main/resources/META-INF/plugin.xml | 1 + .../intellij/qute/psi/QuteAssert.java | 138 ++++---- .../qute/psi/QuteMavenProjectName.java | 1 + ...ateGetDataModelProjectForMessagesTest.java | 137 ++++++++ 25 files changed, 1734 insertions(+), 73 deletions(-) create mode 100644 projects/qute/projects/maven/qute-messages/.classpath create mode 100644 projects/qute/projects/maven/qute-messages/.gitignore create mode 100644 projects/qute/projects/maven/qute-messages/.mvn/wrapper/.gitignore create mode 100644 projects/qute/projects/maven/qute-messages/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 projects/qute/projects/maven/qute-messages/.mvn/wrapper/maven-wrapper.properties create mode 100644 projects/qute/projects/maven/qute-messages/.project create mode 100644 projects/qute/projects/maven/qute-messages/README.md create mode 100644 projects/qute/projects/maven/qute-messages/mvnw create mode 100644 projects/qute/projects/maven/qute-messages/mvnw.cmd create mode 100644 projects/qute/projects/maven/qute-messages/pom.xml create mode 100644 projects/qute/projects/maven/qute-messages/src/main/java/org/acme/App2Messages.java create mode 100644 projects/qute/projects/maven/qute-messages/src/main/java/org/acme/AppMessages.java create mode 100644 projects/qute/projects/maven/qute-messages/src/main/java/org/acme/SomePage.java create mode 100644 projects/qute/projects/maven/qute-messages/src/main/resources/META-INF/resources/index.html create mode 100644 projects/qute/projects/maven/qute-messages/src/main/resources/application.properties create mode 100644 projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg.properties create mode 100644 projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg_fr.properties create mode 100644 projects/qute/projects/maven/qute-messages/src/main/resources/templates/page.qute.html create mode 100644 src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TypeSafeMessageBundlesSupport.java create mode 100644 src/test/java/com/redhat/devtools/intellij/qute/psi/template/TemplateGetDataModelProjectForMessagesTest.java diff --git a/projects/qute/projects/maven/qute-messages/.classpath b/projects/qute/projects/maven/qute-messages/.classpath new file mode 100644 index 000000000..d7f1c8fe7 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/qute/projects/maven/qute-messages/.gitignore b/projects/qute/projects/maven/qute-messages/.gitignore new file mode 100644 index 000000000..5e055ad30 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.gitignore @@ -0,0 +1,40 @@ +#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 diff --git a/projects/qute/projects/maven/qute-messages/.mvn/wrapper/.gitignore b/projects/qute/projects/maven/qute-messages/.mvn/wrapper/.gitignore new file mode 100644 index 000000000..e72f5e8b7 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.mvn/wrapper/.gitignore @@ -0,0 +1 @@ +maven-wrapper.jar diff --git a/projects/qute/projects/maven/qute-messages/.mvn/wrapper/MavenWrapperDownloader.java b/projects/qute/projects/maven/qute-messages/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 000000000..17083930c --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,142 @@ +/* + * 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.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader +{ + private static final String WRAPPER_VERSION = "3.1.1"; + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION + + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the + * default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main( String args[] ) + { + System.out.println( "- Downloader started" ); + File baseDirectory = new File( args[0] ); + System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() ); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH ); + String url = DEFAULT_DOWNLOAD_URL; + if ( mavenWrapperPropertyFile.exists() ) + { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try + { + mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile ); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream ); + url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url ); + } + catch ( IOException e ) + { + System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" ); + } + finally + { + try + { + if ( mavenWrapperPropertyFileInputStream != null ) + { + mavenWrapperPropertyFileInputStream.close(); + } + } + catch ( IOException e ) + { + // Ignore ... + } + } + } + System.out.println( "- Downloading from: " + url ); + + File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH ); + if ( !outputFile.getParentFile().exists() ) + { + if ( !outputFile.getParentFile().mkdirs() ) + { + System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + + "'" ); + } + } + System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() ); + try + { + downloadFileFromURL( url, outputFile ); + System.out.println( "Done" ); + System.exit( 0 ); + } + catch ( Throwable e ) + { + System.out.println( "- Error downloading" ); + e.printStackTrace(); + System.exit( 1 ); + } + } + + private static void downloadFileFromURL( String urlString, File destination ) + throws Exception + { + if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) + { + String username = System.getenv( "MVNW_USERNAME" ); + char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); + Authenticator.setDefault( new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication( username, password ); + } + } ); + } + URL website = new URL( urlString ); + ReadableByteChannel rbc; + rbc = Channels.newChannel( website.openStream() ); + FileOutputStream fos = new FileOutputStream( destination ); + fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE ); + fos.close(); + rbc.close(); + } + +} diff --git a/projects/qute/projects/maven/qute-messages/.mvn/wrapper/maven-wrapper.properties b/projects/qute/projects/maven/qute-messages/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..61a2ef150 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.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.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/projects/qute/projects/maven/qute-messages/.project b/projects/qute/projects/maven/qute-messages/.project new file mode 100644 index 000000000..13f39c6d4 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/.project @@ -0,0 +1,23 @@ + + + qute-messages + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/projects/qute/projects/maven/qute-messages/README.md b/projects/qute/projects/maven/qute-messages/README.md new file mode 100644 index 000000000..04afb4c09 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/README.md @@ -0,0 +1,61 @@ +# qute-messages + +This project uses Quarkus, the Supersonic Subatomic Java Framework. + +If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ . + +## 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 http://localhost:8080/q/dev/. + +## 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.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 -Pnative +``` + +Or, if you don't have GraalVM installed, you can run the native executable build in a container using: +```shell script +./mvnw package -Pnative -Dquarkus.native.container-build=true +``` + +You can then execute your native executable with: `./target/qute-messages-1.0.0-SNAPSHOT-runner` + +If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling. + +## Related Guides + +- Qute Templating ([guide](https://quarkus.io/guides/qute)): Offer templating support for web, email, etc in a build time, type-safe way +- RESTEasy Classic Qute ([guide](https://quarkus.io/guides/qute)): Qute Templating integration for RESTEasy + +## Provided Code + +### RESTEasy Qute + +Create your web page using Quarkus RESTEasy & Qute + +[Related guide section...](https://quarkus.io/guides/qute#type-safe-templates) diff --git a/projects/qute/projects/maven/qute-messages/mvnw b/projects/qute/projects/maven/qute-messages/mvnw new file mode 100644 index 000000000..eaa3d308f --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /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 + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\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 + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/projects/qute/projects/maven/qute-messages/mvnw.cmd b/projects/qute/projects/maven/qute-messages/mvnw.cmd new file mode 100644 index 000000000..abb7c3242 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%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/projects/qute/projects/maven/qute-messages/pom.xml b/projects/qute/projects/maven/qute-messages/pom.xml new file mode 100644 index 000000000..d73d1e002 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + org.acme + qute-messages + 1.0.0-SNAPSHOT + + 3.10.1 + 17 + UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 2.16.5.Final + true + 3.0.0-M7 + + + + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + + + + io.quarkus + quarkus-qute + + + io.quarkus + quarkus-resteasy-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 + + + + + + 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 + native + + + + diff --git a/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/App2Messages.java b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/App2Messages.java new file mode 100644 index 000000000..c774703c9 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/App2Messages.java @@ -0,0 +1,14 @@ +package org.acme; + +import io.quarkus.qute.i18n.Message; +import io.quarkus.qute.i18n.MessageBundle; + +@MessageBundle("msg2") +public interface App2Messages { + + @Message("HELLO!") + String hello(); + + @Message + String hello2(); +} diff --git a/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/AppMessages.java b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/AppMessages.java new file mode 100644 index 000000000..e3a6951d4 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/AppMessages.java @@ -0,0 +1,20 @@ +package org.acme; + +import io.quarkus.qute.i18n.Message; +import io.quarkus.qute.i18n.MessageBundle; + +@MessageBundle +public interface AppMessages { + + @Message("Hello {name ?: 'Qute'}") + String hello_name(String name); + + @Message("Goodbye {name}!") + String goodbye(String name); + + @Message("Hello!") + String hello(); + + @Message + String hello2(); +} diff --git a/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/SomePage.java b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/SomePage.java new file mode 100644 index 000000000..7c1c0836c --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/java/org/acme/SomePage.java @@ -0,0 +1,28 @@ +package org.acme; +import io.quarkus.qute.Template; +import io.quarkus.qute.TemplateInstance; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.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/projects/qute/projects/maven/qute-messages/src/main/resources/META-INF/resources/index.html b/projects/qute/projects/maven/qute-messages/src/main/resources/META-INF/resources/index.html new file mode 100644 index 000000000..035a3acb1 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/resources/META-INF/resources/index.html @@ -0,0 +1,284 @@ + + + + + qute-messages - 1.0.0-SNAPSHOT + + + +
+
+
+ + + + + quarkus_logo_horizontal_rgb_1280px_reverse + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+
+

You just made a Quarkus application.

+

This page is served by Quarkus.

+ Visit the Dev UI +

This page: src/main/resources/META-INF/resources/index.html

+

App configuration: src/main/resources/application.properties

+

Static assets: src/main/resources/META-INF/resources/

+

Code: src/main/java

+

Generated starter code:

+
    +
  • + RESTEasy Qute Create your web page using Quarkus RESTEasy & Qute +
    › @Path: /some-page +
    › Related guide +
    • + +
+
+
+

Selected extensions

+
    +
  • Qute Templating (guide)
    • +
  • RESTEasy Classic Qute (guide)
    • +
+
Documentation
+

Practical step-by-step guides to help you achieve a specific goal. Use them to help get your work + done.

+
Set up your IDE
+

Everyone has a favorite IDE they like to use to code. Learn how to configure yours to maximize your + Quarkus productivity.

+
+
+
+ + diff --git a/projects/qute/projects/maven/qute-messages/src/main/resources/application.properties b/projects/qute/projects/maven/qute-messages/src/main/resources/application.properties new file mode 100644 index 000000000..e69de29bb diff --git a/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg.properties b/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg.properties new file mode 100644 index 000000000..8f87732cd --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg.properties @@ -0,0 +1,4 @@ +hello_name=Hello \ + {name} and \ + good morning! +goodbye=Best regards, {name} diff --git a/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg_fr.properties b/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg_fr.properties new file mode 100644 index 000000000..0fbc49e75 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/resources/messages/msg_fr.properties @@ -0,0 +1,4 @@ +hello_name=Bonjour \ + {name} et \ + bonne matinée! +goodbye=A bientôt, {name} diff --git a/projects/qute/projects/maven/qute-messages/src/main/resources/templates/page.qute.html b/projects/qute/projects/maven/qute-messages/src/main/resources/templates/page.qute.html new file mode 100644 index 000000000..4038ff166 --- /dev/null +++ b/projects/qute/projects/maven/qute-messages/src/main/resources/templates/page.qute.html @@ -0,0 +1,67 @@ + + + + + Hello {name ?: "Qute"} + + + +

Hello {name ?: "Qute"}

+ +{msg:hello_name(name)} + + + + + + + + + + + + + + + + + + + + + + + + + + +Message +{msg:hello_name(name)} + +{! {msg:message('hello_name','name')}!} + +{msg:hello()} +{msg2:hello} +{msg:goodbye(name)} +{msg:hello2} + +

Create your web page using Quarkus RESTEasy & Qute

+ + diff --git a/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/QuteJavaConstants.java b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/QuteJavaConstants.java index 10839c8c8..93c3c1e6f 100644 --- a/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/QuteJavaConstants.java +++ b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/QuteJavaConstants.java @@ -91,4 +91,10 @@ public class QuteJavaConstants { public static final String REGISTER_FOR_REFLECTION_ANNOTATION_METHODS = "methods"; public static final String REGISTER_FOR_REFLECTION_ANNOTATION_TARGETS = "targets"; + + // @Message + public static final String MESSAGE_BUNDLE_ANNOTATION = "io.quarkus.qute.i18n.MessageBundle"; + public static final String MESSAGE_BUNDLE_ANNOTATION_LOCALE = "locale"; + public static final String MESSAGE_ANNOTATION = "io.quarkus.qute.i18n.Message"; + public static final String MESSAGE_ANNOTATION_KEY = "key"; } diff --git a/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TemplateGlobalAnnotationSupport.java b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TemplateGlobalAnnotationSupport.java index d24e07874..76d62eba1 100644 --- a/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TemplateGlobalAnnotationSupport.java +++ b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TemplateGlobalAnnotationSupport.java @@ -1,14 +1,14 @@ /******************************************************************************* -* Copyright (c) 2022 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.0git che -* -* Contributors: -* Red Hat Inc. - initial API and implementation -*******************************************************************************/ + * Copyright (c) 2022 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.devtools.intellij.qute.psi.internal.template.datamodel; import com.intellij.openapi.progress.ProcessCanceledException; diff --git a/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TypeSafeMessageBundlesSupport.java b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TypeSafeMessageBundlesSupport.java new file mode 100644 index 000000000..8991a1c7a --- /dev/null +++ b/src/main/java/com/redhat/devtools/intellij/qute/psi/internal/template/datamodel/TypeSafeMessageBundlesSupport.java @@ -0,0 +1,142 @@ +/******************************************************************************* + * Copyright (c) 2023 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.devtools.intellij.qute.psi.internal.template.datamodel; + + +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.psi.*; +import com.redhat.devtools.intellij.qute.psi.QuteSupportForTemplate; +import com.redhat.devtools.intellij.qute.psi.internal.resolver.ITypeResolver; +import com.redhat.devtools.intellij.qute.psi.template.datamodel.AbstractAnnotationTypeReferenceDataModelProvider; +import com.redhat.devtools.intellij.qute.psi.template.datamodel.SearchContext; +import com.redhat.devtools.intellij.qute.psi.utils.AnnotationUtils; +import org.apache.commons.lang3.StringUtils; + +import com.redhat.qute.commons.datamodel.resolvers.MessageResolverData; +import com.redhat.qute.commons.datamodel.resolvers.ValueResolverInfo; +import com.redhat.qute.commons.datamodel.resolvers.ValueResolverKind; + +import static com.redhat.devtools.intellij.qute.psi.internal.QuteJavaConstants.*; + +/** + * Type-safe Message Bundles support. + * + * @author Angelo ZERR + * @see https://quarkus.io/guides/qute-reference#type-safe-message-bundles + */ +public class TypeSafeMessageBundlesSupport extends AbstractAnnotationTypeReferenceDataModelProvider { + + private static final String DEFAULT_MESSAGE_NAMESPACE = "msg"; + + private static final Logger LOGGER = Logger.getLogger(TemplateGlobalAnnotationSupport.class.getName()); + + private static final String[] ANNOTATION_NAMES = {MESSAGE_ANNOTATION}; + + @Override + protected String[] getAnnotationNames() { + return ANNOTATION_NAMES; + } + + @Override + protected void processAnnotation(PsiElement javaElement, PsiAnnotation annotation, String annotationName, SearchContext context, ProgressIndicator monitor) { + if (!(javaElement instanceof PsiMember)) { + return; + } + if (annotation == null) { + return; + } + ITypeResolver typeResolver = QuteSupportForTemplate.createTypeResolver((PsiMember) javaElement, context.getJavaProject()); + if (javaElement instanceof PsiMethod) { + PsiMethod method = (PsiMethod) javaElement; + collectResolversForMessage(method, annotation, context.getDataModelProject().getValueResolvers(), + typeResolver); + } + } + + private void collectResolversForMessage(PsiMethod method, PsiAnnotation messageAnnotation, + List resolvers, ITypeResolver typeResolver) { + + // @MessageBundle + // public interface AppMessages { + PsiAnnotation messageBundleAnnotation = getMessageBundleAnnotation(method.getContainingClass()); + String sourceType = method.getContainingClass().getQualifiedName(); + ValueResolverInfo resolver = new ValueResolverInfo(); + String namespace = getNamespaceMessage(messageBundleAnnotation); + resolver.setNamespace(namespace); + resolver.setSourceType(sourceType); + resolver.setSignature(typeResolver.resolveSignature(method)); + resolver.setKind(ValueResolverKind.Message); + + // data message + String locale = getLocaleMessage(messageBundleAnnotation); + String messageContent = getMessageContent(messageAnnotation); + if (locale != null || messageContent != null) { + MessageResolverData data = new MessageResolverData(); + data.setLocale(locale); + data.setMessage(messageContent); + resolver.setData(data); + } + + if (!resolvers.contains(resolver)) { + resolvers.add(resolver); + } + + } + + private static PsiAnnotation getMessageBundleAnnotation(PsiClass type) { + try { + return AnnotationUtils.getAnnotation(type, MESSAGE_BUNDLE_ANNOTATION); + } catch (Exception e) { + LOGGER.log(Level.SEVERE, "Error while getting @MessageBundle annotation value.", e); + return null; + } + } + + private static String getNamespaceMessage(PsiAnnotation messageBundleAnnotation) { + String namespace = null; + try { + if (messageBundleAnnotation != null) { + namespace = AnnotationUtils.getAnnotationMemberValue(messageBundleAnnotation, VALUE_ANNOTATION_NAME); + } + } catch (Exception e) { + LOGGER.log(Level.SEVERE, "Error while getting @MessageBundle#value annotation value.", e); + return null; + } + return StringUtils.isEmpty(namespace) ? DEFAULT_MESSAGE_NAMESPACE : namespace; + } + + private static String getLocaleMessage(PsiAnnotation messageBundleAnnotation) { + try { + if (messageBundleAnnotation != null) { + return AnnotationUtils.getAnnotationMemberValue(messageBundleAnnotation, + MESSAGE_BUNDLE_ANNOTATION_LOCALE); + } + } catch (Exception e) { + LOGGER.log(Level.SEVERE, "Error while getting @MessageBundle#locale annotation value.", e); + return null; + } + return null; + } + + private static String getMessageContent(PsiAnnotation messageAnnotation) { + try { + return AnnotationUtils.getAnnotationMemberValue(messageAnnotation, VALUE_ANNOTATION_NAME); + } catch (Exception e) { + LOGGER.log(Level.SEVERE, "Error while getting @Message#value annotation value.", e); + return null; + } + } +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 6f488da37..a31469952 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -520,6 +520,7 @@ + resolvers) { - assertValueResolver(namespace, signature, sourceType, null, resolvers); - } + public static void assertValueResolver(String namespace, String signature, String sourceType, + List resolvers) { + assertValueResolver(namespace, signature, sourceType, null, resolvers); + } + + public static void assertValueResolver(String namespace, String signature, String sourceType, String named, + List resolvers) { + assertValueResolver(namespace, signature, sourceType, named, false, resolvers); + } - public static void assertValueResolver(String namespace, String signature, String sourceType, String named, - List resolvers) { - assertValueResolver(namespace, signature, sourceType, named, false, resolvers); - } + public static ValueResolverInfo assertValueResolver(String namespace, String signature, String sourceType, String named, + boolean globalVariable, List resolvers) { + Optional result = resolvers.stream() + .filter(r -> signature.equals(r.getSignature()) && Objects.equals(namespace, r.getNamespace())) + .findFirst(); + Assert.assertFalse("Find '" + signature + "' value resolver.", result.isEmpty()); + ValueResolverInfo resolver = result.get(); + Assert.assertEquals(namespace, resolver.getNamespace()); + Assert.assertEquals(signature, resolver.getSignature()); + Assert.assertEquals(sourceType, resolver.getSourceType()); + Assert.assertEquals(globalVariable, resolver.isGlobalVariable()); + return resolver; + } - public static void assertValueResolver(String namespace, String signature, String sourceType, String named, - boolean globalVariable, List resolvers) { - Optional result = resolvers.stream() - .filter(r -> signature.equals(r.getSignature()) && Objects.equals(namespace, r.getNamespace())) - .findFirst(); - Assert.assertFalse("Find '" + signature + "' value resolver.", result.isEmpty()); - ValueResolverInfo resolver = result.get(); - Assert.assertEquals(namespace, resolver.getNamespace()); - Assert.assertEquals(signature, resolver.getSignature()); - Assert.assertEquals(sourceType, resolver.getSourceType()); - Assert.assertEquals(globalVariable, resolver.isGlobalVariable()); - } + public static void assertNotValueResolver(String namespace, String signature, String sourceType, String named, + List resolvers) { + assertNotValueResolver(namespace, signature, sourceType, named, false, resolvers); + } - public static void assertNotValueResolver(String namespace, String signature, String sourceType, String named, - List resolvers) { - assertNotValueResolver(namespace, signature, sourceType, named, false, resolvers); - } + public static void assertNotValueResolver(String namespace, String signature, String sourceType, String named, + boolean globalVariable, List resolvers) { + Optional result = resolvers.stream().filter(r -> signature.equals(r.getSignature())) + .findFirst(); + Assert.assertTrue("Find '" + signature + "' value resolver.", result.isEmpty()); + } - public static void assertNotValueResolver(String namespace, String signature, String sourceType, String named, - boolean globalVariable, List resolvers) { - Optional result = resolvers.stream().filter(r -> signature.equals(r.getSignature())) - .findFirst(); - Assert.assertTrue("Find '" + signature + "' value resolver.", result.isEmpty()); - } + public static void assertMessageResolverData(String locale, String messageContent, ValueResolverInfo message) { + if (locale == null && messageContent == null) { + Assert.assertNull(message.getData()); + } else { + Assert.assertNotNull(message.getData()); + Assert.assertTrue(message.getData() instanceof MessageResolverData); + MessageResolverData data = (MessageResolverData) message.getData(); + Assert.assertEquals(locale, data.getLocale()); + Assert.assertEquals(messageContent, data.getMessage()); + } + } - public static void assertParameter(String key, String sourceType, boolean dataMethodInvocation, - List parameters, int index) { - DataModelParameter parameter = parameters.get(index); - Assert.assertEquals(key, parameter.getKey()); - Assert.assertEquals(sourceType, parameter.getSourceType()); - Assert.assertEquals(dataMethodInvocation, parameter.isDataMethodInvocation()); - } + public static void assertParameter(String key, String sourceType, boolean dataMethodInvocation, + List parameters, int index) { + DataModelParameter parameter = parameters.get(index); + Assert.assertEquals(key, parameter.getKey()); + Assert.assertEquals(sourceType, parameter.getSourceType()); + Assert.assertEquals(dataMethodInvocation, parameter.isDataMethodInvocation()); + } - public static void assertParameter(String key, String sourceType, boolean dataMethodInvocation, - DataModelTemplate template) { - DataModelParameter parameter = template.getParameter(key); - Assert.assertNotNull(parameter); - Assert.assertEquals(key, parameter.getKey()); - Assert.assertEquals(sourceType, parameter.getSourceType()); - Assert.assertEquals(dataMethodInvocation, parameter.isDataMethodInvocation()); - } + public static void assertParameter(String key, String sourceType, boolean dataMethodInvocation, + DataModelTemplate template) { + DataModelParameter parameter = template.getParameter(key); + Assert.assertNotNull(parameter); + Assert.assertEquals(key, parameter.getKey()); + Assert.assertEquals(sourceType, parameter.getSourceType()); + Assert.assertEquals(dataMethodInvocation, parameter.isDataMethodInvocation()); + } } \ No newline at end of file diff --git a/src/test/java/com/redhat/devtools/intellij/qute/psi/QuteMavenProjectName.java b/src/test/java/com/redhat/devtools/intellij/qute/psi/QuteMavenProjectName.java index 315854c8d..83462dd98 100644 --- a/src/test/java/com/redhat/devtools/intellij/qute/psi/QuteMavenProjectName.java +++ b/src/test/java/com/redhat/devtools/intellij/qute/psi/QuteMavenProjectName.java @@ -22,4 +22,5 @@ public class QuteMavenProjectName { public static final String quarkus3 = "quarkus3"; + public static String qute_messages = "qute-messages"; } diff --git a/src/test/java/com/redhat/devtools/intellij/qute/psi/template/TemplateGetDataModelProjectForMessagesTest.java b/src/test/java/com/redhat/devtools/intellij/qute/psi/template/TemplateGetDataModelProjectForMessagesTest.java new file mode 100644 index 000000000..2f4e77b56 --- /dev/null +++ b/src/test/java/com/redhat/devtools/intellij/qute/psi/template/TemplateGetDataModelProjectForMessagesTest.java @@ -0,0 +1,137 @@ +/******************************************************************************* +* Copyright (c) 2023 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.devtools.intellij.qute.psi.template; + +import java.util.List; + +import com.intellij.openapi.progress.EmptyProgressIndicator; +import com.intellij.openapi.progress.ProgressIndicator; +import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.utils.IPsiUtils; +import com.redhat.devtools.intellij.lsp4mp4ij.psi.internal.core.ls.PsiUtilsLSImpl; +import com.redhat.devtools.intellij.qute.psi.QuteMavenModuleImportingTestCase; +import com.redhat.devtools.intellij.qute.psi.QuteMavenProjectName; +import com.redhat.devtools.intellij.qute.psi.QuteSupportForTemplate; +import org.junit.Assert; +import org.junit.Test; + +import com.redhat.qute.commons.datamodel.DataModelParameter; +import com.redhat.qute.commons.datamodel.DataModelProject; +import com.redhat.qute.commons.datamodel.DataModelTemplate; +import com.redhat.qute.commons.datamodel.QuteDataModelProjectParams; +import com.redhat.qute.commons.datamodel.resolvers.ValueResolverInfo; + +import static com.redhat.devtools.intellij.qute.psi.QuteAssert.*; + +/** + * Tests for + * {@link QuteSupportForTemplate#getDataModelProject(QuteDataModelProjectParams, IPsiUtils, ProgressIndicator)} + * to tests Type-safe Message Bundles support + * + * @author Angelo ZERR + * + */ +public class TemplateGetDataModelProjectForMessagesTest extends QuteMavenModuleImportingTestCase { + + @Test + public void testQuteMessages() throws Exception { + + loadMavenProject(QuteMavenProjectName.qute_messages); + + QuteDataModelProjectParams params = new QuteDataModelProjectParams(QuteMavenProjectName.qute_messages); + DataModelProject> project = QuteSupportForTemplate.getInstance() + .getDataModelProject(params, PsiUtilsLSImpl.getInstance(myProject), new EmptyProgressIndicator()); + Assert.assertNotNull(project); + + // Test templates + testTemplates(project); + + // Test value resolvers + List resolvers = project.getValueResolvers(); + Assert.assertNotNull(resolvers); + Assert.assertFalse(resolvers.isEmpty()); + testValueResolversFromMessages(resolvers); + } + + private static void testTemplates(DataModelProject> project) { + List> templates = project.getTemplates(); + Assert.assertNotNull(templates); + Assert.assertFalse(templates.isEmpty()); + + templateField(project); + } + + private static void templateField(DataModelProject> project) { + // private final Template page; + + DataModelTemplate pageTemplate = project + .findDataModelTemplate("src/main/resources/templates/page"); + Assert.assertNotNull(pageTemplate); + Assert.assertEquals("src/main/resources/templates/page", pageTemplate.getTemplateUri()); + Assert.assertEquals("org.acme.SomePage", pageTemplate.getSourceType()); + Assert.assertEquals("page", pageTemplate.getSourceField()); + + List parameters = pageTemplate.getParameters(); + Assert.assertNotNull(parameters); + + // return page.data("name", name); + + Assert.assertEquals(1, parameters.size()); + assertParameter("name", "java.lang.String", true, parameters, 0); + + } + + private static void testValueResolversFromMessages(List resolvers) { + + // @MessageBundle + // public interface App2Messages { + + // @Message("HELLO!") + // String hello(); + ValueResolverInfo message = assertValueResolver("msg2", "hello() : java.lang.String", "org.acme.App2Messages", + null, false, resolvers); + assertMessageResolverData(null, "HELLO!", message); + + // @Message + // String hello2(); + message = assertValueResolver("msg2", "hello2() : java.lang.String", "org.acme.App2Messages", null, false, + resolvers); + assertMessageResolverData(null, null, message); + + // @MessageBundle + // public interface AppMessages { + + // @Message("Hello {name ?: 'Qute'}") + // String hello_name(String name); + message = assertValueResolver("msg", "hello_name(name : java.lang.String) : java.lang.String", + "org.acme.AppMessages", null, false, resolvers); + assertMessageResolverData(null, "Hello {name ?: 'Qute'}", message); + + // @Message("Goodbye {name}!") + // String goodbye(String name); + message = assertValueResolver("msg", "goodbye(name : java.lang.String) : java.lang.String", + "org.acme.AppMessages", null, false, resolvers); + assertMessageResolverData(null, "Goodbye {name}!", message); + + // @Message("Hello!") + // String hello(); + message = assertValueResolver("msg", "hello() : java.lang.String", "org.acme.AppMessages", null, false, + resolvers); + assertMessageResolverData(null, "Hello!", message); + + // @Message + // String hello2(); + message = assertValueResolver("msg", "hello2() : java.lang.String", "org.acme.AppMessages", null, false, + resolvers); + assertMessageResolverData(null, null, message); + } + +}