Skip to content

BeanValidationDiagnosticsCollector: Refactoring method and field annotation processing loops into one method. #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrglavas merged 1 commit into from
Nov 7, 2024
+12 −18
Merged

BeanValidationDiagnosticsCollector: Refactoring method and field annotation processing loops into one method. #1071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions .../tools/intellij/lsp4jakarta/lsp4ij/beanvalidation/BeanValidationDiagnosticsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading