fix: allow inject: with constructor class which have arguments

Signed-off-by: azerr <[email protected]>
redhat-developer · Jul 8, 2024 · 5008e6a · 5008e6a
1 parent 7b0c9c6
commit 5008e6a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/qute.jdt/com.redhat.qute.jdt.test/projects/maven/quarkus3/src/main/java/org/acme/Bean3.java b/qute.jdt/com.redhat.qute.jdt.test/projects/maven/quarkus3/src/main/java/org/acme/Bean3.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+public class Bean3 {
+
+    // Quarkus can inject Bean1 in the constructor without declaring the bean1 parameter with @Inject
+    public Bean3(Bean1 bean1) {
+
+    }
+}
diff --git a/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/utils/CDIUtilsTest.java b/qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/utils/CDIUtilsTest.java
@@ -85,24 +85,26 @@ public void namedWithGetterMethod() {
 	@Test
 	public void isBeanQuarkus3() throws Exception {
 		IJavaProject javaProject = loadMavenProject(QuteMavenProjectName.quarkus3);
-		IFile javaFile = javaProject.getProject()
-				.getFile(new Path("src/main/java/org/acme/NotBean1.java"));
-		ICompilationUnit cu = JDTUtilsLSImpl.getInstance().resolveCompilationUnit(javaFile.getLocationURI().toString());
-		// @Decorator annotated class is not a bean
-		assertFalse(CDIUtils.isValidBean(cu.findPrimaryType()));
 
-		cu.getAllTypes();
+		ICompilationUnit notBean1 = getCompilationUnit("src/main/java/org/acme/NotBean1.java", javaProject);
+		// @Decorator annotated class is not a bean
+		assertFalse(CDIUtils.isValidBean(notBean1.findPrimaryType()));
 
-		javaFile = javaProject.getProject()
-				.getFile(new Path("src/main/java/org/acme/NotBean2.java"));
-		cu = JDTUtilsLSImpl.getInstance().resolveCompilationUnit(javaFile.getLocationURI().toString());
+		ICompilationUnit notBean2 = getCompilationUnit("src/main/java/org/acme/NotBean2.java", javaProject);
 		// @Vetoed annotated class is not a bean
-		assertFalse(CDIUtils.isValidBean(cu.findPrimaryType()));
+		assertFalse(CDIUtils.isValidBean(notBean2.findPrimaryType()));
 
-		javaFile = javaProject.getProject()
-				.getFile(new Path("src/main/java/org/acme/Bean1.java"));
-		cu = JDTUtilsLSImpl.getInstance().resolveCompilationUnit(javaFile.getLocationURI().toString());
+		ICompilationUnit bean1 = getCompilationUnit("src/main/java/org/acme/Bean1.java", javaProject);
 		// Empty class is a bean
-		assertTrue(CDIUtils.isValidBean(cu.findPrimaryType()));
+		assertTrue(CDIUtils.isValidBean(bean1.findPrimaryType()));
+
+		// Class with constructor is a bean
+		ICompilationUnit bean3 = getCompilationUnit("src/main/java/org/acme/Bean3.java", javaProject);
+		assertTrue(CDIUtils.isValidBean(bean3));
+	}
+
+	private static ICompilationUnit getCompilationUnit(String javaFilePath, IJavaProject javaProject) {
+		IFile javaFile = javaProject.getProject().getFile(new Path(javaFilePath));
+		return JDTUtilsLSImpl.getInstance().resolveCompilationUnit(javaFile.getLocationURI().toString());
 	}
 }
diff --git a/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/utils/CDIUtils.java b/qute.jdt/com.redhat.qute.jdt/src/main/java/com/redhat/qute/jdt/utils/CDIUtils.java
@@ -79,7 +79,10 @@ public static boolean isValidBean(IJavaElement javaElement) {
 					&& !Flags.isAbstract(type.getFlags())
 					&& !AnnotationUtils.hasAnnotation((IAnnotatable) javaElement, JAVAX_DECORATOR_ANNOTATION, JAKARTA_DECORATOR_ANNOTATION)
 					&& !AnnotationUtils.hasAnnotation((IAnnotatable) javaElement, JAVAX_INJECT_VETOED_ANNOTATION, JAKARTA_INJECT_VETOED_ANNOTATION)
-					&& type.isClass() && hasNoArgConstructor(type));
+					&& type.isClass() 
+					// In Quarkus context, all arguments are injected
+					// See https://github.com/redhat-developer/vscode-quarkus/issues/708
+					/* && hasNoArgConstructor(type)*/);
 		} catch (Exception e) {
 			return false;
 		}