spring-projects
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
Copy file name to clipboard
+11-1Lines changed: 11 additions & 1 deletion b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
Copy file name to clipboard
+11-1Lines changed: 11 additions & 1 deletion
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
diff --git a/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java
Copy file name to clipboard
+76Lines changed: 76 additions & 0 deletions b/‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java
Copy file name to clipboard
+76Lines changed: 76 additions & 0 deletions
@@ -26,6 +26,8 @@
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProcessor;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchies;
 import org.springframework.ide.vscode.boot.java.beans.DependsOnCompletionProcessor;
+import org.springframework.ide.vscode.boot.java.beans.BeanNamesCompletionProcessor;
+import org.springframework.ide.vscode.boot.java.beans.BeanTypesCompletionProcessor;
 import org.springframework.ide.vscode.boot.java.beans.NamedCompletionProvider;
 import org.springframework.ide.vscode.boot.java.beans.ProfileCompletionProvider;
 import org.springframework.ide.vscode.boot.java.beans.QualifierCompletionProvider;
@@ -125,6 +127,8 @@ BootJavaCompletionEngine javaCompletionEngine(
 
 		providers.put(Annotations.SCOPE, new AnnotationAttributeCompletionProcessor(javaProjectFinder, Map.of("value", new ScopeCompletionProcessor())));
 		providers.put(Annotations.DEPENDS_ON, new AnnotationAttributeCompletionProcessor(javaProjectFinder, Map.of("value", new DependsOnCompletionProcessor(springIndex))));
+		providers.put(Annotations.CONDITIONAL_ON_BEAN, new AnnotationAttributeCompletionProcessor(javaProjectFinder, Map.of("name", new BeanNamesCompletionProcessor(springIndex),"type", new BeanTypesCompletionProcessor(springIndex))));
+
 		providers.put(Annotations.QUALIFIER, new AnnotationAttributeCompletionProcessor(javaProjectFinder, Map.of("value", new QualifierCompletionProvider(springIndex))));
 		providers.put(Annotations.PROFILE, new AnnotationAttributeCompletionProcessor(javaProjectFinder, Map.of("value", new ProfileCompletionProvider(springIndex))));
 
 
@@ -51,6 +51,7 @@
 import org.springframework.ide.vscode.boot.java.beans.ResourceDefinitionProvider;
 import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceDefinitionProvider;
 import org.springframework.ide.vscode.boot.java.copilot.util.ResponseModifier;
+import org.springframework.ide.vscode.boot.java.beans.ConditionalOnBeanDefinitionProvider;
 import org.springframework.ide.vscode.boot.java.data.jpa.queries.DataQueryParameterDefinitionProvider;
 import org.springframework.ide.vscode.boot.java.data.jpa.queries.JdtDataQuerySemanticTokensProvider;
 import org.springframework.ide.vscode.boot.java.handlers.BootJavaCodeActionProvider;
@@ -405,6 +406,7 @@ JavaDefinitionHandler javaDefinitionHandler(SimpleLanguageServer server, Compila
 				new ValueDefinitionProvider(),
 				new ConditionalOnResourceDefinitionProvider(),
 				new DependsOnDefinitionProvider(springIndex),
+				new ConditionalOnBeanDefinitionProvider(springIndex),
 				new ResourceDefinitionProvider(springIndex),
 				new QualifierDefinitionProvider(springIndex),
 				new NamedDefinitionProvider(springIndex),
 
@@ -88,9 +88,13 @@ else if (node instanceof StringLiteral && node.getParent() instanceof Annotation
 					computeProposalsForStringLiteral(project, node, "value", completions, offset, doc);
 				}
 			}
-			// case: @Qualifier({"prefix<*>"})
+			// case: @Qualifier({"prefix<*>"}) || @Qualifier(value={"prefix<*>"})
 			else if (node instanceof StringLiteral && node.getParent() instanceof ArrayInitializer) {
 				if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {
+					if (node.getParent().getParent() instanceof MemberValuePair) {
+						String attributeName = ((MemberValuePair)node.getParent().getParent()).getName().toString();
+						computeProposalsForInsideArrayInitializer(project, node, attributeName, completions, offset, doc);
+					}
 					computeProposalsForInsideArrayInitializer(project, node, "value", completions, offset, doc);
 				}
 			}
@@ -106,6 +110,12 @@ else if (node instanceof StringLiteral && node.getParent() instanceof MemberValu
 			else if (node instanceof ArrayInitializer && node.getParent() instanceof Annotation) {
 				computeProposalsForArrayInitializr(project, (ArrayInitializer) node, "value", completions, offset, doc);
 			}
+			// case: @Qualifier(value={<*>})
+			else if (node instanceof ArrayInitializer && node.getParent() instanceof MemberValuePair
+					&& completionProviders.containsKey(((MemberValuePair)node.getParent()).getName().toString())) {
+				String attributeName = ((MemberValuePair)node.getParent()).getName().toString();
+				computeProposalsForArrayInitializr(project, (ArrayInitializer) node, attributeName, completions, offset, doc);
+			}
 		}
 		catch (Exception e) {
 			e.printStackTrace();
 
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Broadcom
+ * 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:
+ *     Broadcom - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.java.beans;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.commons.java.IJavaProject;
+import org.springframework.ide.vscode.commons.protocol.spring.Bean;
+
+/**
+ * @author Karthik Sankaranarayanan
+ */
+public class BeanNamesCompletionProcessor implements AnnotationAttributeCompletionProvider {
+
+    private final SpringMetamodelIndex springIndex;
+
+    public BeanNamesCompletionProcessor(SpringMetamodelIndex springIndex) {
+        this.springIndex = springIndex;
+    }
+
+    @Override
+    public Map<String, String> getCompletionCandidates(IJavaProject project) {
+        Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
+        return Arrays.stream(beans)
+                .map(Bean::getName)
+                .distinct()
+                .collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+    }
+}
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Broadcom
+ * 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:
+ *     Broadcom - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.java.beans;
+
+import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.commons.java.IJavaProject;
+import org.springframework.ide.vscode.commons.protocol.spring.Bean;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Karthik Sankaranarayanan
+ */
+public class BeanTypesCompletionProcessor implements AnnotationAttributeCompletionProvider {
+
+    private final SpringMetamodelIndex springIndex;
+
+    public BeanTypesCompletionProcessor(SpringMetamodelIndex springIndex) {
+        this.springIndex = springIndex;
+    }
+
+    @Override
+    public Map<String, String> getCompletionCandidates(IJavaProject project) {
+        Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
+        return Arrays.stream(beans)
+                .map(Bean::getType)
+                .distinct()
+                .collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+    }
+}
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Broadcom
+ * 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:
+ *     Broadcom - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.java.beans;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
+import org.eclipse.jdt.core.dom.StringLiteral;
+import org.eclipse.lsp4j.LocationLink;
+import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.eclipse.lsp4j.jsonrpc.CancelChecker;
+import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.Annotations;
+import org.springframework.ide.vscode.boot.java.IJavaDefinitionProvider;
+import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
+import org.springframework.ide.vscode.commons.java.IJavaProject;
+import org.springframework.ide.vscode.commons.protocol.spring.Bean;
+
+/**
+ * @author Karthik Sankaranarayanan
+ */
+public class ConditionalOnBeanDefinitionProvider implements IJavaDefinitionProvider {
+
+    private final SpringMetamodelIndex springIndex;
+
+    public ConditionalOnBeanDefinitionProvider(SpringMetamodelIndex springIndex) {
+        this.springIndex = springIndex;
+    }
+
+    @Override
+    public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject project, TextDocumentIdentifier docId, CompilationUnit cu, ASTNode n, int offset) {
+        if (n instanceof StringLiteral) {
+            StringLiteral valueNode = (StringLiteral) n;
+
+            ASTNode parent = ASTUtils.getNearestAnnotationParent(valueNode);
+
+            if (parent != null && parent instanceof Annotation) {
+                Annotation a = (Annotation) parent;
+                IAnnotationBinding binding = a.resolveAnnotationBinding();
+                if (binding != null && binding.getAnnotationType() != null && Annotations.CONDITIONAL_ON_BEAN.equals(binding.getAnnotationType().getQualifiedName())) {
+                    String beanName = valueNode.getLiteralValue();
+
+                    if (beanName != null && beanName.length() > 0) {
+                        return findBeansWithName(project, beanName);
+                    }
+                }
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    private List<LocationLink> findBeansWithName(IJavaProject project, String beanName) {
+        Bean[] beans = this.springIndex.getBeansWithName(project.getElementName(), beanName);
+
+        return Arrays.stream(beans)
+                .map(bean -> {
+                    return new LocationLink(bean.getLocation().getUri(), bean.getLocation().getRange(), bean.getLocation().getRange());
+                })
+                .collect(Collectors.toList());
+    }
+
+}
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,13 @@ else if (node instanceof StringLiteral && node.getParent() instanceof Annotation`
`88`	`88`	`computeProposalsForStringLiteral(project, node, "value", completions, offset, doc);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`		`- // case: @Qualifier({"prefix<*>"})`
	`91`	`+ // case: @Qualifier({"prefix<>"}) \|\| @Qualifier(value={"prefix<>"})`
`92`	`92`	`else if (node instanceof StringLiteral && node.getParent() instanceof ArrayInitializer) {`
`93`	`93`	`if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) {`
	`94`	`+ if (node.getParent().getParent() instanceof MemberValuePair) {`
	`95`	`+ String attributeName = ((MemberValuePair)node.getParent().getParent()).getName().toString();`
	`96`	`+ computeProposalsForInsideArrayInitializer(project, node, attributeName, completions, offset, doc);`
	`97`	`+ }`
`94`	`98`	`computeProposalsForInsideArrayInitializer(project, node, "value", completions, offset, doc);`
`95`	`99`	`}`
`96`	`100`	`}`
`@@ -106,6 +110,12 @@ else if (node instanceof StringLiteral && node.getParent() instanceof MemberValu`
`106`	`110`	`else if (node instanceof ArrayInitializer && node.getParent() instanceof Annotation) {`
`107`	`111`	`computeProposalsForArrayInitializr(project, (ArrayInitializer) node, "value", completions, offset, doc);`
`108`	`112`	`}`
	`113`	`+ // case: @Qualifier(value={<*>})`
	`114`	`+ else if (node instanceof ArrayInitializer && node.getParent() instanceof MemberValuePair`
	`115`	`+ && completionProviders.containsKey(((MemberValuePair)node.getParent()).getName().toString())) {`
	`116`	`+ String attributeName = ((MemberValuePair)node.getParent()).getName().toString();`
	`117`	`+ computeProposalsForArrayInitializr(project, (ArrayInitializer) node, attributeName, completions, offset, doc);`
	`118`	`+ }`
`109`	`119`	`}`
`110`	`120`	`catch (Exception e) {`
`111`	`121`	`e.printStackTrace();`