Added integration test for generic managed bean class

eclipse-lsp4jakarta · Dec 1, 2021 · d06b37a · d06b37a
1 parent b3ac527
commit d06b37a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/...e/src/main/java/org/eclipse/lsp4jakarta/jdt/core/cdi/ManagedBeanDiagnosticsCollector.java b/...e/src/main/java/org/eclipse/lsp4jakarta/jdt/core/cdi/ManagedBeanDiagnosticsCollector.java
@@ -254,10 +254,10 @@ else if (!hasParameterizedInjectConstructor)
                  */
                 if (isManagedBean) {
                 	boolean isClassGeneric = type.getTypeParameters().length != 0;
-
-                    if (isClassGeneric && managedBeanAnnotations.stream()
-                            .anyMatch(annotation -> !annotation.equals("Dependent"))) {
-                    	diagnostics.add(createDiagnostic(type, unit, "Managed bean class of generic type must have scope @dependent.",
+                    boolean isDependent = !managedBeanAnnotations.stream().anyMatch(annotation -> !annotation.equals("Dependent"));
+                	
+                    if (isClassGeneric && !isDependent) {
+                    	diagnostics.add(createDiagnostic(type, unit, "Managed bean class of generic type must have scope @Dependent",
                     			DIAGNOSTIC_CODE));
                     }
                 }

diff --git a/....core/src/main/java/org/eclipse/lsp4jakarta/jdt/core/di/DependencyInjectionConstants.java b/....core/src/main/java/org/eclipse/lsp4jakarta/jdt/core/di/DependencyInjectionConstants.java
@@ -13,10 +13,6 @@
 
 package org.eclipse.lsp4jakarta.jdt.core.di;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.eclipse.lsp4j.DiagnosticSeverity;
 
 public class DependencyInjectionConstants {

diff --git a/.../projects/jakarta-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java b/.../projects/jakarta-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java
@@ -3,7 +3,7 @@
 import jakarta.enterprise.context.*;
 
 @RequestScoped
-public class ManagedBean {
+public class ManagedBean<T> {
 	public int a;
 
 

diff --git a/...e.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/cdi/ManagedBeanTest.java b/...e.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/cdi/ManagedBeanTest.java
@@ -35,17 +35,27 @@ public void managedBeanAnnotations() throws Exception {
         diagnosticsParams.setUris(Arrays.asList(uri));
 
         // test expected diagnostic
-        Diagnostic d = d(6, 12, 13,
+        Diagnostic d1 = d(6, 12, 13,
                 "A managed bean with a non-static public field must not declare any scope other than @Dependent",
                 DiagnosticSeverity.Error, "jakarta-cdi", "InvalidManagedBeanAnnotation");
+
+        Diagnostic d2 = d(5, 13, 24,
+                "Managed bean class of generic type must have scope @Dependent",
+                DiagnosticSeverity.Error, "jakarta-cdi", "InvalidManagedBeanAnnotation");
 
-        assertJavaDiagnostics(diagnosticsParams, JDT_UTILS, d);
+        assertJavaDiagnostics(diagnosticsParams, JDT_UTILS, d1, d2);
 
-        // test expected quick-fix
-        JakartaJavaCodeActionParams codeActionParams = createCodeActionParams(uri, d);
-        TextEdit te = te(4, 0, 5, 0, "@Dependent\n");
-        CodeAction ca = ca(uri, "Replace current scope with @Dependent", d, te);
-        assertJavaCodeAction(codeActionParams, JDT_UTILS, ca);
+        // Assert for the diagnostic d1
+        JakartaJavaCodeActionParams codeActionParams1 = createCodeActionParams(uri, d1);
+        TextEdit te1 = te(4, 0, 5, 0, "@Dependent\n");
+        CodeAction ca1 = ca(uri, "Replace current scope with @Dependent", d1, te1);
+        assertJavaCodeAction(codeActionParams1, JDT_UTILS, ca1);
+
+        // Assert for the diagnostic d2
+        JakartaJavaCodeActionParams codeActionParams2 = createCodeActionParams(uri, d2);
+        TextEdit te2 = te(4, 0, 5, 0, "@Dependent\n");
+        CodeAction ca2 = ca(uri, "Replace current scope with @Dependent", d2, te2);
+        assertJavaCodeAction(codeActionParams2, JDT_UTILS, ca2);
     }
 
     @Test