Support for Injecting Beans Directly In Templates

Fixes #546

Signed-off-by: azerr <azerr@redhat.com>

Author: angelozerr

qute.jdt/com.redhat.qute.jdt.test/projects/maven/qute-quickstart/src/main/java/org/acme/qute/InjectedData.java

@@ -0,0 +1,23 @@
+package org.acme.qute;
+
+import javax.inject.Named;
+
+@Named
+public class InjectedData {
+
+	@Named
+	private String foo;
+
+	@Named("bar")
+	private String aBar;
+
+	@Named("user")
+	public String getUser() {
+		return null;
+	}
+
+	@Named
+	public String getSystemUser() {
+		return null;
+	}
+}

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java

@@ -21,13 +21,13 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.redhat.qute.commons.ValueResolver;
 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.jdt.QuteSupportForTemplate;
+import com.redhat.qute.commons.datamodel.resolvers.ValueResolverInfo;
 import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
+import com.redhat.qute.jdt.QuteSupportForTemplate;
 
 /**
  * Tests for
@@ -51,7 +51,13 @@ public void quteQuickStart() throws Exception {
 		// Test templates
 		testTemplates(project);
 		// Test value resolvers
-		testValueResolvers(project);
+
+		List<ValueResolverInfo> resolvers = project.getValueResolvers();
+		Assert.assertNotNull(resolvers);
+		Assert.assertFalse(resolvers.isEmpty());
+
+		testValueResolversFomTemplateExtension(resolvers);
+		testValueResolversFomInject(resolvers);
 	}
 
 	private static void testTemplates(DataModelProject<DataModelTemplate<DataModelParameter>> project) {
@@ -105,7 +111,7 @@ private static void templateField(DataModelProject<DataModelTemplate<DataModelPa
 		Assert.assertEquals(2, parameters2.size());
 		assertParameter("age2", "int", true, parameters2, 0);
 		assertParameter("name2", "java.lang.String", true, parameters2, 1);
-		
+
 		// Template hallo;
 
 		DataModelTemplate<DataModelParameter> halloTemplate = project
@@ -178,10 +184,7 @@ private static void checkedTemplate(DataModelProject<DataModelTemplate<DataModel
 		assertParameter("name", "java.lang.String", false, hello3Parameters, 0);
 	}
 
-	private static void testValueResolvers(DataModelProject<DataModelTemplate<DataModelParameter>> project) {
-		List<ValueResolver> resolvers = project.getValueResolvers();
-		Assert.assertNotNull(resolvers);
-		Assert.assertFalse(resolvers.isEmpty());
+	private static void testValueResolversFomTemplateExtension(List<ValueResolverInfo> resolvers) {
 
 		// Resolver from Java sources
 		assertValueResolver(null, "discountedPrice(item : org.acme.qute.Item) : java.math.BigDecimal",
@@ -194,7 +197,7 @@ private static void testValueResolvers(DataModelProject<DataModelTemplate<DataMo
 				"io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions", resolvers);
 
 		// from io.quarkus.qute.runtime.extensions.ConfigTemplateExtensions
-		assertValueResolver("config", "config:getConfigProperty(propertyName : java.lang.String) : java.lang.Object",
+		assertValueResolver("config", "getConfigProperty(propertyName : java.lang.String) : java.lang.Object",
 				"io.quarkus.qute.runtime.extensions.ConfigTemplateExtensions", resolvers);
 
 		// from io.quarkus.qute.runtime.extensions.MapTemplateExtensions
@@ -212,24 +215,69 @@ private static void testValueResolvers(DataModelProject<DataModelTemplate<DataMo
 				"fmtInstance(format : java.lang.String, ignoredPropertyName : java.lang.String, args : java.lang.Object[]) : java.lang.String",
 				"io.quarkus.qute.runtime.extensions.StringTemplateExtensions", resolvers);
 		assertValueResolver("str",
-				"str:fmt(ignoredPropertyName : java.lang.String, format : java.lang.String, args : java.lang.Object[]) : java.lang.String",
+				"fmt(ignoredPropertyName : java.lang.String, format : java.lang.String, args : java.lang.Object[]) : java.lang.String",
 				"io.quarkus.qute.runtime.extensions.StringTemplateExtensions", resolvers);
 
 		// from io.quarkus.qute.runtime.extensions.TimeTemplateExtensions
 		assertValueResolver(null,
 				"format(temporal : java.time.temporal.TemporalAccessor, pattern : java.lang.String) : java.lang.String",
 				"io.quarkus.qute.runtime.extensions.TimeTemplateExtensions", resolvers);
 		assertValueResolver("time",
-				"time:format(dateTimeObject : java.lang.Object, pattern : java.lang.String) : java.lang.String",
+				"format(dateTimeObject : java.lang.Object, pattern : java.lang.String) : java.lang.String",
 				"io.quarkus.qute.runtime.extensions.TimeTemplateExtensions", resolvers);
 
 	}
 
+	private void testValueResolversFomInject(List<ValueResolverInfo> resolvers) {
+		Assert.assertNotNull(resolvers);
+		Assert.assertFalse(resolvers.isEmpty());
+
+		// from org.acme.qute.InjectedData source
+
+		// @Named
+		// public class InjectedData;
+		assertValueResolver("inject", "org.acme.qute.InjectedData", "org.acme.qute.InjectedData", //
+				"injectedData", resolvers);
+
+		// @Named
+		// private String foo;
+		assertValueResolver("inject", "foo : java.lang.String", "org.acme.qute.InjectedData", //
+				"foo", resolvers);
+
+		// @Named("bar")
+		// private String aBar;
+		assertValueResolver("inject", "aBar : java.lang.String", "org.acme.qute.InjectedData", //
+				"bar", resolvers);
+
+		// @Named("user")
+		// private String getUser() {...
+		assertValueResolver("inject", "getUser() : java.lang.String", "org.acme.qute.InjectedData", //
+				"user", resolvers);
+
+		// @Named
+		// private String getSystemUser() {...
+		assertValueResolver("inject", "getSystemUser() : java.lang.String", "org.acme.qute.InjectedData", //
+				"systemUser", resolvers);
+
+		// from io.quarkus.vertx.http.runtime.CurrentRequestProducer
+		assertValueResolver("inject",
+				"getCurrentRequest(rc : io.vertx.ext.web.RoutingContext) : io.vertx.core.http.HttpServerRequest",
+				"io.quarkus.vertx.http.runtime.CurrentRequestProducer", //
+				"vertxRequest", resolvers);
+
+	}
+
 	private static void assertValueResolver(String namespace, String signature, String sourceType,
-			List<ValueResolver> resolvers) {
-		Optional<ValueResolver> result = resolvers.stream().filter(r -> signature.equals(r.getSignature())).findFirst();
+			List<ValueResolverInfo> resolvers) {
+		assertValueResolver(namespace, signature, sourceType, null, resolvers);
+	}
+
+	private static void assertValueResolver(String namespace, String signature, String sourceType, String named,
+			List<ValueResolverInfo> resolvers) {
+		Optional<ValueResolverInfo> result = resolvers.stream().filter(r -> signature.equals(r.getSignature()))
+				.findFirst();
 		Assert.assertFalse("Find '" + signature + "' value resolver.", result.isEmpty());
-		ValueResolver resolver = result.get();
+		ValueResolverInfo resolver = result.get();
 		Assert.assertEquals(namespace, resolver.getNamespace());
 		Assert.assertEquals(signature, resolver.getSignature());
 		Assert.assertEquals(sourceType, resolver.getSourceType());

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/utils/CDIUtilsTest.java

@@ -0,0 +1,73 @@
+/*******************************************************************************
+* 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.qute.jdt.utils;
+
+import org.eclipse.jdt.core.IJavaElement;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link CDIUtils}.
+ * 
+ * @author Angelo ZERR
+ *
+ */
+public class CDIUtilsTest {
+
+	@Test
+	public void namedWithType() {
+		String javaType = "MyClass";
+
+		String name = CDIUtils.getSimpleName(javaType, null, IJavaElement.TYPE);
+		Assert.assertEquals("myClass", name);
+
+		String named = "foo";
+		name = CDIUtils.getSimpleName(javaType, named, IJavaElement.TYPE);
+		Assert.assertEquals("foo", name);
+	}
+	
+	@Test
+	public void namedWithField() {
+		String javaType = "MyField";
+
+		String name = CDIUtils.getSimpleName(javaType, null, IJavaElement.FIELD);
+		Assert.assertEquals("MyField", name);
+
+		String named = "foo";
+		name = CDIUtils.getSimpleName(javaType, named, IJavaElement.FIELD);
+		Assert.assertEquals("foo", name);
+	}
+	
+	@Test
+	public void namedWithMethod() {
+		String javaType = "MyMethod";
+
+		String name = CDIUtils.getSimpleName(javaType, null, IJavaElement.METHOD);
+		Assert.assertEquals("MyMethod", name);
+
+		String named = "foo";
+		name = CDIUtils.getSimpleName(javaType, named, IJavaElement.METHOD);
+		Assert.assertEquals("foo", name);
+	}
+	
+	@Test
+	public void namedWithGetterMethod() {
+		String javaType = "getMethod";
+
+		String name = CDIUtils.getSimpleName(javaType, null, IJavaElement.METHOD, () -> true);
+		Assert.assertEquals("method", name);
+
+		String named = "foo";
+		name = CDIUtils.getSimpleName(javaType, named, IJavaElement.METHOD, () -> true);
+		Assert.assertEquals("foo", name);
+	}
+}

qute.jdt/com.redhat.qute.jdt/META-INF/MANIFEST.MF

@@ -17,10 +17,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: com.redhat.qute.commons,
  com.redhat.qute.commons.datamodel,
+ com.redhat.qute.commons.datamodel.resolvers,
+ com.redhat.qute.commons.usertags,
  com.redhat.qute.jdt,
  com.redhat.qute.jdt.internal.java;x-friends:="com.redhat.qute.jdt.test",
  com.redhat.qute.jdt.internal.ls;x-friends:="com.redhat.qute.jdt.test",
  com.redhat.qute.jdt.internal.template;x-friends:="com.redhat.qute.jdt.test",
+ com.redhat.qute.jdt.template.datamodel,
  com.redhat.qute.jdt.utils
 Bundle-Activator: com.redhat.qute.jdt.QutePlugin
 

qute.jdt/com.redhat.qute.jdt/build.properties

@@ -3,4 +3,5 @@ output.. = target/classes/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               schema/

qute.jdt/com.redhat.qute.jdt/plugin.properties

@@ -11,4 +11,6 @@
 #     Red Hat Inc. - initial API and implementation
 ###############################################################################
 pluginName=JDT Qute Extension
-providerName=Red Hat
+providerName=Red Hat
+
+dataModelProviders.name=Data model providers

qute.jdt/com.redhat.qute.jdt/plugin.xml

@@ -2,6 +2,10 @@
 <?eclipse version="3.5"?>
 <plugin>
 
+   <extension-point id="dataModelProviders"
+					name="%dataModelProviders.name"
+					schema="schema/dataModelProviders.exsd" />
+
    <!-- Delegate command handler for Qute template -->
    <extension point="org.eclipse.jdt.ls.core.delegateCommandHandler">
       <delegateCommandHandler class="com.redhat.qute.jdt.internal.ls.QuteSupportForTemplateDelegateCommandHandler">      
@@ -23,4 +27,19 @@
        </delegateCommandHandler>
    </extension>
 
-</plugin>
+   <!-- Data model providers for Qute core -->
+   <extension point="com.redhat.qute.jdt.dataModelProviders">
+   	  <provider class="com.redhat.qute.jdt.internal.template.datamodel.CheckedTemplateSupport" />
+      <provider class="com.redhat.qute.jdt.internal.template.datamodel.TemplateExtensionSupport" />            
+      <provider class="com.redhat.qute.jdt.internal.template.datamodel.TemplateFieldSupport" />
+   </extension>
+
+   <!-- Data model providers for Quarkus integration for Qute -->
+   <extension point="com.redhat.qute.jdt.dataModelProviders">
+      <provider namespaces="inject,cdi"
+                description="A CDI bean annotated with `@Named` can be referenced in any template through `cdi` and/or `inject` namespaces."
+                url="https://quarkus.io/guides/qute-reference#injecting-beans-directly-in-templates"
+                class="com.redhat.qute.jdt.internal.extensions.quarkus.InjectNamespaceResolverSupport" />
+   </extension>
+
+</plugin>