Merge pull request #1071 from mrglavas/1070#reduce-code-duplication

BeanValidationDiagnosticsCollector: Refactoring method and field annotation processing loops into one method.
OpenLiberty · Nov 7, 2024 · cc044cc · cc044cc
2 parents bdb5c2d + c038bc2
commit cc044cc
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/.../tools/intellij/lsp4jakarta/lsp4ij/beanvalidation/BeanValidationDiagnosticsCollector.java b/.../tools/intellij/lsp4jakarta/lsp4ij/beanvalidation/BeanValidationDiagnosticsCollector.java
@@ -35,40 +35,34 @@ protected String getDiagnosticSource() {
     }
 
     public void collectDiagnostics(PsiJavaFile unit, List<Diagnostic> diagnostics) {
-
         if (unit != null) {
             PsiClass[] alltypes;
             PsiField[] allFields;
-            PsiAnnotation[] annotations;
             PsiMethod[] allMethods;
 
             alltypes = unit.getClasses();
             for (PsiClass type : alltypes) {
                 allFields = type.getFields();
                 for (PsiField field : allFields) {
-                    annotations = field.getAnnotations();
-                    for (PsiAnnotation annotation : annotations) {
-                        String matchedAnnotation = getMatchedJavaElementName(type, annotation.getQualifiedName(),
-                                SET_OF_ANNOTATIONS.toArray(new String[0]));
-                        if (matchedAnnotation != null) {
-                            validAnnotation(field, annotation, matchedAnnotation, diagnostics);
-                        }
-                    }
+                    processAnnotations(field, type, diagnostics);
                 }
                 allMethods = type.getMethods();
                 for (PsiMethod method : allMethods) {
-                    annotations = method.getAnnotations();
-                    for (PsiAnnotation annotation : annotations) {
-                        String matchedAnnotation = getMatchedJavaElementName(type, annotation.getQualifiedName(),
-                                SET_OF_ANNOTATIONS.toArray(new String[0]));
-                        if (matchedAnnotation != null) {
-                            validAnnotation(method, annotation, matchedAnnotation, diagnostics);
-                        }
-                    }
+                    processAnnotations(method, type, diagnostics);
                 }
             }
         }
+    }
 
+    private void processAnnotations(PsiJvmModifiersOwner psiModifierOwner, PsiClass type, List<Diagnostic> diagnostics) {
+        PsiAnnotation[] annotations = psiModifierOwner.getAnnotations();
+        for (PsiAnnotation annotation : annotations) {
+            String matchedAnnotation = getMatchedJavaElementName(type, annotation.getQualifiedName(),
+                    SET_OF_ANNOTATIONS.toArray(new String[0]));
+            if (matchedAnnotation != null) {
+                validAnnotation(psiModifierOwner, annotation, matchedAnnotation, diagnostics);
+            }
+        }
     }
 
     private void validAnnotation(PsiElement element, PsiAnnotation annotation, String matchedAnnotation,