From 7c40f304803a1ced85e4f242829d345fd1880e85 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 9 Jan 2025 14:36:50 +0100 Subject: [PATCH] GH-1041: removed special symbols addon class for config beans, not necessary anymore --- .../java/beans/ComponentSymbolProvider.java | 13 ++++--------- .../ConfigBeanSymbolAddOnInformation.java | 19 ------------------- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConfigBeanSymbolAddOnInformation.java diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java index 01312a60a..7d9dfb41a 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java @@ -90,15 +90,10 @@ public class ComponentSymbolProvider extends AbstractSymbolProvider { beanLabel("+", annotationTypeName, metaAnnotationNames, beanName, beanType.getName()), SymbolKind.Interface, Either.forLeft(location)); - boolean isConfiguration = false; - SymbolAddOnInformation[] addon = new SymbolAddOnInformation[0]; - if (Annotations.CONFIGURATION.equals(annotationType.getQualifiedName()) - || metaAnnotations.stream().anyMatch(t -> Annotations.CONFIGURATION.equals(t.getQualifiedName()))) { - addon = new SymbolAddOnInformation[] {new ConfigBeanSymbolAddOnInformation(beanName, beanType.getQualifiedName())}; - isConfiguration = true; - } else { - addon = new SymbolAddOnInformation[] {new BeansSymbolAddOnInformation(beanName, beanType.getQualifiedName())}; - } + boolean isConfiguration = Annotations.CONFIGURATION.equals(annotationType.getQualifiedName()) + || metaAnnotations.stream().anyMatch(t -> Annotations.CONFIGURATION.equals(t.getQualifiedName())); + + SymbolAddOnInformation[] addon = new SymbolAddOnInformation[] {new BeansSymbolAddOnInformation(beanName, beanType.getQualifiedName())}; InjectionPoint[] injectionPoints = ASTUtils.findInjectionPoints(type, doc); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConfigBeanSymbolAddOnInformation.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConfigBeanSymbolAddOnInformation.java deleted file mode 100644 index 58beddf04..000000000 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConfigBeanSymbolAddOnInformation.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2022 VMware, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * VMware, Inc. - initial API and implementation - *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.beans; - -public class ConfigBeanSymbolAddOnInformation extends BeansSymbolAddOnInformation { - - public ConfigBeanSymbolAddOnInformation(String beanID, String beanType) { - super(beanID, beanType); - } - -}