Create common method to generate diagnostic.

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>
eclipse · Jul 24, 2023 · 3d5a7fd · 3d5a7fd
1 parent 23f978d
commit 3d5a7fd
Showing 1 changed file with 17 additions and 26 deletions.
diff --git a/...a/org/eclipse/lsp4jakarta/jdt/core/beanvalidation/BeanValidationDiagnosticsCollector.java b/...a/org/eclipse/lsp4jakarta/jdt/core/beanvalidation/BeanValidationDiagnosticsCollector.java
@@ -160,14 +160,11 @@ private void validAnnotation(IMember element, IAnnotation annotation, String mat
                                 DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
                     }
                 } else if (matchedAnnotation.equals(EMAIL)) {
-                    if (!type.equals(getSignatureFormatOfType(STRING))
-                            && !type.equals(getSignatureFormatOfType(CHAR_SEQUENCE))) {
-                        String source = isMethod ? 
-                                Messages.getMessage("AnnotationStringMethods", "@" + annotationName) :
-                                Messages.getMessage("AnnotationStringFields", "@" + annotationName);
-                        diagnostics.add(createDiagnostic(element, declaringType.getCompilationUnit(),
-                                source, DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
-                    }
+                    checkStringOnly(element, declaringType, diagnostics, annotationName, isMethod, type);
+                } else if (matchedAnnotation.equals(NOT_BLANK)) {
+                    checkStringOnly(element, declaringType, diagnostics, annotationName, isMethod, type);
+                } else if (matchedAnnotation.equals(PATTERN)) {
+                    checkStringOnly(element, declaringType, diagnostics, annotationName, isMethod, type);
                 } else if (matchedAnnotation.equals(FUTURE) || matchedAnnotation.equals(FUTURE_OR_PRESENT)
                         || matchedAnnotation.equals(PAST) || matchedAnnotation.equals(PAST_OR_PRESENT)) {
                     String dataType = getDataTypeName(type);
@@ -214,24 +211,6 @@ private void validAnnotation(IMember element, IAnnotation annotation, String mat
                         diagnostics.add(createDiagnostic(element, declaringType.getCompilationUnit(),
                                 source, DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
                     }
-                } else if (matchedAnnotation.equals(NOT_BLANK)) {
-                    if (!type.equals(getSignatureFormatOfType(STRING))
-                            && !type.equals(getSignatureFormatOfType(CHAR_SEQUENCE))) {
-                        String source = isMethod ? 
-                                Messages.getMessage("AnnotationStringMethods", "@" + annotationName) :
-                                Messages.getMessage("AnnotationStringFields", "@" + annotationName);
-                        diagnostics.add(createDiagnostic(element, declaringType.getCompilationUnit(),
-                                source, DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
-                    }
-                } else if (matchedAnnotation.equals(PATTERN)) {
-                    if (!type.equals(getSignatureFormatOfType(STRING))
-                            && !type.equals(getSignatureFormatOfType(CHAR_SEQUENCE))) {
-                        String source = isMethod ? 
-                                Messages.getMessage("AnnotationStringMethods", "@" + annotationName) :
-                                Messages.getMessage("AnnotationStringFields", "@" + annotationName);
-                        diagnostics.add(createDiagnostic(element, declaringType.getCompilationUnit(),
-                                source, DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
-                    }
                 }
 
                 // These ones contains check on all collection types which requires resolving
@@ -266,6 +245,18 @@ private void validAnnotation(IMember element, IAnnotation annotation, String mat
         }
     }
 
+    private void checkStringOnly(IMember element, IType declaringType, List<Diagnostic> diagnostics,
+            String annotationName, boolean isMethod, String type) throws JavaModelException {
+        if (!type.equals(getSignatureFormatOfType(STRING))
+                && !type.equals(getSignatureFormatOfType(CHAR_SEQUENCE))) {
+            String source = isMethod ? 
+                    Messages.getMessage("AnnotationStringMethods", "@" + annotationName) :
+                    Messages.getMessage("AnnotationStringFields", "@" + annotationName);
+            diagnostics.add(createDiagnostic(element, declaringType.getCompilationUnit(),
+                    source, DIAGNOSTIC_CODE_INVALID_TYPE, annotationName, DiagnosticSeverity.Error));
+        }
+    }
+
     /*
      * Refer to Class signature documentation for the formating
      * https://www.ibm.com/support/knowledgecenter/sl/SS5JSH_9.5.0/org.eclipse.jdt.