From 161276dbd6d97e3ce9826f5b8ea65984c9c5d3cd Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 20 Mar 2025 21:25:47 +0100 Subject: [PATCH] move set of jakarta annotations to constants class --- .../ide/vscode/boot/java/Annotations.java | 6 ++++++ .../ide/vscode/boot/java/utils/SpringIndexerJava.java | 11 +---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java index 792981421..c78a049cd 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java +++ b/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 JAKARTA_ANNOTATIONS = Set.of( + Annotations.RESOURCE_JAKARTA, Annotations.INJECT_JAKARTA, Annotations.NAMED_JAKARTA, + Annotations.RESOURCE_JAVAX, Annotations.INJECT_JAVAX, Annotations.NAMED_JAVAX + ); + } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java index 8ef111c1b..fc6f2cafc 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java +++ b/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, BiConsumer, IProblemCollector> problemCollectorCreator; - private final Set 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 symbolProviders, IndexCache cache, JavaProjectFinder projectFimder, ProgressService progressService, JdtReconciler jdtReconciler, @@ -861,7 +856,7 @@ public class SpringIndexerJava implements SpringIndexer { 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 @@ public class SpringIndexerJava implements SpringIndexer { 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);