move set of jakarta annotations to constants class

Author: martinlippert

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java

@@ -114,5 +114,11 @@ public class Annotations {
 	        "org.aspectj.lang.annotation.AfterThrowing", "AfterThrowing",
 	        "org.aspectj.lang.annotation.DeclareParents", "DeclareParents"
 	);
+	
+	public static final Set<String> JAKARTA_ANNOTATIONS = Set.of(
+			Annotations.RESOURCE_JAKARTA, Annotations.INJECT_JAKARTA, Annotations.NAMED_JAKARTA,
+			Annotations.RESOURCE_JAVAX, Annotations.INJECT_JAVAX, Annotations.NAMED_JAVAX
+	);
+
 
 }

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java

@@ -114,11 +114,6 @@ public class SpringIndexerJava implements SpringIndexer {
 	private final SpringIndexerJavaDependencyTracker dependencyTracker = new SpringIndexerJavaDependencyTracker();
 	private final BiFunction<AtomicReference<TextDocument>, BiConsumer<String, Diagnostic>, IProblemCollector> problemCollectorCreator;
 
-	private final Set<String> jakartaAnnnotations = Set.of(
-			Annotations.RESOURCE_JAKARTA, Annotations.INJECT_JAKARTA, Annotations.NAMED_JAKARTA,
-			Annotations.RESOURCE_JAVAX, Annotations.INJECT_JAVAX, Annotations.NAMED_JAVAX
-	);
-
 
 	public SpringIndexerJava(SymbolHandler symbolHandler, AnnotationHierarchyAwareLookup<SymbolProvider> symbolProviders, IndexCache cache,
 			JavaProjectFinder projectFimder, ProgressService progressService, JdtReconciler jdtReconciler,
@@ -861,7 +856,7 @@ private WorkspaceSymbol provideDefaultSymbol(Annotation node, final SpringIndexe
 				String qualifiedName = type.getQualifiedName();
 				if (qualifiedName != null
 						&& ((qualifiedName.startsWith("org.springframework") && !qualifiedName.startsWith("org.springframework.lang"))
-							|| isJakartaAnnotationWithDefaultSymbol(qualifiedName))) {
+							|| Annotations.JAKARTA_ANNOTATIONS.contains(qualifiedName))) {
 					TextDocument doc = DocumentUtils.getTempTextDocument(context.getDocURI(), context.getDocRef(), context.getContent());
 					return DefaultSymbolProvider.provideDefaultSymbol(node, doc);
 				}
@@ -877,10 +872,6 @@ private WorkspaceSymbol provideDefaultSymbol(Annotation node, final SpringIndexe
 		return null;
 	}
 
-	private boolean isJakartaAnnotationWithDefaultSymbol(String qualifiedName) {
-		return jakartaAnnnotations.contains(qualifiedName);
-	}
-
 	public static ASTParserCleanupEnabled createParser(IJavaProject project, AnnotationHierarchies annotationHierarchies, boolean ignoreMethodBodies) throws Exception {
 		String[] classpathEntries = getClasspathEntries(project);
 		String[] sourceEntries = getSourceEntries(project);